OSDN Git Service
Makoto Onuki [Thu, 11 May 2017 03:19:52 +0000 (03:19 +0000)]
Merge "Add a check to investigate b/
37893215." into oc-dev
am:
bf3423a939
Change-Id: I74a50f0373b0a841024add669310e8221549be67
Phil Weaver [Thu, 11 May 2017 02:59:27 +0000 (02:59 +0000)]
Merge "Clarify documentation for notification a11y events" into oc-dev
am:
69a0f3f020
Change-Id: Icad2076a2d7a6fdcd27c686c144cb233a17eea91
Adam Powell [Thu, 11 May 2017 02:52:20 +0000 (02:52 +0000)]
Merge "Lock out ResolverDrawerLayout dismissals during animations" into oc-dev
am:
33a030fa03
Change-Id: Ica063156bc487bd10d2c8af1a7520b71c1c31a88
Svet Ganov [Thu, 11 May 2017 02:48:46 +0000 (02:48 +0000)]
Merge "Properly position dataset picker UI" into oc-dev
am:
d915aecfaa
Change-Id: Ic480311a515e5a096f6b62319d677a07dd22c391
Adrian Roos [Thu, 11 May 2017 02:45:38 +0000 (02:45 +0000)]
Merge "AOD: Update wakeup animation" into oc-dev
am:
40b34460ef
Change-Id: Ibcecb29cfb4ba1f958d307bf96bfa28f9c2ee1b4
Michael Wachenschwanz [Thu, 11 May 2017 02:01:55 +0000 (02:01 +0000)]
Merge "WTF Logging for catching memory issue in Parcel" into oc-dev
am:
9254322192
Change-Id: I2471901f1504c242b9020f575126c56375036498
TreeHugger Robot [Thu, 11 May 2017 01:59:25 +0000 (01:59 +0000)]
Merge "Add a check to investigate b/
37893215." into oc-dev
TreeHugger Robot [Thu, 11 May 2017 01:57:04 +0000 (01:57 +0000)]
Merge "Clarify documentation for notification a11y events" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 01:48:46 +0000 (01:48 +0000)]
Merge "Lock out ResolverDrawerLayout dismissals during animations" into oc-dev
Mady Mellor [Thu, 11 May 2017 01:44:51 +0000 (01:44 +0000)]
Merge "Remove PIP tuner items" into oc-dev
am:
86339dc8ee
Change-Id: I8d584f830e706f20d181a0f46bf94783f30340e8
TreeHugger Robot [Thu, 11 May 2017 01:38:11 +0000 (01:38 +0000)]
Merge "Properly position dataset picker UI" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 01:33:21 +0000 (01:33 +0000)]
Merge "AOD: Update wakeup animation" into oc-dev
Andre Eisenbach [Thu, 11 May 2017 01:33:18 +0000 (01:33 +0000)]
Merge "Bluetooth: HID: Add support for Set Idle and Get Idle Commands (3/4)" am:
51876abe82 am:
9413fd9e1f
am:
01d1188a8b
Change-Id: Ie92cbd1f5795d7b9f55d0e51503e7d08b61e8732
Michael Wachenschwanz [Thu, 11 May 2017 01:26:05 +0000 (01:26 +0000)]
Merge "WTF Logging for catching memory issue in Parcel" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 01:13:44 +0000 (01:13 +0000)]
Merge "Remove PIP tuner items" into oc-dev
Kevin Chyn [Thu, 11 May 2017 01:13:10 +0000 (01:13 +0000)]
Merge "AuthenticationCallback should not be cleared onAuthenticationFailed" into oc-dev
am:
6fddc2472e
Change-Id: I3493866a4e594a186f897b02dca0773e4a7a0d49
Andre Eisenbach [Thu, 11 May 2017 01:10:49 +0000 (01:10 +0000)]
Merge "Bluetooth: HID: Add support for Set Idle and Get Idle Commands (3/4)" am:
51876abe82
am:
9413fd9e1f
Change-Id: If065f6d25da71238b3788af0ee0854321a905e47
Mady Mellor [Thu, 11 May 2017 01:07:46 +0000 (01:07 +0000)]
Merge "Slight adjustments to gradient shown when dragging to dismiss" into oc-dev
am:
1eeeba6af6
Change-Id: Icbd24ad48859a8a7d3f0a217a8f1d1bc879f8f2f
TreeHugger Robot [Thu, 11 May 2017 00:46:31 +0000 (00:46 +0000)]
Merge "AuthenticationCallback should not be cleared onAuthenticationFailed" into oc-dev
Andre Eisenbach [Thu, 11 May 2017 00:43:49 +0000 (00:43 +0000)]
Merge "Bluetooth: HID: Add support for Set Idle and Get Idle Commands (3/4)"
am:
51876abe82
Change-Id: Ia3242c0c2d7111b356c3ad2c70e8b1bea4572e9a
Felipe Leme [Thu, 11 May 2017 00:41:10 +0000 (00:41 +0000)]
Merge "Fixed autofill dumpsys and improved logging." into oc-dev
am:
08d8e034f4
Change-Id: I303ec6c9d1bef5d88b33c35e62c598ad6082c6ad
TreeHugger Robot [Thu, 11 May 2017 00:39:06 +0000 (00:39 +0000)]
Merge "Slight adjustments to gradient shown when dragging to dismiss" into oc-dev
Andre Eisenbach [Thu, 11 May 2017 00:37:42 +0000 (00:37 +0000)]
Merge "Bluetooth: HID: Add support for Set Idle and Get Idle Commands (3/4)"
Adrian Roos [Thu, 11 May 2017 00:30:58 +0000 (00:30 +0000)]
Merge "AOD: Anchor clock at a third of the height" into oc-dev
am:
2af0676b2d
Change-Id: I4eefd2a95a82c573f54fe3e71919e8553c42d206
Android Build Merger (Role) [Thu, 11 May 2017 00:26:50 +0000 (00:26 +0000)]
Merge "Merge "Fixed a concurrent modification crash" into oc-dev am:
33bd2c6333" into oc-dev-plus-aosp
Selim Cinek [Thu, 11 May 2017 00:25:15 +0000 (00:25 +0000)]
Merge "Fixed a concurrent modification crash" into oc-dev
am:
33bd2c6333
Change-Id: Ic707ae6d212bc0d686c778f53d7decb5a84f0b00
Android Build Merger (Role) [Thu, 11 May 2017 00:24:47 +0000 (00:24 +0000)]
Merge "Merge "Adding a new config and Setting for WiFi Wakeup." into oc-dev am:
b569eedf37" into oc-dev-plus-aosp
Android Build Merger (Role) [Thu, 11 May 2017 00:20:19 +0000 (00:20 +0000)]
Merge "Merge "Merge "Notify ImsService Status Correctly" am:
1bb9181380 am:
6d249dc08c" into nyc-mr2-dev-plus-aosp am:
a27aba8c4a -s ours" into oc-dev-plus-aosp
Jeremy Joslin [Thu, 11 May 2017 00:18:48 +0000 (00:18 +0000)]
Merge "Adding a new config and Setting for WiFi Wakeup." into oc-dev
am:
b569eedf37
Change-Id: Id4e9f4644bc470d1a3b8813502eb3e1e2ca45f05
TreeHugger Robot [Thu, 11 May 2017 00:18:32 +0000 (00:18 +0000)]
Merge "Fixed autofill dumpsys and improved logging." into oc-dev
Brad Ebinger [Thu, 11 May 2017 00:18:29 +0000 (00:18 +0000)]
Merge "Merge "Notify ImsService Status Correctly" am:
1bb9181380 am:
6d249dc08c" into nyc-mr2-dev-plus-aosp
am:
a27aba8c4a -s ours
Change-Id: Icf812ff6e9269942cf1ce5318356907a57cc2b80
Makoto Onuki [Thu, 11 May 2017 00:15:47 +0000 (00:15 +0000)]
Merge "Reconnect to DAService after binding is dead" into oc-dev
am:
ef5700667f
Change-Id: I03049914406ed38f92c3a6a43a82f55504c6e518
Android Build Merger (Role) [Thu, 11 May 2017 00:12:48 +0000 (00:12 +0000)]
Merge "Merge "Notify ImsService Status Correctly" am:
1bb9181380 am:
6d249dc08c am:
96e8803185 -s ours" into oc-dev-plus-aosp
Brad Ebinger [Thu, 11 May 2017 00:10:51 +0000 (00:10 +0000)]
Merge "Notify ImsService Status Correctly" am:
1bb9181380 am:
6d249dc08c
am:
96e8803185 -s ours
Change-Id: I4375c629e5b04de5fb531c0cc2df969ff0ea1b54
Adrian Roos [Thu, 11 May 2017 00:08:33 +0000 (00:08 +0000)]
Merge "AOD: Anchor clock at a third of the height" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 00:08:10 +0000 (00:08 +0000)]
Merge "Fixed a concurrent modification crash" into oc-dev
Makoto Onuki [Thu, 11 May 2017 00:06:56 +0000 (00:06 +0000)]
Merge "Offload saving bitmaps from binder threads" into oc-dev
am:
31ef139466
Change-Id: I2980b05a8a997e003792fe995973b54eaf29d5e1
TreeHugger Robot [Thu, 11 May 2017 00:05:48 +0000 (00:05 +0000)]
Merge "Adding a new config and Setting for WiFi Wakeup." into oc-dev
Makoto Onuki [Thu, 11 May 2017 00:04:14 +0000 (00:04 +0000)]
Merge "Tweak for b/
37809561." into oc-dev
am:
ca50e88b6b
Change-Id: I7ecbf3e077cdd9b06e9c1a13455c572c6f21c00e
Android Build Merger (Role) [Thu, 11 May 2017 00:03:20 +0000 (00:03 +0000)]
Merge "Merge "Notify ImsService Status Correctly" am:
1bb9181380 am:
6d249dc08c" into nyc-mr2-dev-plus-aosp
Brad Ebinger [Thu, 11 May 2017 00:01:43 +0000 (00:01 +0000)]
Merge "Notify ImsService Status Correctly" am:
1bb9181380
am:
6d249dc08c
Change-Id: I1ad0e6187f2b3de1f32b0391ce97447a831874b3
Makoto Onuki [Wed, 10 May 2017 23:32:39 +0000 (16:32 -0700)]
Add a check to investigate b/
37893215.
Test: Manual
Bug
37893215
Change-Id: I3a06af3828a5f51ecf4a539ef91b9a60575f68ba
Brad Ebinger [Wed, 10 May 2017 23:55:18 +0000 (23:55 +0000)]
Merge "Notify ImsService Status Correctly" am:
1bb9181380
am:
6d249dc08c
Change-Id: I5cd0317376fcf915c777ed56da9e856d72272b41
Brad Ebinger [Wed, 10 May 2017 23:54:32 +0000 (23:54 +0000)]
Merge "Notify ImsService Status Correctly" into oc-dev
am:
9684d718fa
Change-Id: Ia056fd9cc30e673056e7e9b5140c498bb6abce1b
Chen Xu [Wed, 10 May 2017 23:50:17 +0000 (23:50 +0000)]
Merge "support horizontal scroll and zoon for webview" into oc-dev
am:
be0078f018
Change-Id: I9f253695288ffdc4b134e47ae0fd2cd8ed0296be
Brad Ebinger [Wed, 10 May 2017 23:48:12 +0000 (23:48 +0000)]
Merge "Notify ImsService Status Correctly"
am:
1bb9181380
Change-Id: I694072b5125151cd1db6b88774c09126199e7cc0
Sergey Vasilinets [Wed, 10 May 2017 23:46:50 +0000 (23:46 +0000)]
Merge "Fix npe due to strict mode in Bitmap.sameAs" into oc-dev
am:
8d2b02bf08
Change-Id: I88c7ffb54b3dfc12a24594c20a7b3787f81dc028
Jason Monk [Wed, 10 May 2017 23:43:30 +0000 (23:43 +0000)]
Merge "Fix QS footer on small screens" into oc-dev
am:
9bda9ead49
Change-Id: I6e425ae473e5025ae52f39b11f004ce71ae0fa7f
Svet Ganov [Wed, 10 May 2017 20:42:33 +0000 (13:42 -0700)]
Properly position dataset picker UI
Test: all autofill CTS tests pass
bug:
37958210
bug:
37986800
Change-Id: Ic2cb3b8c6762a922bdb7c632e451772b7a006739
Adrian Roos [Tue, 9 May 2017 00:24:26 +0000 (17:24 -0700)]
AOD: Update wakeup animation
Fixes several issues with the wakeup transition.
Bug:
34716110
Test: Trigger ambient display, press power button
Change-Id: I1fa6e0be13c80a84356a8826ed18e9477bf2aba2
Makoto Onuki [Wed, 10 May 2017 23:20:35 +0000 (23:20 +0000)]
Merge "Reconnect to DAService after binding is dead" into oc-dev
Ruben Brunk [Wed, 10 May 2017 23:04:07 +0000 (23:04 +0000)]
Merge "Fix VR component enforcement for "2D in 3D" apps." into oc-dev
am:
4d73fd5765
Change-Id: I7031eb3ac81aa95df7a729ad358f5288b1cabc4e
Brad Ebinger [Wed, 10 May 2017 23:00:52 +0000 (23:00 +0000)]
Merge "Notify ImsService Status Correctly"
Adrian Roos [Wed, 10 May 2017 22:55:58 +0000 (22:55 +0000)]
Merge "AOD: Notification groups on Ambient Display" into oc-dev
am:
bafe438d71
Change-Id: I159e4543f15c5d2f89bbfee10f77ed33aaaad7a7
Jason Monk [Wed, 10 May 2017 22:39:15 +0000 (22:39 +0000)]
Merge "Fix battery icon tint in QS during battery saver" into oc-dev
am:
0b9e1e7f22
Change-Id: Ib5608f431e8586eb3c79151bade78c9f3656ad51
Michael Wachenschwanz [Wed, 10 May 2017 18:43:44 +0000 (11:43 -0700)]
WTF Logging for catching memory issue in Parcel
Catch an exception sent from native code looking for a specific known
bug and report via wtf which code path is hitting the bug. Revert this
change once bug has been resolved.
Bug:
37298089
Test: manual
Change-Id: Ieb98a8a82a9a2cffe4d0cfbbc8333f453b3e36d5
Signed-off-by: Michael Wachenschwanz <mwachens@google.com>
Android Build Merger (Role) [Wed, 10 May 2017 22:34:47 +0000 (22:34 +0000)]
Merge "Merge "Add Save and Restore of BluetoothOn setting" am:
bbcc641317 am:
1755a4af45 am:
6682651b2b" into oc-dev-plus-aosp
Stanley Tng [Wed, 10 May 2017 22:32:32 +0000 (22:32 +0000)]
Merge "Add Save and Restore of BluetoothOn setting" am:
bbcc641317 am:
1755a4af45
am:
6682651b2b
Change-Id: I6dd36520e8a0cf09c75788eda2e03b4309acea9e
Geoffrey Pitsch [Wed, 10 May 2017 22:31:09 +0000 (22:31 +0000)]
Merge "Fix Toast exception in NotificationManagerService" into oc-dev
am:
3ee2bfd8f5
Change-Id: I10a6e8958b66463762188a82ed05ca24ff538805
TreeHugger Robot [Wed, 10 May 2017 22:24:09 +0000 (22:24 +0000)]
Merge "Offload saving bitmaps from binder threads" into oc-dev
Makoto Onuki [Wed, 10 May 2017 22:20:29 +0000 (22:20 +0000)]
Merge "Tweak for b/
37809561." into oc-dev
Andrew Sapperstein [Wed, 10 May 2017 22:13:02 +0000 (22:13 +0000)]
Merge "Update input method menu to use proper context." into oc-dev
am:
2ead893b18
Change-Id: I1de100ecc38e0fc72506b6ecd123ea2cfb86416b
Svet Ganov [Wed, 10 May 2017 22:09:50 +0000 (22:09 +0000)]
Merge "Revert "Fixed placemente of Autofill UI for virtual views."" into oc-dev
am:
e59c6ef346
Change-Id: I3c615043966131d206967bbb7d230af9b6652f47
Svet Ganov [Wed, 10 May 2017 22:05:55 +0000 (22:05 +0000)]
Merge "Label the close image button" into oc-dev
am:
c453901d13
Change-Id: Ic7dcf152a9759865619129fb1f3d06dbb75e2921
Stanley Tng [Wed, 10 May 2017 22:04:24 +0000 (22:04 +0000)]
Merge "Add Save and Restore of BluetoothOn setting" am:
bbcc641317
am:
1755a4af45
Change-Id: I6a143760d9acef0fb5f28680ca1538e346ebd81f
Kevin Chyn [Wed, 10 May 2017 21:39:55 +0000 (14:39 -0700)]
AuthenticationCallback should not be cleared onAuthenticationFailed
Fixes:
38197608
Test: 1) enroll a finger
2) enter keyguard, touch sensor with an unenrolled finger
3) touch sensor with enrolled finger
4) phone should enter keyguard
5) do this test from screen off as well
Change-Id: I1c7b060888128b4a6b492fd6a7a8ebc85d2b3353
Pavel Grafov [Wed, 10 May 2017 21:34:27 +0000 (21:34 +0000)]
Merge "If ENSURE_VERIFY_APPS is enforced, reject installation by default." into oc-dev
am:
79cc05a6c1
Change-Id: Iaf27be8afb90c8364fa365d6d21bef61e8b7470b
Mady Mellor [Tue, 9 May 2017 20:20:56 +0000 (13:20 -0700)]
Slight adjustments to gradient shown when dragging to dismiss
- Adjusted the height
- Gave the asset a 90% alpha and set it as the background programmatically
Test: manual, have a PIP drag it around, note the gradient appearance
Change-Id: I7bc3262f6813f737da62201cdce6a14046f3e754
TreeHugger Robot [Wed, 10 May 2017 21:18:46 +0000 (21:18 +0000)]
Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" into oc-dev-plus-aosp
Stanley Tng [Wed, 10 May 2017 21:17:44 +0000 (21:17 +0000)]
Merge "Add Save and Restore of BluetoothOn setting"
am:
bbcc641317
Change-Id: Ie967141aa0d8f43750f84fdd6071c26e0a26958a
Selim Cinek [Fri, 5 May 2017 21:45:11 +0000 (14:45 -0700)]
Fixed a concurrent modification crash
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/settings/CurrentUserTrackerTest.java
Change-Id: I23261843b7366d3a66a795a41c61b7661f7ca3a6
Fixes:
38006784
Treehugger Robot [Wed, 10 May 2017 20:44:33 +0000 (20:44 +0000)]
Merge "Add Save and Restore of BluetoothOn setting"
Brad Ebinger [Wed, 10 May 2017 20:42:34 +0000 (20:42 +0000)]
Merge "Notify ImsService Status Correctly" into oc-dev
Chen Xu [Wed, 10 May 2017 20:31:50 +0000 (20:31 +0000)]
Merge "support horizontal scroll and zoon for webview" into oc-dev
Sergey Vasilinets [Wed, 10 May 2017 20:28:21 +0000 (20:28 +0000)]
Merge "Fix npe due to strict mode in Bitmap.sameAs" into oc-dev
Santos Cordon [Wed, 5 Apr 2017 17:31:15 +0000 (10:31 -0700)]
Add uniqueId to Virtual Display and pass through to inputflinger (1/2)
This CL adds :
1) Adds uniqueId (protected via system/sig permission) to virtual
displays.
2) Add support for N virtual display viewports into inputflinger.
3) Set the virtual display's viewports in inputflinger if it has the
uniqueId value set to non-null. (a) Moving the new viewport from java to
native inputflinger and (b) adding "uniqueId" value to viewports makes
up the great majority of this change.
4) From the inputflinger side, we also read in a new value from the
input device configuration files called 'touch.displayId'.
5) When touch.displayId and the virtual display's uniqueId match,
inputflinger links the two.
Test: Start VR and ensure that the virtual viewport shows up when running
'adb shell dump input". Run a VR app, and ensure that the virtual input
device is associated with the new virtual viewport.
Test: com.android.server.display.DisplayManagerServiceTest
Bug:
36051620
Change-Id: Id728d6e7292feaa1d8de7660bc6a2ec90fa1ff3c
Mady Mellor [Wed, 10 May 2017 19:55:06 +0000 (12:55 -0700)]
Remove PIP tuner items
Test: Check tuner for items, also try moving PIP around note it doesn't
minimize, also try long drag to dismiss, note it doesn't dismiss
Bug:
37476193
Change-Id: I1ac1abd9c75d40bd84f59dab8aba5cdb98cd59bb
Felipe Leme [Tue, 9 May 2017 00:23:52 +0000 (17:23 -0700)]
Fixed autofill dumpsys and improved logging.
Fixes:
38196286
Bug:
37997043
Test: adb shell dumpsys autofill -a
Test: CtsAutoFillServiceTestCases pass
Change-Id: Ifaae7b5c0894ecf0d16fff8a3c96e4746fe2361b
Bryce Lee [Wed, 10 May 2017 19:22:15 +0000 (19:22 +0000)]
Merge "Use application context getting secondary displays." into oc-dev
am:
456882b5ae
Change-Id: Ib45a340b34f11f0112c91893893f32e0a849cf93
Android Build Merger (Role) [Wed, 10 May 2017 19:00:42 +0000 (19:00 +0000)]
Merge "Merge "Increase limit of locale pairs" am:
aa9a59ab32 am:
22ff1759d2 am:
dba95b0c94" into oc-dev-plus-aosp
Hall Liu [Wed, 10 May 2017 18:58:23 +0000 (18:58 +0000)]
Merge "Increase limit of locale pairs" am:
aa9a59ab32 am:
22ff1759d2
am:
dba95b0c94
Change-Id: I7135571a65625f3aa3ada7a0c1b00f08c565fce9
Makoto Onuki [Mon, 1 May 2017 17:05:28 +0000 (10:05 -0700)]
Reconnect to DAService after binding is dead
- When the DO/PO process crashes twice with a short interval, AM gives up
and the binding will be "died". Once binding is in this state it'll never
be re-connected.
(Still, DO/PO can disable and re-enable their DAS to force DPMS to bind again
though.)
- Detect this and re-connect after one hour.
- Back-off time will be exponentially increased and never reset until DPMS
explicitly re-connects, which happens when:
-- the device rebooted,
-- the user stopped and re-started, or
-- the DAS is disabled and re-enabled.
Test: adb shell am instrument -e class com.android.server.am.PersistentConnectionTest -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyConstantsTest -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest -w com.android.frameworks.servicestests
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l VERBOSE -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceAdminServiceDeviceOwnerTest
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l VERBOSE -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceAdminServiceProfileOwnerTest
Bug
37711907
Change-Id: Ie0b227a94e6ce85d72a969a4dea1020baf734e2f
Jason Monk [Wed, 10 May 2017 18:54:34 +0000 (18:54 +0000)]
Merge "Disable parts of tuner from user builds" into oc-dev
am:
53ae4dbf8c
Change-Id: I7409558792e77fa16f0e4b95fdf7ae40e59ed1ed
Adrian Roos [Fri, 28 Apr 2017 16:23:19 +0000 (09:23 -0700)]
AOD: Anchor clock at a third of the height
Change-Id: Ie9074be76f23f9c353e38b515fd5a3cd9702696d
Fixes:
37646086
Test: Trigger AOD, observe that clock does not shift in response to notifications.
TreeHugger Robot [Wed, 10 May 2017 18:39:10 +0000 (18:39 +0000)]
Merge "Fix QS footer on small screens" into oc-dev
Hall Liu [Wed, 10 May 2017 18:31:12 +0000 (18:31 +0000)]
Merge "Increase limit of locale pairs" am:
aa9a59ab32
am:
22ff1759d2
Change-Id: Ib993597558b13e9879dc56014af8529aa84c4480
Jason Monk [Wed, 10 May 2017 18:26:53 +0000 (18:26 +0000)]
Merge "Update QS mobile data unavailable asset" into oc-dev
am:
66c81e379e
Change-Id: I8feecad17a1613bd6774a6a557f8986b300c38b0
Ruben Brunk [Wed, 10 May 2017 18:19:00 +0000 (18:19 +0000)]
Merge "Fix VR component enforcement for "2D in 3D" apps." into oc-dev
Adrian Roos [Wed, 10 May 2017 18:17:36 +0000 (18:17 +0000)]
Merge "AOD: Notification groups on Ambient Display" into oc-dev
Jason Monk [Wed, 10 May 2017 18:03:13 +0000 (18:03 +0000)]
Merge "Fix battery icon tint in QS during battery saver" into oc-dev
Android Build Merger (Role) [Wed, 10 May 2017 18:00:10 +0000 (18:00 +0000)]
Merge "Merge "Update startStreaming to return status code" am:
6476ceeaee am:
a89cacebfb am:
331058a871" into oc-dev-plus-aosp
Jason Monk [Wed, 10 May 2017 17:51:02 +0000 (17:51 +0000)]
Merge "Fix brightness dialog background to be light" into oc-dev
am:
175f53b2d6
Change-Id: Ic062c499bbb5a5aade5da15a6a038324e47a866e
Robert Greenwalt [Wed, 10 May 2017 17:50:17 +0000 (17:50 +0000)]
Merge "Update startStreaming to return status code" am:
6476ceeaee am:
a89cacebfb
am:
331058a871
Change-Id: Ie2bc9f47e7774a838829720379fc5865e71d2f0f
TreeHugger Robot [Wed, 10 May 2017 17:41:12 +0000 (17:41 +0000)]
Merge "Fix Toast exception in NotificationManagerService" into oc-dev
Andrew Sapperstein [Wed, 10 May 2017 17:35:44 +0000 (17:35 +0000)]
Merge "Update input method menu to use proper context." into oc-dev
Robert Greenwalt [Wed, 10 May 2017 17:35:34 +0000 (17:35 +0000)]
Merge "Update startStreaming to return status code" am:
6476ceeaee
am:
a89cacebfb
Change-Id: Ief49d5e046bc9a3396f16ec81a2196a2c3b9557b
Rebecca Silberstein [Wed, 10 May 2017 17:35:27 +0000 (17:35 +0000)]
Merge "Create a new NETWORK_SETTINGS permission" into oc-dev
am:
ed285e0cd6
Change-Id: Iae9b1317dc53a8213861ff3803764f9d45758f71
TreeHugger Robot [Wed, 10 May 2017 17:21:29 +0000 (17:21 +0000)]
Merge "Revert "Fixed placemente of Autofill UI for virtual views."" into oc-dev
Hall Liu [Wed, 10 May 2017 17:15:31 +0000 (17:15 +0000)]
Merge "Increase limit of locale pairs"
am:
aa9a59ab32
Change-Id: I4f9d25169bbd7e53c5396e944613e8c15fe4e308
Robert Greenwalt [Wed, 10 May 2017 17:11:12 +0000 (17:11 +0000)]
Merge "Update startStreaming to return status code"
am:
6476ceeaee
Change-Id: I92f8fad5bff456b158ba2afd55c3065678b0d5cf