ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
20,634 Commits 2 Branches 0 Tags 54 MiB
8fa06d3579
Commit Graph

20634 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Russell Brenner
8fa06d3579 am 49b49f8f: Added include/private/hwui/DrawGlInfo.h 
* commit '49b49f8fb6d094768d4e093353b34271f2da1bfc':
  Added include/private/hwui/DrawGlInfo.h
 2011-03-31 18:55:20 -07:00
Jeff Hamilton
105d6527dd am 96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread 
* commit '96cf34d362a1666683e813af915e4f6e0d1b38a0':
  Make STOP_APP_SWITCHES signatureOrSystem.
 2011-03-30 09:30:40 -07:00
Irfan Sheriff
51af9642fd am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread 
* commit '05f14e2bcf78be62b35e85902408ea66103a3881':
  DO NOT MERGE Pick upstream intf with valid IP conf
 2011-03-30 09:30:32 -07:00
Robert Greenwalt
4f90fda71f am 568845a7: Merge "Fix some alt-network issues." into gingerbread 
* commit '568845a766cddc4e4c222b4d9de064f8a48da990':
  Fix some alt-network issues.
 2011-03-30 09:30:15 -07:00
The Android Open Source Project
db14ee1cc2 am ad663d80: Merge from gingerbread 
* commit 'ad663d8040ddd4f3e537117847f20d42797b429e':
  egl: fixes for object refcounts
 2011-03-29 15:23:08 -07:00
The Android Open Source Project
1a1b70fbfa Merge from gingerbread 
Change-Id: I31e3da083b642d5c7cf6332095fa228b840ee7bb
 2011-03-29 13:54:43 -07:00
Michael I. Gold
894c1459c1 egl: fixes for object refcounts 
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same.  eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.

Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5
Related-Bug: 2964479
 2011-03-29 13:43:54 -07:00
Brad Fitzpatrick
eb797b1fd5 am 1e7fb7ae: Merge "Error in compound cache-control header." 
* commit '1e7fb7aed7b00cebc8f0e501c911727af6527523':
  Error in compound cache-control header.
 2011-03-29 09:27:16 -07:00
Brad Fitzpatrick
13e41db3a1 Merge "Error in compound cache-control header." 2011-03-29 08:55:02 -07:00
Brad Fitzpatrick
7dba70e98f am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" 
* commit 'f0dbf00d37c349e8c615045876d6bc89b6bb8c54':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils
 2011-03-28 08:26:02 -07:00
Brad Fitzpatrick
587b9dc7b6 am 1a5a2379: Merge "Unregister callback from binder when vibration is removed" 
* commit '1a5a2379eb3a6cf16fb153aecbc4ac9e85d3ed42':
  Unregister callback from binder when vibration is removed
 2011-03-28 08:15:35 -07:00
Brad Fitzpatrick
199f567fc7 Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" 2011-03-28 08:13:08 -07:00
Brad Fitzpatrick
a57bf3d09b Merge "Unregister callback from binder when vibration is removed" 2011-03-28 07:59:08 -07:00
Jeff Hamilton
fbf4a75c57 Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread 2011-03-25 14:53:14 -07:00
Irfan Sheriff
fce4eab91a Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread 2011-03-25 11:01:02 -07:00
Robert Greenwalt
9028577960 Merge "Fix some alt-network issues." into gingerbread 2011-03-25 09:35:53 -07:00
Jeff Hamilton
618cfd6e85 am 9c1ef098: Update the value for the NFC shared UID. 
* commit '9c1ef098837bd73044cb970545344dd03f66daa0':
  Update the value for the NFC shared UID.
 2011-03-24 20:21:41 -07:00
Bart Sears
89c36f4b85 am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread 
* commit '6a19759c0fae744e80c032ca3c23932e73e6d9d9':
  Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
 2011-03-24 03:36:31 -07:00
Huahui Wu
98e4ec6578 am f440831d: DO NOT MERGE 
* commit 'f440831d76817e837164ca18c7705e81d2391f87':
  DO NOT MERGE
 2011-03-24 03:35:59 -07:00
Brad Fitzpatrick
1ec98a1eb5 am 2e383bc6: Merge "Making it possible to call SIP calls with special allowed chars." 
* commit '2e383bc6445b37d3b37fbc5b7620cd4716c5692c':
  Making it possible to call SIP calls with special allowed chars.
 2011-03-23 12:44:23 -07:00
Brad Fitzpatrick
133232d829 am 5d5a0ca5: Merge "Fixing the wrong link in YuvImage JavaDoc." 
* commit '5d5a0ca5ebc3f4f60b5ad2afc161b3b8b33953e7':
  Fixing the wrong link in YuvImage JavaDoc.
 2011-03-23 12:44:18 -07:00
Brad Fitzpatrick
2fc222d9cf Merge "Making it possible to call SIP calls with special allowed chars." 2011-03-23 12:33:39 -07:00
Brad Fitzpatrick
eb6bc968dd Merge "Fixing the wrong link in YuvImage JavaDoc." 2011-03-23 12:30:28 -07:00
Nick Pelly
7821c1bd81 am e69f4267: Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread 
* commit 'e69f4267e1cdf5353fffa99a0d49f4c9069415b9':
  NfcAdapterExtras: reset singleton state if initialization fails.
 2011-03-22 10:14:36 -07:00
Nick Pelly
54b76288d4 Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread 2011-03-22 09:52:55 -07:00
Simon Wilson
dd9d07bac6 am 1ba4897e: Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread 
* commit '1ba4897e89fc30042a086b26755dfdb80af258dd':
  DO NOT MERGE Change WiMAX indicator display
 2011-03-21 18:02:57 -07:00
Simon Wilson
3614b4772e Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread 2011-03-21 16:58:41 -07:00
Fred Quintana
3a3926ac51 am 661e9b37: Merge "remove the code that clears the passwords when the sim is replaced with a different one." into gingerbread 
* commit '661e9b371fcc1a2aec5dfd74f2cc65db1d8a77d5':
  remove the code that clears the passwords when the sim is replaced with a different one.
 2011-03-21 11:33:34 -07:00
Fred Quintana
3e4bb01174 Merge "remove the code that clears the passwords when the sim is replaced with a different one." into gingerbread 2011-03-21 11:04:23 -07:00
Mike Lockwood
1b085405ba am 65de3c76: DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting 
* commit '65de3c76874386a5c1ffd26690451ecdef972a9e':
  DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
 2011-03-20 17:37:33 -07:00
Eric Fischer
eefe09b7df am c0604255: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'c0604255a71c0b7114c3f011519160d4812a8100':
  Import revised translations.  DO NOT MERGE
 2011-03-18 16:06:41 -07:00
Eric Fischer
d2cd24d8ce Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-03-18 15:22:05 -07:00
Valentin Kravtsov
a06b350e55 am 125be9c8: Merge "Fixing a race condition in RecognitionService" into gingerbread 
* commit '125be9c85a3bf71add2841d4195905c1e681a83e':
  Fixing a race condition in RecognitionService
 2011-03-18 09:04:33 -07:00
Valentin Kravtsov
16f5cc4c58 Merge "Fixing a race condition in RecognitionService" into gingerbread 2011-03-18 08:49:51 -07:00
Xia Wang
601cf70eb9 am e12a1a09: Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread 
* commit 'e12a1a0949ceaff3e4d203ab6897501fb7bdfb98':
  Port wi-fi stress test into GB DO NOT MERGE
 2011-03-17 16:21:28 -07:00
Xavier Ducrohet
c8f07bae1f am c7c8c599: Merge 67450db0 from honeycomb. Do not merge. 
* commit 'c7c8c599a636a105db0d2eac3b8b332532a7a40f':
  Merge 67450db0 from honeycomb. Do not merge.
 2011-03-17 16:21:20 -07:00
Mike Lockwood
6dd337b9f1 am 5982bf66: GPS: Restore XTRA downloading at boot. 
* commit '5982bf66d4fdea38105d91ff0f9d38660ac87581':
  GPS: Restore XTRA downloading at boot.
 2011-03-17 16:20:56 -07:00
Simon Wilson
41c48eef34 am 3f5995da: Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread 
* commit '3f5995da76541443b7c071bd3acad7590ba222ec':
  DO NOT MERGE Add images to ERI icon list
 2011-03-17 16:20:46 -07:00
Mike Lockwood
2ce416b5d2 am 27d9fb57: DO NOT MERGE: Improve message for the "no app for USB accessory" dialog. 
* commit '27d9fb57168da5b5c1385df5f0c493cf8339933f':
  DO NOT MERGE:  Improve message for the "no app for USB accessory" dialog.
 2011-03-17 16:20:32 -07:00
Xia Wang
0d2b3fe91d Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread 2011-03-17 15:06:40 -07:00
Brad Fitzpatrick
25fd80d611 am d973bed3: Merge "Removing dead store; it was likely a relict of debuging code." 
* commit 'd973bed36cb4d4da1d97f309119f4114f60e7171':
  Removing dead store; it was likely a relict of debuging code.
 2011-03-17 10:18:15 -07:00
Brad Fitzpatrick
64069d47d8 Merge "Removing dead store; it was likely a relict of debuging code." 2011-03-17 09:51:47 -07:00
Simon Wilson
2d0c7bfc6a Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread 2011-03-16 19:51:07 -07:00
Dianne Hackborn
fdbbb9ae21 am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread 
* commit '7c2e76f0a4daa7e4316e7a85d41d3c391319d955':
  Improve error reporting for issue #3183612
 2011-03-15 14:49:45 -07:00
Mike Lockwood
dd50b8a8bf am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread 
* commit 'b09763209980ff9210cc353f2410598220ec0480':
  DO NOT MERGE: Backport more USB accessory changes from honeycomb
 2011-03-15 14:49:37 -07:00
Dianne Hackborn
9db5a3473f Merge "Improve error reporting for issue #3183612" into gingerbread 2011-03-15 14:40:56 -07:00
Mike Lockwood
79ae55e051 Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread 2011-03-15 14:04:54 -07:00
Xavier Ducrohet
c0ab47832c am 0a98226e: Merge 9d76581f from honeycomb. do not merge. 
* commit '0a98226e3c8cda46786558147a0eb6a56c3370c0':
  Merge 9d76581f from honeycomb. do not merge.
 2011-03-15 11:41:13 -07:00
Xavier Ducrohet
56b53603d9 am b243aabd: Merge adaa12cd from honeycomb. do not merge. 
* commit 'b243aabdaf1ba6fdfc0579c9f949e00d562456ed':
  Merge adaa12cd from honeycomb. do not merge.
 2011-03-15 11:41:10 -07:00
Brad Fitzpatrick
08e024a356 am 8d25eab1: Merge "Releasing lock even if exception is thrown." 
* commit '8d25eab10523ac2424dc645dc697126dbadad588':
  Releasing lock even if exception is thrown.
 2011-03-15 11:37:37 -07:00