drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,277 Commits 1 Branch 0 Tags
Commit Graph

62277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
0988cddae5 am 66adcedb: (-s ours) am 3524831a: am 8d00c194: Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '66adcedbc635bbce37a849824d0cefceab810535':
  Import revised translations.  DO NOT MERGE
 2011-11-15 13:10:56 -08:00
Tsu Chiang Chuang
8f62946310 am 06e4a400: am b3f2890a: am 047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0 
* commit '06e4a40017f1af75ec58d9d942ef0c4ddad20fd2':
  Adding mobile microbenchmark tests.
 2011-11-15 13:07:26 -08:00
Gilles Debunne
6ec455211b am 7bc6600e: am 8a440477: Merge "Clean-up in TextView" into ics-mr1 
* commit '7bc6600e60688ea37ee7f18b82cb16677c0f5e74':
  Clean-up in TextView
 2011-11-15 13:07:14 -08:00
John Reck
a952f8abfd am 6a622c56: am a0c6bf5a: Merge "Call onScrollChanged when scrolling layers" into ics-mr1 
* commit '6a622c5608e3f67efb7ba6a346ea4d8cfa5267ec':
  Call onScrollChanged when scrolling layers
 2011-11-15 13:07:11 -08:00
Hong Teng
cc6c20f532 am 716747f7: 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 '716747f7cb29b45e41c2870f12d39095f4ed80c8':
  Fix for issue  5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
 2011-11-15 13:07:07 -08:00
Daniel Sandler
0e02e42140 am 50fb8a29: am ce33622a: Merge "Bring back the \'more notifications\' icon." into ics-mr1 
* commit '50fb8a29f00e4414ef4961c4d2d6afca9ddf1659':
  Bring back the 'more notifications' icon.
 2011-11-15 13:06:59 -08:00
Jean-Michel Trivi
eb80b31b55 am 87597d9c: am 538dc6ac: Merge "Fix 5615747 Don\'t leak remote control client death handlers" into ics-mr1 
* commit '87597d9ce00691f05703f728c17548df2bbc9cc2':
  Fix 5615747 Don't leak remote control client death handlers
 2011-11-15 13:06:57 -08:00
Wu-cheng Li
7c4dee75b8 am 4e1fed76: am b90a70d1: Merge "Improve camera face detection javadoc." into ics-mr1 
* commit '4e1fed76c19cc9656af55e57dc57979324322593':
  Improve camera face detection javadoc.
 2011-11-15 13:06:51 -08:00
Mathias Agopian
556a406cf4 am 3aa684ec: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1 
* commit '3aa684ec0d3f70027fa808fb95b096a1613a1ddc':
  enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
 2011-11-15 13:06:08 -08:00
Mathias Agopian
a0d32c4d09 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
3aa684ec0d Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1 2011-11-15 13:03:47 -08:00
Mathias Agopian
6b3ce09d37 Merge "fix crash when validating an invalid EGL objects" into ics-mr1 2011-11-15 13:03:22 -08:00
Jeff Brown
bc072da931 POWER key is always a wake key. 
This change is useful to ensure that injected POWER key events
always wake the device even if the right policy flags were
not set.

Change-Id: I05b8b35f984f5c9f58b0e9d44bcb6f41a9562fc8
 2011-11-15 13:03:11 -08:00
Winson Chung
9ebb030ad9 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
Steven Ross
0a981cf522 No blackscreen when dialog is showing fixes 5511992 
When a dialog is activated, we won't show the blackscreen
until after the lockscreen comes back in focus, which occurs
when the dialog closes.
The user may toggle the power button, causing onScreenTurnedOff to
reset mHasOverlay, even though the dialog is still on top of the window.
Thus, the dialog will have a black box behind it without this change.

Change-Id: I6bec7984b88454e9fff22147cbbfc27b9c0a74f2
 2011-11-15 15:42:23 -05:00
Winson Chung
e5129d7f49 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
8b6b92ea5e 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
4900001670 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
66adcedbc6 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
3524831a63 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
Sunita Nadampalli
f1e868f682 SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call 
Surface Texture dequeue logic is modified to return the oldest of the
free buffers to Client on dequeue call.

Currently dequeue method is returning the first buffer index which is free.
The parsing is done in ascending order of the buffer slot indices.
This leads to returning the buffer which has been just queued to composer,
and hence display, and this defeats the purpose of having minimum dequeue count
as 2 in asynchrnouse mode.

This is fixed by checking all the free slots and returning the oldest buffer.

Change-Id: Ibbac10593c3994c278c601af0480b171635ecdd4
Signed-off-by: Sunita Nadampalli <sunitan@ti.com>
 2011-11-15 11:43:35 -08:00
Michael Jurka
489ab1167b am 729a9afe: am 4b7494e0: Merge "Updating recent apps visuals on tablet" into ics-mr1 
* commit '729a9afe44c21cbe4e10ca4d6ba400641cc75cbc':
  Updating recent apps visuals on tablet
 2011-11-15 11:30:36 -08:00
Jeff Sharkey
5898991075 am bc03c74c: am d968670d: Merge "Conservatively trim data usage stats." into ics-mr1 
* commit 'bc03c74c485669695805944a655795a6f9890956':
  Conservatively trim data usage stats.
 2011-11-15 11:30:34 -08:00
Nick Pelly
2cb8b5d9e9 am 26eeedce: am b3b66af2: Merge "Move nfc-extras tests into frameworks/base/nfc-extras/tests." into ics-mr1 
* commit '26eeedceb12fa4d293f6e987115f0e2de54947b8':
  Move nfc-extras tests into frameworks/base/nfc-extras/tests.
 2011-11-15 11:30:22 -08:00
Adam Powell
187309bdcc am 5d536c94: am 539bcca9: Merge "Fix bug 5594320 - Overlay action bar decor layout causes two measure passes" into ics-mr1 
* commit '5d536c945da075036f151e5dbac86d74d32e2fc9':
  Fix bug 5594320 - Overlay action bar decor layout causes two measure passes
 2011-11-15 11:30:13 -08:00
Nick Pelly
0c2184bdb0 am fb52c474: am a26cf301: Merge "Enforce 1-1 relationship between context and NfcAdapterExtras." into ics-mr1 
* commit 'fb52c4747687819238eb4570ee7d424842c6159f':
  Enforce 1-1 relationship between context and NfcAdapterExtras.
 2011-11-15 11:30:10 -08:00
Dianne Hackborn
356b9b87cf am f1c78890: am 91c2b5ce: Merge "Improve low memory reporting." into ics-mr1 
* commit 'f1c78890dc703f44227b556e71624bed7eef95a1':
  Improve low memory reporting.
 2011-11-15 11:30:01 -08:00
Jeff Brown
a4db1b7278 am 642de92b: am 9058435d: Merge "Fix races when content providers are acquired and released." into ics-mr1 
* commit '642de92b3500446ab2d2a84fbe4ff9c083e8c1af':
  Fix races when content providers are acquired and released.
 2011-11-15 11:29:59 -08:00
Dianne Hackborn
aaba252903 am 74710e50: am f10a5364: Merge "Maybe fix issue #5405788: Device continuously opening and closing..." into ics-mr1 
* commit '74710e5041045251c43ff408641ec6818d23f985':
  Maybe fix issue #5405788: Device continuously opening and closing...
 2011-11-15 11:29:57 -08:00
Daisuke Miyakawa
2b6517cd2c am f2213aca: am d8f5e6ba: Merge "Allow ContactsProvider to remove dulicates" into ics-mr1 
* commit 'f2213acaae5073ea3b4f3f566f0e8c7dc976765b':
  Allow ContactsProvider to remove dulicates
 2011-11-15 11:29:51 -08:00
Jamie Gennis
43015443b4 am c38d40de: am 6b228af6: Merge "EGL: add the ANDROID suffix to the blob cache ext" into ics-mr1 
* commit 'c38d40ded9810aa809489e080ee811bec86d546d':
  EGL: add the ANDROID suffix to the blob cache ext
 2011-11-15 11:29:47 -08:00
Tsu Chiang Chuang
06e4a40017 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
b3f2890a8a am 047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0 
* commit '047c4de2c548960fff428a92099003593cede5f8':
  Adding mobile microbenchmark tests.
 2011-11-15 11:10:44 -08:00
David Deephanphongs
fbca596721 Modify getState to prefer AKEY_STATE_DOWN and AKEY_STATE_UP over AKEY_STATE_UNKNOWN. 
For the getState() routines that operate on multiple devices / mappers:
Return AKEY_STATE_DOWN (or AKEY_STATE_VIRTUAL) if any of the devices/mappers
have the key down.
Otherwise, return AKEY_STATE_UP if at least one device/mapper returns AKEY_STATE_UP.
Otherwise, return AKEY_STATE_UNKNOWN.

Change-Id: I1ef6251d73af916b51f408a41c5e4adf5bdc237a
 2011-11-15 11:10:07 -08:00
Bill Gruber
c3cf16d2b4 Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0 2011-11-15 10:57:32 -08:00
Adrian Ludwig
0fd69ff4b9 Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0 2011-11-15 10:37:28 -08:00
Gilles Debunne
7bc6600e60 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
8a440477fd Merge "Clean-up in TextView" into ics-mr1 2011-11-15 09:59:45 -08:00
John Reck
6a622c5608 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
a0c6bf5af6 Merge "Call onScrollChanged when scrolling layers" into ics-mr1 2011-11-15 09:56:17 -08:00
Hong Teng
716747f7cb 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
481ffa505b 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
50fb8a29f0 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
ce33622aed Merge "Bring back the 'more notifications' icon." into ics-mr1 2011-11-15 09:20:56 -08:00
Jean-Michel Trivi
87597d9ce0 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
538dc6acfd Merge "Fix 5615747 Don't leak remote control client death handlers" into ics-mr1 2011-11-15 08:56:55 -08:00
Bill Gruber
afc270bb75 IAB Doc Fix: Error in code snippet 
Bug 5221766

Change-Id: I7af624ed69526b545c97d1419e08f60c92b79d8e
 2011-11-15 07:18:30 -08:00
Wu-cheng Li
4e1fed76c1 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
b90a70d154 Merge "Improve camera face detection javadoc." into ics-mr1 2011-11-15 06:14:11 -08:00
Wu-cheng Li
8c13670c13 Improve camera face detection javadoc. 
bug:4460717
Change-Id: I6e040911ce802e597e77dfdde1c92b75d51975c8
 2011-11-15 17:55:37 +08:00