OSDN Git Service
Julia Reynolds [Wed, 20 Sep 2017 20:14:17 +0000 (20:14 +0000)]
Merge "DND apps might not have a service, and that's ok" into oc-mr1-dev
am:
098dae1b3e
Change-Id: I2bc381f8f155033fa218d43af8842044626e3404
TreeHugger Robot [Wed, 20 Sep 2017 20:01:33 +0000 (20:01 +0000)]
Merge "DND apps might not have a service, and that's ok" into oc-mr1-dev
Jonathan Basseri [Wed, 20 Sep 2017 19:24:24 +0000 (19:24 +0000)]
Merge "Convert ICarrierService to oneway." into oc-mr1-dev
am:
806af68f5d
Change-Id: Ifd29502f4fb0ad02216e6f9b7c48cb332f89dea2
Yin-Chia Yeh [Wed, 20 Sep 2017 19:16:50 +0000 (19:16 +0000)]
Merge "LegacyCamera: fix wrong class name in JNI" into oc-mr1-dev
am:
b1b99b0299
Change-Id: I1f4817fbc32ba186229eb36fe726e6f4ff2fad16
Jonathan Basseri [Wed, 20 Sep 2017 19:16:24 +0000 (19:16 +0000)]
Merge "Convert ICarrierService to oneway." into oc-mr1-dev
Tyler Gunn [Wed, 20 Sep 2017 19:11:15 +0000 (19:11 +0000)]
Merge "Add Telephony connection event for call forwarded supp service notice." am:
9cc6286675 am:
53a0c05f47
am:
fea3f2e8c6
Change-Id: I2ef9f40ec0487faa19ea8aa005607296d646e78a
TreeHugger Robot [Wed, 20 Sep 2017 19:06:01 +0000 (19:06 +0000)]
Merge "LegacyCamera: fix wrong class name in JNI" into oc-mr1-dev
Tyler Gunn [Wed, 20 Sep 2017 19:03:24 +0000 (19:03 +0000)]
Merge "Add Telephony connection event for call forwarded supp service notice." am:
9cc6286675
am:
53a0c05f47
Change-Id: I1aa5936c8246cae56d886573f116b8d55a70834d
Tyler Gunn [Wed, 20 Sep 2017 18:54:34 +0000 (18:54 +0000)]
Merge "Add Telephony connection event for call forwarded supp service notice."
am:
9cc6286675
Change-Id: Ie7b6f251a29d1be706382e93f6f368fd8b8e1cc7
Tyler Gunn [Wed, 20 Sep 2017 18:20:04 +0000 (18:20 +0000)]
Merge "Add Telephony connection event for call forwarded supp service notice."
Makoto Onuki [Wed, 20 Sep 2017 17:33:20 +0000 (17:33 +0000)]
Merge "Fix STOPSHIP in SyncManager" into oc-mr1-dev
am:
80683fc983
Change-Id: Ie6135bbae0151fbcb30f8d797234aa7986bb98ad
TreeHugger Robot [Wed, 20 Sep 2017 17:27:40 +0000 (17:27 +0000)]
Merge "Fix STOPSHIP in SyncManager" into oc-mr1-dev
Jason Monk [Wed, 20 Sep 2017 17:10:30 +0000 (17:10 +0000)]
Merge "Fix random systemui crashes during boot" am:
8078996f4a -s ours am:
7b4087acdb
am:
f7aeee2ca5
Change-Id: Ib02b2f73f86d9678a53b717696232dd71bb0579f
Android Build Merger (Role) [Wed, 20 Sep 2017 17:06:23 +0000 (17:06 +0000)]
Merge "AudioService: reduce EU volume warning thresdhold for USB headsets am:
630f37a4ad am:
94089cefe1" into oc-mr1-dev-plus-aosp
Eric Laurent [Wed, 20 Sep 2017 17:03:35 +0000 (17:03 +0000)]
AudioService: reduce EU volume warning thresdhold for USB headsets am:
630f37a4ad
am:
94089cefe1
Change-Id: I996ef93c75788c4712f81278cb8ca7f59167e812
Eric Laurent [Wed, 20 Sep 2017 17:02:15 +0000 (17:02 +0000)]
AudioService: reduce EU volume warning thresdhold for USB headsets am:
630f37a4ad
am:
0c4a9d2714
Change-Id: I9637e4b9e12908cee03f398c5ef91e89ea8e32e1
Tyler Gunn [Wed, 7 Jun 2017 22:42:39 +0000 (15:42 -0700)]
Add Telephony connection event for call forwarded supp service notice.
Test: Test Harness
Bug:
33761801
Merged-In: I5503232f90b3255df601be3f16443e8ae311a479
Change-Id: I8ffc8079b43c54594e596f29cec641ca051d4796
Jason Monk [Wed, 20 Sep 2017 17:00:20 +0000 (17:00 +0000)]
Merge "Fix random systemui crashes during boot" am:
8078996f4a -s ours
am:
7b4087acdb
Change-Id: Ib5f08316a5ae559fe8fab09601607e523bd32793
Eric Laurent [Wed, 20 Sep 2017 16:54:47 +0000 (16:54 +0000)]
AudioService: reduce EU volume warning thresdhold for USB headsets
am:
630f37a4ad
Change-Id: Ied24bdcddc54255c3a287ffa871148177ad097f7
Eric Laurent [Wed, 20 Sep 2017 16:54:43 +0000 (16:54 +0000)]
AudioService: reduce EU volume warning thresdhold for USB headsets
am:
630f37a4ad
Change-Id: Ib9a3ebae93073018fc4bda0d2dc36c5fc1fdac92
Jason Monk [Wed, 20 Sep 2017 16:53:13 +0000 (16:53 +0000)]
Merge "Fix random systemui crashes during boot"
am:
8078996f4a -s ours
Change-Id: I97b1d904c2e37aff4ade169d0f76d7f0d123fc5b
Shubham Ajmera [Wed, 20 Sep 2017 16:29:15 +0000 (16:29 +0000)]
Merge "Fix compiler filter for downgrading unused apps" into oc-mr1-dev
am:
15f814e36e
Change-Id: Ia35c3ff6e3c8fd2af13604134051128747ba36e9
Ray Essick [Wed, 20 Sep 2017 16:20:51 +0000 (16:20 +0000)]
Merge "packagemanager_native access to package installer, version" into oc-mr1-dev
am:
71ab6f6555
Change-Id: I552b7d549a129d1188db8ae6957ba7fb80149d0f
Shubham Ajmera [Wed, 20 Sep 2017 16:13:00 +0000 (16:13 +0000)]
Merge "Fix compiler filter for downgrading unused apps" into oc-mr1-dev
Ray Essick [Wed, 20 Sep 2017 16:08:47 +0000 (16:08 +0000)]
Merge "packagemanager_native access to package installer, version" into oc-mr1-dev
Beverly [Wed, 20 Sep 2017 16:07:47 +0000 (16:07 +0000)]
Merge "DND alert info set to INVISIBLE (not GONE) to retain formatting." into oc-mr1-dev
am:
8e84dfec6a
Change-Id: I779fde484505f8fd6e5a19397b670299970320c9
TreeHugger Robot [Wed, 20 Sep 2017 16:02:46 +0000 (16:02 +0000)]
Merge "DND alert info set to INVISIBLE (not GONE) to retain formatting." into oc-mr1-dev
Neil Fuller [Wed, 20 Sep 2017 15:44:32 +0000 (15:44 +0000)]
Merge "Fix reliability triggering" into oc-mr1-dev
am:
36e5c8e7ed
Change-Id: Ib1ee3dae5b5b25a2ebdf1fea21d080cfbf506af2
Neil Fuller [Wed, 20 Sep 2017 15:39:37 +0000 (15:39 +0000)]
resolve merge conflicts of
83c367aa5b48 to stage-aosp-master am:
8acdb8aa65
am:
93fcfbc8cb -s ours
Change-Id: I5eb5f54262cbcb38095ff5a6092c200c839e6987
Neil Fuller [Wed, 20 Sep 2017 15:36:47 +0000 (15:36 +0000)]
Merge "Fix reliability triggering" into oc-mr1-dev
Rubin Xu [Wed, 20 Sep 2017 15:28:29 +0000 (15:28 +0000)]
Merge "Fail gracefully if password reset token is invalidated" into oc-mr1-dev
am:
223a65f3f5
Change-Id: I3bba8e337fe57999daf1e7d8ff90a9f7bfc6831d
Rubin Xu [Wed, 20 Sep 2017 15:15:42 +0000 (15:15 +0000)]
Merge "Fail gracefully if password reset token is invalidated" into oc-mr1-dev
Neil Fuller [Wed, 20 Sep 2017 14:55:08 +0000 (14:55 +0000)]
resolve merge conflicts of
83c367aa5b48 to stage-aosp-master
am:
8acdb8aa65
Change-Id: I7605323c886c9dafb83899c8b78e2bb860f96bb4
Alan Viverette [Wed, 20 Sep 2017 14:09:01 +0000 (14:09 +0000)]
Merge "Handle null left and right tab strip drawables" into oc-mr1-dev
am:
286c7db342
Change-Id: I82092817d26af0a372923d238b9f84112f196ad2
TreeHugger Robot [Wed, 20 Sep 2017 13:59:05 +0000 (13:59 +0000)]
Merge "Handle null left and right tab strip drawables" into oc-mr1-dev
Jason Monk [Wed, 20 Sep 2017 13:50:45 +0000 (13:50 +0000)]
Merge "Fix random systemui crashes during boot"
Julia Reynolds [Fri, 15 Sep 2017 18:26:32 +0000 (14:26 -0400)]
DND apps might not have a service, and that's ok
Also add logging for permission changes.
Bug:
64969998
Test: manual; trigger backup and verify dnd apps still have dnd
access.
Change-Id: Iefa14a6a1130fb4cc823fe6979f6b5a7b212ca4b
Neil Fuller [Wed, 20 Sep 2017 12:43:28 +0000 (13:43 +0100)]
resolve merge conflicts of
83c367aa5b48 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia3dc2e0b10bbf5be9c7d8f98b03cf8030bbfff07
Treehugger Robot [Wed, 20 Sep 2017 12:08:58 +0000 (12:08 +0000)]
Merge "Fix reliability triggering"
Victor Chang [Wed, 20 Sep 2017 09:33:23 +0000 (09:33 +0000)]
Merge "Remove StructGroupSourceReq" into oc-mr1-dev-plus-aosp
Karthik Ravi Shankar [Wed, 20 Sep 2017 03:28:32 +0000 (03:28 +0000)]
Merge "Fix window visibility during layout" into oc-mr1-dev
am:
7a59a62276
Change-Id: Ic4726a77ce790616d50ff84edc35e7941b409659
Shubham Ajmera [Wed, 20 Sep 2017 03:18:33 +0000 (03:18 +0000)]
Merge "Partially revert
ce54397368dc98182d7b4eb2ff3c142bbd87e39d" into oc-mr1-dev
am:
2cdfda1232
Change-Id: If3060eb7b21a3bb5f6b34b36de012cb35e4f03c9
TreeHugger Robot [Wed, 20 Sep 2017 03:17:44 +0000 (03:17 +0000)]
Merge "Fix window visibility during layout" into oc-mr1-dev
TreeHugger Robot [Wed, 20 Sep 2017 03:11:22 +0000 (03:11 +0000)]
Merge "Partially revert
ce54397368dc98182d7b4eb2ff3c142bbd87e39d" into oc-mr1-dev
Sungsoo Lim [Wed, 20 Sep 2017 03:02:28 +0000 (03:02 +0000)]
Merge "Select a system audio route only when needed" into oc-mr1-dev
am:
d4aee713d4
Change-Id: Ifa91341cb48c970f9b19c6f8bc0219c1a3372a9a
TreeHugger Robot [Wed, 20 Sep 2017 02:54:45 +0000 (02:54 +0000)]
Merge "Select a system audio route only when needed" into oc-mr1-dev
Hugo Benichi [Wed, 20 Sep 2017 01:05:15 +0000 (01:05 +0000)]
Merge changes Ied9d0cec,I3087f446,Ibe706872 into oc-mr1-dev
am:
14676c5da4
Change-Id: I34613d4e53c6cc33029e1f8030b0605100cc59fc
Hugo Benichi [Wed, 20 Sep 2017 00:58:35 +0000 (00:58 +0000)]
Merge changes Ied9d0cec,I3087f446,Ibe706872 into oc-mr1-dev
* changes:
Wakeup packet events: addressing a few comments
Connectivity metrics: add WakeupStats events
Connectivity metrics: collect NFLOG wakeup events
Christine Franks [Wed, 20 Sep 2017 00:43:12 +0000 (00:43 +0000)]
Merge "Handle night display state when timezone changes" into oc-mr1-dev
am:
1276f357d3
Change-Id: I96cc0161eb092f2a965efbff4a417bc992493625
Felipe Leme [Wed, 20 Sep 2017 00:33:23 +0000 (00:33 +0000)]
Merge "Handle autofill auth scenarios where the FillContext cannot be retrieved:" into oc-mr1-dev
am:
5488a38465
Change-Id: I40b5124559da062bad0bdb9405aa89ef10d12597
Android Build Merger (Role) [Wed, 20 Sep 2017 00:23:32 +0000 (00:23 +0000)]
Merge "Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev am:
9282193c84" into oc-mr1-dev-plus-aosp
Christine Franks [Wed, 20 Sep 2017 00:23:28 +0000 (00:23 +0000)]
Merge "Handle night display state when timezone changes" into oc-mr1-dev
TreeHugger Robot [Wed, 20 Sep 2017 00:19:03 +0000 (00:19 +0000)]
Merge "Handle autofill auth scenarios where the FillContext cannot be retrieved:" into oc-mr1-dev
David Stevens [Wed, 20 Sep 2017 00:18:26 +0000 (00:18 +0000)]
Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev
am:
9282193c84
Change-Id: Idbd4d3f24dffaad11518dd3d4d16ca7c7137ee94
Jordan Liu [Wed, 20 Sep 2017 00:12:10 +0000 (00:12 +0000)]
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM" am:
c8ad4a82c7 am:
649f3bf73f
am:
56ed1f9c9d
Change-Id: I039843725244d892248591cf4e88e1840e506733
David Stevens [Wed, 20 Sep 2017 00:09:04 +0000 (00:09 +0000)]
Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev
Jordan Liu [Wed, 20 Sep 2017 00:04:56 +0000 (00:04 +0000)]
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM" am:
c8ad4a82c7
am:
649f3bf73f
Change-Id: If8b12685886ccbdecdb4e123629edc4e3426711d
Jordan Liu [Tue, 19 Sep 2017 23:55:48 +0000 (23:55 +0000)]
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM"
am:
c8ad4a82c7
Change-Id: Id1af6c8abd901f981ad1abfa5fbf4887ee694c17
Jordan Liu [Tue, 19 Sep 2017 23:39:42 +0000 (23:39 +0000)]
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM"
Bryce Lee [Tue, 19 Sep 2017 23:32:17 +0000 (23:32 +0000)]
Merge "Consider task's root activity when determining if resizable." into oc-mr1-dev
am:
1c2a6921c0
Change-Id: I06e858733e21220b6008bd55c2d4119bc51cd2cd
Bryce Lee [Tue, 19 Sep 2017 23:21:54 +0000 (23:21 +0000)]
Merge "Consider task's root activity when determining if resizable." into oc-mr1-dev
Bryce Lee [Fri, 15 Sep 2017 00:06:41 +0000 (17:06 -0700)]
Consider task's root activity when determining if resizable.
We consider an activity resizable if the root activity of the its
parent task is resizable. This changelist adds this condition to
consideration.
Change-Id: I4162ff7eb6cad3f4a3f9fdf35ccc0b0d2383ff15
Fixes:
65668913
Test: bit FrameworksServicesTests:com.android.server.am.ActivityRecordTests#testCanBeLaunchedOnDisplay
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerDisplayTests#testLaunchNonResizeableActivityFromSecondaryDisplaySameTask
Felipe Leme [Tue, 19 Sep 2017 23:01:33 +0000 (23:01 +0000)]
Merge "Autofill optimization: don't contact server when session is finished." into oc-mr1-dev
am:
2748ffcef7
Change-Id: I912d263f40e3d1cc58c77f2a91c585bb97aa3c37
TreeHugger Robot [Tue, 19 Sep 2017 22:47:16 +0000 (22:47 +0000)]
Merge "Autofill optimization: don't contact server when session is finished." into oc-mr1-dev
Ajay Nadathur [Tue, 19 Sep 2017 22:26:00 +0000 (22:26 +0000)]
Merge "Deferred setup banner updates intermittently" into oc-mr1-dev
am:
19e00be16b
Change-Id: I2ba4882632e59141c9b1de697928d5a3a7a413fc
Calin Juravle [Tue, 19 Sep 2017 22:17:53 +0000 (22:17 +0000)]
Merge "Fix dexopt dump" into oc-mr1-dev
am:
479af339de
Change-Id: I1ce2dd66298058e26e623ed39eec413575a10a7c
TreeHugger Robot [Tue, 19 Sep 2017 22:13:28 +0000 (22:13 +0000)]
Merge "Deferred setup banner updates intermittently" into oc-mr1-dev
Calin Juravle [Tue, 19 Sep 2017 22:09:56 +0000 (22:09 +0000)]
Merge "Add an explicit reason for the compilation of shared apks" into oc-mr1-dev
am:
d78d269650
Change-Id: I18243e9c77c921d5b860ccfe4bb021e21e8bb5e7
Calin Juravle [Tue, 19 Sep 2017 21:58:14 +0000 (21:58 +0000)]
Merge "Fix dexopt dump" into oc-mr1-dev
Calin Juravle [Tue, 19 Sep 2017 21:56:41 +0000 (21:56 +0000)]
Merge "Add an explicit reason for the compilation of shared apks" into oc-mr1-dev
Shubham Ajmera [Tue, 19 Sep 2017 21:07:05 +0000 (14:07 -0700)]
Partially revert
ce54397368dc98182d7b4eb2ff3c142bbd87e39d
We have already reverted A/B dexopt for secondary dex files in commit
7c1471197427b59f99578fd2483b1e113ba4b7f1. This removes secondary dex
opt during boot after OTA.
Bug:
65067046
Test: make and boot.
Change-Id: I76009ed609a608e009a50860b53a8dfed9d57334
Christine Franks [Fri, 25 Aug 2017 20:57:26 +0000 (13:57 -0700)]
Handle night display state when timezone changes
Bug:
64458884
Test: runtest -c com.android.server.NightDisplayServiceTest \
frameworks-services and manually tested Hawaii and London
Change-Id: I052034a4c64eb73c42672215e8847c11e00efeb5
Sundeep Ghuman [Tue, 19 Sep 2017 21:01:55 +0000 (21:01 +0000)]
Merge "Do not pause scanning during Network state changes." into oc-mr1-dev
am:
7b911fbdaf
Change-Id: I9f75901dcbaace37a44971a0e2b2dba02dedfa00
Shubham Ajmera [Tue, 19 Sep 2017 04:13:59 +0000 (21:13 -0700)]
Fix compiler filter for downgrading unused apps
Bug:
65861247
Test: Verified manually that dex files are getting downgraded for \
unused packages.
Change-Id: Ice2b111ab5bfd231a592ac5ed416362b95d27e8a
TreeHugger Robot [Tue, 19 Sep 2017 20:52:49 +0000 (20:52 +0000)]
Merge "Do not pause scanning during Network state changes." into oc-mr1-dev
John Reck [Tue, 19 Sep 2017 20:48:24 +0000 (20:48 +0000)]
Merge "Remove all FATAL_IFs from graphicsstats service" into oc-mr1-dev
am:
879a9677b9
Change-Id: I62eeec65e62e5f4d422b95847b7bbab93e1a4fbe
Arthur Ishiguro [Tue, 19 Sep 2017 20:42:28 +0000 (20:42 +0000)]
Merge "Adds handle to NanoAppInstanceInfo Parcel" into oc-mr1-dev
am:
0853fe8a53
Change-Id: Icefb1d6d21bcebfc5b16e5ec234c9f1c6043717f
TreeHugger Robot [Tue, 19 Sep 2017 20:33:25 +0000 (20:33 +0000)]
Merge "Remove all FATAL_IFs from graphicsstats service" into oc-mr1-dev
TreeHugger Robot [Tue, 19 Sep 2017 20:32:56 +0000 (20:32 +0000)]
Merge "Adds handle to NanoAppInstanceInfo Parcel" into oc-mr1-dev
Christopher Tate [Tue, 19 Sep 2017 20:04:35 +0000 (20:04 +0000)]
Merge "Mark uid as non-idle/FG-entitled when launching for fg service" into oc-mr1-dev
am:
93243bf808
Change-Id: Ibb5a539d306c58a21844ff97e0ac2678dd55c8e3
TreeHugger Robot [Tue, 19 Sep 2017 19:50:42 +0000 (19:50 +0000)]
Merge "Mark uid as non-idle/FG-entitled when launching for fg service" into oc-mr1-dev
Jonathan Basseri [Tue, 25 Jul 2017 20:34:36 +0000 (13:34 -0700)]
Convert ICarrierService to oneway.
Change the carrier config AIDL used by CarrierService to a oneway call.
This is the IPC used to fetch carrier config bundles from carrier apps.
Converting to oneway allows CarrierConfigLoader to be non-blocking while
it fetches config.
Bug:
63176442
Test: runtest carrierconfig-unit & manual
Change-Id: Iceaf0446321f719011f67897398da7d5998c5fc7
Beverly [Tue, 19 Sep 2017 18:56:58 +0000 (14:56 -0400)]
DND alert info set to INVISIBLE (not GONE) to retain formatting.
Change-Id: I182aed5f48d4c2a935a7bfbb9a240046b27dea58
Fixes:
64688590
Test: Manual based on repro steps
Fyodor Kupolov [Tue, 19 Sep 2017 18:56:45 +0000 (18:56 +0000)]
Merge "Fix AddAccountSettings memory leak" am:
104501fa29 am:
c17b4e5a14
am:
80e87f97c3
Change-Id: Iff2f6a0dff9774d155961aafade36eeb5db5bc81
Felipe Leme [Tue, 19 Sep 2017 16:06:20 +0000 (09:06 -0700)]
Autofill optimization: don't contact server when session is finished.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Bug:
65414762
Change-Id: I214a7835727c3ff71de9dc65c8d6fe54507265fb
Fyodor Kupolov [Tue, 19 Sep 2017 18:48:54 +0000 (18:48 +0000)]
Merge "Fix AddAccountSettings memory leak" am:
104501fa29
am:
c17b4e5a14
Change-Id: Ie7dd4310f3937c2c3e0fc9d3590b1a7813c0abee
Fyodor Kupolov [Tue, 19 Sep 2017 18:42:07 +0000 (18:42 +0000)]
Merge "Fix AddAccountSettings memory leak"
am:
104501fa29
Change-Id: I844d7ce66a162ba1e72a099d429e17de9c72fb86
Victor Chang [Fri, 11 Aug 2017 16:17:16 +0000 (17:17 +0100)]
Remove StructGroupSourceReq
- Remove the class as part of removing setsockoptGroupSourceReq from
Os.java
- CtsLibcoreTestCases and CtsLibcoreOjTestCases pass on aosp/master
Bug:
32071916
Test: m
Change-Id: I132190f47cea9f56ec56a824763f7e2b2cfde893
Fyodor Kupolov [Tue, 19 Sep 2017 18:29:14 +0000 (18:29 +0000)]
Merge "Fix AddAccountSettings memory leak"
Yin-Chia Yeh [Tue, 19 Sep 2017 18:23:43 +0000 (11:23 -0700)]
LegacyCamera: fix wrong class name in JNI
Test: class not found exception is fixed
Bug:
65954232
Change-Id: I1a80e121d21f8fef027c6b3a5854285b7779bb3e
Ray Essick [Tue, 19 Sep 2017 15:44:27 +0000 (08:44 -0700)]
packagemanager_native access to package installer, version
implementation of getInstallerForPackage() and
getVersionCodeForPackage() to support native media.metrics needs.
Bug:
65027506
Test: watch logs for various package combinations
Change-Id: I8a262799867cffe45922f21a237ad2af3d99a39b
David Stevens [Thu, 24 Aug 2017 01:41:49 +0000 (18:41 -0700)]
Handle showWhenLocked on secondary displays
The keyguard has windows on the default display and the remote display
selected by MediaRouter. Keyguard occlusion only applies to the default
display. To make the activity showWhenLocked flag work on secondary
displays, pass the display id of the locked secondary display from the
SystemUi to KeyguardController and make its isKeyguardShowing method
take a displayId.
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testSecondaryDisplayShowWhenLocked
Bug:
64994006
Merged-In: Ib31fc76e9df469e97a59a181f09d457ceed4ef5f
Change-Id: Ib31fc76e9df469e97a59a181f09d457ceed4ef5f
Arthur Ishiguro [Mon, 18 Sep 2017 19:07:44 +0000 (12:07 -0700)]
Adds handle to NanoAppInstanceInfo Parcel
- Since mHandle (UID) was not recorded in writeToParcel, it always
returned 0 as the UID. This resulted in error messages claiming
mismatches between the reported and actual UID of nanoapps when called
from an external process.
- Also fixes the Parcel constructor to actually read the mContexthubId
field.
Bug:
37785458
Test: Compile and load, verify error message doesn't appear
Change-Id: I2ff75f510aae549c741786f5746862256ea5a877
Android Build Merger (Role) [Tue, 19 Sep 2017 16:56:47 +0000 (16:56 +0000)]
Merge "Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." am:
99d28ebbda am:
8b2e421025 am:
c26e534bef" into oc-mr1-dev-plus-aosp
Tyler Gunn [Tue, 19 Sep 2017 16:52:09 +0000 (16:52 +0000)]
Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." am:
99d28ebbda am:
8b2e421025
am:
c26e534bef
Change-Id: I447794014fe74f6efb4c712808704b8b0f8bc43f
Fyodor Kupolov [Tue, 19 Sep 2017 16:51:50 +0000 (16:51 +0000)]
Merge "Allow to enable WAL for testing" into oc-mr1-dev
am:
14b86be8da
Change-Id: I7902b082d55063a902576b300295a771b64238b4
Fyodor Kupolov [Tue, 19 Sep 2017 16:45:39 +0000 (16:45 +0000)]
Merge "Allow to enable WAL for testing" into oc-mr1-dev
Tyler Gunn [Tue, 19 Sep 2017 16:44:26 +0000 (16:44 +0000)]
Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." am:
99d28ebbda
am:
8b2e421025
Change-Id: I2b73595add333660c2a4b62538334b8cb38ac9cb
David Stevens [Tue, 19 Sep 2017 16:44:05 +0000 (16:44 +0000)]
Merge "Listen for device power state for VrMode" into oc-mr1-dev
am:
71267deb18
Change-Id: I8c84eed94013f07e1c0eabe020cd4e8eeee1f7ba
Tyler Gunn [Tue, 19 Sep 2017 16:37:38 +0000 (16:37 +0000)]
Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables."
am:
99d28ebbda
Change-Id: I99ff94901868d3b16a20a6592e106bc0645b863e
OSDN Git Service
