OSDN Git Service
TreeHugger Robot [Thu, 23 Mar 2017 02:34:26 +0000 (02:34 +0000)]
Merge "Revisit logging in MediaRouter and MediaSessionRecord"
TreeHugger Robot [Thu, 23 Mar 2017 02:22:49 +0000 (02:22 +0000)]
Merge "Add missing type for USB headset devices"
TreeHugger Robot [Thu, 23 Mar 2017 02:22:22 +0000 (02:22 +0000)]
Merge "Add more robust handling of daemon crashes"
TreeHugger Robot [Thu, 23 Mar 2017 02:21:27 +0000 (02:21 +0000)]
Merge "Camera: Allow addSurface due to mismatched dataSpace for PRIVATE format"
Jakub Pawlowski [Thu, 23 Mar 2017 01:33:35 +0000 (01:33 +0000)]
Merge "Bluetooth 5 Enable->Enabled (1/2)" am:
fa69eeac5c am:
cde107da6c
am:
88e9c86822
Change-Id: I10b47fa5566c05ddeef5e13ee9d1593c648a0b48
Jakub Pawlowski [Thu, 23 Mar 2017 01:29:27 +0000 (01:29 +0000)]
Merge "Bluetooth 5 Enable->Enabled (1/2)" am:
fa69eeac5c
am:
cde107da6c
Change-Id: Id8151bf6c58a384b5ca264faae71b601a9dcfc63
TreeHugger Robot [Thu, 23 Mar 2017 01:26:47 +0000 (01:26 +0000)]
Merge "Move two target preference layout from settings to lib"
Jakub Pawlowski [Thu, 23 Mar 2017 01:25:31 +0000 (01:25 +0000)]
Merge "Bluetooth 5 Enable->Enabled (1/2)"
am:
fa69eeac5c
Change-Id: Ia09cf5db2f69659a3b77e4c5e663d5977793df48
Jakub Pawlowski [Thu, 23 Mar 2017 01:17:42 +0000 (01:17 +0000)]
Merge "Bluetooth 5 Enable->Enabled (1/2)"
Chen Xu [Thu, 23 Mar 2017 01:17:28 +0000 (01:17 +0000)]
Merge "sendDialerCode API review"
Adam Lesinski [Thu, 23 Mar 2017 01:11:57 +0000 (01:11 +0000)]
Merge "Update IBatteryPropertiesRegistrar.aidl to support force updates" am:
0aae170841 am:
e4d926d9af
am:
adecfd3e78
Change-Id: I4955b7f35dacd5266a479dc7523e63ed9ea1a527
Sanket Padawe [Thu, 23 Mar 2017 01:06:56 +0000 (01:06 +0000)]
Merge "Change 'idx' to 'index' in SubscriptionManager & TelephonyManager apis." am:
1df4c1ae54 am:
bdee77da38
am:
7d75eff739 -s ours
Change-Id: Iad2d9551806b564be0177e6beb5a3598334972f7
Adam Lesinski [Thu, 23 Mar 2017 01:02:56 +0000 (01:02 +0000)]
Merge "Update IBatteryPropertiesRegistrar.aidl to support force updates" am:
0aae170841
am:
e4d926d9af
Change-Id: Ie8e717f2c5ca38e57d269d9d4d44599b897fb855
TreeHugger Robot [Thu, 23 Mar 2017 01:02:08 +0000 (01:02 +0000)]
Merge "Fix onCurrentVrActivityChanged callbacks."
Jakub Pawlowski [Thu, 23 Mar 2017 00:58:44 +0000 (00:58 +0000)]
Merge "BluetoothGattCallbackExt removal" am:
e2ddacaff4 am:
2a32d04a24
am:
822ddff283
Change-Id: I2bffe270bde8eecd2673b75fbd578f833b59f402
Sanket Padawe [Thu, 23 Mar 2017 00:57:56 +0000 (00:57 +0000)]
Merge "Change 'idx' to 'index' in SubscriptionManager & TelephonyManager apis." am:
1df4c1ae54
am:
bdee77da38
Change-Id: Ie01e7db8f2c5eb4552db0ff7416998b67d70a501
Marie Janssen [Thu, 23 Mar 2017 00:57:33 +0000 (00:57 +0000)]
Merge "Bluetooth: log unexpected crashes and restarts" am:
25b6f08ece am:
3d4c1fd1fb
am:
e2967d4de3
Change-Id: I74a892c8455f40f73bc19d684c5f58e840ddbe68
Jakub Pawlowski [Thu, 23 Mar 2017 00:53:41 +0000 (00:53 +0000)]
Merge "BluetoothGattCallbackExt removal" am:
e2ddacaff4
am:
2a32d04a24
Change-Id: Id25f495acb6864b1416a2730b5396be99105e43d
Marie Janssen [Thu, 23 Mar 2017 00:52:33 +0000 (00:52 +0000)]
Merge "Bluetooth: log unexpected crashes and restarts" am:
25b6f08ece
am:
3d4c1fd1fb
Change-Id: I423f7fb78ffdb2b72a1db780abf9119e6718c8ad
Ajay Panicker [Thu, 23 Mar 2017 00:51:58 +0000 (00:51 +0000)]
Bluetooth: Use content observer for airplane mode am:
400279def2
am:
84743eeed8
Change-Id: I610eecbb739633861f79b3fe053d09789393be22
Adam Lesinski [Thu, 23 Mar 2017 00:48:31 +0000 (00:48 +0000)]
Merge "Update IBatteryPropertiesRegistrar.aidl to support force updates"
am:
0aae170841
Change-Id: I8363aab4dbf0690b92988353d9360c713412a0be
Ajay Panicker [Thu, 23 Mar 2017 00:47:22 +0000 (00:47 +0000)]
Bluetooth: Use content observer for airplane mode
am:
400279def2
Change-Id: I16d88bbe5e0326223b74903804ee1f40d367035d
TreeHugger Robot [Thu, 23 Mar 2017 00:46:00 +0000 (00:46 +0000)]
Merge "Fix MtpDocumentsProvider test."
Sanket Padawe [Thu, 23 Mar 2017 00:45:37 +0000 (00:45 +0000)]
Merge "Change 'idx' to 'index' in SubscriptionManager & TelephonyManager apis."
am:
1df4c1ae54
Change-Id: I9233a85edb9321faaeb3f7813d4020159e52b691
Jakub Pawlowski [Thu, 23 Mar 2017 00:44:06 +0000 (00:44 +0000)]
Merge "BluetoothGattCallbackExt removal"
am:
e2ddacaff4
Change-Id: I59ba6c9950997ea447a5b021d509a72abc546661
Marie Janssen [Thu, 23 Mar 2017 00:42:53 +0000 (00:42 +0000)]
Merge "Bluetooth: log unexpected crashes and restarts"
am:
25b6f08ece
Change-Id: I1a0bfa2c8aba75dd60437680c5726f8c4e6c88ab
Jaewan Kim [Wed, 22 Mar 2017 09:22:40 +0000 (18:22 +0900)]
Revisit logging in MediaRouter and MediaSessionRecord
This limits excessive logs from MediaRouter and MediaSessionRecord
- MediaRouter: Leave log only if there's change in the audio route.
- MediaSessionRecord: Leave log for the controller callback instead of
dumping verbose stack traces.
Bug:
36497125
Test: Manual test
Change-Id: Ie0fe9f33388d1aa9f25c26b3b3f7c71fec409ba8
TreeHugger Robot [Thu, 23 Mar 2017 00:01:38 +0000 (00:01 +0000)]
Merge "Add manufacturer and model to device ID attestation"
fionaxu [Tue, 7 Mar 2017 00:05:24 +0000 (16:05 -0800)]
sendDialerCode API review
1. address the feeback from API review:
throw exception rather than a boolean return
throw Security exception for permission denial and non-default dailer app.
throw invalidStateException if telephonyServie unavaialble.
2. sendDialerCode API will only check permission and package match without
enforcing the format of secret code(*#*# CODE #*#*) as throwing an unchecked
exception for wrong bad format seems to be an overkill regarding the API usage.
Dialer calls this API for each keyboard press to check format and send the intent
altogether which is no longer appropriate if we plan to return void and will
reduce frquent API calls.
3. allow callers with carrier privilege
4. not require MODIFY_PHONE_STATE as third party dialer apps won't be
granted
5. TODO mark android.provider.Telephony.SECRET_CODE to be protected
after calling apps move to this API.
Bug:
35767402
Test: Manual
Change-Id: I8287aa93f2f79d356935a48cf808705d9b49984b
Treehugger Robot [Wed, 22 Mar 2017 23:53:59 +0000 (23:53 +0000)]
Merge "Update IBatteryPropertiesRegistrar.aidl to support force updates"
TreeHugger Robot [Wed, 22 Mar 2017 23:50:35 +0000 (23:50 +0000)]
Merge "Expose ACTION_STORAGE_LOW and ACTION_STORAGE_OK to Instant Apps"
Julia Reynolds [Wed, 22 Mar 2017 23:47:05 +0000 (23:47 +0000)]
Merge "Don't bind incorrect services."
Jim Miller [Wed, 22 Mar 2017 23:40:10 +0000 (16:40 -0700)]
Add more robust handling of daemon crashes
It seems the new fingerprint daemon doesn't recover as quickly as before
and there's a finite chance reconnecting immediately will fail.
This changes the framework to be more robust about recovering by:
1. explicitly connecting to the daemon in isHardwareDetected()
2. ensuring we remove the current client when daemon death is detected
3. reset the daemon whenever we get HW_UNAVAILABLE so we try again
Test: manually kill daemon and verify FingerprintService reconnects
Partial fix for bug
36181191
Change-Id: Id530ed62be58b33af5b5b60083f3a69e4e8cd8bf
TreeHugger Robot [Wed, 22 Mar 2017 23:41:34 +0000 (23:41 +0000)]
Merge "Fix launching installer on missing split"
TreeHugger Robot [Wed, 22 Mar 2017 23:28:05 +0000 (23:28 +0000)]
Merge "Notification cleanup"
Fan Zhang [Wed, 22 Mar 2017 17:54:03 +0000 (10:54 -0700)]
Move two target preference layout from settings to lib
Change-Id: I5eda0cdcc4e8d8bb25f95ee12837d90179ac5c0a
Fix:
36511169
Test: make RunSettingsLibRoboTests
Ruben Brunk [Wed, 22 Mar 2017 22:43:24 +0000 (15:43 -0700)]
Fix onCurrentVrActivityChanged callbacks.
Bug:
36503317
Test: Use controller in a 3P VR application.
Change-Id: I1b11785077183c719e19f4f496677dba79e42dab
Jakub Pawlowski [Wed, 22 Mar 2017 22:40:21 +0000 (15:40 -0700)]
Bluetooth 5 Enable->Enabled (1/2)
Test: manual
Bug:
30622771
Change-Id: I37b198927076a0267de67e1bd94eaea9e88e53bb
TreeHugger Robot [Wed, 22 Mar 2017 22:31:44 +0000 (22:31 +0000)]
Merge "SoundTriggerTestApp: also unload on error conditions"
Rob Carr [Wed, 22 Mar 2017 22:31:21 +0000 (22:31 +0000)]
Merge "Amend "Fix various flashes when..." CL"
TreeHugger Robot [Wed, 22 Mar 2017 22:26:19 +0000 (22:26 +0000)]
Merge "Update AccountManager JavaDoc."
Evan Rosky [Wed, 22 Mar 2017 22:12:54 +0000 (22:12 +0000)]
Merge "Hooked-up options menu closing"
Andrii Kulian [Wed, 22 Mar 2017 21:57:27 +0000 (21:57 +0000)]
Merge "Revert "Update display contents when metrics change""
TreeHugger Robot [Wed, 22 Mar 2017 21:51:51 +0000 (21:51 +0000)]
Merge "Add skia/src/codec to core/jni include dirs"
Andrii Kulian [Wed, 22 Mar 2017 21:50:24 +0000 (21:50 +0000)]
Revert "Update display contents when metrics change"
This reverts commit
eddb7c0985e1fac8bdbeaaed40c678c0dc9da321.
Reason for revert: b/
36518752
Bug:
36518752
Change-Id: I39773db7b8d02aec360ca80d02b3c161ccf02786
TreeHugger Robot [Wed, 22 Mar 2017 21:48:50 +0000 (21:48 +0000)]
Merge "Do not check targetSdkVersion if only one package"
Todd Kennedy [Wed, 22 Mar 2017 21:42:38 +0000 (14:42 -0700)]
Fix launching installer on missing split
Bonehead mistake; we were applying the post-resolution filters twice.
Don't do that!
Test: build and see that the installer runs when trying to launch a split that's not on the device
Change-Id: Ice65cdd7cc85d0394422009ba42f388f0ec2595c
Chad Brubaker [Wed, 22 Mar 2017 21:36:37 +0000 (14:36 -0700)]
Expose ACTION_STORAGE_LOW and ACTION_STORAGE_OK to Instant Apps
Instant Apps wont be started by these broadcasts, but if they're running
it gives them a chance to be good citizens on the device and help out
with a space crunch.
Test: manual
Bug:
33350280
Change-Id: I1700153b1c698a29e1e35535f64062544d071cab
TreeHugger Robot [Wed, 22 Mar 2017 21:27:36 +0000 (21:27 +0000)]
Merge "Adding source bounds hint to support better PiP transition."
Sanket Padawe [Wed, 22 Mar 2017 21:27:21 +0000 (21:27 +0000)]
Merge "Change 'idx' to 'index' in SubscriptionManager & TelephonyManager apis."
Geoffrey Pitsch [Wed, 22 Mar 2017 21:15:59 +0000 (21:15 +0000)]
Merge "AccountManagerService send pkg uid when creating notification channel"
TreeHugger Robot [Wed, 22 Mar 2017 21:14:00 +0000 (21:14 +0000)]
Merge "Prevent downgrade of targetSandboxVersion"
Fyodor Kupolov [Wed, 22 Mar 2017 21:02:08 +0000 (21:02 +0000)]
Merge "Added concurrency test"
Chris Thornton [Wed, 22 Mar 2017 20:50:04 +0000 (13:50 -0700)]
SoundTriggerTestApp: also unload on error conditions
When the service is killed/going down, it should unload all the sound
models it has running as part of being a good citizen.
Test: Kill/stop the service and see that the models are evicted from the
HAL
Change-Id: I6f88c8327682df5870b381d5bafda79e67fb7079
Amith Yamasani [Wed, 22 Mar 2017 20:49:27 +0000 (20:49 +0000)]
Merge "Logging to track #
36406078"
Geoffrey Pitsch [Wed, 22 Mar 2017 20:42:43 +0000 (16:42 -0400)]
AccountManagerService send pkg uid when creating notification channel
AccountManager needs to pass the app's uid explicitly in order for the
channel lookup to not fail. Requires separate API that only system can
call.
Bug:
36511867
Test: Install Clankium and reboot device, observe Notification
Change-Id: I6ddd87d755b4b2129565dd275e799b0349a80936
Amith Yamasani [Wed, 22 Mar 2017 20:37:15 +0000 (13:37 -0700)]
Logging to track #
36406078
Bug:
36406078
Test: N/A
Change-Id: I9724fa8511686a342bf25d1979c17c0a4700e292
TreeHugger Robot [Wed, 22 Mar 2017 20:37:44 +0000 (20:37 +0000)]
Merge "AVRCP version interop pereference (3/3)"
Robert Carr [Tue, 21 Mar 2017 02:04:30 +0000 (19:04 -0700)]
Amend "Fix various flashes when..." CL
Missing cosmetic changes from last patch set due to
a rebase error on my part.
Test: Cosmetic
Change-Id: I3a8a68e8cecd1947cd9e54d5fcfe8bb4a792265b
Rob Carr [Wed, 22 Mar 2017 20:26:36 +0000 (20:26 +0000)]
Merge "SurfaceView: Fix Surface leak when changing format."
Julia Reynolds [Wed, 22 Mar 2017 14:52:11 +0000 (10:52 -0400)]
Notification cleanup
- remove EXTRA_ORIGINATING_USER_ID
- deprecate two icon extra fields; use the getters instead
- rename badge icon methods
- update some unclear documentation
Test: make, cts
Fixes:
33666468
Fixes:
36128288
Change-Id: Ic477259aab5f267fb72ab715d72195d6364cedae
Jakub Pawlowski [Wed, 22 Mar 2017 20:09:37 +0000 (20:09 +0000)]
Merge "BluetoothGattCallbackExt removal"
TreeHugger Robot [Wed, 22 Mar 2017 20:04:20 +0000 (20:04 +0000)]
Merge "PlayerBase: more general exception catching in release"
Fyodor Kupolov [Wed, 22 Mar 2017 19:57:04 +0000 (12:57 -0700)]
Do not check targetSdkVersion if only one package
Bug:
36485175
Test: AccountManagerServiceTest
Change-Id: Icef2a292dbf5119a5c2bb184aa2da7bcf8e7bd11
Winson Chung [Thu, 2 Mar 2017 23:40:51 +0000 (15:40 -0800)]
Adding source bounds hint to support better PiP transition.
Bug:
35396882
Test: Start a transition with source bounds hint.
Change-Id: I4897242af84744bc05a093111a15ea52e49815e8
Adam Lesinski [Wed, 22 Mar 2017 19:31:52 +0000 (19:31 +0000)]
Update IBatteryPropertiesRegistrar.aidl to support force updates
Change-Id: Ic4f705a20db32369d106462c47eb150850a3f638
Test: builds
Fyodor Kupolov [Wed, 22 Mar 2017 00:16:17 +0000 (17:16 -0700)]
Added concurrency test
Test 2 threads repeatedly calling getAccounts while 1 thread calls
setAuthToken.
Example output:
I AccountManagerServiceTest: readTotalTime=1468 avg=36.7
I AccountManagerServiceTest: writeTotalTime=813 avg=40
Bug:
36485175
Test: AccountManagerServiceTest
Change-Id: Iee66339ceeb8f149eb9fc0906c537db60465d475
TreeHugger Robot [Wed, 22 Mar 2017 19:25:14 +0000 (19:25 +0000)]
Merge "Update “don’t snooze” in expanded snooze menu to cancel"
TreeHugger Robot [Wed, 22 Mar 2017 19:21:09 +0000 (19:21 +0000)]
Merge "cherry-pick from nyc-mr1-dev docs: Removing Android docs from Gerrit Original Change-Id: I5331cdc968be817ff70ba32dd03fce76493a6ab8 Test: make ds-docs"
Matt Sarett [Wed, 22 Mar 2017 19:12:25 +0000 (15:12 -0400)]
Add skia/src/codec to core/jni include dirs
This should allow a jpeg encoding change in Skia to land:
https://skia-review.googlesource.com/c/10011/
Test: NA
Change-Id: If2474a548c9e22c5a13bf14fd38bd344355ac29a
Winson Chung [Wed, 22 Mar 2017 18:56:02 +0000 (18:56 +0000)]
Merge "Removing per-user PiP component."
Jerome Gaillard [Wed, 22 Mar 2017 18:55:07 +0000 (18:55 +0000)]
Merge "Update FontFamily_Delegate following Change Ia23ee6a7"
TreeHugger Robot [Wed, 22 Mar 2017 18:41:57 +0000 (18:41 +0000)]
Merge "Fix crash on user switch."
Ajay Panicker [Wed, 22 Feb 2017 20:23:15 +0000 (12:23 -0800)]
Bluetooth: Use content observer for airplane mode
We are making this switch as the airplane mode switch intent is going away.
Fix:
35256299
Test: Toggle Airplane Mode
Change-Id: I3b1e5bbdf689b0db98cfbb0ab377198d34f0ba05
Ajay Panicker [Mon, 20 Mar 2017 21:20:52 +0000 (14:20 -0700)]
AVRCP version interop pereference (3/3)
Add a mechanism to allow the user to select the AVRCP version broadcasted
through SDP in the developer options. This helps solve some interoperability
issues such as with Honda Carkits where broadcasting AVRCP version 1.6 causes
media metadata to fail.
Bug:
35956792
Test: Select AVRCP version through developer option
Change-Id: Ibc271063058b6324b1a0517c6b853f8d7e6eb0f3
Jakub Pawlowski [Wed, 22 Mar 2017 18:22:18 +0000 (11:22 -0700)]
BluetoothGattCallbackExt removal
New methods should be added to BluetoothGattCallback, instead of
creating Ext class.
Test: manual
Bug:
30622771
Change-Id: I2567df5baace6bd2d2f30c36d2f62056408ca5d0
Chris Tate [Wed, 22 Mar 2017 18:07:43 +0000 (18:07 +0000)]
Merge "Give shell the CHANGE_DEVICE_IDLE_TEMP_WHITELIST permission"
Bryce Lee [Wed, 22 Mar 2017 18:07:20 +0000 (18:07 +0000)]
Merge "Do not allow Tasks to influence orientation under some conditions."
TreeHugger Robot [Wed, 22 Mar 2017 18:03:40 +0000 (18:03 +0000)]
Merge "Revive old method to prevent crash internal app."
Dan Shi [Wed, 22 Mar 2017 17:55:53 +0000 (17:55 +0000)]
Merge "Add test configs to apct tests under frameworks/base"
Tenghui Zhu [Wed, 22 Mar 2017 17:34:25 +0000 (17:34 +0000)]
Merge "disable versioning for objectAnimator to support path motion"
TreeHugger Robot [Wed, 22 Mar 2017 17:33:55 +0000 (17:33 +0000)]
Merge "Autofill a manual request directly when it only has one dataset."
TreeHugger Robot [Wed, 22 Mar 2017 17:20:51 +0000 (17:20 +0000)]
Merge "Don't call setAutofillId() when populating virtual structure for Assit."
Kirill Grouchnikov [Wed, 22 Mar 2017 17:07:29 +0000 (17:07 +0000)]
Merge "Add support for tinting icon menus"
Dmitry Dementyev [Mon, 20 Mar 2017 17:57:01 +0000 (10:57 -0700)]
Update AccountManager JavaDoc.
Test: none.
Change-Id: Ib996d9c995c75adc4ec755a4fbd359eddbf43e70
Jorim Jaggi [Wed, 22 Mar 2017 17:02:55 +0000 (17:02 +0000)]
Merge "When snapshots are disabled, fill it with single color."
Mady Mellor [Wed, 22 Mar 2017 16:57:35 +0000 (09:57 -0700)]
Update “don’t snooze” in expanded snooze menu to cancel
Test: manual - snooze notification, expand menu, note ‘cancel’ option
Bug:
36249627
Change-Id: I6ea834df0b0f93ed89b5b26dc54cc404402cd962
Jerome Gaillard [Wed, 22 Mar 2017 16:55:04 +0000 (16:55 +0000)]
Update FontFamily_Delegate following Change Ia23ee6a7
Test: layoutlib tests
Change-Id: I8815060f9bab65f913a0272e439f6c86a63acbcf
Anthony Chen [Wed, 22 Mar 2017 16:54:37 +0000 (09:54 -0700)]
Fix crash on user switch.
Recent changes in SystemUI expects taht the navigation bar have a parent
view that is not the WindowManager. Inflate navigation_bar_window as the
parent view for the CarNavigationBar as this is the view that the
default StatusBar users.
Test: verified that user switching no longer results in a crash
Bug:
36070562
Change-Id: I3e9c2efd4caa7b36478e621bc2dd6f7e41ad7fbd
Jorim Jaggi [Wed, 22 Mar 2017 16:42:52 +0000 (16:42 +0000)]
Merge "Add API to disable snapshotting of activities"
Bryce Lee [Fri, 10 Mar 2017 22:14:03 +0000 (14:14 -0800)]
Do not allow Tasks to influence orientation under some conditions.
When all AppWindowTokens belonging to a Task are closing, it should
not be considered for orientation. Likewise, if a task is moving to
the bottom, it should also not be considered.
Change-Id: Ie387457c413d5360afbb0ac8edb112f81feab81b
Fixes:
35699615
Test: bit FrameworksServicesTests:com.android.server.wm.TaskStackTests#testClosingAppDifferentStackOrientation
Test: bit FrameworksServicesTests:com.android.server.wm.TaskStackTests#testMoveTaskToBackDifferentStackOrientation
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerAppConfigurationTests#testTaskCloseRestoreOrientation
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerAppConfigurationTests#testTaskMoveToBackOrientation
Philip P. Moltmann [Wed, 22 Mar 2017 16:20:35 +0000 (16:20 +0000)]
Merge "Use only official pdfium APIs"
Seigo Nonaka [Wed, 22 Mar 2017 16:14:33 +0000 (09:14 -0700)]
Revive old method to prevent crash internal app.
Bug:
36509029
Test: N/A
Change-Id: I4e04847de7b61a790323257c09da9a960a6689d5
TreeHugger Robot [Wed, 22 Mar 2017 16:11:42 +0000 (16:11 +0000)]
Merge "Don't unlock the work profile if it is turned off."
Treehugger Robot [Wed, 22 Mar 2017 16:09:03 +0000 (16:09 +0000)]
Merge "Bluetooth: log unexpected crashes and restarts"
Winson Chung [Wed, 22 Mar 2017 05:16:42 +0000 (22:16 -0700)]
Removing per-user PiP component.
- This was added in ag/923778 for TV, where the TV recents activity, which
is started per-user, needed to reference the PiP bounds to coordinate the
layout of the PiP UI in recents. As a result of that change, the PiP
manager for both phones and TV was being instantiated multiple times,
once for the primary user, and another for secondary/managed users. With
each instantiation of the PipManager, we were re-registering the input
consumer, and once the process was killed, the input consumer was not
being cleaned up correctly and it not longer was registered with the
primary SystemUI which drives the PiP.
As of ag/
1964066, the TV recents code is removed, so we can now safely
remove the PipUI component for secondary users as well, ensuring only a
single PipManager/InputConsumerController instance.
This does not prevent PiP from working in secondary users, but only
leaves the input consumer and menu controller in the primary user's
SystemUI.
- Fix some crashes when interacting with the PiP in a secondary user,
all communication between the menu controller and the menu activity
should be done in a parcelable way as the menu activity runs per-user
- Adding exception when the PipUI component is not created for the primary
user
- Initial changes to dump input consumers in WM to be able to correlate
them with SysUI's state
Bug:
35792308
Test: Ensure PiP component is not started for secondary user, verify that
it still works on secondary users
Change-Id: I3df10860227498bc37799ad296f0a4b71b87d30e
Signed-off-by: Winson Chung <winsonc@google.com>
Julia Reynolds [Tue, 21 Mar 2017 21:34:25 +0000 (17:34 -0400)]
Don't bind incorrect services.
It's possible for system apps to put the wrong types of managed
services in a managed services setting; guard against that better
to prevent log spam.
Test: cts verifier, while setting is in a bad state.
Change-Id: Id836df1a2dbb29426bcb304e379c1cc5bb3dc485
TreeHugger Robot [Wed, 22 Mar 2017 15:40:11 +0000 (15:40 +0000)]
Merge "Unhide Typeface construction APIs."
Jean-Michel Trivi [Wed, 22 Mar 2017 15:39:42 +0000 (08:39 -0700)]
PlayerBase: more general exception catching in release
When stopping AppOps watching in the player release, catch
any exception to be safer.
Test: see bug repro steps
Bug:
36240191
Change-Id: I8e11cfc12c305878699dc57131e35e2a98eb7b16
Jorim Jaggi [Tue, 14 Mar 2017 17:21:40 +0000 (18:21 +0100)]
When snapshots are disabled, fill it with single color.
Test: Launch DisableScreenshotsActivity, go to recents, make sure
content is blue. Reopen activity from home, make sure starting
window is blue.
Bug:
31339431
Change-Id: I29689774c3cdcb784d8f5bfa4f947a6f35b91e01