OSDN Git Service
John Reck [Wed, 14 Jun 2017 20:31:11 +0000 (20:31 +0000)]
Merge "Add a workaround for simulate secondary display" into oc-dev am:
31443a17e8
am:
f0d3971021
Change-Id: I5ee14c0887eaeac267c815851ae6f9e8ee47d80f
Android Build Merger (Role) [Wed, 14 Jun 2017 20:28:16 +0000 (20:28 +0000)]
Merge "Merge "Revert accidental API change to RemoteViews." into oc-dev am:
0e6a5f8d7e am:
321163990e" into oc-dr1-dev-plus-aosp
Daniel Sandler [Wed, 14 Jun 2017 20:25:39 +0000 (20:25 +0000)]
Merge "Revert accidental API change to RemoteViews." into oc-dev am:
0e6a5f8d7e
am:
321163990e
Change-Id: Ic96a571c015fd814d38fd3747e3610e6ff375590
John Reck [Wed, 14 Jun 2017 20:25:03 +0000 (20:25 +0000)]
Merge "Add a workaround for simulate secondary display" into oc-dev
am:
31443a17e8
Change-Id: Ic63e4f48ec55bce9f51089bc41481ab8805ae8c7
Daniel Sandler [Wed, 14 Jun 2017 20:24:58 +0000 (20:24 +0000)]
Merge "Revert accidental API change to RemoteViews." into oc-dev am:
0e6a5f8d7e
am:
d9a722f54c
Change-Id: I7d026257ee7e95fac7c03b786c79661ea834e831
Daniel Sandler [Wed, 14 Jun 2017 20:18:56 +0000 (20:18 +0000)]
Merge "Revert accidental API change to RemoteViews." into oc-dev
am:
0e6a5f8d7e
Change-Id: I7e00e745c8aa2ddb6232747d4371dc3194be28ef
Daniel Sandler [Wed, 14 Jun 2017 20:18:56 +0000 (20:18 +0000)]
Merge "Revert accidental API change to RemoteViews." into oc-dev
am:
0e6a5f8d7e
Change-Id: I4f59700800b25533e2bdcc7dce5b6c39badcfdec
TreeHugger Robot [Wed, 14 Jun 2017 20:13:59 +0000 (20:13 +0000)]
Merge "Add a workaround for simulate secondary display" into oc-dev
Daniel Sandler [Wed, 14 Jun 2017 20:12:32 +0000 (20:12 +0000)]
Merge "Revert accidental API change to RemoteViews." into oc-dev
Daniel Sandler [Tue, 13 Jun 2017 18:32:46 +0000 (18:32 +0000)]
Revert accidental API change to RemoteViews.
This reverts commit
7f09ce1a238ad5a647da913e275fd637ac75ab49 (but
retains the bug fix)
Change-Id: Ib4700ada5aa0b5dab7e43f895b48eb7058308869
Fixes:
62543637
Bug:
62181033
Lucas Dupin [Wed, 14 Jun 2017 19:34:12 +0000 (19:34 +0000)]
Merge changes from topic 'wallpaper_grey_scrim-oc-dr1-dev' into oc-dr1-dev
am:
8521eebfad
Change-Id: If523c47be47a0c1f251124c0607802068fd14900
TreeHugger Robot [Wed, 14 Jun 2017 19:23:48 +0000 (19:23 +0000)]
Merge changes from topic 'wallpaper_grey_scrim-oc-dr1-dev' into oc-dr1-dev
* changes:
Fixed flaky test
Disabled test
Scrims should be grey when in-app
Chris Thornton [Wed, 14 Jun 2017 19:16:36 +0000 (19:16 +0000)]
Merge "Add SoundTriggerManager APIs to use a PendingIntent to get callbacks." into oc-dr1-dev
am:
6f071c369e
Change-Id: I98f9c06856a70a5a4b3634f41860068c331f0c83
TreeHugger Robot [Wed, 14 Jun 2017 19:10:37 +0000 (19:10 +0000)]
Merge "Add SoundTriggerManager APIs to use a PendingIntent to get callbacks." into oc-dr1-dev
Andrei Stingaceanu [Wed, 14 Jun 2017 18:04:14 +0000 (18:04 +0000)]
Merge "DayPickerView - clamp date to min/max" into oc-dev am:
511c95a022
am:
c63475e5de
Change-Id: I6698e18eaaed18626e83f19a516d3dc249e6558d
Andrei Stingaceanu [Wed, 14 Jun 2017 17:56:32 +0000 (17:56 +0000)]
Merge "DayPickerView - clamp date to min/max" into oc-dev am:
511c95a022
am:
37aa78bfab
Change-Id: Icd47bbcaca1f046249c24a657cd49dc2e61405a7
John Reck [Wed, 14 Jun 2017 17:47:50 +0000 (10:47 -0700)]
Add a workaround for simulate secondary display
To workaround a deadlock caused by bufferqueue locks
we force RenderThread over to use async mode which
we enable via eglSwapInterval(0)
Bug:
38372997
Test: steps in the bug
Change-Id: Ia305f73abbdd64ab0c25d1f7d32792cc6295a0ce
Andrei Stingaceanu [Wed, 14 Jun 2017 17:47:03 +0000 (17:47 +0000)]
Merge "DayPickerView - clamp date to min/max" into oc-dev
am:
511c95a022
Change-Id: I1ede393b4a5ac44b9961a37e265b7663c88aaa5e
Andrei Stingaceanu [Wed, 14 Jun 2017 17:46:59 +0000 (17:46 +0000)]
Merge "DayPickerView - clamp date to min/max" into oc-dev
am:
511c95a022
Change-Id: I57eafe97328ee10bd0ccee296586307baa02cc6d
TreeHugger Robot [Wed, 14 Jun 2017 17:38:42 +0000 (17:38 +0000)]
Merge "DayPickerView - clamp date to min/max" into oc-dev
Lucas Dupin [Tue, 13 Jun 2017 17:47:15 +0000 (10:47 -0700)]
Fixed flaky test
Change-Id: I88a39a8eb4fd6da6dc5b156aa475330299ffb9b9
Fixes:
62568528
Test: runtest systemui
Lucas Dupin [Tue, 13 Jun 2017 17:37:52 +0000 (10:37 -0700)]
Disabled test
Bug:
62568528
Change-Id: I1e3908e4d18c216132b0c4d7ae9b6e223e321799
Lucas Dupin [Wed, 24 May 2017 21:14:44 +0000 (14:14 -0700)]
Scrims should be grey when in-app
Bug:
38164389
Test: runtest -x colorextraction/tests/src/com/google/android/colorextraction/ColorExtractorTest.java
Test: runtest -x tests/src/com/android/systemui/colorextraction/SysuiColorExtractorTests.java
Change-Id: Ifcc04a8562e46b4f65bce0470ccd6c02dffcf377
(cherry picked from commit
e1571705e6ea8367e7ee93d61104ce27035492dc)
Peter Qiu [Wed, 14 Jun 2017 16:19:59 +0000 (16:19 +0000)]
Merge "wifi: add API for retrieving Hotspot 2.0 OSU providers" into oc-dr1-dev
am:
088f2754c0
Change-Id: I864d0236bd3b17b3e38818e4ec43e42dd85dfd03
TreeHugger Robot [Wed, 14 Jun 2017 16:14:32 +0000 (16:14 +0000)]
Merge "wifi: add API for retrieving Hotspot 2.0 OSU providers" into oc-dr1-dev
Philipp Weiß [Wed, 14 Jun 2017 15:23:17 +0000 (15:23 +0000)]
Merge "Use SystemUI Dialog Theme for QSSecurityFooter dialog" into oc-dr1-dev
am:
08836ed404
Change-Id: Ia1c7d6110c8195b9480f8fdac9c5125e9a2395a5
Philipp Weiß [Wed, 14 Jun 2017 15:16:48 +0000 (15:16 +0000)]
Merge "Use SystemUI Dialog Theme for QSSecurityFooter dialog" into oc-dr1-dev
Philip P. Moltmann [Wed, 14 Jun 2017 15:11:45 +0000 (15:11 +0000)]
Merge "Select the right pages to scrap" into oc-dev am:
890cb59003
am:
517503d1dd
Change-Id: I2703a8ca505ba9be595c83d1b7c74ef3b824762c
Philip P. Moltmann [Wed, 14 Jun 2017 15:03:42 +0000 (15:03 +0000)]
Merge "Select the right pages to scrap" into oc-dev am:
890cb59003
am:
955aead48d
Change-Id: Ie7ea8573c00506a035a1eb61bdff7f66780e27ce
Philip P. Moltmann [Wed, 14 Jun 2017 14:52:18 +0000 (14:52 +0000)]
Merge "Select the right pages to scrap" into oc-dev
am:
890cb59003
Change-Id: Id04b03520dfe63f5b11ee5b17841165a477a8f79
Philip P. Moltmann [Wed, 14 Jun 2017 14:52:13 +0000 (14:52 +0000)]
Merge "Select the right pages to scrap" into oc-dev
am:
890cb59003
Change-Id: I5393dde07ea3feff2053d85769eccd5195139229
Philip P. Moltmann [Wed, 14 Jun 2017 14:44:30 +0000 (14:44 +0000)]
Merge "Select the right pages to scrap" into oc-dev
Android Build Merger (Role) [Wed, 14 Jun 2017 13:58:54 +0000 (13:58 +0000)]
Merge "Merge "Fix footer not being hidden in detail panels" into oc-dev am:
2a0b423cd4 am:
adfc1ad840" into oc-dr1-dev-plus-aosp
Jason Monk [Wed, 14 Jun 2017 13:56:46 +0000 (13:56 +0000)]
Merge "Fix footer not being hidden in detail panels" into oc-dev am:
2a0b423cd4
am:
adfc1ad840
Change-Id: I57cd3a2694ce39f9e66d836d683b7d72b37ac766
Jason Monk [Wed, 14 Jun 2017 13:55:04 +0000 (13:55 +0000)]
Merge "Fix footer not being hidden in detail panels" into oc-dev am:
2a0b423cd4
am:
2cb53750ec
Change-Id: I02b42acfc44c732f9c7d67a1bf65e2714b3d714a
Jason Monk [Wed, 14 Jun 2017 13:47:43 +0000 (13:47 +0000)]
Merge "Revert Early version of new volume" into oc-dr1-dev
am:
f3ad1dbcfd
Change-Id: Id1d9e70e14eecaa4f6c016aa1985e3a3f3170bc7
Jason Monk [Wed, 14 Jun 2017 13:46:17 +0000 (13:46 +0000)]
Merge "Fix footer not being hidden in detail panels" into oc-dev
am:
2a0b423cd4
Change-Id: Ic8ce2331b9191422f921834f484492bc7bff4c95
Jason Monk [Wed, 14 Jun 2017 13:46:11 +0000 (13:46 +0000)]
Merge "Fix footer not being hidden in detail panels" into oc-dev
am:
2a0b423cd4
Change-Id: I97266821c07fd307dbe04e5d715792e57bfa9c0d
Grace Chen [Wed, 14 Jun 2017 13:40:46 +0000 (13:40 +0000)]
Merge "Default CDMA subscription source to RUIM/SIM" into oc-dr1-dev
am:
356d1ac545
Change-Id: I692e3d0d7eac1f94e39e85e4b244fd9974fc1108
Jason Monk [Wed, 14 Jun 2017 13:37:28 +0000 (13:37 +0000)]
Merge "Fix footer not being hidden in detail panels" into oc-dev
Jason Monk [Wed, 14 Jun 2017 13:36:38 +0000 (13:36 +0000)]
Merge "Revert Early version of new volume" into oc-dr1-dev
Grace Chen [Wed, 14 Jun 2017 13:35:34 +0000 (13:35 +0000)]
Merge "Default CDMA subscription source to RUIM/SIM" into oc-dr1-dev
Erik Kline [Wed, 14 Jun 2017 10:32:29 +0000 (10:32 +0000)]
Merge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine" am:
6f029bbc82 am:
35728f01cb
am:
d2bf55e300
Change-Id: Iec52309a56dd38ac9854ce40a792b3b622f0b015
Erik Kline [Wed, 14 Jun 2017 10:25:33 +0000 (10:25 +0000)]
Merge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine" am:
6f029bbc82
am:
35728f01cb
Change-Id: I5eb3c02331aabc033ecfebee2900477c61e1b6f6
Erik Kline [Wed, 14 Jun 2017 10:19:35 +0000 (10:19 +0000)]
Merge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine"
am:
6f029bbc82
Change-Id: I098bd78d29cf4119208d24977dab8494d3bf5fdb
Treehugger Robot [Wed, 14 Jun 2017 10:11:58 +0000 (10:11 +0000)]
Merge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine"
phweiss [Tue, 13 Jun 2017 13:23:13 +0000 (15:23 +0200)]
Use SystemUI Dialog Theme for QSSecurityFooter dialog
Without the ContextThemeWrapper, the dialog's text color
gets changed whenever the QS theme changes.
Bug:
62534577
Test: manual, CTS Verifier > Managed Provisioning > Device Owner Tests
> Network Logging UI
Change-Id: I408902688b97bb3c6dff06215b12956ae49a4806
(cherry picked from commit
da9bee2623c358913cafc06b6d617d10e234777c)
Android Build Merger (Role) [Wed, 14 Jun 2017 06:33:43 +0000 (06:33 +0000)]
Merge "Merge "SensorManager: attach background thread to JavaVM" into oc-dev am:
d27d5d9ea8 am:
41cb9f1bb1" into oc-dr1-dev-plus-aosp
Peng Xu [Wed, 14 Jun 2017 06:31:51 +0000 (06:31 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev am:
d27d5d9ea8
am:
41cb9f1bb1
Change-Id: I26fbfe8ae684fe27c43fcad12ff127506614e0b9
Peng Xu [Wed, 14 Jun 2017 06:27:45 +0000 (06:27 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev am:
d27d5d9ea8
am:
308aa4c846
Change-Id: I90935ea2db530143daf3da44637b7cb97f9be2bd
Peng Xu [Wed, 14 Jun 2017 06:20:15 +0000 (06:20 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev
am:
d27d5d9ea8
Change-Id: Ib34a45b6fe35f27f4b3093888cbecd70b8b71300
Peng Xu [Wed, 14 Jun 2017 06:20:15 +0000 (06:20 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev
am:
d27d5d9ea8
Change-Id: Iecea6df9119b4a9bbd5843e78787d581ced518c7
Peng Xu [Wed, 14 Jun 2017 06:12:37 +0000 (06:12 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev
gopinath [Wed, 14 Jun 2017 04:49:30 +0000 (04:49 +0000)]
App launch test apk change am:
0a2c9396a2
am:
8c64bf0edf
Change-Id: Ia90bdb8649c55d271a68d6c831dbd59cd8a4a21f
gopinath [Wed, 14 Jun 2017 04:45:04 +0000 (04:45 +0000)]
App launch test apk change am:
0a2c9396a2
am:
4c81f3d412
Change-Id: I6eab0fc584667f63dfa14de51f0c66b5494fb0f6
gopinath [Wed, 14 Jun 2017 04:39:30 +0000 (04:39 +0000)]
App launch test apk change
am:
0a2c9396a2
Change-Id: I2468cfc8f0db8c993ed0203d12bffb5abcd76305
gopinath [Wed, 14 Jun 2017 04:37:29 +0000 (04:37 +0000)]
App launch test apk change
am:
0a2c9396a2
Change-Id: Icad70c318aecfa28b985b7a7c737e332c9024ab8
Ying Xu [Wed, 14 Jun 2017 02:41:26 +0000 (02:41 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels" am:
70373f7928 am:
707dc81da1
am:
aaca44229b
Change-Id: I9656821a325d000dde93e05987c29c76609578bc
Ying Xu [Wed, 14 Jun 2017 02:33:41 +0000 (02:33 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels" am:
70373f7928
am:
707dc81da1
Change-Id: I37113bddb18b73dbf10b0dc9067dec9311338e86
Ying Xu [Wed, 14 Jun 2017 02:25:53 +0000 (02:25 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels"
am:
70373f7928
Change-Id: I1c169772fb1335df4128b186e826f1bed1ca501d
Ying Xu [Wed, 14 Jun 2017 02:16:51 +0000 (02:16 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels"
Lucas Dupin [Wed, 14 Jun 2017 02:07:59 +0000 (02:07 +0000)]
Merge "Disable StatusBar logs" into oc-dr1-dev
am:
2306a78963
Change-Id: Id542cb75499e2e1616e35ba067a431e3402a1f44
TreeHugger Robot [Wed, 14 Jun 2017 01:57:53 +0000 (01:57 +0000)]
Merge "Disable StatusBar logs" into oc-dr1-dev
Kevin Chyn [Wed, 14 Jun 2017 01:53:02 +0000 (01:53 +0000)]
Merge "Add assist gesture silence and wake settings" into oc-dr1-dev
am:
6eacc1a4ba
Change-Id: I16bac560e1ef3c20830f4bc79dca772da20032e7
Kevin Chyn [Wed, 14 Jun 2017 01:43:47 +0000 (01:43 +0000)]
Merge "Add assist gesture silence and wake settings" into oc-dr1-dev
Chris Thornton [Fri, 9 Jun 2017 05:34:37 +0000 (22:34 -0700)]
Add SoundTriggerManager APIs to use a PendingIntent to get callbacks.
Test: APIs exercised using a special test app not in this CL.
Change-Id: I99425d1e67a778513e6c75e7d595c072032aa2ab
Yifan Hong [Wed, 14 Jun 2017 01:20:09 +0000 (18:20 -0700)]
SensorManager: attach background thread to JavaVM
Test: pass
Bug:
62404135
Change-Id: Ic3c0849cd366f550cbdccbb9bb8d082c5c570c35
Eugene Susla [Wed, 14 Jun 2017 00:29:15 +0000 (00:29 +0000)]
Merge "Support associating with an already-paired device" into oc-dev am:
c041c7a34e
am:
99f209be12
Change-Id: Ia2e43979fb0e1687874e63249f829e221a1c47f7
Eugene Susla [Wed, 14 Jun 2017 00:24:12 +0000 (00:24 +0000)]
Merge "Support associating with an already-paired device" into oc-dev am:
c041c7a34e
am:
c26f789ae2
Change-Id: Ice5843da51415f87140a6311415a7074b155cdb3
Eugene Susla [Wed, 14 Jun 2017 00:17:25 +0000 (00:17 +0000)]
Merge "Support associating with an already-paired device" into oc-dev
am:
c041c7a34e
Change-Id: I31ab12934cd18aace7aece30fd5551e20e02216e
Eugene Susla [Wed, 14 Jun 2017 00:17:19 +0000 (00:17 +0000)]
Merge "Support associating with an already-paired device" into oc-dev
am:
c041c7a34e
Change-Id: I0af2c5f93b8e0387f28f9c34c81b20ad5a9875e2
gopinath [Fri, 12 May 2017 22:37:37 +0000 (15:37 -0700)]
App launch test apk change
Support launching the app using the package name.
Remove the unused variables.
b/
33226470
Change-Id: I5b3829912782a9fc0c8f09cbd6fa9ee4b5b35314
(cherry picked from commit
a00259f47dc480f799a812a00f52e3c887aae4b0)
TreeHugger Robot [Wed, 14 Jun 2017 00:03:49 +0000 (00:03 +0000)]
Merge "Support associating with an already-paired device" into oc-dev
Mady Mellor [Tue, 13 Jun 2017 23:59:15 +0000 (23:59 +0000)]
Merge "Add plugin hooks to DozeService" into oc-dr1-dev
am:
644f8e8583
Change-Id: Idfa991157c7885861a2fc51492175ca7e2b3bb08
TreeHugger Robot [Tue, 13 Jun 2017 23:51:06 +0000 (23:51 +0000)]
Merge "Add plugin hooks to DozeService" into oc-dr1-dev
Christopher Tate [Tue, 13 Jun 2017 23:49:55 +0000 (23:49 +0000)]
Merge "Fix #
62545908 : 'metered' network jobs run without network" into oc-dev am:
796b510787
am:
4c8dccf728
Change-Id: I05d188c5b7ede54792b22d6c1445b32f4a63ed22
Android Build Merger (Role) [Tue, 13 Jun 2017 23:45:54 +0000 (23:45 +0000)]
Merge "Merge "Fix #
62545908 : 'metered' network jobs run without network" into oc-dev am:
796b510787 am:
85c9638438" into oc-dr1-dev-plus-aosp
Christopher Tate [Tue, 13 Jun 2017 23:44:45 +0000 (23:44 +0000)]
Merge "Fix #
62545908 : 'metered' network jobs run without network" into oc-dev am:
796b510787
am:
85c9638438
Change-Id: Icc9968bcbee5fb029a4fea4368ac57fc7bc6c71d
Android Build Merger (Role) [Tue, 13 Jun 2017 23:44:14 +0000 (23:44 +0000)]
Merge "Merge "Use UiContext with StrictMode Dialog" into oc-dev am:
9274d87a0e am:
e9a4951c4d" into oc-dr1-dev-plus-aosp
Adam Lesinski [Tue, 13 Jun 2017 23:43:08 +0000 (23:43 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev am:
9274d87a0e
am:
e9a4951c4d
Change-Id: I8093fff1e13490be07b62537bbfdfd064102bb46
Adam Lesinski [Tue, 13 Jun 2017 23:40:24 +0000 (23:40 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev am:
9274d87a0e
am:
26cafd3e42
Change-Id: I59bdeb970bd305f7c01a3f2cf405102ae95756ed
Christopher Tate [Tue, 13 Jun 2017 23:39:28 +0000 (23:39 +0000)]
Merge "Fix #
62545908 : 'metered' network jobs run without network" into oc-dev
am:
796b510787
Change-Id: I0659c68ece4fef6d3e93e436a35c960dc341618b
Christopher Tate [Tue, 13 Jun 2017 23:34:51 +0000 (23:34 +0000)]
Merge "Fix #
62545908 : 'metered' network jobs run without network" into oc-dev
am:
796b510787
Change-Id: I8c87bb6ac0ed8867ffd36a6fe1692bfb933bf746
Adam Lesinski [Tue, 13 Jun 2017 23:32:22 +0000 (23:32 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev
am:
9274d87a0e
Change-Id: I1b62c2f6aeb7d7167a6bbf1e4b09124914c7936e
Adam Lesinski [Tue, 13 Jun 2017 23:30:22 +0000 (23:30 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev
am:
9274d87a0e
Change-Id: I559890874c83627283a891f7eb6c4fd46430f618
Lucas Dupin [Tue, 13 Jun 2017 23:30:15 +0000 (16:30 -0700)]
Disable StatusBar logs
Reverted DEBUG flag that was accidentally
set to true.
Test: make
Change-Id: Icb37d7831052f4bb1c3a1e2349f5af5270a9e932
TreeHugger Robot [Tue, 13 Jun 2017 23:27:10 +0000 (23:27 +0000)]
Merge "Fix #
62545908 : 'metered' network jobs run without network" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 23:16:58 +0000 (23:16 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev
Grace Chen [Tue, 13 Jun 2017 23:07:45 +0000 (16:07 -0700)]
Default CDMA subscription source to RUIM/SIM
Operators read CDMA subscription from RUIM/SIM now thus change
the default hardcoded preference everywhere. Add code clean-up to
make the default come from a single source, the Phone interface.
Additional rework proposed in http://b/
62299272, but this corrects
immediate issue where CDMA SSM was defaulting to NV instead of RUIM
/SIM and caused CSIM subscription to not load and 'no sim' symptom
for many users.
Bug:
62143087
Test: None
Change-Id: I32b1f1e40c736a566df824218a6565de851ce161
Android Build Merger (Role) [Tue, 13 Jun 2017 23:04:29 +0000 (23:04 +0000)]
Merge "Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev am:
167f0001b8 am:
8b5b0c2bfa" into oc-dr1-dev-plus-aosp
Winson Chung [Tue, 13 Jun 2017 23:03:35 +0000 (23:03 +0000)]
Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev am:
167f0001b8
am:
8b5b0c2bfa
Change-Id: If68611d32998af58c6d59825b27e679783a9109c
Android Build Merger (Role) [Tue, 13 Jun 2017 23:03:10 +0000 (23:03 +0000)]
Merge "Merge "Increases TC Logging Visibility for testing" into oc-dr1-dev am:
f69a9c9dc6" into oc-dr1-dev-plus-aosp
Brad Ebinger [Tue, 13 Jun 2017 23:01:49 +0000 (23:01 +0000)]
Merge "Increases TC Logging Visibility for testing" into oc-dr1-dev
am:
f69a9c9dc6
Change-Id: Ia53392e722399e33720d3a11d7bee5f18661f862
Winson Chung [Tue, 13 Jun 2017 23:00:15 +0000 (23:00 +0000)]
Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev am:
167f0001b8
am:
3609f00c42
Change-Id: I3d99f5bc6eebeb4cecf9d479b81a287aebabdb7f
Winson Chung [Tue, 13 Jun 2017 22:55:00 +0000 (22:55 +0000)]
Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev
am:
167f0001b8
Change-Id: Ie180c311af24be6067ebf8cd24c6c1958dfe0c39
Winson Chung [Tue, 13 Jun 2017 22:53:09 +0000 (22:53 +0000)]
Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev
am:
167f0001b8
Change-Id: I4f54c90c54fd81bd399a0198d48ab597feaba217
Brad Ebinger [Tue, 13 Jun 2017 22:51:28 +0000 (22:51 +0000)]
Merge "Increases TC Logging Visibility for testing" into oc-dr1-dev
Android Build Merger (Role) [Tue, 13 Jun 2017 22:50:04 +0000 (22:50 +0000)]
Merge "Merge "Save overlay paths as user state" into oc-dev am:
508a5bade6 am:
b692f4a095" into oc-dr1-dev-plus-aosp
Todd Kennedy [Tue, 13 Jun 2017 22:46:41 +0000 (22:46 +0000)]
Merge "Save overlay paths as user state" into oc-dev am:
508a5bade6
am:
80b761b6db
Change-Id: I0a2f3b0318b75bd08b8dfa1db1658930617333c1
Todd Kennedy [Tue, 13 Jun 2017 22:46:33 +0000 (22:46 +0000)]
Merge "Save overlay paths as user state" into oc-dev am:
508a5bade6
am:
b692f4a095
Change-Id: I7b3a9b1f543391b50aa63c0c98e166bd58fbc37c
OSDN Git Service
