OSDN Git Service
Rohan Shah [Tue, 27 Mar 2018 15:58:57 +0000 (15:58 +0000)]
Merge "[QS] Change spacing for QQS in landscape" into pi-dev am:
47a0da6aec
am:
4a8ce37dee
Change-Id: Ie7cb39d7601465993c9f4b7099e1ced471bef77c
Rohan Shah [Tue, 27 Mar 2018 15:52:18 +0000 (15:52 +0000)]
Merge "[QS] Change spacing for QQS in landscape" into pi-dev
am:
47a0da6aec
Change-Id: Iafdad03c6bcb69819afd908408cb794390752e9c
Rohan Shah [Tue, 27 Mar 2018 15:38:26 +0000 (15:38 +0000)]
Merge "[QS] Change spacing for QQS in landscape" into pi-dev
Jorim Jaggi [Tue, 27 Mar 2018 15:37:13 +0000 (15:37 +0000)]
Merge "Handle insets for letterboxing correctly" into pi-dev am:
f67bb19fc3
am:
5cc319e400
Change-Id: I805a333a87da14e575da7298624ca3a0768d4f17
Jorim Jaggi [Tue, 27 Mar 2018 15:23:14 +0000 (15:23 +0000)]
Merge "Handle insets for letterboxing correctly" into pi-dev
am:
f67bb19fc3
Change-Id: I816544a76dede73ac66157affcf645ecd792ea5d
Robert Berry [Tue, 27 Mar 2018 15:16:01 +0000 (15:16 +0000)]
Merge "Fix broken test RecoverySnapshotStorageTest" into pi-dev am:
7dd666f4c5
am:
0ada86708c
Change-Id: Ic88ee04645ee3ff352a7fe918f79c69c42096551
TreeHugger Robot [Tue, 27 Mar 2018 15:10:27 +0000 (15:10 +0000)]
Merge "Handle insets for letterboxing correctly" into pi-dev
Ricky Wai [Tue, 27 Mar 2018 15:09:46 +0000 (15:09 +0000)]
Merge "Suppress expected exception due to missing network_watchlist.xml" into pi-dev am:
fcfc753a0e
am:
a0bda99a49
Change-Id: I12f3d07759d15447dc902e8a721275d33febbf97
Robert Berry [Tue, 27 Mar 2018 15:08:22 +0000 (15:08 +0000)]
Merge "Fix broken test RecoverySnapshotStorageTest" into pi-dev
am:
7dd666f4c5
Change-Id: I7380c5f676f40fead709bc237e59b5eff73ab53b
Ricky Wai [Tue, 27 Mar 2018 15:03:04 +0000 (15:03 +0000)]
Merge "Suppress expected exception due to missing network_watchlist.xml" into pi-dev
am:
fcfc753a0e
Change-Id: I1ecf54edcd43f05156465c6130e2629894ffabd4
Dan Gittik [Tue, 27 Mar 2018 15:03:01 +0000 (15:03 +0000)]
Merge "Added safeguards for pushed brighntess curve." into pi-dev am:
abe80b8dfd
am:
f60fc0ada1
Change-Id: I387b7eb22396953e9f40b0a6472fb4448533bcf4
TreeHugger Robot [Tue, 27 Mar 2018 14:55:46 +0000 (14:55 +0000)]
Merge "Fix broken test RecoverySnapshotStorageTest" into pi-dev
Dan Gittik [Tue, 27 Mar 2018 14:55:37 +0000 (14:55 +0000)]
Merge "Added safeguards for pushed brighntess curve." into pi-dev
am:
abe80b8dfd
Change-Id: Ie4dd5ed1cc33e5c7fcb1a076468208c94db45bcd
Ricky Wai [Tue, 27 Mar 2018 14:48:52 +0000 (14:48 +0000)]
Merge "Suppress expected exception due to missing network_watchlist.xml" into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 14:43:14 +0000 (14:43 +0000)]
Merge "Added safeguards for pushed brighntess curve." into pi-dev
Julia Reynolds [Tue, 27 Mar 2018 14:35:26 +0000 (14:35 +0000)]
Merge "Add link to notification app listing in shade" into pi-dev am:
b429012907
am:
2d38ea9929
Change-Id: I395436efd7b153e42cf9dd7b13522fb7f22a59a9
Kenny Guy [Tue, 27 Mar 2018 14:28:19 +0000 (14:28 +0000)]
Merge "Don't treat user switch as slider interaction." into pi-dev am:
a14ad4b2bf
am:
d747075196
Change-Id: I18527286cad7482957037c2ba55b80eb72e0ad43
Julia Reynolds [Tue, 27 Mar 2018 14:25:09 +0000 (14:25 +0000)]
Merge "Add link to notification app listing in shade" into pi-dev
am:
b429012907
Change-Id: I692a7829d800225b8db13fbb79e8224cf9d7b3b2
Amin Shaikh [Tue, 27 Mar 2018 14:21:46 +0000 (14:21 +0000)]
Merge "Show ripples for QS tiles and footer buttons." into pi-dev am:
b24dbfef71
am:
e7e8f8bde0
Change-Id: I4368391c21c0ca10e8de44a28e92fb6ec6c5e314
Kenny Guy [Tue, 27 Mar 2018 14:19:40 +0000 (14:19 +0000)]
Merge "Don't treat user switch as slider interaction." into pi-dev
am:
a14ad4b2bf
Change-Id: I4d54327e98a43b653e3f55fbd107b8d8249e132d
Amin Shaikh [Tue, 27 Mar 2018 14:14:53 +0000 (14:14 +0000)]
Merge "Show ripples for QS tiles and footer buttons." into pi-dev
am:
b24dbfef71
Change-Id: I15054c07cd73cddb3b0c2daccc4d9bac4dd959fc
TreeHugger Robot [Tue, 27 Mar 2018 14:09:18 +0000 (14:09 +0000)]
Merge "Add link to notification app listing in shade" into pi-dev
hughchen [Tue, 27 Mar 2018 14:08:20 +0000 (14:08 +0000)]
Merge "Add metric PREVIOUSLY_CONNECTED_DEVICES" into pi-dev am:
4045fdc014
am:
6631f6ad3e
Change-Id: I96a4bccb8b5658a8c3283a28d6d5b0f9d2dd0c10
hughchen [Tue, 27 Mar 2018 14:01:49 +0000 (14:01 +0000)]
Merge "Add metric PREVIOUSLY_CONNECTED_DEVICES" into pi-dev
am:
4045fdc014
Change-Id: I883495f47e9d40d2d0664da4f8c245307b7eb065
TreeHugger Robot [Tue, 27 Mar 2018 14:01:25 +0000 (14:01 +0000)]
Merge "Don't treat user switch as slider interaction." into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 14:00:19 +0000 (14:00 +0000)]
Merge "Show ripples for QS tiles and footer buttons." into pi-dev
Amin Shaikh [Tue, 27 Mar 2018 13:55:31 +0000 (13:55 +0000)]
Merge "Fix tile text display for large font/display sizes" into pi-dev am:
58b47f3d53
am:
847e5a30a6
Change-Id: Ic197ef8a1dc5a5cafa0b1c4baab8d51b16f2656e
Amin Shaikh [Tue, 27 Mar 2018 13:48:42 +0000 (13:48 +0000)]
Merge "Show status labels in wifi QS tile." into pi-dev am:
a691b71e99
am:
9b3b03b891
Change-Id: I3c960d96edab07bb20303a1ddd7520a0e60a34e6
TreeHugger Robot [Tue, 27 Mar 2018 13:46:41 +0000 (13:46 +0000)]
Merge "Add metric PREVIOUSLY_CONNECTED_DEVICES" into pi-dev
Amin Shaikh [Tue, 27 Mar 2018 13:42:46 +0000 (13:42 +0000)]
Merge "Fix tile text display for large font/display sizes" into pi-dev
am:
58b47f3d53
Change-Id: If9fb92d66ce971746c29835bf4affc3aa34b677f
Adrian Roos [Tue, 27 Mar 2018 13:39:47 +0000 (13:39 +0000)]
Merge "WM: Move mLayoutSeq to DisplayContent" into pi-dev am:
5f60091450
am:
8994ae2c53
Change-Id: I5edb7de0e72a95f02ba508c21076f7660b68c2d5
Mathew Inwood [Tue, 27 Mar 2018 13:34:51 +0000 (13:34 +0000)]
[automerger skipped] Merge "Fix merge conflicts between AOSP, pi-dev." into pi-dev-plus-aosp
am:
f81370c91b -s ours
Change-Id: I7e73bac1ced8ae566751d9e034a4908ddfed90be
Alison Cichowlas [Tue, 27 Mar 2018 13:30:11 +0000 (13:30 +0000)]
Merge "Update screenshot saving strings." into pi-dev am:
644ded01dd
am:
f3da2369c9
Change-Id: Iee45ad79955ec2365e4689eaf3d4dc69160a94e3
Amin Shaikh [Tue, 27 Mar 2018 13:29:31 +0000 (13:29 +0000)]
Merge "Show status labels in wifi QS tile." into pi-dev
am:
a691b71e99
Change-Id: I4529c5fceb1b1ec07735bd998571148d74181387
TreeHugger Robot [Tue, 27 Mar 2018 13:24:53 +0000 (13:24 +0000)]
Merge "Fix tile text display for large font/display sizes" into pi-dev
Lorenzo Colitti [Tue, 27 Mar 2018 13:22:43 +0000 (13:22 +0000)]
Merge "Allow third party cookies in the captive portal login app." into pi-dev am:
89868f29d0
am:
bcb1fb3570
Change-Id: Ie328d2b68764acfdffa45fd713b2d82db2eb1376
Adrian Roos [Tue, 27 Mar 2018 13:22:15 +0000 (13:22 +0000)]
Merge "WM: Move mLayoutSeq to DisplayContent" into pi-dev
am:
5f60091450
Change-Id: Iea74b7c6d381fb933a0678c791cd727a7e3b3dfb
Mathew Inwood [Tue, 27 Mar 2018 13:18:28 +0000 (13:18 +0000)]
Merge "Fix merge conflicts between AOSP, pi-dev." into pi-dev-plus-aosp
Alison Cichowlas [Tue, 27 Mar 2018 13:16:43 +0000 (13:16 +0000)]
Merge "Update screenshot saving strings." into pi-dev
am:
644ded01dd
Change-Id: I9a14a9763a7e4bb9bba9df843da18b48057d4389
Etan Cohen [Tue, 27 Mar 2018 13:16:32 +0000 (13:16 +0000)]
Merge "[RTT] Collect metrics on observed IEEE 802.11mc supporting APs" into pi-dev am:
861f7fae2f
am:
5a698ccfc7
Change-Id: I614f5c4c2e8e76d9971bd36f30220c4432557165
Lorenzo Colitti [Tue, 27 Mar 2018 13:10:26 +0000 (13:10 +0000)]
Merge "Allow third party cookies in the captive portal login app." into pi-dev
am:
89868f29d0
Change-Id: I0174124cad9c108a26594b0ddd6162ca3ea6e68d
TreeHugger Robot [Tue, 27 Mar 2018 13:10:24 +0000 (13:10 +0000)]
Merge "Show status labels in wifi QS tile." into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 13:09:27 +0000 (13:09 +0000)]
Merge "WM: Move mLayoutSeq to DisplayContent" into pi-dev
Etan Cohen [Tue, 27 Mar 2018 13:05:21 +0000 (13:05 +0000)]
Merge "[RTT] Collect metrics on observed IEEE 802.11mc supporting APs" into pi-dev
am:
861f7fae2f
Change-Id: If2cab10fc1ee8a90ac37fbd953c6bc23ccd2d3f4
TreeHugger Robot [Tue, 27 Mar 2018 13:03:33 +0000 (13:03 +0000)]
Merge "Update screenshot saving strings." into pi-dev
Leon Scroggins III [Tue, 27 Mar 2018 13:02:39 +0000 (13:02 +0000)]
Merge "Update AnimatedImageDrawable docs" into pi-dev am:
6f5e83df3a
am:
5115645c5a
Change-Id: I8ba7f7eb28c5a03365c2b8cf79b846fe1f51b5a1
Mathew Inwood [Tue, 27 Mar 2018 12:52:05 +0000 (13:52 +0100)]
Fix merge conflicts between AOSP, pi-dev.
Due to changes between AOSP & internal master, the merge to these two
changes caused duplicated code:
Ieb4bd9cc439c6a5b8fb9424d8902d8b46aec309f
Ic0d5b8fa631c2bd583b6fc52b2ee3708c8113f59
Merged-In: Idd73c9938592c5c4d67cfb9efefdffed0dd5f262
Bug:
76450910
Test: m
Change-Id: I46130cfd82288a564f681e305e2060286b026bcf
Robert Berry [Tue, 27 Mar 2018 11:16:06 +0000 (12:16 +0100)]
Fix broken test RecoverySnapshotStorageTest
This throws an NPE now.
Bug:
75952916
Test: runtest frameworks-services -p \
com.android.server.locksettings.recoverablekeystore
Change-Id: I094036dbe7e0c149b234a60729aa7fec8db3e2d9
Leon Scroggins III [Tue, 27 Mar 2018 12:56:05 +0000 (12:56 +0000)]
Merge "Update AnimatedImageDrawable docs" into pi-dev
am:
6f5e83df3a
Change-Id: I5c864b2d4a16a96a60ed2c69e3263b570b3e901a
TreeHugger Robot [Tue, 27 Mar 2018 12:55:40 +0000 (12:55 +0000)]
Merge "Allow third party cookies in the captive portal login app." into pi-dev
Etan Cohen [Tue, 27 Mar 2018 12:51:20 +0000 (12:51 +0000)]
Merge "[RTT] Collect metrics on observed IEEE 802.11mc supporting APs" into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 12:47:22 +0000 (12:47 +0000)]
Merge "Update AnimatedImageDrawable docs" into pi-dev
Eric Sandness [Tue, 27 Mar 2018 12:42:53 +0000 (12:42 +0000)]
Merge "Permission Check For DPM.isDeviceProvisioned" into pi-dev am:
9f36c26f83
am:
f21a3796cb
Change-Id: Ib1879c2e4da140611ee08cb32afef7cd2c2198dc
Eric Sandness [Tue, 27 Mar 2018 12:36:01 +0000 (12:36 +0000)]
Merge "Permission Check For DPM.isDeviceProvisioned" into pi-dev
am:
9f36c26f83
Change-Id: Ie798dde6593e6d0786f541a5c2512eb388ca5554
Siarhei Vishniakou [Tue, 27 Mar 2018 12:35:52 +0000 (12:35 +0000)]
Merge "Suppress key validation logs" into pi-dev am:
e8c16570d4
am:
b63f23a0d7
Change-Id: I5b0aff923c1ab0a9d6274a76e6465d7308fb047c
Siarhei Vishniakou [Tue, 27 Mar 2018 12:29:13 +0000 (12:29 +0000)]
Merge "Suppress key validation logs" into pi-dev
am:
e8c16570d4
Change-Id: Ie11548342cdd0be1c263043869bff8747691c4c3
Eric Sandness [Tue, 27 Mar 2018 12:25:53 +0000 (12:25 +0000)]
Merge "Permission Check For DPM.isDeviceProvisioned" into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 12:18:22 +0000 (12:18 +0000)]
Merge "Suppress key validation logs" into pi-dev
Jorim Jaggi [Mon, 26 Mar 2018 13:46:01 +0000 (15:46 +0200)]
Handle insets for letterboxing correctly
Add letterbox insets to main window insets to get the correct
amount of insets.
Test: Go to recents in landscape with cutout.
Change-Id: I45882d5fb3166252e4b4a333177211623fae34b0
Fixes:
72757033
Dan Gittik [Fri, 23 Mar 2018 14:46:15 +0000 (14:46 +0000)]
Added safeguards for pushed brighntess curve.
Currently, the only safeguard is making sure the brightness curve isn't too dark to turn
auto-brightness off (or connect the phone to a computer and reset the curve with ADB).
Test: atest BrightnessMappingStrategyTest.
Change-Id: Ic87292fe51639a0001d0d5643ca24cda37de5753
Fixes:
74439069
Kenny Guy [Wed, 14 Mar 2018 17:30:20 +0000 (17:30 +0000)]
Don't treat user switch as slider interaction.
Bug:
73825714
Test: Manual, switch users check event not in dumpsys display.
Change-Id: I1a8c3bfe713b160ffe1268350a616c72f794e579
hughchen [Tue, 27 Mar 2018 04:04:59 +0000 (12:04 +0800)]
Add metric PREVIOUSLY_CONNECTED_DEVICES
Bug:
74134939
Test: Build
Change-Id: I134e1aea2a562a8a3f33b340a7dfc643b89886d4
Ricky Wai [Fri, 23 Mar 2018 18:05:49 +0000 (18:05 +0000)]
Suppress expected exception due to missing network_watchlist.xml
Test: NULL
Bug:
73264037
Change-Id: I640ad865fe85191f7d9e5fe887be10884c7bb801
Mathew Inwood [Tue, 27 Mar 2018 11:02:21 +0000 (11:02 +0000)]
[automerger skipped] Merge "More flexible API enforcement policy." into pi-dev am:
c6d9f7ce1d
am:
e52db912c7 -s ours
Change-Id: I7c59442fffffe85bae98654c084b3c0511480ea8
Rubin Xu [Tue, 27 Mar 2018 10:57:36 +0000 (10:57 +0000)]
Merge "Require strong auth after user is stopped" into pi-dev am:
7109908a4e
am:
33a0fe9daa
Change-Id: I3f819788b02f80caf55df46bdaf19bcf00f34121
Mathew Inwood [Tue, 27 Mar 2018 10:51:21 +0000 (10:51 +0000)]
Merge "More flexible API enforcement policy." into pi-dev
am:
c6d9f7ce1d
Change-Id: I397333316f8afaee0e2591afdf336325532bd2ed
Eran Messeri [Tue, 27 Mar 2018 10:50:09 +0000 (10:50 +0000)]
Merge "DPM: Separate storage of PasswordMetrics from other state" into pi-dev am:
734a8c9964
am:
349c220ee8
Change-Id: I9b712f872472438ef234e5505c85f78225f4a221
Rubin Xu [Tue, 27 Mar 2018 10:46:25 +0000 (10:46 +0000)]
Merge "Require strong auth after user is stopped" into pi-dev
am:
7109908a4e
Change-Id: I1386435d0e51e5c8381794d3e7fd325e69c042f0
Yueming Wang [Tue, 27 Mar 2018 10:45:58 +0000 (10:45 +0000)]
Merge "Add javadoc to explain ApnSetting conflict." into pi-dev am:
3cc7c4fc76
am:
5148a2e55f
Change-Id: I98a93f4f9dad2f50c18b5a14c3500d8598368a33
Eran Messeri [Tue, 27 Mar 2018 10:35:33 +0000 (10:35 +0000)]
Merge "DPM: Separate storage of PasswordMetrics from other state" into pi-dev
am:
734a8c9964
Change-Id: I103071ccf7e7a940edcb11400393593d50486ca9
TreeHugger Robot [Tue, 27 Mar 2018 10:34:38 +0000 (10:34 +0000)]
Merge "More flexible API enforcement policy." into pi-dev
Yueming Wang [Tue, 27 Mar 2018 10:30:37 +0000 (10:30 +0000)]
Merge "Add javadoc to explain ApnSetting conflict." into pi-dev
am:
3cc7c4fc76
Change-Id: I2370b8cc9b5b730d2bf2c4f522d955e952f74bdb
TreeHugger Robot [Tue, 27 Mar 2018 10:29:36 +0000 (10:29 +0000)]
Merge "Require strong auth after user is stopped" into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 10:22:46 +0000 (10:22 +0000)]
Merge "DPM: Separate storage of PasswordMetrics from other state" into pi-dev
Yueming Wang [Tue, 27 Mar 2018 10:19:13 +0000 (10:19 +0000)]
Merge "Add javadoc to explain ApnSetting conflict." into pi-dev
Eric Sandness [Tue, 27 Mar 2018 10:09:51 +0000 (10:09 +0000)]
Merge "Permission Check For DPM.getUserProvisioningState" into pi-dev am:
1ad8367249
am:
135b4fa15c
Change-Id: I927b602ff188ec92c155503fe2629364ddd7d49f
Eric Sandness [Tue, 27 Mar 2018 10:03:32 +0000 (10:03 +0000)]
Merge "Permission Check For DPM.getUserProvisioningState" into pi-dev
am:
1ad8367249
Change-Id: I8b33dcb4338ffa47c11d06f30e4d7b36f275fcd9
Eric Sandness [Tue, 27 Mar 2018 09:52:58 +0000 (09:52 +0000)]
Merge "Permission Check For DPM.getUserProvisioningState" into pi-dev
Robert Berry [Tue, 27 Mar 2018 09:52:25 +0000 (09:52 +0000)]
Merge "Fix setRecoverySecretTypes to not always set snapshot pending" into pi-dev am:
af13eeb110
am:
c5935d442d
Change-Id: I42cc114641755be42fb9c7269ae726f87e48f5a0
Jaewan Kim [Tue, 27 Mar 2018 09:24:27 +0000 (09:24 +0000)]
Merge changes from topics "session2_seekcompleted", "session2_pullout", "session2_fastforward" into pi-dev am:
51e33d1948
am:
4aa935c9ca
Change-Id: I20d38121ccdf50c07a1955b0cd4ec14249e91a2a
Jaewan Kim [Tue, 27 Mar 2018 09:21:21 +0000 (09:21 +0000)]
MediaSession2: Pull out Command/CommandGroup from the MediaSession2 am:
3b15124ecc
am:
13585d0af1
Change-Id: I7b2d2d5bb2273e522de4c3f5b244207468a8869f
Robert Berry [Tue, 27 Mar 2018 09:19:20 +0000 (09:19 +0000)]
Merge "Fix setRecoverySecretTypes to not always set snapshot pending" into pi-dev
am:
af13eeb110
Change-Id: Ibae3e0a4a9f8b2af534c44eb8a27b9d28a4177fc
Jaewan Kim [Tue, 27 Mar 2018 09:17:52 +0000 (09:17 +0000)]
MediaController2: Add fastForward() / rewind() am:
ab715ec20b
am:
bef45e5d16
Change-Id: I2d4e0e60bfc5d7b29c3a410b43a45e5892a00d86
Eric Sandness [Tue, 27 Mar 2018 08:56:40 +0000 (09:56 +0100)]
Permission Check For DPM.isDeviceProvisioned
Require the caller of DPM.isDeviceProvisioned() to hold the MANAGE_USERS
permission. The only callers should be within the framework itself, or
apps involved in device provisioning which already hold this permission.
Bug:
62343414
Test: Set TestDPC as Device Owner and use it to reset password
Test: com.android.server.devicepolicy.DevicePolicyManagerTest
Test: com.android.server.locksettings.LockSettingsServiceTests
Test: com.google.android.gts.devicepolicy.DevicePolicyManagerTest
Change-Id: Ie53deb5ba8679a5b431f2a8da60ec9710c44d56f
TreeHugger Robot [Tue, 27 Mar 2018 09:09:54 +0000 (09:09 +0000)]
Merge "Fix setRecoverySecretTypes to not always set snapshot pending" into pi-dev
Jaewan Kim [Tue, 27 Mar 2018 09:04:15 +0000 (09:04 +0000)]
Merge changes from topics "session2_seekcompleted", "session2_pullout", "session2_fastforward" into pi-dev
am:
51e33d1948
Change-Id: Ia5d67ef0232c69a50c96dd20cbf9111105e069e8
Jaewan Kim [Tue, 27 Mar 2018 08:59:03 +0000 (08:59 +0000)]
MediaSession2: Pull out Command/CommandGroup from the MediaSession2
am:
3b15124ecc
Change-Id: Ied11e199086ab29d01ca84e04e42e28fdd6b6eee
Jaewan Kim [Tue, 27 Mar 2018 08:53:48 +0000 (08:53 +0000)]
MediaController2: Add fastForward() / rewind()
am:
ab715ec20b
Change-Id: I74be2d8ed5797e8f18966e0665942536b3ae6966
Jaewan Kim [Tue, 27 Mar 2018 08:39:45 +0000 (08:39 +0000)]
Merge changes from topics "session2_seekcompleted", "session2_pullout", "session2_fastforward" into pi-dev
* changes:
MediaPlayerBase: Add PlayerEventCallback#onSeekCompleted()
MediaSession2: Pull out Command/CommandGroup from the MediaSession2
MediaController2: Add fastForward() / rewind()
yuemingw [Wed, 21 Mar 2018 16:32:09 +0000 (16:32 +0000)]
Add javadoc to explain ApnSetting conflict.
As per discussion with Amit, it's better to define "conflict"
of ApnSetting in DevicePolicyManager API javadoc.
Bug:
72153573
Test: not required.
Change-Id: I765dace36a3c9c491c988dc0a87479cdec620e37
Mathew Inwood [Thu, 22 Feb 2018 13:19:53 +0000 (13:19 +0000)]
More flexible API enforcement policy.
This CL adds the basics to set black, dark gray or light gray list
enforcement, rather than just black as before. It's not possible to
actually set the policy per-package yet.
PackageDexOptimizer still uses a single bit, for API checks on/off, rather
than the new enum. It assumes blacklist enforcement internally. This can
be improved in a follow up CL.
(cherry-picked from commit
e52130ae4cf3b046b38a09fc7cc7712f5b7fb83d)
Test: m
Test: Boot device
BUG:
73337509
Change-Id: Ieb4bd9cc439c6a5b8fb9424d8902d8b46aec309f
Merged-In: Idd73c9938592c5c4d67cfb9efefdffed0dd5f262
Richard Chou [Tue, 27 Mar 2018 08:27:26 +0000 (08:27 +0000)]
Merge "Reset SIM state if the subscription is no longer active." into pi-dev am:
4f3d29de54
am:
59dc7b1139
Change-Id: Ib2b2ac2cd24aa0663fab5d46e67e198c6a6b548c
Jin Seok Park [Tue, 27 Mar 2018 08:21:22 +0000 (08:21 +0000)]
Merge "ExifInterface: Remove casting int[] to long[]" into pi-dev am:
30d648ab7a
am:
23f169747c
Change-Id: Ie5d32c1d540883b78cc0fac59ebd803994e7e755
Richard Chou [Tue, 27 Mar 2018 08:20:18 +0000 (08:20 +0000)]
Merge "Reset SIM state if the subscription is no longer active." into pi-dev
am:
4f3d29de54
Change-Id: I69bdf0d2fd6fcfea2a2ae5b5d9056407e0a498e4
David Brazdil [Tue, 27 Mar 2018 08:15:29 +0000 (08:15 +0000)]
Merge "Remove from hidden API light greylist" into pi-dev am:
3caac870ef
am:
14014b5e9d
Change-Id: Ia20fb669b0f4537f617e89a2e503ae70d4d41bf0
Jin Seok Park [Tue, 27 Mar 2018 08:15:28 +0000 (08:15 +0000)]
Merge "ExifInterface: Remove casting int[] to long[]" into pi-dev
am:
30d648ab7a
Change-Id: I6d08177e8348bde93fc44cf1481d88902fdacd43
David Brazdil [Tue, 27 Mar 2018 08:08:38 +0000 (08:08 +0000)]
Merge "Remove from hidden API light greylist" into pi-dev
am:
3caac870ef
Change-Id: I154dcd166e81c2bf7fdc1ef99ae4d68862c976cb
Yangster-mac [Tue, 27 Mar 2018 08:03:21 +0000 (08:03 +0000)]
Merge "Flush the past buckets in anomaly tracker when time jumps forward" into pi-dev am:
cdc9d9008b
am:
3746711c66
Change-Id: Ifef47dde04f685756e660732954876a762a9b11d
Richard Chou [Tue, 27 Mar 2018 08:02:17 +0000 (08:02 +0000)]
Merge "Reset SIM state if the subscription is no longer active." into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 07:57:14 +0000 (07:57 +0000)]
Merge "ExifInterface: Remove casting int[] to long[]" into pi-dev
OSDN Git Service
