ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity
40,605 Commits 2 Branches 0 Tags 54 MiB
04e1429aeb
Commit Graph

40605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
04e1429aeb am 6b3ce09d: Merge "fix crash when validating an invalid EGL objects" into ics-mr1 
* commit '6b3ce09d37fdb53a3a32e688017a5b343398c03b':
  fix crash when validating an invalid EGL objects
 2011-11-15 13:06:06 -08:00
Mathias Agopian
233c639ab8 Merge "fix crash when validating an invalid EGL objects" into ics-mr1 2011-11-15 13:03:22 -08:00
Winson Chung
f1af922a3d am e5129d7f: Merge "Defer adding large icon until when we compose the final notification. (Bug 5566846)" into ics-mr1 
* commit 'e5129d7f49361df69e804a79696e28b213ea20b0':
  Defer adding large icon until when we compose the final notification. (Bug 5566846)
 2011-11-15 12:45:18 -08:00
Winson Chung
1dc1b96dc5 Merge "Defer adding large icon until when we compose the final notification. (Bug 5566846)" into ics-mr1 2011-11-15 12:41:56 -08:00
Danielle Millett
edebb6e705 am 49000016: am 8d8e669e: Merge "DO NOT MERGE cherry picking from MR0 cl 148223" into ics-mr0 
* commit '4900001670c5229fa06e57821a3436023c25520d':
  DO NOT MERGE cherry picking from MR0 cl 148223
 2011-11-15 12:21:01 -08:00
Danielle Millett
4a22c4e3fa am 8d8e669e: Merge "DO NOT MERGE cherry picking from MR0 cl 148223" into ics-mr0 
* commit '8d8e669ea11d011b3e2320ad5dab580916b6d32e':
  DO NOT MERGE cherry picking from MR0 cl 148223
 2011-11-15 12:16:59 -08:00
Eric Fischer
d6553a5ddc am 3524831a: am 8d00c194: Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '3524831a633693cf72880299706b2039d41c3b78':
  Import revised translations.  DO NOT MERGE
 2011-11-15 11:55:54 -08:00
Eric Fischer
7ec7256cd7 am 8d00c194: Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '8d00c194c228e67851e5a0cb75c4bf4d99dd40f0':
  Import revised translations.  DO NOT MERGE
 2011-11-15 11:51:38 -08:00
Tsu Chiang Chuang
1ad7f913fd am b3f2890a: am 047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0 
* commit 'b3f2890a8af3a99be1b0d5fd5a40df656cb60598':
  Adding mobile microbenchmark tests.
 2011-11-15 11:13:45 -08:00
Tsu Chiang Chuang
164e08265a am 047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0 
* commit '047c4de2c548960fff428a92099003593cede5f8':
  Adding mobile microbenchmark tests.
 2011-11-15 11:10:44 -08:00
Gilles Debunne
de6c104464 am 8a440477: Merge "Clean-up in TextView" into ics-mr1 
* commit '8a440477fd203d74b73b32dc2b357f07dfc36067':
  Clean-up in TextView
 2011-11-15 10:02:15 -08:00
Gilles Debunne
6f7ea17504 Merge "Clean-up in TextView" into ics-mr1 2011-11-15 09:59:45 -08:00
John Reck
44a59b2464 am a0c6bf5a: Merge "Call onScrollChanged when scrolling layers" into ics-mr1 
* commit 'a0c6bf5af6af4b0fd59347b78d3a507c416a46e6':
  Call onScrollChanged when scrolling layers
 2011-11-15 09:58:48 -08:00
John Reck
8aad25a355 Merge "Call onScrollChanged when scrolling layers" into ics-mr1 2011-11-15 09:56:17 -08:00
Hong Teng
c72dcb1bc0 am 481ffa50: Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1 
* commit '481ffa505bb1d8f5089ea98e3b5960d409b6819c':
  Fix for issue  5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
 2011-11-15 09:45:29 -08:00
Hong Teng
501fc74035 Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1 2011-11-15 09:42:37 -08:00
Daniel Sandler
0f8f6fdd22 am ce33622a: Merge "Bring back the \'more notifications\' icon." into ics-mr1 
* commit 'ce33622aed7fb25a14ef957cdc78b78cc4602be9':
  Bring back the 'more notifications' icon.
 2011-11-15 09:22:40 -08:00
Daniel Sandler
5ee4306964 Merge "Bring back the 'more notifications' icon." into ics-mr1 2011-11-15 09:20:56 -08:00
Jean-Michel Trivi
82c3030fe2 am 538dc6ac: Merge "Fix 5615747 Don\'t leak remote control client death handlers" into ics-mr1 
* commit '538dc6acfd14ea59f0b294531f9417ca04ca621f':
  Fix 5615747 Don't leak remote control client death handlers
 2011-11-15 08:58:55 -08:00
Jean-Michel Trivi
f2e6bb27d5 Merge "Fix 5615747 Don't leak remote control client death handlers" into ics-mr1 2011-11-15 08:56:55 -08:00
Wu-cheng Li
ac0f6f5ae4 am b90a70d1: Merge "Improve camera face detection javadoc." into ics-mr1 
* commit 'b90a70d1542edd5a95e73b75192e6eb5a66401cc':
  Improve camera face detection javadoc.
 2011-11-15 06:16:21 -08:00
Wu-cheng Li
434213525a Merge "Improve camera face detection javadoc." into ics-mr1 2011-11-15 06:14:11 -08:00
Michael Jurka
42fb812a6c am 4b7494e0: Merge "Updating recent apps visuals on tablet" into ics-mr1 
* commit '4b7494e07a44c0aa363379be463de70455a895f3':
  Updating recent apps visuals on tablet
 2011-11-14 23:55:12 -08:00
Michael Jurka
a27d66819a Merge "Updating recent apps visuals on tablet" into ics-mr1 2011-11-14 23:53:34 -08:00
Jeff Sharkey
764f1a67b0 am d968670d: Merge "Conservatively trim data usage stats." into ics-mr1 
* commit 'd968670d8369e5d92ba9b7a45b3804d692a05a4e':
  Conservatively trim data usage stats.
 2011-11-14 23:39:46 -08:00
Jeff Sharkey
d6a4be01a1 Merge "Conservatively trim data usage stats." into ics-mr1 2011-11-14 23:37:17 -08:00
Nick Pelly
d35098ace5 am b3b66af2: Merge "Move nfc-extras tests into frameworks/base/nfc-extras/tests." into ics-mr1 
* commit 'b3b66af2b5b4ccca1f507290ab6f138a3cbffc3e':
  Move nfc-extras tests into frameworks/base/nfc-extras/tests.
 2011-11-14 20:16:07 -08:00
Nick Pelly
f8255d8f6c Merge "Move nfc-extras tests into frameworks/base/nfc-extras/tests." into ics-mr1 2011-11-14 20:14:11 -08:00
Adam Powell
0aeb2a87de am 539bcca9: Merge "Fix bug 5594320 - Overlay action bar decor layout causes two measure passes" into ics-mr1 
* commit '539bcca99d00166303245cd8137f49f29ff3f08e':
  Fix bug 5594320 - Overlay action bar decor layout causes two measure passes
 2011-11-14 19:49:39 -08:00
Adam Powell
a4a49056ab Merge "Fix bug 5594320 - Overlay action bar decor layout causes two measure passes" into ics-mr1 2011-11-14 19:47:55 -08:00
Nick Pelly
5bf9761f32 am a26cf301: Merge "Enforce 1-1 relationship between context and NfcAdapterExtras." into ics-mr1 
* commit 'a26cf3011157eb94fa2766e76fa0096628c16c18':
  Enforce 1-1 relationship between context and NfcAdapterExtras.
 2011-11-14 19:40:46 -08:00
Nick Pelly
c6e725bf86 Merge "Enforce 1-1 relationship between context and NfcAdapterExtras." into ics-mr1 2011-11-14 19:39:09 -08:00
Dianne Hackborn
94765462e8 am 91c2b5ce: Merge "Improve low memory reporting." into ics-mr1 
* commit '91c2b5cebe981fb894b7e6f053a8593c1d9db80f':
  Improve low memory reporting.
 2011-11-14 18:40:13 -08:00
Jeff Brown
d51c64e0b7 am 9058435d: Merge "Fix races when content providers are acquired and released." into ics-mr1 
* commit '9058435dc1a741030c042c4d6f2512f5d1605e5d':
  Fix races when content providers are acquired and released.
 2011-11-14 18:37:47 -08:00
Dianne Hackborn
f696eedf8e am f10a5364: Merge "Maybe fix issue #5405788: Device continuously opening and closing..." into ics-mr1 
* commit 'f10a53646044da31e73f5393d929c603871d4a28':
  Maybe fix issue #5405788: Device continuously opening and closing...
 2011-11-14 18:37:46 -08:00
Dianne Hackborn
987c8330af Merge "Improve low memory reporting." into ics-mr1 2011-11-14 18:36:50 -08:00
Jeff Brown
4d38d2538e Merge "Fix races when content providers are acquired and released." into ics-mr1 2011-11-14 18:35:57 -08:00
Dianne Hackborn
874f8ce777 Merge "Maybe fix issue #5405788: Device continuously opening and closing..." into ics-mr1 2011-11-14 18:35:46 -08:00
Daisuke Miyakawa
b65ed93ec9 am d8f5e6ba: Merge "Allow ContactsProvider to remove dulicates" into ics-mr1 
* commit 'd8f5e6badb0dc11055508b83f20e48c82a7058bd':
  Allow ContactsProvider to remove dulicates
 2011-11-14 17:56:47 -08:00
Daisuke Miyakawa
8e71118641 Merge "Allow ContactsProvider to remove dulicates" into ics-mr1 2011-11-14 17:54:17 -08:00
Jamie Gennis
57918ba883 am 6b228af6: Merge "EGL: add the ANDROID suffix to the blob cache ext" into ics-mr1 
* commit '6b228af6ff20b3f592db4ad5662e1bc401d09b4d':
  EGL: add the ANDROID suffix to the blob cache ext
 2011-11-14 17:41:20 -08:00
Mathias Agopian
f0480de374 fix crash when validating an invalid EGL objects 
the code that validated EGL objects dereferenced the object
to access its EGLDisplay -- needed for validation (!).
This was wrong for two reasons, first we dereferenced the object
before validating it (potentially leading to a crash), secondly
we didn't validate that the object existed in the right EGLDisplay.

We now use the EGLDisplay passed by the user API.

Change-Id: I66f9e851d4f8507892a6b1fee3065f124c4e7138
 2011-11-14 17:40:21 -08:00
Jamie Gennis
7cd230c508 Merge "EGL: add the ANDROID suffix to the blob cache ext" into ics-mr1 2011-11-14 17:36:46 -08:00
Jim Miller
4cc7ceea88 am ff95f657: Merge "Fix 5579440: Add transport control view to tablet unlock screens" into ics-mr1 
* commit 'ff95f6572596c48b58f5a73d23b2273866ea3fab':
  Fix 5579440: Add transport control view to tablet unlock screens
 2011-11-14 16:16:28 -08:00
Jim Miller
772deeafa3 Merge "Fix 5579440: Add transport control view to tablet unlock screens" into ics-mr1 2011-11-14 16:14:07 -08:00
Danielle Millett
e37af76c12 Merge "DO NOT MERGE cherry picking from MR0 cl 148223" into ics-mr0 2011-11-14 15:08:05 -08:00
Eric Fischer
643bf2c9c2 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-11-14 15:06:30 -08:00
Tsu Chiang Chuang
90e2e54c10 Merge "Adding mobile microbenchmark tests." into ics-mr0 2011-11-14 15:03:17 -08:00
Tsu Chiang Chuang
0fccb0ad90 am 6a54a997: Merge "Adding mobile microbenchmark tests." into ics-mr1 
* commit '6a54a997e3dc71c5b9c5a1c7829bc3eb35404e92':
  Adding mobile microbenchmark tests.
 2011-11-14 14:38:31 -08:00
Adam Cohen
368df1fc1f am 6066a2b4: Merge "Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)" into ics-mr1 
* commit '6066a2b4de36549b7d8fe36507b7254e501f0b28':
  Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)
 2011-11-14 14:35:57 -08:00