OSDN Git Service
Daniel Sandler [Fri, 15 Jan 2016 21:18:20 +0000 (21:18 +0000)]
Merge "Stop leaking Notifications when they change groupKeys." into mnc-dr1.5-dev am:
76f28bbd64
am:
3be84505f4
* commit '
3be84505f41e58125b4449f0506d518bd2f1ae95':
Stop leaking Notifications when they change groupKeys.
Daniel Sandler [Fri, 15 Jan 2016 21:14:01 +0000 (21:14 +0000)]
Merge "Stop leaking Notifications when they change groupKeys." into mnc-dr1.5-dev
am:
76f28bbd64
* commit '
76f28bbd64a6841a91d4890d7a248411fd95b149':
Stop leaking Notifications when they change groupKeys.
Daniel Sandler [Fri, 15 Jan 2016 21:05:41 +0000 (21:05 +0000)]
Merge "Stop leaking Notifications when they change groupKeys." into mnc-dr1.5-dev
Dan Albert [Fri, 15 Jan 2016 21:02:29 +0000 (21:02 +0000)]
Merge "Make the appropriate cast to protect from mingw."
am:
dbf8c17bd2
* commit '
dbf8c17bd20c3c5b4ba99242afa8b714841914d1':
Make the appropriate cast to protect from mingw.
Dan Albert [Fri, 15 Jan 2016 20:41:23 +0000 (20:41 +0000)]
Merge "Make the appropriate cast to protect from mingw."
Dan Albert [Fri, 15 Jan 2016 20:16:06 +0000 (12:16 -0800)]
Make the appropriate cast to protect from mingw.
As the comment at the top of the file says:
STATUST: mingw does seem to redefine UNKNOWN_ERROR from our enum
value, so a cast is necessary.
Bug: http://b/
26523949
Change-Id: I9d86cafdc47bbb9ce0e967cdde9315babc083432
Neil Fuller [Fri, 15 Jan 2016 16:36:34 +0000 (16:36 +0000)]
Merge "Add thread safety documentation"
am:
b3ea05a56e
* commit '
b3ea05a56ea980541d328ab7534a2da230d62c06':
Add thread safety documentation
Neil Fuller [Fri, 15 Jan 2016 16:31:40 +0000 (16:31 +0000)]
Merge "Fix @code escapes"
am:
b0d92f4717
* commit '
b0d92f4717af4e4736dc80b2a822dae8e5a52587':
Fix @code escapes
Neil Fuller [Fri, 15 Jan 2016 16:27:16 +0000 (16:27 +0000)]
Merge "Add thread safety documentation"
Neil Fuller [Tue, 24 Nov 2015 18:19:06 +0000 (18:19 +0000)]
Add thread safety documentation
An upcoming change will remove "synchronized" from the API docs. This change
documents those cases where the guarantees can be determined from code
inspection.
Bug:
25767152
(cherry-picked from commit
bf0dc0fba790cf95f76870c37469703f8f20a57c)
Change-Id: I328b96328e89950b90d537bf0a6a704242de4993
Neil Fuller [Fri, 15 Jan 2016 16:22:16 +0000 (16:22 +0000)]
Merge "Fix @code escapes"
Neil Fuller [Mon, 30 Nov 2015 09:51:33 +0000 (09:51 +0000)]
Fix @code escapes
The body of {@code} must not be HTML escaped. This is one of
several changes that fix the source in conjunction with a
doclava fix.
Bug:
25757239
(cherry-picked from commit
71fbb81b14958b80fe55738607740c6630e4e9da)
Change-Id: I19dafddc6501be6fee362c396ac5bbdc934ae39d
Dan Sandler [Thu, 14 Jan 2016 20:49:36 +0000 (15:49 -0500)]
Stop leaking Notifications when they change groupKeys.
If a Notification changes groups (either from one group to
another, or gets a group key for the first time, which takes
it out of its implicit singleton group) it should be removed
from the old group in NotificationGroupManager's mGroupMap
and re-inserted under the new one.
Unfortunately we were passing the *new* notification in the
oldNotification argument, so we would always attempt (and
fail) to remove it from the *new* group, leaving a strong
reference to the Notification inside mGroupMap under an
obsolete group key.
Bug:
26561365
Change-Id: Ie5cdceb4f843dbd363652e00fbc0f3ac6f6ef247
Neil Fuller [Thu, 14 Jan 2016 22:28:43 +0000 (22:28 +0000)]
Merge "Hide static setDefault methods in ICU4J"
am:
9e892f53dd
* commit '
9e892f53dd489c824b6a39c45028f838123daa85':
Hide static setDefault methods in ICU4J
Ian Pedowitz [Thu, 14 Jan 2016 22:26:32 +0000 (22:26 +0000)]
Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr1.5-dev am:
33001945a8
am:
33b55366c5
* commit '
33b55366c5138237e3da268a05f08b064426becc':
DO NOT MERGE Fix for syncs being dropped when appIdle is on
Ian Pedowitz [Thu, 14 Jan 2016 22:21:37 +0000 (22:21 +0000)]
Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr1.5-dev
am:
33001945a8
* commit '
33001945a82ba8cd5b5ad27b808312aa2ef210af':
DO NOT MERGE Fix for syncs being dropped when appIdle is on
Neil Fuller [Thu, 14 Jan 2016 22:20:16 +0000 (22:20 +0000)]
Merge "Hide static setDefault methods in ICU4J"
Ian Pedowitz [Thu, 14 Jan 2016 22:18:32 +0000 (22:18 +0000)]
Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr1.5-dev
Alan Viverette [Thu, 14 Jan 2016 21:49:09 +0000 (21:49 +0000)]
Don\'t verify the scrollbar drawable am:
a53c3b2197
am:
ca6b87fea6
* commit '
ca6b87fea6b16e38f8bbbd514d3cf07361a5feba':
Don't verify the scrollbar drawable
Alan Viverette [Thu, 14 Jan 2016 21:44:31 +0000 (21:44 +0000)]
Don\'t verify the scrollbar drawable
am:
a53c3b2197
* commit '
a53c3b2197b73d5b6a697ae2077e04065df84d9e':
Don't verify the scrollbar drawable
Alan Viverette [Thu, 14 Jan 2016 21:06:36 +0000 (16:06 -0500)]
Don't verify the scrollbar drawable
Avoids infinite invalidations caused by re-use of scrollbar drawable
during a single draw() pass. Does not address the general problem of
drawable reuse causing unnecessary invalidations as a result of calls
to setBounds() invoking invalidateSelf().
Bug:
26533725
Change-Id: I99e9c2dfe4ddfc833569e40e7268dcb03e931fc9
Shreyas Basarge [Mon, 11 Jan 2016 15:43:54 +0000 (15:43 +0000)]
DO NOT MERGE Fix for syncs being dropped when appIdle is on
Syncs were being dropped when appIdleMode was on for
an app. This CL backs off the sync instead of dropping
it. When the app becomes non-idle, backoff is cleared
and the sync is performed.
Bug:
26355386
Change-Id: I2040dfd847011d3ca902e66a8cd52b2a429177c1
Justin Harrison [Thu, 14 Jan 2016 06:48:37 +0000 (06:48 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev am:
e41a6c8b19
am:
2363da89a4
* commit '
2363da89a431d8809c49e4bb9568f63887e6e33e':
Fix race condition when setting default ringtones
Justin Harrison [Thu, 14 Jan 2016 06:44:21 +0000 (06:44 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev
am:
e41a6c8b19
* commit '
e41a6c8b19482a05a98e77d13281f7f14056f119':
Fix race condition when setting default ringtones
Justin Harrison [Thu, 14 Jan 2016 06:42:20 +0000 (06:42 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev
Amit Mahajan [Thu, 14 Jan 2016 06:38:27 +0000 (06:38 +0000)]
Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev am:
c6c9b2aa66
am:
cd097ff856
* commit '
cd097ff856b800e3d6b991adfe2316007ddb9957':
Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]
Amit Mahajan [Thu, 14 Jan 2016 06:34:46 +0000 (06:34 +0000)]
Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev am:
658fdf8426
am:
2b260b0006
* commit '
2b260b0006403e6be39015c12e422f9782ce6877':
DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE
Amit Mahajan [Thu, 14 Jan 2016 06:33:00 +0000 (06:33 +0000)]
Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev
am:
c6c9b2aa66
* commit '
c6c9b2aa66635761b5cebc2faf9e06631c36eab5':
Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]
Amit Mahajan [Thu, 14 Jan 2016 06:30:15 +0000 (06:30 +0000)]
Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev
am:
658fdf8426
* commit '
658fdf8426e5c0fb68b7c04af651eae93a32b4b4':
DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE
Amit Mahajan [Thu, 14 Jan 2016 06:28:47 +0000 (06:28 +0000)]
Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev
Amit Mahajan [Thu, 14 Jan 2016 06:26:26 +0000 (06:26 +0000)]
Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev
Chenjie Luo [Thu, 14 Jan 2016 02:34:53 +0000 (02:34 +0000)]
Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am:
4a577bff96 am:
d5cea64d8d
am:
7034a6e2d0
* commit '
7034a6e2d05c45c437bef6150bcc70b58b3ccb3b':
Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
Chenjie Luo [Thu, 14 Jan 2016 02:29:13 +0000 (02:29 +0000)]
Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am:
4a577bff96
am:
d5cea64d8d
* commit '
d5cea64d8d63e9ffb61af1e669962de08ea513cc':
Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
Vinit Deshpande [Thu, 14 Jan 2016 00:58:30 +0000 (16:58 -0800)]
Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]
Bug:
24147407
Change-Id: Ia07b8bc4ccbdaeea18ed22fbfcf813f71ddfa7dc
Chenjie Luo [Thu, 14 Jan 2016 02:24:48 +0000 (02:24 +0000)]
Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev
am:
4a577bff96
* commit '
4a577bff9674f4bc748ab76bf48ac6e7d3e567cc':
Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
Chenjie Luo [Thu, 14 Jan 2016 02:22:15 +0000 (02:22 +0000)]
Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev
Amit Mahajan [Wed, 13 Jan 2016 02:25:33 +0000 (18:25 -0800)]
DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE
Bug:
24147407
Change-Id: Ida957b9cc6b9c3e13bc8660213ce5cf979c886d5
Chenjie Luo [Wed, 13 Jan 2016 19:01:59 +0000 (11:01 -0800)]
Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
Bug:
25860409
Change-Id: I3f525c9c8df81807d98391c70cd2d1f8c139c8f5
Adam Lesinski [Thu, 14 Jan 2016 00:59:58 +0000 (00:59 +0000)]
Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev am:
d2e215978b
am:
a5c7106017
* commit '
a5c71060174c5357c75592998fb095e768eca8bd':
UsageStats: Use new settings key idle_duration2 for app idle
Adam Lesinski [Thu, 14 Jan 2016 00:54:10 +0000 (00:54 +0000)]
Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev
am:
d2e215978b
* commit '
d2e215978be9df2f3d2bf56eb1c857c6a1bc420a':
UsageStats: Use new settings key idle_duration2 for app idle
Adam Lesinski [Thu, 14 Jan 2016 00:45:31 +0000 (00:45 +0000)]
Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev
Nancy Zheng [Thu, 14 Jan 2016 00:23:20 +0000 (00:23 +0000)]
Pulling in https://android-review.googlesource.com/#/c/186482/1 am:
74dfcf90f1 am:
f474056e99
am:
f4c56a21a3
* commit '
f4c56a21a389e70b472e4e7e586c7cf59a444f8e':
Pulling in https://android-review.googlesource.com/#/c/186482/1
Nancy Zheng [Thu, 14 Jan 2016 00:12:14 +0000 (00:12 +0000)]
Pulling in https://android-review.googlesource.com/#/c/186482/1 am:
74dfcf90f1
am:
f474056e99
* commit '
f474056e99de892b731155989ee0d9dae1d3eea7':
Pulling in https://android-review.googlesource.com/#/c/186482/1
Nancy Zheng [Wed, 13 Jan 2016 23:59:42 +0000 (23:59 +0000)]
Pulling in https://android-review.googlesource.com/#/c/186482/1
am:
74dfcf90f1
* commit '
74dfcf90f18d8d0e1128707a5986c4fa94d70350':
Pulling in https://android-review.googlesource.com/#/c/186482/1
Nancy Zheng [Wed, 13 Jan 2016 23:23:56 +0000 (15:23 -0800)]
Pulling in https://android-review.googlesource.com/#/c/186482/1
Fix memory leak in HWUI
std::unique_ptr::release just releases the ownership of the
managed object. To delete the object, std::unique_ptr::reset
function should be called.
Bug:
26116596
Change-Id: If65f74085b1fc2be3a9fffc433326e0bcdb40ff3
Selim Cinek [Wed, 13 Jan 2016 23:14:26 +0000 (23:14 +0000)]
Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev am:
d23f1eb0cd
am:
804ff964af
* commit '
804ff964afed8154c5b169cd1f2bb6e89dc05f2f':
Fixed a crash with the heads up manager
Ian Pedowitz [Wed, 13 Jan 2016 23:10:29 +0000 (23:10 +0000)]
Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev am:
624d43b66f
am:
0cd5e9f475
* commit '
0cd5e9f475cd31535ad33a6d2151f2270bd3f29c':
Revert "Avoid drawable invalidation during draw()"
Selim Cinek [Wed, 13 Jan 2016 23:10:20 +0000 (23:10 +0000)]
Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev
am:
d23f1eb0cd
* commit '
d23f1eb0cd9893395573a4059be195e8fdb1007a':
Fixed a crash with the heads up manager
Ian Pedowitz [Wed, 13 Jan 2016 23:01:29 +0000 (23:01 +0000)]
Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev
am:
624d43b66f
* commit '
624d43b66f039e3b0f33274486512621919d96a3':
Revert "Avoid drawable invalidation during draw()"
Selim Cinek [Wed, 13 Jan 2016 23:01:13 +0000 (23:01 +0000)]
Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev
Ian Pedowitz [Wed, 13 Jan 2016 22:47:45 +0000 (22:47 +0000)]
Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev
Alan Viverette [Wed, 13 Jan 2016 21:49:10 +0000 (21:49 +0000)]
Revert "Avoid drawable invalidation during draw()"
This reverts commit
e5e59c6da424096da8f57137cdc57d8bd410b079.
Drawables expect to be able to call invalidateSelf() during
draw() to pump animation frames. We shouldn't break this.
Bug:
26533725
Change-Id: Ibe2871f2622faf836637225fc1e3e6f0ca6def47
Selim Cinek [Fri, 6 Nov 2015 19:33:20 +0000 (11:33 -0800)]
Fixed a crash with the heads up manager
Bug:
25693389
Change-Id: Id852e342000bff6de0ce19f442eb53b21e935b7b
Adam Lesinski [Wed, 13 Jan 2016 20:26:07 +0000 (12:26 -0800)]
UsageStats: Use new settings key idle_duration2 for app idle
Ignores the old, re-appropriated key "idle_duration" which is now
set to a high value in order to force disable app idle on devices
with bug b/
26355386
Bug:
26355386
Change-Id: Iff9de843ad6e547d29c1583687fc7f7ce7e15090
Robert Greenwalt [Wed, 13 Jan 2016 20:48:14 +0000 (20:48 +0000)]
Merge "Add free short codes for Direct Carrier Billing in Google Play"
am:
d736cba6e7
* commit '
d736cba6e7f93a2e6df172a644e413f27a1dc939':
Add free short codes for Direct Carrier Billing in Google Play
Pavel Zhamaitsiak [Wed, 13 Jan 2016 20:44:08 +0000 (20:44 +0000)]
Merge "Add WiFi Calling overlays for T-Mobile\'s MCCMNCs" into mnc-dr1.5-dev am:
9ae30e69ad
am:
fba6bccff5
* commit '
fba6bccff5d230b581e46ed64911d0c67e4be442':
Add WiFi Calling overlays for T-Mobile's MCCMNCs
Pavel Zhamaitsiak [Wed, 13 Jan 2016 20:35:46 +0000 (20:35 +0000)]
Merge "Add WiFi Calling overlays for T-Mobile\'s MCCMNCs" into mnc-dr1.5-dev
am:
9ae30e69ad
* commit '
9ae30e69ada03ebf3408ed1d2f24a5a67ea33b68':
Add WiFi Calling overlays for T-Mobile's MCCMNCs
Robert Greenwalt [Wed, 13 Jan 2016 20:35:34 +0000 (20:35 +0000)]
Merge "Add free short codes for Direct Carrier Billing in Google Play"
Pavel Zhamaitsiak [Wed, 13 Jan 2016 20:30:46 +0000 (20:30 +0000)]
Merge "Add WiFi Calling overlays for T-Mobile's MCCMNCs" into mnc-dr1.5-dev
Pavel Zhamaitsiak [Wed, 13 Jan 2016 19:19:05 +0000 (11:19 -0800)]
Add WiFi Calling overlays for T-Mobile's MCCMNCs
Bug:
26024279
Change-Id: I71920fc45dec3e4fe5a3f4e349ff1ba3df703000
Keisuke Kuroyanagi [Wed, 13 Jan 2016 19:03:56 +0000 (19:03 +0000)]
Tests for getPrimaryHorizontal with grapheme boundaries am:
a5c53291a8
am:
3bb115ba5c
* commit '
3bb115ba5c8f176a355384f98e0b5348499b8b76':
Tests for getPrimaryHorizontal with grapheme boundaries
Keisuke Kuroyanagi [Wed, 13 Jan 2016 18:57:42 +0000 (18:57 +0000)]
Tests for getPrimaryHorizontal with grapheme boundaries
am:
a5c53291a8
* commit '
a5c53291a8123fa0296c849fe153a7dcf79b4dda':
Tests for getPrimaryHorizontal with grapheme boundaries
Keisuke Kuroyanagi [Wed, 13 Jan 2016 06:47:34 +0000 (15:47 +0900)]
Tests for getPrimaryHorizontal with grapheme boundaries
Bug:
25375561
Change-Id: I022473627499d7f18105e3a300754fae5be7da8e
Adam Lesinski [Wed, 13 Jan 2016 02:12:06 +0000 (02:12 +0000)]
Merge "UsageStats: Fix issue where initializing data for first time would cause crash" into mnc-dr1.5-dev am:
f2cc98bc96
am:
112e26646f
* commit '
112e26646f334bed6ee202765b09e6687dde1436':
UsageStats: Fix issue where initializing data for first time would cause crash
Adam Lesinski [Wed, 13 Jan 2016 02:04:17 +0000 (02:04 +0000)]
Merge "UsageStats: Fix issue where initializing data for first time would cause crash" into mnc-dr1.5-dev
am:
f2cc98bc96
* commit '
f2cc98bc967c1b14d779198046137bf13aeb219c':
UsageStats: Fix issue where initializing data for first time would cause crash
Adam Lesinski [Wed, 13 Jan 2016 01:48:45 +0000 (01:48 +0000)]
Merge "UsageStats: Fix issue where initializing data for first time would cause crash" into mnc-dr1.5-dev
Adam Lesinski [Tue, 12 Jan 2016 18:36:09 +0000 (10:36 -0800)]
UsageStats: Fix issue where initializing data for first time would cause crash
With the updated rolling window of stats for app idleness, we need to make sure
it is populated before we initialize some defaults.
Now that we look at older entries to figure out idleness, if those
entries are in the future (due to time change), set them to the current
screen on time.
Bug:
26504153
Change-Id: Ia22add0e8eaf0f137002bbe3e91d747fef5b7d69
Samuel Tan [Tue, 12 Jan 2016 23:17:50 +0000 (23:17 +0000)]
Merge "Remove PersistableBundle.aidl from Java framework"
am:
2e37bfd2d2
* commit '
2e37bfd2d2f629ca50ecf0e6674484cd30560d26':
Remove PersistableBundle.aidl from Java framework
Samuel Tan [Tue, 12 Jan 2016 23:09:52 +0000 (23:09 +0000)]
Merge "Remove PersistableBundle.aidl from Java framework"
Matthew Bouyack [Tue, 12 Jan 2016 22:45:49 +0000 (22:45 +0000)]
Merge "In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments." into cw-e-dev am:
eebf168e43 am:
e0845e8629
am:
6222bb0f6a
* commit '
6222bb0f6a772c8fa1dc402740399b0ad1017520':
In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments.
Samuel Tan [Wed, 6 Jan 2016 01:29:43 +0000 (17:29 -0800)]
Remove PersistableBundle.aidl from Java framework
Remove PersistableBundle.aidl from the Java framework, since it
has been moved to the native libbinder.
BUG:
26292234
Change-Id: Ia3dc49a3ad92f4c579e6dff0606c1db8fb3be76b
TEST: aosp_arm builds successfully.
Matthew Bouyack [Tue, 12 Jan 2016 22:40:13 +0000 (22:40 +0000)]
Merge "In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments." into cw-e-dev am:
eebf168e43
am:
e0845e8629
* commit '
e0845e86299a35f84ad63177047745de5a6020e9':
In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments.
Michael Wright [Tue, 12 Jan 2016 22:40:10 +0000 (22:40 +0000)]
Merge "Make sure NaturalSurfaceLayout is consistent with SurfaceControl"
am:
6fa9c5cd01
* commit '
6fa9c5cd01e36c62d5ad7efa230d4e52f457c148':
Make sure NaturalSurfaceLayout is consistent with SurfaceControl
Matthew Bouyack [Tue, 12 Jan 2016 22:33:09 +0000 (22:33 +0000)]
Merge "In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments." into cw-e-dev
am:
eebf168e43
* commit '
eebf168e43e4a455a74e949cc0d7e156b231a697':
In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments.
Matthew Bouyack [Tue, 12 Jan 2016 22:28:21 +0000 (22:28 +0000)]
Merge "In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments." into cw-e-dev
Michael Wright [Tue, 12 Jan 2016 22:20:52 +0000 (22:20 +0000)]
Merge "Make sure NaturalSurfaceLayout is consistent with SurfaceControl"
Michael Wright [Tue, 12 Jan 2016 21:55:08 +0000 (21:55 +0000)]
Merge "Animate backlight quickly when display state request to change or power mode changed"
am:
3a87cb0192
* commit '
3a87cb0192052e20724b9107bc37d9e2d80978e2':
Animate backlight quickly when display state request to change or power mode changed
Michael Wright [Tue, 12 Jan 2016 21:46:38 +0000 (21:46 +0000)]
Merge "Animate backlight quickly when display state request to change or power mode changed"
Kenny Root [Tue, 12 Jan 2016 21:07:06 +0000 (21:07 +0000)]
Merge "Track changes in libcore"
am:
a15ef2abab
* commit '
a15ef2abab566468af66d431303a1645069dd094':
Track changes in libcore
Kenny Root [Tue, 12 Jan 2016 20:59:32 +0000 (20:59 +0000)]
Merge "Track changes in libcore"
Kenny Root [Tue, 12 Jan 2016 20:58:04 +0000 (12:58 -0800)]
Track changes in libcore
The OCSP update added some API changes necessary to interact with it.
This change tracks the addition of the API.
Change-Id: I22c0448848747943bc039ff8e8fd0a1f0c531224
Alan Viverette [Tue, 12 Jan 2016 20:43:33 +0000 (20:43 +0000)]
Merge "Avoid drawable invalidation during draw()" into mnc-dr1.5-dev am:
cf6885b7b7
am:
c783ebc13a
* commit '
c783ebc13a350f3f83dbe0713af9581e39b355ec':
Avoid drawable invalidation during draw()
Matthew Bouyack [Tue, 12 Jan 2016 20:01:48 +0000 (12:01 -0800)]
In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos
and save the result. Then pass that value to
UiFrameInfoBuilder::setVsync as both arguments.
The order of function argument evaluation is undefined in C++. Because
the value returned from TimeLord::latestVsync may be changed by
the preceding call to TimeLord::computeFrameTimeNanos the values of the
arguments passed to UiFrameInfoBuilder::setVsync is also undefined. This
change removes any ambiguity.
Change-Id: Ie71ee453f9ccc725edfe5f7cc9b277f2a809dfdc
Alan Viverette [Tue, 12 Jan 2016 19:22:16 +0000 (19:22 +0000)]
Merge "Avoid drawable invalidation during draw()" into mnc-dr1.5-dev
am:
cf6885b7b7
* commit '
cf6885b7b7665b5589c0640e1cf4b98780f3aeec':
Avoid drawable invalidation during draw()
Alan Viverette [Tue, 12 Jan 2016 19:18:28 +0000 (19:18 +0000)]
Merge "Avoid drawable invalidation during draw()" into mnc-dr1.5-dev
Alan Viverette [Tue, 12 Jan 2016 19:00:26 +0000 (19:00 +0000)]
Merge "Handle null result from getVirtualChildAt()" into mnc-dr1.5-dev am:
d9434699e4
am:
9c0890ea4b
* commit '
9c0890ea4b2144ac3175d07a09df1dd18f0e2e22':
Handle null result from getVirtualChildAt()
Jason Monk [Tue, 12 Jan 2016 18:58:28 +0000 (18:58 +0000)]
Get data type from service state as well am:
67b2c16a9a
am:
05130f3f23
* commit '
05130f3f237efbbf497b770938e0b758a646de1a':
Get data type from service state as well
Alan Viverette [Tue, 12 Jan 2016 18:53:45 +0000 (18:53 +0000)]
Merge "Handle null result from getVirtualChildAt()" into mnc-dr1.5-dev
am:
d9434699e4
* commit '
d9434699e4ef8c528ce01223ee9ef200bfd693e4':
Handle null result from getVirtualChildAt()
Jason Monk [Tue, 12 Jan 2016 18:51:32 +0000 (18:51 +0000)]
Get data type from service state as well
am:
67b2c16a9a
* commit '
67b2c16a9a9060d37888bdab4dfadd384a76e9d7':
Get data type from service state as well
Alan Viverette [Tue, 12 Jan 2016 18:19:33 +0000 (18:19 +0000)]
Merge "Handle null result from getVirtualChildAt()" into mnc-dr1.5-dev
Marco Nelissen [Fri, 6 Nov 2015 00:44:52 +0000 (16:44 -0800)]
Fix race condition when setting default ringtones
If the device was powered off during first boot, after media scanner
inserted some entries but before the default ringtone settings were
set (or committed to disk), the default settings would not be set
on subsequent boots.
Bug:
18625739
Bug:
22349910
Bug:
25633323
Change-Id: I8ff5d3c4f842297d0675e1f5cbe17c0709a14158
Jason Monk [Tue, 12 Jan 2016 15:24:09 +0000 (10:24 -0500)]
Get data type from service state as well
Bug:
26276354
Bug:
26413831
Change-Id: Ic080300db7d5e5200caf611cc2ee1ef3af93736e
Alan Viverette [Mon, 4 Jan 2016 17:36:28 +0000 (12:36 -0500)]
Avoid drawable invalidation during draw()
Prevents infinite invalidation loop when reusing a drawable asset within
a single draw() call. Also reduces unnecessary extra invalidations due to
drawable setters (ex. setBounds()) being called during draw().
Bug:
26329675
Change-Id: I31b3c99e8efd4193415cc562a84c8939a2f56c2d
(cherry picked from commit
8cda8e915916b3166e4496589b802fd1ed553c77)
Alan Viverette [Thu, 17 Dec 2015 17:42:39 +0000 (12:42 -0500)]
Handle null result from getVirtualChildAt()
Also adds final where the method was being called, adds Nullable
annotation to method, and updates docs.
Bug:
25985497
Change-Id: I847a8507f2e3970f1340cddf4abf8650dda22b35
(cherry picked from commit
ad52693cf3dfe3f5e84f5a22fe4c3787f2f2cbfb)
mochangming [Tue, 29 Dec 2015 05:55:24 +0000 (13:55 +0800)]
Animate backlight quickly when display state request to change or power mode changed
* mAppliedDimming should be false when power request policy is not dim.
* mAppliedLowPower should be false when low power mode is disabled.
* Backlight brightness changes quickly.
Change-Id: I44bf9c216554f8dce5abd0520f198824df5e8dcf
Signed-off-by: mochangming <mochangming@xiaomi.com>
Doris Liu [Tue, 12 Jan 2016 01:44:19 +0000 (01:44 +0000)]
Merge "Get animation update timing for AVD" into mnc-dr1.5-dev am:
a73abeaf4b
am:
7537aa7596
* commit '
7537aa75968d127525ef8fba84f365514ae789a3':
Get animation update timing for AVD
Doris Liu [Tue, 12 Jan 2016 01:39:05 +0000 (01:39 +0000)]
Merge "Get animation update timing for AVD" into mnc-dr1.5-dev
am:
a73abeaf4b
* commit '
a73abeaf4b7b158664c34124d8df39ad843f7451':
Get animation update timing for AVD
Doris Liu [Tue, 12 Jan 2016 01:36:23 +0000 (01:36 +0000)]
Merge "Get animation update timing for AVD" into mnc-dr1.5-dev
Raph Levien [Tue, 12 Jan 2016 01:20:52 +0000 (01:20 +0000)]
Merge branch 'mnc-dr2-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr2-dev-plus-aosp
Raph Levien [Tue, 12 Jan 2016 01:20:09 +0000 (01:20 +0000)]
Merge changes from topic \'grapheme-dr1.5\' into mnc-dr1.5-dev am:
9f2c939730
am:
728a2fa272
* commit '
728a2fa2723e6ee68853a55563fbf47aed965435':
Respect grapheme clusters in Layout#getOffsetForHorizontal.
Fix: Cursor can be at an invalid offset in EditText.