OSDN Git Service
Mathias Agopian [Tue, 15 Nov 2011 21:14:04 +0000 (13:14 -0800)]
am
1fea891f: am
556a406c: am
3aa684ec: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1
* commit '
1fea891f0099a554c9402675bf4ce8f9ef2cac13':
enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
Mathias Agopian [Tue, 15 Nov 2011 21:14:02 +0000 (13:14 -0800)]
am
d6ae2cee: am
a0d32c4d: am
6b3ce09d: Merge "fix crash when validating an invalid EGL objects" into ics-mr1
* commit '
d6ae2ceedf3a44840d3e872ca69380bf92fe430e':
fix crash when validating an invalid EGL objects
Winson Chung [Tue, 15 Nov 2011 21:14:00 +0000 (13:14 -0800)]
am
92c2fbd7: am
9ebb030a: am
e5129d7f: Merge "Defer adding large icon until when we compose the final notification. (Bug
5566846)" into ics-mr1
* commit '
92c2fbd704ea5093c103602574eefc78e923ad86':
Defer adding large icon until when we compose the final notification. (Bug
5566846)
Danielle Millett [Tue, 15 Nov 2011 21:13:58 +0000 (13:13 -0800)]
am
d296b167: am
8b6b92ea: (-s ours) am
49000016: am
8d8e669e: Merge "DO NOT MERGE cherry picking from MR0 cl 148223" into ics-mr0
* commit '
d296b167629fcdcdfbcb6ac105900085ae6e59f4':
DO NOT MERGE cherry picking from MR0 cl 148223
Eric Fischer [Tue, 15 Nov 2011 21:13:56 +0000 (13:13 -0800)]
am
0988cdda: am
66adcedb: (-s ours) am
3524831a: am
8d00c194: Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
0988cddae508cf9e479103fd63a342441bcad25c':
Import revised translations. DO NOT MERGE
Mathias Agopian [Tue, 15 Nov 2011 21:11:19 +0000 (13:11 -0800)]
am
556a406c: am
3aa684ec: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1
* commit '
556a406cf4dd8a7faa318e0d522d899f8b9da7dc':
enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
Mathias Agopian [Tue, 15 Nov 2011 21:11:17 +0000 (13:11 -0800)]
am
a0d32c4d: am
6b3ce09d: Merge "fix crash when validating an invalid EGL objects" into ics-mr1
* commit '
a0d32c4d094704fd6f4ccd3cba297a7c7d2f38fe':
fix crash when validating an invalid EGL objects
Winson Chung [Tue, 15 Nov 2011 21:11:14 +0000 (13:11 -0800)]
am
9ebb030a: am
e5129d7f: Merge "Defer adding large icon until when we compose the final notification. (Bug
5566846)" into ics-mr1
* commit '
9ebb030ad9eeb94bdf9e15b7a3f55d9792dda96b':
Defer adding large icon until when we compose the final notification. (Bug
5566846)
Danielle Millett [Tue, 15 Nov 2011 21:11:08 +0000 (13:11 -0800)]
am
8b6b92ea: (-s ours) am
49000016: am
8d8e669e: Merge "DO NOT MERGE cherry picking from MR0 cl 148223" into ics-mr0
* commit '
8b6b92ea5e257cd9d5799b74f64e7e1cc1ca3ddc':
DO NOT MERGE cherry picking from MR0 cl 148223
Eric Fischer [Tue, 15 Nov 2011 21:10:56 +0000 (13:10 -0800)]
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
Tsu Chiang Chuang [Tue, 15 Nov 2011 21:10:23 +0000 (13:10 -0800)]
am
8f629463: am
06e4a400: am
b3f2890a: am
047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0
* commit '
8f62946310a7f2bf251070df4e248b9058ddd5ff':
Adding mobile microbenchmark tests.
Gilles Debunne [Tue, 15 Nov 2011 21:10:21 +0000 (13:10 -0800)]
am
6ec45521: am
7bc6600e: am
8a440477: Merge "Clean-up in TextView" into ics-mr1
* commit '
6ec455211b9959ed7ef37bd3e6655722d33d9fd9':
Clean-up in TextView
John Reck [Tue, 15 Nov 2011 21:10:19 +0000 (13:10 -0800)]
am
a952f8ab: am
6a622c56: am
a0c6bf5a: Merge "Call onScrollChanged when scrolling layers" into ics-mr1
* commit '
a952f8abfddef8744245e93024314b01f6bfd0fb':
Call onScrollChanged when scrolling layers
Hong Teng [Tue, 15 Nov 2011 21:10:17 +0000 (13:10 -0800)]
am
cc6c20f5: 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 '
cc6c20f5321e39ee75172f329450dd60a69c980f':
Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
Daniel Sandler [Tue, 15 Nov 2011 21:10:15 +0000 (13:10 -0800)]
am
0e02e421: am
50fb8a29: am
ce33622a: Merge "Bring back the \'more notifications\' icon." into ics-mr1
* commit '
0e02e42140d54410ec90e21e90af23cc8b4da31d':
Bring back the 'more notifications' icon.
Jean-Michel Trivi [Tue, 15 Nov 2011 21:10:13 +0000 (13:10 -0800)]
am
eb80b31b: am
87597d9c: am
538dc6ac: Merge "Fix
5615747 Don\'t leak remote control client death handlers" into ics-mr1
* commit '
eb80b31b5548650675c078ccfffc3091402a9382':
Fix
5615747 Don't leak remote control client death handlers
Wu-cheng Li [Tue, 15 Nov 2011 21:10:11 +0000 (13:10 -0800)]
am
7c4dee75: am
4e1fed76: am
b90a70d1: Merge "Improve camera face detection javadoc." into ics-mr1
* commit '
7c4dee75b8a9db10ff1c5456ea7d13bfc61f35ab':
Improve camera face detection javadoc.
Tsu Chiang Chuang [Tue, 15 Nov 2011 21:07:26 +0000 (13:07 -0800)]
am
06e4a400: am
b3f2890a: am
047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0
* commit '
06e4a40017f1af75ec58d9d942ef0c4ddad20fd2':
Adding mobile microbenchmark tests.
Gilles Debunne [Tue, 15 Nov 2011 21:07:14 +0000 (13:07 -0800)]
am
7bc6600e: am
8a440477: Merge "Clean-up in TextView" into ics-mr1
* commit '
7bc6600e60688ea37ee7f18b82cb16677c0f5e74':
Clean-up in TextView
John Reck [Tue, 15 Nov 2011 21:07:11 +0000 (13:07 -0800)]
am
6a622c56: am
a0c6bf5a: Merge "Call onScrollChanged when scrolling layers" into ics-mr1
* commit '
6a622c5608e3f67efb7ba6a346ea4d8cfa5267ec':
Call onScrollChanged when scrolling layers
Hong Teng [Tue, 15 Nov 2011 21:07:07 +0000 (13:07 -0800)]
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.
Daniel Sandler [Tue, 15 Nov 2011 21:06:59 +0000 (13:06 -0800)]
am
50fb8a29: am
ce33622a: Merge "Bring back the \'more notifications\' icon." into ics-mr1
* commit '
50fb8a29f00e4414ef4961c4d2d6afca9ddf1659':
Bring back the 'more notifications' icon.
Jean-Michel Trivi [Tue, 15 Nov 2011 21:06:57 +0000 (13:06 -0800)]
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
Wu-cheng Li [Tue, 15 Nov 2011 21:06:51 +0000 (13:06 -0800)]
am
4e1fed76: am
b90a70d1: Merge "Improve camera face detection javadoc." into ics-mr1
* commit '
4e1fed76c19cc9656af55e57dc57979324322593':
Improve camera face detection javadoc.
Mathias Agopian [Tue, 15 Nov 2011 21:06:08 +0000 (13:06 -0800)]
am
3aa684ec: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1
* commit '
3aa684ec0d3f70027fa808fb95b096a1613a1ddc':
enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
Mathias Agopian [Tue, 15 Nov 2011 21:06:06 +0000 (13:06 -0800)]
am
6b3ce09d: Merge "fix crash when validating an invalid EGL objects" into ics-mr1
* commit '
6b3ce09d37fdb53a3a32e688017a5b343398c03b':
fix crash when validating an invalid EGL objects
Mathias Agopian [Tue, 15 Nov 2011 21:03:47 +0000 (13:03 -0800)]
Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1
Mathias Agopian [Tue, 15 Nov 2011 21:03:22 +0000 (13:03 -0800)]
Merge "fix crash when validating an invalid EGL objects" into ics-mr1
Winson Chung [Tue, 15 Nov 2011 20:45:18 +0000 (12:45 -0800)]
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)
Winson Chung [Tue, 15 Nov 2011 20:41:56 +0000 (12:41 -0800)]
Merge "Defer adding large icon until when we compose the final notification. (Bug
5566846)" into ics-mr1
Danielle Millett [Tue, 15 Nov 2011 20:21:01 +0000 (12:21 -0800)]
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
Danielle Millett [Tue, 15 Nov 2011 20:16:59 +0000 (12:16 -0800)]
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
Eric Fischer [Tue, 15 Nov 2011 19:55:54 +0000 (11:55 -0800)]
am
3524831a: am
8d00c194: Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
3524831a633693cf72880299706b2039d41c3b78':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 15 Nov 2011 19:51:38 +0000 (11:51 -0800)]
am
8d00c194: Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
8d00c194c228e67851e5a0cb75c4bf4d99dd40f0':
Import revised translations. DO NOT MERGE
Michael Jurka [Tue, 15 Nov 2011 19:33:07 +0000 (11:33 -0800)]
am
489ab116: am
729a9afe: am
4b7494e0: Merge "Updating recent apps visuals on tablet" into ics-mr1
* commit '
489ab1167b98061631e6590092e564ec3c9b006c':
Updating recent apps visuals on tablet
Jeff Sharkey [Tue, 15 Nov 2011 19:33:05 +0000 (11:33 -0800)]
am
58989910: am
bc03c74c: am
d968670d: Merge "Conservatively trim data usage stats." into ics-mr1
* commit '
5898991075ad5aa941c7c3c92467c03d28902ecf':
Conservatively trim data usage stats.
Nick Pelly [Tue, 15 Nov 2011 19:33:03 +0000 (11:33 -0800)]
am
2cb8b5d9: am
26eeedce: am
b3b66af2: Merge "Move nfc-extras tests into frameworks/base/nfc-extras/tests." into ics-mr1
* commit '
2cb8b5d9e98d8d9696cdb0640e47c40ac7bc53f7':
Move nfc-extras tests into frameworks/base/nfc-extras/tests.
Adam Powell [Tue, 15 Nov 2011 19:33:01 +0000 (11:33 -0800)]
am
187309bd: am
5d536c94: am
539bcca9: Merge "Fix bug
5594320 - Overlay action bar decor layout causes two measure passes" into ics-mr1
* commit '
187309bdcc366eee4e8fcbb472d330580760b3cc':
Fix bug
5594320 - Overlay action bar decor layout causes two measure passes
Nick Pelly [Tue, 15 Nov 2011 19:32:59 +0000 (11:32 -0800)]
am
0c2184bd: am
fb52c474: am
a26cf301: Merge "Enforce 1-1 relationship between context and NfcAdapterExtras." into ics-mr1
* commit '
0c2184bdb034179cca377ad788246d1b8c37a1cf':
Enforce 1-1 relationship between context and NfcAdapterExtras.
Dianne Hackborn [Tue, 15 Nov 2011 19:32:57 +0000 (11:32 -0800)]
am
356b9b87: am
f1c78890: am
91c2b5ce: Merge "Improve low memory reporting." into ics-mr1
* commit '
356b9b87cf7eae6e45182cc1827bd4a6ee7223b3':
Improve low memory reporting.
Jeff Brown [Tue, 15 Nov 2011 19:32:54 +0000 (11:32 -0800)]
am
a4db1b72: am
642de92b: am
9058435d: Merge "Fix races when content providers are acquired and released." into ics-mr1
* commit '
a4db1b7278157ca553cd9b99753da2963fe65772':
Fix races when content providers are acquired and released.
Dianne Hackborn [Tue, 15 Nov 2011 19:32:52 +0000 (11:32 -0800)]
am
aaba2529: am
74710e50: am
f10a5364: Merge "Maybe fix issue #
5405788: Device continuously opening and closing..." into ics-mr1
* commit '
aaba2529034c83e31e0c369a0363a1c5d2a03f6f':
Maybe fix issue #
5405788: Device continuously opening and closing...
Daisuke Miyakawa [Tue, 15 Nov 2011 19:32:50 +0000 (11:32 -0800)]
am
2b6517cd: am
f2213aca: am
d8f5e6ba: Merge "Allow ContactsProvider to remove dulicates" into ics-mr1
* commit '
2b6517cd2caae54b43645d6dd296ca5b981d7b09':
Allow ContactsProvider to remove dulicates
Jamie Gennis [Tue, 15 Nov 2011 19:32:48 +0000 (11:32 -0800)]
am
43015443: am
c38d40de: am
6b228af6: Merge "EGL: add the ANDROID suffix to the blob cache ext" into ics-mr1
* commit '
43015443b4014d2ae6a6a439102d610a51d85a4f':
EGL: add the ANDROID suffix to the blob cache ext
Michael Jurka [Tue, 15 Nov 2011 19:30:36 +0000 (11:30 -0800)]
am
729a9afe: am
4b7494e0: Merge "Updating recent apps visuals on tablet" into ics-mr1
* commit '
729a9afe44c21cbe4e10ca4d6ba400641cc75cbc':
Updating recent apps visuals on tablet
Jeff Sharkey [Tue, 15 Nov 2011 19:30:34 +0000 (11:30 -0800)]
am
bc03c74c: am
d968670d: Merge "Conservatively trim data usage stats." into ics-mr1
* commit '
bc03c74c485669695805944a655795a6f9890956':
Conservatively trim data usage stats.
Nick Pelly [Tue, 15 Nov 2011 19:30:22 +0000 (11:30 -0800)]
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.
Adam Powell [Tue, 15 Nov 2011 19:30:13 +0000 (11:30 -0800)]
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
Nick Pelly [Tue, 15 Nov 2011 19:30:10 +0000 (11:30 -0800)]
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.
Dianne Hackborn [Tue, 15 Nov 2011 19:30:01 +0000 (11:30 -0800)]
am
f1c78890: am
91c2b5ce: Merge "Improve low memory reporting." into ics-mr1
* commit '
f1c78890dc703f44227b556e71624bed7eef95a1':
Improve low memory reporting.
Jeff Brown [Tue, 15 Nov 2011 19:29:59 +0000 (11:29 -0800)]
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.
Dianne Hackborn [Tue, 15 Nov 2011 19:29:57 +0000 (11:29 -0800)]
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...
Daisuke Miyakawa [Tue, 15 Nov 2011 19:29:51 +0000 (11:29 -0800)]
am
f2213aca: am
d8f5e6ba: Merge "Allow ContactsProvider to remove dulicates" into ics-mr1
* commit '
f2213acaae5073ea3b4f3f566f0e8c7dc976765b':
Allow ContactsProvider to remove dulicates
Jamie Gennis [Tue, 15 Nov 2011 19:29:47 +0000 (11:29 -0800)]
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
Tsu Chiang Chuang [Tue, 15 Nov 2011 19:13:45 +0000 (11:13 -0800)]
am
b3f2890a: am
047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0
* commit '
b3f2890a8af3a99be1b0d5fd5a40df656cb60598':
Adding mobile microbenchmark tests.
Tsu Chiang Chuang [Tue, 15 Nov 2011 19:10:44 +0000 (11:10 -0800)]
am
047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0
* commit '
047c4de2c548960fff428a92099003593cede5f8':
Adding mobile microbenchmark tests.
Gilles Debunne [Tue, 15 Nov 2011 18:02:15 +0000 (10:02 -0800)]
am
8a440477: Merge "Clean-up in TextView" into ics-mr1
* commit '
8a440477fd203d74b73b32dc2b357f07dfc36067':
Clean-up in TextView
Gilles Debunne [Tue, 15 Nov 2011 17:59:45 +0000 (09:59 -0800)]
Merge "Clean-up in TextView" into ics-mr1
John Reck [Tue, 15 Nov 2011 17:58:48 +0000 (09:58 -0800)]
am
a0c6bf5a: Merge "Call onScrollChanged when scrolling layers" into ics-mr1
* commit '
a0c6bf5af6af4b0fd59347b78d3a507c416a46e6':
Call onScrollChanged when scrolling layers
John Reck [Tue, 15 Nov 2011 17:56:17 +0000 (09:56 -0800)]
Merge "Call onScrollChanged when scrolling layers" into ics-mr1
Hong Teng [Tue, 15 Nov 2011 17:45:29 +0000 (09:45 -0800)]
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.
Hong Teng [Tue, 15 Nov 2011 17:42:37 +0000 (09:42 -0800)]
Merge "Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1
Daniel Sandler [Tue, 15 Nov 2011 17:22:40 +0000 (09:22 -0800)]
am
ce33622a: Merge "Bring back the \'more notifications\' icon." into ics-mr1
* commit '
ce33622aed7fb25a14ef957cdc78b78cc4602be9':
Bring back the 'more notifications' icon.
Daniel Sandler [Tue, 15 Nov 2011 17:20:56 +0000 (09:20 -0800)]
Merge "Bring back the 'more notifications' icon." into ics-mr1
Jean-Michel Trivi [Tue, 15 Nov 2011 16:58:55 +0000 (08:58 -0800)]
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
Jean-Michel Trivi [Tue, 15 Nov 2011 16:56:55 +0000 (08:56 -0800)]
Merge "Fix
5615747 Don't leak remote control client death handlers" into ics-mr1
Wu-cheng Li [Tue, 15 Nov 2011 14:16:21 +0000 (06:16 -0800)]
am
b90a70d1: Merge "Improve camera face detection javadoc." into ics-mr1
* commit '
b90a70d1542edd5a95e73b75192e6eb5a66401cc':
Improve camera face detection javadoc.
Wu-cheng Li [Tue, 15 Nov 2011 14:14:11 +0000 (06:14 -0800)]
Merge "Improve camera face detection javadoc." into ics-mr1
Jeff Brown [Tue, 15 Nov 2011 12:12:04 +0000 (04:12 -0800)]
am
bf677de4: Merge "Clean up GenerationCache."
* commit '
bf677de46a039e07038511909576bfbf4406f7fd':
Clean up GenerationCache.
Steven Ross [Tue, 15 Nov 2011 12:11:58 +0000 (04:11 -0800)]
am
a4e3fe22: Merge "Making KeyguardView slippery fixes
5501105"
* commit '
a4e3fe22762116b1bb6f40b354febf7bd2eec44d':
Making KeyguardView slippery fixes
5501105
Jim Miller [Tue, 15 Nov 2011 12:11:52 +0000 (04:11 -0800)]
am
6162960c: am
3dd55677: am
ff95f657: Merge "Fix
5579440: Add transport control view to tablet unlock screens" into ics-mr1
* commit '
6162960c1eda8cce32a236e7f805cc4fdf9cf656':
Fix
5579440: Add transport control view to tablet unlock screens
Tsu Chiang Chuang [Tue, 15 Nov 2011 12:11:40 +0000 (04:11 -0800)]
am
017d80c1: am
8340db9e: am
6a54a997: Merge "Adding mobile microbenchmark tests." into ics-mr1
* commit '
017d80c1f9cd3a2bb4aea990d3e722a8b73ca838':
Adding mobile microbenchmark tests.
Adam Cohen [Tue, 15 Nov 2011 12:11:38 +0000 (04:11 -0800)]
am
e23a588e: am
621f9716: am
6066a2b4: Merge "Fix uncaught exception in WindowManager#setWallpaperOffsets (issue
5613241)" into ics-mr1
* commit '
e23a588eb562430ed8be8c57252a9c3ac3ee9156':
Fix uncaught exception in WindowManager#setWallpaperOffsets (issue
5613241)
Jean-Michel Trivi [Tue, 15 Nov 2011 12:11:36 +0000 (04:11 -0800)]
am
f1ec32db: am
9d36a995: am
258576a8: Merge "Fix
5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1
* commit '
f1ec32db686586eddd023583e1c5978005c06d58':
Fix
5607938 AudioFocusDeathHandler leaks GREF
Dave Burke [Tue, 15 Nov 2011 12:11:13 +0000 (04:11 -0800)]
am
28a5ec96: am
2cfb873c: am
9d66da8a: Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1
* commit '
28a5ec9613a824d2ec15ce5e5cec77a6fcf444d5':
Revert "Discard framebuffer rendering queues when discarding layers"
John Wang [Tue, 15 Nov 2011 12:11:08 +0000 (04:11 -0800)]
am
196c215a: am
6504d74b: am
72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1
* commit '
196c215a8b89499a353cf023488a04888431a6b0':
[maguro] Fix STK issues
Mathias Agopian [Tue, 15 Nov 2011 12:11:01 +0000 (04:11 -0800)]
am
d8fa1ad4: am
738d8cae: am
c93a151f: Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1
* commit '
d8fa1ad4523b6c04cab663ff4b65181fc00594d9':
Define, document, and test the behavior of very large SurfaceTextures
Glenn Kasten [Tue, 15 Nov 2011 12:10:50 +0000 (04:10 -0800)]
am
527c44e8: Merge "Don\'t check return value of new for being == null"
* commit '
527c44e8a455dd0fdef1aeb6d7d8f99bb0839295':
Don't check return value of new for being == null
Alex Sakhartchouk [Tue, 15 Nov 2011 12:10:47 +0000 (04:10 -0800)]
am
b14d771c: am
f579bb92: am
cde433c5: Merge "Fixing a race condition in RSSurfaceView. Bug
5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context." into ics-mr1
* commit '
b14d771cf07479e3186a167a219fb2d42d8d4d30':
Fixing a race condition in RSSurfaceView. Bug
5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context.
Wu-cheng Li [Fri, 12 Aug 2011 12:25:00 +0000 (20:25 +0800)]
Improve camera face detection javadoc.
bug:
4460717
Change-Id: I6e040911ce802e597e77dfdde1c92b75d51975c8
Michael Jurka [Tue, 15 Nov 2011 07:55:12 +0000 (23:55 -0800)]
am
4b7494e0: Merge "Updating recent apps visuals on tablet" into ics-mr1
* commit '
4b7494e07a44c0aa363379be463de70455a895f3':
Updating recent apps visuals on tablet
Michael Jurka [Tue, 15 Nov 2011 07:53:34 +0000 (23:53 -0800)]
Merge "Updating recent apps visuals on tablet" into ics-mr1
Michael Jurka [Sun, 13 Nov 2011 21:50:38 +0000 (13:50 -0800)]
Updating recent apps visuals on tablet
- getting rid of blue glow (
5529032)
- moving app icon position
- show message if there are no recent apps (
5533332)
- fixing rare IllegalStateException on orientation change (
5584344)
Change-Id: I2210e584957869c8f02339e6841daf39364a9dad
Jeff Sharkey [Tue, 15 Nov 2011 07:39:46 +0000 (23:39 -0800)]
am
d968670d: Merge "Conservatively trim data usage stats." into ics-mr1
* commit '
d968670d8369e5d92ba9b7a45b3804d692a05a4e':
Conservatively trim data usage stats.
Jeff Sharkey [Tue, 15 Nov 2011 07:37:17 +0000 (23:37 -0800)]
Merge "Conservatively trim data usage stats." into ics-mr1
Nick Pelly [Tue, 15 Nov 2011 04:16:07 +0000 (20:16 -0800)]
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.
Nick Pelly [Tue, 15 Nov 2011 04:14:11 +0000 (20:14 -0800)]
Merge "Move nfc-extras tests into frameworks/base/nfc-extras/tests." into ics-mr1
Jeff Sharkey [Tue, 15 Nov 2011 02:02:21 +0000 (18:02 -0800)]
Conservatively trim data usage stats.
Instead of trusting NTP time alone, use the most-conservative of
system clock and NTP.
Bug:
5584564
Change-Id: I5dd87fc009959b1cf0a7d660e385a0b1a8be238b
Adam Powell [Tue, 15 Nov 2011 03:49:39 +0000 (19:49 -0800)]
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
Adam Powell [Tue, 15 Nov 2011 03:47:55 +0000 (19:47 -0800)]
Merge "Fix bug
5594320 - Overlay action bar decor layout causes two measure passes" into ics-mr1
Nick Pelly [Tue, 15 Nov 2011 03:40:46 +0000 (19:40 -0800)]
am
a26cf301: Merge "Enforce 1-1 relationship between context and NfcAdapterExtras." into ics-mr1
* commit '
a26cf3011157eb94fa2766e76fa0096628c16c18':
Enforce 1-1 relationship between context and NfcAdapterExtras.
Nick Pelly [Tue, 15 Nov 2011 03:39:09 +0000 (19:39 -0800)]
Merge "Enforce 1-1 relationship between context and NfcAdapterExtras." into ics-mr1
Mathias Agopian [Tue, 15 Nov 2011 03:17:37 +0000 (19:17 -0800)]
enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
this flag should be enabled for all targets, but currently
some have issues with it, so we're turning it on only for
tested targets.
this will hopefully resolve some performance issues.
Bug:
5553562
Change-Id: I939992b4cd0debea980dec0127c72be2dff33af8
Dianne Hackborn [Tue, 15 Nov 2011 02:40:13 +0000 (18:40 -0800)]
am
91c2b5ce: Merge "Improve low memory reporting." into ics-mr1
* commit '
91c2b5cebe981fb894b7e6f053a8593c1d9db80f':
Improve low memory reporting.
Jeff Brown [Tue, 15 Nov 2011 02:37:47 +0000 (18:37 -0800)]
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.
Dianne Hackborn [Tue, 15 Nov 2011 02:37:46 +0000 (18:37 -0800)]
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...
Dianne Hackborn [Tue, 15 Nov 2011 02:36:50 +0000 (18:36 -0800)]
Merge "Improve low memory reporting." into ics-mr1
Jeff Brown [Tue, 15 Nov 2011 02:35:57 +0000 (18:35 -0800)]
Merge "Fix races when content providers are acquired and released." into ics-mr1
Dianne Hackborn [Tue, 15 Nov 2011 02:35:46 +0000 (18:35 -0800)]
Merge "Maybe fix issue #
5405788: Device continuously opening and closing..." into ics-mr1
Jeff Brown [Sat, 12 Nov 2011 04:16:14 +0000 (20:16 -0800)]
Fix races when content providers are acquired and released.
This change fixes race conditions that occur very regularly when
content providers are accessed from multiple threads at the same
time.
When a content provider is not already in the application's cache,
the application needs to ask the ActivityManager to obtain it.
Meanwhile, another thread can come along and do the same thing.
This can cause problems because the application attempts to
install two copies of the provider and the reference counts
and other bookkeeping can get muddled.
Similarly, there are races between releasing the last reference
to a content provider and acquiring the content provider. It's
possible for one thread to snatch the content provider from the
jaws of death. We need to handle this explicitly to ensure that
the content provider does not accidentally get released right
after it was acquired by the other thread.
This change ensures that the reference count bookkeeping and
provider map are maintained in parallel while holding the same lock.
Previously because the lock was dropped and reacquired in the
middle of acquisition and removal, it was possible for a
content provider with a zero reference count to be returned
to the application. Likewise, it was possible for a content
provider with a non-zero reference count to be disposed!
This change also performs compensatory actions when races are
detected to ensure that the necessary invariants are maintained
throughout. In particular, it ensures that the application
drops a duplicate reference to a content provider when no
longer needed.
Another way to solve this problem would be to explicitly prevent
the races from happening in the first place by maintaining a
table of content providers that are in the process of being
acquired. The first thread to attempt to acquire the provider
would store a record. The next thread would find the record
and block until the first thread was finished. I chose not
to implement the code in that manner because we would still
have needed to perform compensatory actions in the case where
the same provider binder has multiple logical names. Also,
it could cause deadlocks if the attempt to acquire
a content provider were re-entrant for some bizarre reason.
Bug:
5547357
Change-Id: I2ad39a8acc30aaf7ae5354decd0a0a41e9b9c3da
OSDN Git Service
