OSDN Git Service
Sungsoo Lim [Fri, 9 Jun 2017 15:49:48 +0000 (15:49 +0000)]
Merge "Fix the finding logic of MediaButtonSession" into oc-dev am:
9cfd30202d
am:
acd925d497
Change-Id: I2e1fe0367a3fe06110cf28c297422cfe07c374c8
Sungsoo Lim [Fri, 9 Jun 2017 15:42:50 +0000 (15:42 +0000)]
Merge "Fix the finding logic of MediaButtonSession" into oc-dev
am:
9cfd30202d
Change-Id: I5a12aef2922ccc468469c3b32f2fddda8e044fa0
Sungsoo Lim [Fri, 9 Jun 2017 15:38:42 +0000 (15:38 +0000)]
Merge "Fix the finding logic of MediaButtonSession" into oc-dev
Android Build Merger (Role) [Fri, 9 Jun 2017 13:25:00 +0000 (13:25 +0000)]
Merge "Merge "Fix deadlock when create alert window notification" into oc-dev am:
678477b383 am:
d5418a231b" into oc-dr1-dev-plus-aosp
Wale Ogunwale [Fri, 9 Jun 2017 13:23:13 +0000 (13:23 +0000)]
Merge "Fix deadlock when create alert window notification" into oc-dev am:
678477b383
am:
d5418a231b
Change-Id: I48aadf1444ce14bbff67894fdb0a6fdf1dbb2ecf
Wale Ogunwale [Fri, 9 Jun 2017 13:23:09 +0000 (13:23 +0000)]
Merge "Fix deadlock when create alert window notification" into oc-dev am:
678477b383
am:
59cd5a98dc
Change-Id: I00b769b3bce0ca6851001a84f4c53c16f5094c6c
Wale Ogunwale [Fri, 9 Jun 2017 13:15:38 +0000 (13:15 +0000)]
Merge "Fix deadlock when create alert window notification" into oc-dev
am:
678477b383
Change-Id: I2c6149881b738777ed309209538c5d9726d36c36
Wale Ogunwale [Fri, 9 Jun 2017 13:15:38 +0000 (13:15 +0000)]
Merge "Fix deadlock when create alert window notification" into oc-dev
am:
678477b383
Change-Id: If4da36399c68f7a91c0ab87d398eb3cdb70f2215
Wale Ogunwale [Fri, 9 Jun 2017 13:07:13 +0000 (13:07 +0000)]
Merge "Fix deadlock when create alert window notification" into oc-dev
Hugo Benichi [Fri, 9 Jun 2017 12:10:15 +0000 (12:10 +0000)]
Merge "Revert "Instrument captive portal login activity"" am:
2921320517 am:
bbddbfc451
am:
56057f2b55 -s ours
Change-Id: I22d9980ace64235c8b88417bb4b818a13cbb65e0
Hugo Benichi [Fri, 9 Jun 2017 11:47:25 +0000 (11:47 +0000)]
Merge "Revert "Instrument captive portal login activity"" am:
2921320517
am:
bbddbfc451
Change-Id: I0271fa4138ac9c4f1ddfea648c003a79909214df
Hugo Benichi [Fri, 9 Jun 2017 11:40:01 +0000 (11:40 +0000)]
Merge "Revert "Instrument captive portal login activity""
am:
2921320517
Change-Id: Iacae406a0998bb91c84b73a66ff383dfa8038665
Hugo Benichi [Fri, 9 Jun 2017 11:31:21 +0000 (11:31 +0000)]
Merge "Revert "Instrument captive portal login activity""
Hugo Benichi [Fri, 9 Jun 2017 11:30:05 +0000 (11:30 +0000)]
Revert "Instrument captive portal login activity"
This reverts commit
f867da14eaa194cb53b0726b50e570268e70f1d7.
Change-Id: Ic900c91ed87c2d65c151f8386954bd7b74128348
Android Build Merger (Role) [Fri, 9 Jun 2017 11:27:21 +0000 (11:27 +0000)]
Merge "Merge "Prioritize reused activity's stack over computed stack." into oc-dev am:
ac56b8adde am:
d1e55c133d" into oc-dr1-dev-plus-aosp
Bryce Lee [Fri, 9 Jun 2017 11:25:07 +0000 (11:25 +0000)]
Merge "Prioritize reused activity's stack over computed stack." into oc-dev am:
ac56b8adde
am:
d1e55c133d
Change-Id: I20352302ad5d8691993547214a92956d9c182cf3
Bryce Lee [Fri, 9 Jun 2017 11:25:02 +0000 (11:25 +0000)]
Merge "Prioritize reused activity's stack over computed stack." into oc-dev am:
ac56b8adde
am:
cbf1bd40ea
Change-Id: I5770bf1ed814ba03bad9a08c0cf59151aef34100
Bryce Lee [Fri, 9 Jun 2017 11:18:04 +0000 (11:18 +0000)]
Merge "Prioritize reused activity's stack over computed stack." into oc-dev
am:
ac56b8adde
Change-Id: I78c8fc62d4050546896262245785084fd5cab609
Bryce Lee [Fri, 9 Jun 2017 11:17:58 +0000 (11:17 +0000)]
Merge "Prioritize reused activity's stack over computed stack." into oc-dev
am:
ac56b8adde
Change-Id: Ib4fd790e9ee235b25ddde40d839c01e7685a2f12
Bryce Lee [Fri, 9 Jun 2017 11:11:12 +0000 (11:11 +0000)]
Merge "Prioritize reused activity's stack over computed stack." into oc-dev
Erik Kline [Fri, 9 Jun 2017 09:31:05 +0000 (09:31 +0000)]
Merge "Convert IControlsTethering from interface into callback" am:
5b9d362b60 am:
ad3fd82f8b
am:
b9fc817f59
Change-Id: I178130e65db4fef26d62ea7eaa9a52f7e8103432
Erik Kline [Fri, 9 Jun 2017 09:23:37 +0000 (09:23 +0000)]
Merge "Convert IControlsTethering from interface into callback" am:
5b9d362b60
am:
ad3fd82f8b
Change-Id: Ib1f41df1200378191c0722a280939ccbde539920
Erik Kline [Fri, 9 Jun 2017 09:16:01 +0000 (09:16 +0000)]
Merge "Convert IControlsTethering from interface into callback"
am:
5b9d362b60
Change-Id: I911548e994761778cf5434b2513d433eeaccd4f3
Erik Kline [Fri, 9 Jun 2017 09:06:39 +0000 (09:06 +0000)]
Merge "Convert IControlsTethering from interface into callback"
Hugo Benichi [Fri, 9 Jun 2017 07:24:42 +0000 (07:24 +0000)]
Merge "Instrument captive portal login activity" am:
b213053def am:
30b7dfb526
am:
d614cd3509 -s ours
Change-Id: I71166b2679994e342ca72398c68f6751ee2d5fa3
Hugo Benichi [Fri, 9 Jun 2017 07:16:18 +0000 (07:16 +0000)]
Merge "New Metrics constants for captive portal related UI" am:
aac9aff5dc am:
75792d4299 -s ours
am:
97520fb0dd -s ours
Change-Id: Ia8e70a92b70cc1321024156c5a8879352827d567
Hugo Benichi [Fri, 9 Jun 2017 07:11:46 +0000 (07:11 +0000)]
Merge "Instrument captive portal login activity" am:
b213053def
am:
30b7dfb526
Change-Id: Iec106e30ce9dbb38189fe3888f6111be92816891
Hugo Benichi [Fri, 9 Jun 2017 07:08:25 +0000 (07:08 +0000)]
Merge "New Metrics constants for captive portal related UI" am:
aac9aff5dc
am:
75792d4299 -s ours
Change-Id: Ic7a559a6a5759dc0528e2a2d167d999b208225dd
Hugo Benichi [Fri, 9 Jun 2017 06:50:52 +0000 (06:50 +0000)]
Merge "Instrument captive portal login activity"
am:
b213053def
Change-Id: Ic8205b609f8c6e0bc04eac17c3bcbe7df0508207
Hugo Benichi [Fri, 9 Jun 2017 06:47:47 +0000 (06:47 +0000)]
Merge "New Metrics constants for captive portal related UI"
am:
aac9aff5dc
Change-Id: Ib55742148a08ae21f01539939e41699cdb581ca2
Romain Guy [Fri, 9 Jun 2017 06:40:44 +0000 (06:40 +0000)]
Merge "Fix CTS : BitmapRGBAF16Test#testSetPixel failure" into oc-dr1-dev
am:
c025347cf2
Change-Id: I67be64383eeac28ea84ae02a351a92d078b4dac8
Hugo Benichi [Fri, 9 Jun 2017 06:39:19 +0000 (06:39 +0000)]
Merge "Instrument captive portal login activity"
Hugo Benichi [Fri, 9 Jun 2017 06:38:09 +0000 (06:38 +0000)]
Merge "New Metrics constants for captive portal related UI"
Romain Guy [Fri, 9 Jun 2017 06:34:35 +0000 (06:34 +0000)]
Merge "Fix CTS : BitmapRGBAF16Test#testSetPixel failure" into oc-dr1-dev
Hugo Benichi [Mon, 5 Jun 2017 05:52:24 +0000 (14:52 +0900)]
Instrument captive portal login activity
Also add CAPTIVE_PORTAL_LOGIN_ACTIVITY_SSL_ERROR constants to
metrics_constants.proto for counting ssl error pages shown by the
captive portal login activity.
Bug:
36203355
Bug:
34901696
Bug:
36532213
Test: manually tested with captive portal testing setup while watching
event logs: adb logcat -b events | grep captiveportallogin
06-08 16:25:20.279 21558 21558 I sysui_action: [1004,com.android.captiveportallogin]
06-08 17:01:04.052 21558 21558 I sysui_action: [1007,com.android.captiveportallogin]
Merged-In: Ia05853506d424ad4cb2c11770ae7718fbef3f01c
(cherry picked from commit
c61dc92fc0619d101c4b789f6305012701cc47a0)
Change-Id: I9184f6263a003c2be28f41a550c6164c8d6ee907
Sungsoo [Fri, 9 Jun 2017 03:59:47 +0000 (12:59 +0900)]
Fix the finding logic of MediaButtonSession
When we find a media button session with the given UID, we should
ignore the sessions whose playback state is not set.
Bug:
62373831
Test: passed CtsMediaTestCases
Change-Id: I484c888c5bdbceb85dd4524c1353906efc0c4f02
Android Build Merger (Role) [Fri, 9 Jun 2017 04:45:04 +0000 (04:45 +0000)]
Merge "Merge "Fixed an issue where the notification could stay userlocked" into oc-dev am:
dc66506f0a am:
81c8d5f861" into oc-dr1-dev-plus-aosp
Selim Cinek [Fri, 9 Jun 2017 04:44:04 +0000 (04:44 +0000)]
Merge "Fixed an issue where the notification could stay userlocked" into oc-dev am:
dc66506f0a
am:
81c8d5f861
Change-Id: I4cf8932e64329727d23da074d2ba7af08718676f
Selim Cinek [Fri, 9 Jun 2017 04:42:32 +0000 (04:42 +0000)]
Merge "Fixed an issue where the notification could stay userlocked" into oc-dev am:
dc66506f0a
am:
4ab7b364a5
Change-Id: I1835b0a6ba2b5b677ba0ec33c9ba3749364e819e
Android Build Merger (Role) [Fri, 9 Jun 2017 04:38:48 +0000 (04:38 +0000)]
Merge "Merge "Fixed a bug where systemui could crash while cloning" into oc-dev am:
b9eb205bd7 am:
0ae979806f" into oc-dr1-dev-plus-aosp
Selim Cinek [Fri, 9 Jun 2017 04:38:10 +0000 (04:38 +0000)]
Merge "Fixed an issue where the notification could stay userlocked" into oc-dev
am:
dc66506f0a
Change-Id: I541a5d64c0111057b709ca7179ff439da02bed29
Selim Cinek [Fri, 9 Jun 2017 04:36:31 +0000 (04:36 +0000)]
Merge "Fixed an issue where the notification could stay userlocked" into oc-dev
am:
dc66506f0a
Change-Id: Ia2ea2f1b69bdcab2d27a56e89fbfb87b8cc11eed
Selim Cinek [Fri, 9 Jun 2017 04:36:30 +0000 (04:36 +0000)]
Merge "Fixed a bug where systemui could crash while cloning" into oc-dev am:
b9eb205bd7
am:
0ae979806f
Change-Id: Ibd7703fbe50943517f448dbed2372b20ee355a2e
Selim Cinek [Fri, 9 Jun 2017 04:36:27 +0000 (04:36 +0000)]
Merge "Fixed a bug where systemui could crash while cloning" into oc-dev am:
b9eb205bd7
am:
f62145a41a
Change-Id: I55c470ed539b2ace8d79f7418a8c0ead1f19c3a1
Selim Cinek [Fri, 9 Jun 2017 04:30:51 +0000 (04:30 +0000)]
Merge "Fixed a bug where systemui could crash while cloning" into oc-dev
am:
b9eb205bd7
Change-Id: I5b1ff4ba5708c7d470940fd46074aefe9c210b83
Selim Cinek [Fri, 9 Jun 2017 04:30:47 +0000 (04:30 +0000)]
Merge "Fixed a bug where systemui could crash while cloning" into oc-dev
am:
b9eb205bd7
Change-Id: I6cd3b23a9adcb20a93b112204154f1e42a7a3c21
Android Build Merger (Role) [Fri, 9 Jun 2017 04:28:18 +0000 (04:28 +0000)]
Merge "Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev am:
d1f55f6302 am:
9f23608173" into oc-dr1-dev-plus-aosp
Jorim Jaggi [Fri, 9 Jun 2017 04:26:52 +0000 (04:26 +0000)]
Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev am:
d1f55f6302
am:
9f23608173
Change-Id: I4c25856ca91283541a3d298e2f918db92f5c34d4
Selim Cinek [Fri, 9 Jun 2017 04:25:36 +0000 (04:25 +0000)]
Merge "Fixed an issue where the notification could stay userlocked" into oc-dev
Jorim Jaggi [Fri, 9 Jun 2017 04:24:38 +0000 (04:24 +0000)]
Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev am:
d1f55f6302
am:
8fee9425e4
Change-Id: I0e88c75cea5b39aadd829470c1b299cf10444e5a
Android Build Merger (Role) [Fri, 9 Jun 2017 04:22:06 +0000 (04:22 +0000)]
Merge "Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev am:
713ad88afe am:
e7a5369ab4" into oc-dr1-dev-plus-aosp
Selim Cinek [Fri, 9 Jun 2017 04:21:59 +0000 (04:21 +0000)]
Merge "Fixed a bug where systemui could crash while cloning" into oc-dev
Jorim Jaggi [Fri, 9 Jun 2017 04:21:09 +0000 (04:21 +0000)]
Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev am:
713ad88afe
am:
e7a5369ab4
Change-Id: Ia8a8bfa87ccb193e27093df069c3996f46c44dd1
Jorim Jaggi [Fri, 9 Jun 2017 04:18:44 +0000 (04:18 +0000)]
Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev am:
713ad88afe
am:
af3829adf4
Change-Id: I4e75a7ccdedc15cb428edbf65624ad3181313b7c
Jorim Jaggi [Fri, 9 Jun 2017 04:16:28 +0000 (04:16 +0000)]
Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev
am:
d1f55f6302
Change-Id: Ibc28f6019637dbc9696c62f1ad1ce4679954fbd5
Jorim Jaggi [Fri, 9 Jun 2017 04:15:12 +0000 (04:15 +0000)]
Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev
am:
d1f55f6302
Change-Id: Ibbb9214593ee1b5dd51a0b0da8815c270b875257
Jorim Jaggi [Fri, 9 Jun 2017 04:11:31 +0000 (04:11 +0000)]
Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev
am:
713ad88afe
Change-Id: Ie76d079092805920ebd6820ce412691ccdceb039
Jorim Jaggi [Fri, 9 Jun 2017 04:11:29 +0000 (04:11 +0000)]
Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev
am:
713ad88afe
Change-Id: Idd18d8e092b1628eb0a08d579d6a6a488ce01026
Jorim Jaggi [Fri, 9 Jun 2017 04:06:38 +0000 (04:06 +0000)]
Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev
Jorim Jaggi [Fri, 9 Jun 2017 04:05:31 +0000 (04:05 +0000)]
Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev
Romain Guy [Fri, 9 Jun 2017 01:24:25 +0000 (18:24 -0700)]
Fix CTS : BitmapRGBAF16Test#testSetPixel failure
Don't grab a pointer to a temporary object on the stack!
Bug:
62458021
Test: CtsGraphicsTestCase
Change-Id: Ic9662e76c9064b3f3af6f8a4534d2ef56f9c5eea
Adrian Roos [Fri, 9 Jun 2017 00:44:30 +0000 (00:44 +0000)]
Merge "AOD: Move clock to prevent burn in" into oc-dr1-dev
am:
63f23f8dd7
Change-Id: Idfe377248ce22f16da0801111706fe936cf1cd8d
Adrian Roos [Fri, 9 Jun 2017 00:38:36 +0000 (00:38 +0000)]
Merge "AOD: Move clock to prevent burn in" into oc-dr1-dev
Jorim Jaggi [Thu, 8 Jun 2017 22:40:38 +0000 (15:40 -0700)]
Properly run window animations at vsync-sf (1/2)
- Add new Choreographer instance that runs on vsync-sf
- Use this new Choreographer for WindowAnimator, and remove all
the hacks around it
Test: Open apps and close apps, notice no stutter
Test: Screen zoom animations
Test: go/wm-smoke
Bug:
36631902
Change-Id: I988ae25645effc3ac20efa7cb9b68f23444da0d0
Android Build Merger (Role) [Fri, 9 Jun 2017 00:12:23 +0000 (00:12 +0000)]
Merge "Merge "Bluetooth: fix connectGatt overload invocations" into oc-dev am:
556b10a4e6 am:
25278b0197" into oc-dr1-dev-plus-aosp
Jakub Pawlowski [Fri, 9 Jun 2017 00:11:17 +0000 (00:11 +0000)]
Merge "Bluetooth: fix connectGatt overload invocations" into oc-dev am:
556b10a4e6
am:
25278b0197
Change-Id: I5b560a7ff1036068c58e0bb0da1e43c0f7c56106
Jakub Pawlowski [Fri, 9 Jun 2017 00:09:19 +0000 (00:09 +0000)]
Merge "Bluetooth: fix connectGatt overload invocations" into oc-dev am:
556b10a4e6
am:
232108bafb
Change-Id: I859c30a21d87dac7b58b483a4469e9627e14cc55
Jakub Pawlowski [Fri, 9 Jun 2017 00:03:31 +0000 (00:03 +0000)]
Merge "Bluetooth: fix connectGatt overload invocations" into oc-dev
am:
556b10a4e6
Change-Id: I9477ac6e3990a4e2db4a8254f11702b1557591f3
Jakub Pawlowski [Fri, 9 Jun 2017 00:01:44 +0000 (00:01 +0000)]
Merge "Bluetooth: fix connectGatt overload invocations" into oc-dev
am:
556b10a4e6
Change-Id: I92c46f849d80794d6c658b4ec0cfd071bf89a7bf
Matthew Ng [Thu, 8 Jun 2017 23:52:51 +0000 (23:52 +0000)]
Merge "Merge "Fixes the animation and state when docking a task by drag" into oc-dev am:
008e620153" into oc-dev-plus-aosp
am:
ccf45069c0
Change-Id: Ib2ae2bfeb84e999696a04ea2ffdee93872564edf
Wale Ogunwale [Thu, 8 Jun 2017 23:51:48 +0000 (16:51 -0700)]
Fix deadlock when create alert window notification
Don't hold WM lock when calling into notification manager which
can call into activity manager.
Test: Make sure alert window notification is displayed
Change-Id: Id8831878093f8079f815a830ff8acdfad99d48cb
Fixes:
62458061
Jakub Pawlowski [Thu, 8 Jun 2017 23:51:21 +0000 (23:51 +0000)]
Merge "Bluetooth: fix connectGatt overload invocations" into oc-dev
Matthew Ng [Thu, 8 Jun 2017 23:48:34 +0000 (23:48 +0000)]
Merge "Fixes the animation and state when docking a task by drag" into oc-dev am:
008e620153
am:
71e5f8f64d
Change-Id: I5cc1c3d12ae1475d81bf6cb6ae6fff529a30839d
Android Build Merger (Role) [Thu, 8 Jun 2017 23:44:38 +0000 (23:44 +0000)]
Merge "Merge "Fixes the animation and state when docking a task by drag" into oc-dev am:
008e620153" into oc-dev-plus-aosp
Matthew Ng [Thu, 8 Jun 2017 23:43:49 +0000 (23:43 +0000)]
Merge "Fixes the animation and state when docking a task by drag" into oc-dev
am:
008e620153
Change-Id: If6a7101ba7055e23562b87195f35f1e068048389
Android Build Merger (Role) [Thu, 8 Jun 2017 23:34:27 +0000 (23:34 +0000)]
Merge "Merge "Fixes the animation and state when docking a task by drag" into oc-dev am:
008e620153 am:
afa235e444" into oc-dr1-dev-plus-aosp
Matthew Ng [Thu, 8 Jun 2017 23:33:39 +0000 (23:33 +0000)]
Merge "Fixes the animation and state when docking a task by drag" into oc-dev am:
008e620153
am:
afa235e444
Change-Id: I7644257bc94951f9e918aae009431a8ad0cf0de4
Matthew Ng [Thu, 8 Jun 2017 23:31:02 +0000 (23:31 +0000)]
Merge "Fixes the animation and state when docking a task by drag" into oc-dev
am:
008e620153
Change-Id: If1947aac627b92213202b22b721a397492173508
Bill Yi [Thu, 8 Jun 2017 23:30:52 +0000 (23:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
dd5886bc5b -s ours
am:
71713e846c -s ours
Change-Id: I602a57140ca17d6a15cac0a39b5565e8657fc12f
Matthew Ng [Thu, 8 Jun 2017 23:25:36 +0000 (23:25 +0000)]
Merge "Fixes the animation and state when docking a task by drag" into oc-dev
am:
008e620153
Change-Id: Id626a44a564ae0811338bb04c3c6efb698d07b37
Android Build Merger (Role) [Thu, 8 Jun 2017 23:25:20 +0000 (23:25 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
dd5886bc5b -s ours am:
4ec78fa17b -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Thu, 8 Jun 2017 23:24:17 +0000 (23:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
dd5886bc5b -s ours
am:
4ec78fa17b -s ours
Change-Id: I859e5d2bbdc071565c6be82e8353e9bc18141c86
Android Build Merger (Role) [Thu, 8 Jun 2017 23:23:51 +0000 (23:23 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
67a947b636 -s ours am:
95657195ca -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Thu, 8 Jun 2017 23:23:02 +0000 (23:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
dd5886bc5b -s ours
Change-Id: I99f7800bccdd03503185c593f86c1daab328c7f5
Bill Yi [Thu, 8 Jun 2017 23:21:33 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
67a947b636 -s ours
am:
3183fb75ac -s ours
Change-Id: Ia39368e2fdcaeabe757a02b740ea9a1dab6eb653
Bill Yi [Thu, 8 Jun 2017 23:21:30 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
67a947b636 -s ours
am:
95657195ca -s ours
Change-Id: I46e87727da55349410a0ef208a4dac8ae41c2aa5
TreeHugger Robot [Thu, 8 Jun 2017 23:21:05 +0000 (23:21 +0000)]
Merge "Fixes the animation and state when docking a task by drag" into oc-dev
Bill Yi [Thu, 8 Jun 2017 23:15:04 +0000 (23:15 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
dd5886bc5b -s ours
Change-Id: I62a7f882d68c02075e41e2c9da475a75af113b0f
Bill Yi [Thu, 8 Jun 2017 23:14:52 +0000 (23:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
67a947b636 -s ours
Change-Id: I87e77b18f173d20154743daf5e735bf72bfc685f
Bill Yi [Thu, 8 Jun 2017 23:12:30 +0000 (23:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
67a947b636 -s ours
Change-Id: If19e88be06d1d63955c7213c95dff59056a86c88
Bill Yi [Thu, 8 Jun 2017 23:04:51 +0000 (23:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Thu, 8 Jun 2017 23:03:52 +0000 (23:03 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Jorim Jaggi [Wed, 7 Jun 2017 21:33:04 +0000 (14:33 -0700)]
Boost android.anim and wm lock sections to -10 during transition
-4 is not enough if we have to compete against RT and main thread
from top app that have -10. Boost it more during app transitions
Test: Inspect systrace, make sure priorities are right, including
getting reset after the transition.
Test: Open Chrome 100x
Test: go/wm-smoke
Change-Id: Id6b060b8aafded67b4bae61b6e8960e37976b096
Fixes:
36631902
Android Build Merger (Role) [Thu, 8 Jun 2017 22:53:16 +0000 (22:53 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
75b5199e9d -s ours am:
5679e1cc6e -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Thu, 8 Jun 2017 22:52:21 +0000 (22:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
75b5199e9d -s ours
am:
5679e1cc6e -s ours
Change-Id: I62d5eaf20549840c1a4adab9f247b292e3505159
Bill Yi [Thu, 8 Jun 2017 22:49:33 +0000 (22:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
75b5199e9d -s ours
am:
041f0dce8a -s ours
Change-Id: Ic242af69e818aefb95a3b889294fb45240432a33
Bill Yi [Thu, 8 Jun 2017 22:45:15 +0000 (22:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
75b5199e9d -s ours
Change-Id: I3393f85819b8ed0fec35cfa0cbea0899141d73dc
Bill Yi [Thu, 8 Jun 2017 22:41:45 +0000 (22:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
75b5199e9d -s ours
Change-Id: Ic7b1e9095cf413bd0401bd8d3cdfc469dd915988
Bill Yi [Thu, 8 Jun 2017 22:34:26 +0000 (22:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Mathieu Chartier [Thu, 8 Jun 2017 22:06:08 +0000 (22:06 +0000)]
Merge "Add system property for hot startup method threshold" am:
a370159592 am:
187b15bbd5
am:
abb7782a4e
Change-Id: I0122af5a47614972dd5ba696f8a22bcae2625a1c
OSDN Git Service
