OSDN Git Service
Alexandru-Andrei Rotaru [Tue, 27 Mar 2018 19:28:24 +0000 (19:28 +0000)]
[automerger skipped] Reapply "Notify the user and turn off tethering when the service is disallowed."
am:
be8e056d0e -s ours
Change-Id: I6e8960dc1efb1c9b81cd6a3273e4d06c354050e1
Nate Fischer [Tue, 27 Mar 2018 19:20:12 +0000 (19:20 +0000)]
Merge "WebView: clarify shouldInterceptRequest docs" into pi-dev
am:
0cf0d1368a
Change-Id: Ib556e836800e748cca781b2cf94280ac62e1d0bf
Kweku Adams [Tue, 27 Mar 2018 19:06:52 +0000 (19:06 +0000)]
Merge "Refactoring SecureSettingsProto to avoid method limit." into pi-dev
am:
4bd3f99bfe
Change-Id: I0aac058c9eea7a462ad48a7b97faa4cd838c5132
Derek Sollenberger [Tue, 27 Mar 2018 18:59:01 +0000 (18:59 +0000)]
Merge "Remove deprecated android.graphics.Canvas APIs" into pi-dev
am:
812e87ecba
Change-Id: I0e201fc0c0aa445c8697ff438cbbb314b02884c9
Jerry Zhang [Tue, 27 Mar 2018 18:52:15 +0000 (18:52 +0000)]
Merge "Guard against null server" into pi-dev
am:
bb54f62d1a
Change-Id: I6a35fcd7b27e04ae207fafca9f504bfaad174035
TreeHugger Robot [Tue, 27 Mar 2018 18:49:01 +0000 (18:49 +0000)]
Merge "resolve merge conflicts of
a2640b6f5142697162d4f02b4134e78b268f4a4b to pi-dev-plus-aosp" into pi-dev-plus-aosp
Jeff Sharkey [Tue, 27 Mar 2018 18:47:31 +0000 (18:47 +0000)]
Merge "Only resolve users on content:// Uris." into pi-dev
am:
766343cbbc
Change-Id: Ibc3d03e645e07324484a8a2f4db9832d042a07d3
Tyler Gunn [Tue, 27 Mar 2018 18:42:00 +0000 (18:42 +0000)]
Merge "Add exception catching for BlockedNumberContract methods used by Telecom." into pi-dev
am:
8b7fcc3dab
Change-Id: I273a85688aa4d9601d4b482dc15fa9c4d2fb0411
Joshua Baxter [Tue, 27 Mar 2018 18:36:31 +0000 (18:36 +0000)]
docs: fixed typo am:
3639e2f929
am:
b3c20232f1
Change-Id: I69cfe0e14e51b1c70851752de38c0ae6461b4b0f
Robert Berry [Tue, 27 Mar 2018 18:31:59 +0000 (18:31 +0000)]
Merge "Do not create snapshot on first init" into pi-dev
am:
678c0286be
Change-Id: I0972ab2048c328364800ed8657413dbf1f5c2543
Andrii Kulian [Tue, 27 Mar 2018 18:24:50 +0000 (18:24 +0000)]
Merge "Use transaction for local activity relaunch" into pi-dev
am:
dbac87dd40
Change-Id: Iea33b11413999fe45f6d0e28d376b18e68fc5124
TreeHugger Robot [Tue, 27 Mar 2018 18:23:02 +0000 (18:23 +0000)]
Merge "WebView: clarify shouldInterceptRequest docs" into pi-dev
Mihai Popa [Tue, 27 Mar 2018 18:20:26 +0000 (18:20 +0000)]
Merge "[Magnifier-35] Do not show when text is large" into pi-dev
am:
f45b3a1136
Change-Id: I6f050b6dfe847daf8d3ebef29398344d69d8baf5
Beverly [Tue, 27 Mar 2018 18:14:57 +0000 (18:14 +0000)]
Merge "Priority only dnd doesn't change ringer" into pi-dev
am:
0d5bbf77b5
Change-Id: I50789ea423b1134f87af763cea4c51fb5471eae3
Rohan Shah [Tue, 27 Mar 2018 18:09:38 +0000 (18:09 +0000)]
Merge "[Notif] Disable long click listener after dismiss" into pi-dev
am:
620da5249f
Change-Id: I32f5cdb7487f603533e55920110428104e55c9f9
TreeHugger Robot [Tue, 27 Mar 2018 18:09:37 +0000 (18:09 +0000)]
Merge "Refactoring SecureSettingsProto to avoid method limit." into pi-dev
Alexandru-Andrei Rotaru [Mon, 26 Jun 2017 16:31:35 +0000 (17:31 +0100)]
Reapply "Notify the user and turn off tethering when the service is disallowed."
Added UserRestrinctionListener for turning the service off one the
DISALLOW_CONFIG_TETHERING is on into Tethering. Added notification about
tethering being turned off. Also added Unit Tests to test the functionality
of the UserRestrictionListener added.
(cherry picked from commit
f8f3fbbd016d12f80c02e136ab4684da807792a1)
Bug:
27936525
Test: Turn the tehering service on (either wifi, usb or bluetooth).
Automatically the system should send a notification about the service
being active.Close settings from recents. From TestDPC User Restrictions
switch on DISALLOW_CONFIG_TETHERING. The tethering should be turned off
and a notification should appear informing that the service is inactive.
Merged-In: Ib7ea8885cedc2a842ebd4487c8b366a6666996bc
Change-Id: I500e51fb44a93e943f8566b544e7ad4983ac6a6e
TreeHugger Robot [Tue, 27 Mar 2018 18:00:29 +0000 (18:00 +0000)]
Merge "Remove deprecated android.graphics.Canvas APIs" into pi-dev
Jerry Zhang [Tue, 27 Mar 2018 17:54:21 +0000 (17:54 +0000)]
Merge "Guard against null server" into pi-dev
Victor Hsieh [Tue, 27 Mar 2018 17:48:04 +0000 (17:48 +0000)]
Merge "Downgrade OOB warning of priv app to warning" into pi-dev
am:
7d2c324cc7
Change-Id: Id1933304f4a9dc9382de285e900a9d3e6a1904cc
TreeHugger Robot [Tue, 27 Mar 2018 17:43:27 +0000 (17:43 +0000)]
Merge "Only resolve users on content:// Uris." into pi-dev
Tyler Gunn [Tue, 27 Mar 2018 17:39:26 +0000 (17:39 +0000)]
Merge "Add exception catching for BlockedNumberContract methods used by Telecom." into pi-dev
Joshua Baxter [Tue, 27 Mar 2018 17:34:53 +0000 (17:34 +0000)]
docs: fixed typo
am:
3639e2f929
Change-Id: I6f7381045bb25fdcc9f86e3e2dd0d7b8c4eda853
TreeHugger Robot [Tue, 27 Mar 2018 17:28:32 +0000 (17:28 +0000)]
Merge "Do not create snapshot on first init" into pi-dev
Andrii Kulian [Tue, 27 Mar 2018 17:24:42 +0000 (17:24 +0000)]
Merge "Use transaction for local activity relaunch" into pi-dev
David Brazdil [Tue, 27 Mar 2018 17:23:54 +0000 (17:23 +0000)]
Merge "Add serialization methods to hidden API light greylist" into pi-dev
am:
02175b7847
Change-Id: Ie625488ec40b3fd18d11043a1d25f5ccb487c351
TreeHugger Robot [Tue, 27 Mar 2018 17:20:12 +0000 (17:20 +0000)]
Merge "[Magnifier-35] Do not show when text is large" into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 17:14:17 +0000 (17:14 +0000)]
Merge "Priority only dnd doesn't change ringer" into pi-dev
Jorim Jaggi [Tue, 27 Mar 2018 17:11:49 +0000 (17:11 +0000)]
Merge "Clear calling identity in finish callback" into pi-dev
am:
2f426bcd09
Change-Id: Ide17dbc9159085c4367644a891e82c40247ab9fa
Rohan Shah [Tue, 27 Mar 2018 17:06:51 +0000 (17:06 +0000)]
Merge "[Notif] Disable long click listener after dismiss" into pi-dev
Winson Chung [Tue, 27 Mar 2018 17:06:51 +0000 (17:06 +0000)]
Merge "Disable long press recents whenever overview service is bound" into pi-dev
am:
b1d16f8e52
Change-Id: I6999074e8354dd6fc7a9529d08722f2a3a65ff6e
Victor Hsieh [Tue, 27 Mar 2018 17:04:01 +0000 (17:04 +0000)]
Merge "Downgrade OOB warning of priv app to warning" into pi-dev
Winson Chung [Tue, 27 Mar 2018 17:00:15 +0000 (17:00 +0000)]
Merge "Update onboarding based on swipe up state" into pi-dev
am:
5995d21a93
Change-Id: Ib664658e297afb0f136f44dd2da86b195adc380f
David Brazdil [Tue, 27 Mar 2018 16:55:18 +0000 (16:55 +0000)]
Merge "Add serialization methods to hidden API light greylist" into pi-dev
David Brazdil [Mon, 26 Mar 2018 15:02:23 +0000 (16:02 +0100)]
Add serialization methods to hidden API light greylist
This patch adds a build-time rule that adds all members with signatures:
readObject(Ljava/io/ObjectInputStream;)V
readObjectNoData()V
readResolve()Ljava/lang/Object;
serialVersionUID:J
serialPersistentFields:[Ljava/io/ObjectStreamField
writeObject(Ljava/io/ObjectOutputStream;)V
writeReplace()Ljava/lang/Object;
to the hidden API light greylist. This is needed so that apps can retain
the ability to write their own serializers.
Bug:
64382372
Bug:
73255398
Test: make
Change-Id: I0103f47044e957bbff0a39230ff53562f3feddac
TreeHugger Robot [Tue, 27 Mar 2018 16:44:26 +0000 (16:44 +0000)]
Merge "Clear calling identity in finish callback" into pi-dev
Winson Chung [Tue, 27 Mar 2018 16:43:55 +0000 (16:43 +0000)]
Merge "Disable long press recents whenever overview service is bound" into pi-dev
Jeff Sharkey [Tue, 27 Mar 2018 16:43:25 +0000 (16:43 +0000)]
Merge "API council requested tweaks to JobInfo." into pi-dev
am:
a9975804a2
Change-Id: I40217f8df995db19a59e0253b3d8d0440d57acb3
Winson Chung [Tue, 27 Mar 2018 16:43:14 +0000 (16:43 +0000)]
Merge "Update onboarding based on swipe up state" into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 16:25:23 +0000 (16:25 +0000)]
Merge "API council requested tweaks to JobInfo." into pi-dev
Sunny Goyal [Tue, 27 Mar 2018 16:20:59 +0000 (16:20 +0000)]
Merge "Whitelisting Launcher3 for hidden APIs" into pi-dev
am:
87c24a655b
Change-Id: I55ec195af3f9e4420f10fd67f911f1078f2e8941
TreeHugger Robot [Tue, 27 Mar 2018 16:06:54 +0000 (16:06 +0000)]
Merge "Whitelisting Launcher3 for hidden APIs" into pi-dev
dimitry [Tue, 27 Mar 2018 15:56:35 +0000 (17:56 +0200)]
resolve merge conflicts of
a2640b6f5142697162d4f02b4134e78b268f4a4b to pi-dev-plus-aosp
Test: n/a
Change-Id: I3b91125b1a715690c2cd417b1e937e568c755d9f
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
Mihai Popa [Wed, 21 Mar 2018 19:45:06 +0000 (19:45 +0000)]
[Magnifier-35] Do not show when text is large
There is no point in displaying the magnifier when the text is large
enough. In this CL we are using the font metrics of the TextView to
decide whether the magnifier should be displayed or not.
Bug:
70608551
Test: manual testing
Change-Id: Icb2fb4412b6b930dfb3322e51fd0139152cf9d39
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
Tyler Gunn [Mon, 26 Mar 2018 22:49:23 +0000 (22:49 +0000)]
Add exception catching for BlockedNumberContract methods used by Telecom.
The content resolver can throw in some instances when using the blocked
number provider. Rather than crashing all of telecom, adding exception
handling to provide graceful fallback in these cases.
Test: Compile / build
Bug:
74965829
Merged-In: Iae4c2dfc912e0d2a4194deb62568ee2f78ce4e22
Change-Id: Iae4c2dfc912e0d2a4194deb62568ee2f78ce4e22
(cherry picked from commit
b408ebe55737438ac257872cb7f26e21701ec459)
TreeHugger Robot [Tue, 27 Mar 2018 15:10:27 +0000 (15:10 +0000)]
Merge "Handle insets for letterboxing correctly" into pi-dev
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
Victor Hsieh [Tue, 27 Mar 2018 14:22:32 +0000 (07:22 -0700)]
Downgrade OOB warning of priv app to warning
We can't enforce priv apps to uncompress .dex and .so just yet until all
priv apps from Play have done so.
Also fix the wrong default value.
Test: build
Bug:
76440172
Bug:
63920015
Change-Id: I98ab7272702c1693752f8e4ecb53e1b1eb5e1f35
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
Jeff Sharkey [Tue, 27 Mar 2018 01:10:02 +0000 (19:10 -0600)]
API council requested tweaks to JobInfo.
Split network estimates into separate download/upload values, and
add missing accessor methods.
Test: none
Bug:
74945408,
74032541,
74032817
Change-Id: I4c92b8a867690dc4f048701f13142655c3370958
Derek Sollenberger [Thu, 22 Feb 2018 21:16:33 +0000 (16:16 -0500)]
Remove deprecated android.graphics.Canvas APIs
Bug:
73777445
Test: compile
Change-Id: Ie68f2fbe3c3be82f3c20529d535875d4cc204b7c
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
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
Remi NGUYEN VAN [Tue, 27 Mar 2018 14:02:18 +0000 (23:02 +0900)]
resolve merge conflicts of
f8b537d7a3343f178952c2b05a76c4f58c63a9a1 to stage-aosp-master
Test: TODO
Change-Id: I7959d7812f8db31de689154f37b92497a992fb6c
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
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
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
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
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
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: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: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
Jorim Jaggi [Tue, 27 Mar 2018 11:06:09 +0000 (13:06 +0200)]
Clear calling identity in finish callback
Test: go/wm-smoke
Fixes:
76138720
Change-Id: Id6b1afd757d4374a401abe4ee68fe99ed182a62e
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
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
Robert Berry [Tue, 27 Mar 2018 10:45:11 +0000 (11:45 +0100)]
Do not create snapshot on first init
Currently the first time the RecoveryController is initialized, it sets
a snapshot pending. This is because there is no cert, so it installs the
cert, and the existing logic also sets snapshot pending. This fixes that.
Bug:
74949975
Test: runtest frameworks-services -p \
com.android.server.locksettings.recoverablekeystore
Change-Id: If150524c3fc41fd2ee9cc6310109b41d62dcbb29
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
OSDN Git Service
