OSDN Git Service
Jovana Knezevic [Wed, 21 Mar 2018 20:07:41 +0000 (20:07 +0000)]
Merge "Adding UserManagerHelper class to SettingsLib." into pi-dev
am:
c7034f7ab1
Change-Id: Ief0abc0585a1b929a45ea78ef5264419f89e9caf
Christopher Tate [Wed, 21 Mar 2018 20:03:08 +0000 (20:03 +0000)]
Merge "Document Job Scheduler internal "calling" vs "source" package" into pi-dev
am:
1948f20312
Change-Id: Ie63cad3619772af031b329e643ea499f1adfcabb
Bryce Lee [Wed, 21 Mar 2018 19:59:01 +0000 (19:59 +0000)]
Merge "Ignore non-existent displays in #topRunningActivityLocked." into pi-dev
am:
3ebf5e3507
Change-Id: Ib9213703a04f4b6cbf483b2fb3a62b88531d3adc
Brad Ebinger [Wed, 21 Mar 2018 19:54:46 +0000 (19:54 +0000)]
Merge "Added Locking for MmTelFeature" into pi-dev
am:
fb241e2250 -s ours
Change-Id: I0cb8337a5d2e02f2d0e9003b841fd9fe4aef8ebd
Winson Chung [Wed, 21 Mar 2018 19:51:44 +0000 (19:51 +0000)]
Merge "Fix issue with slippery state for quickstep button case." into pi-dev
am:
d0bf944c3d
Change-Id: Id6e012c28b1d3e5616650ca6ebd30c5d5077ffbf
Chavi Weingarten [Wed, 21 Mar 2018 19:48:49 +0000 (19:48 +0000)]
Merge "Don't add stopping apps in relaunch based on stopped flag." into pi-dev
am:
ab762775d5
Change-Id: Id3d1d73a691fdfd243315645d5dca552a3cec3b9
Jovana Knezevic [Wed, 21 Mar 2018 19:34:32 +0000 (19:34 +0000)]
Merge "Adding UserManagerHelper class to SettingsLib." into pi-dev
Lei Yu [Wed, 21 Mar 2018 19:33:05 +0000 (19:33 +0000)]
Merge "Add metric ACTION_ANOMALY_TRIGGERED" into pi-dev
am:
8e861350de
Change-Id: I3ea6f73962fec662c94a7cd2fa5efdf3f9739a1d
TreeHugger Robot [Wed, 21 Mar 2018 19:12:14 +0000 (19:12 +0000)]
Merge "Document Job Scheduler internal "calling" vs "source" package" into pi-dev
Bryce Lee [Wed, 21 Mar 2018 19:01:36 +0000 (19:01 +0000)]
Merge "Ignore non-existent displays in #topRunningActivityLocked." into pi-dev
Brad Ebinger [Wed, 21 Mar 2018 18:56:00 +0000 (18:56 +0000)]
Merge "Added Locking for MmTelFeature" into pi-dev
Lucas Dupin [Wed, 21 Mar 2018 18:52:23 +0000 (18:52 +0000)]
Merge "Renamed config_dozeAfterScreenOff" into pi-dev
am:
425812c8b4
Change-Id: Idbcdb70caeddd08db6246ea79d554aa8fb65bf54
Winson Chung [Wed, 21 Mar 2018 18:47:41 +0000 (18:47 +0000)]
Merge "Fix issue with slippery state for quickstep button case." into pi-dev
Andrew Sapperstein [Wed, 21 Mar 2018 18:39:12 +0000 (18:39 +0000)]
Merge "Update material_deep_teal_500 to #008577." into pi-dev
am:
74d9b14f21
Change-Id: Ia8bb80846588b20da5957b6393fb216afed42435
Beverly [Wed, 21 Mar 2018 18:31:47 +0000 (18:31 +0000)]
Merge "Category message is sufficient for message notif" into pi-dev
am:
b24d84b222
Change-Id: I5502cade1ec859215f76d29966f0663f387cc433
Chavi Weingarten [Wed, 21 Mar 2018 18:30:13 +0000 (18:30 +0000)]
Merge "Don't add stopping apps in relaunch based on stopped flag." into pi-dev
Adrian Roos [Wed, 21 Mar 2018 18:29:12 +0000 (18:29 +0000)]
Merge "Preserve letterbox while dragResizing" into pi-dev
am:
2dae40bfe6
Change-Id: I7756f489afd1d26d63438672d599bfbb0b415bdb
Fyodor Kupolov [Wed, 21 Mar 2018 18:25:44 +0000 (18:25 +0000)]
Merge "Include additional information in the dumpsys" into pi-dev
am:
38e09dd7e1
Change-Id: I3dd0f79193cdb71b46ff9d4477d431ee6a703fb3
Tim Volodine [Wed, 21 Mar 2018 18:15:52 +0000 (18:15 +0000)]
Merge "WebView Tracing API: remove LARGE_BUFFER, make RECORD_CONTINUOUSLY the default mode" into pi-dev
am:
158a18108b
Change-Id: I557685531c2d80fd3eb4792d5b8aacffd9ae7d2e
TreeHugger Robot [Wed, 21 Mar 2018 18:05:21 +0000 (18:05 +0000)]
Merge "Add metric ACTION_ANOMALY_TRIGGERED" into pi-dev
Lucas Dupin [Wed, 21 Mar 2018 18:04:49 +0000 (18:04 +0000)]
Merge "Renamed config_dozeAfterScreenOff" into pi-dev
Svet Ganov [Wed, 21 Mar 2018 17:59:09 +0000 (17:59 +0000)]
Merge "Make autofill save UI RTL compliant" into pi-dev
am:
de51e0c615
Change-Id: I66dcaea04f2867f8984bfc58bd58df567bbb4b45
Android Build Merger (Role) [Wed, 21 Mar 2018 17:54:22 +0000 (17:54 +0000)]
Merge "Merge "Some Slices API refinement" into pi-dev am:
1543171d3e" into pi-dev-plus-aosp
Tej Singh [Wed, 21 Mar 2018 17:49:44 +0000 (17:49 +0000)]
Merge "Logging: Bluetooth Enabled" am:
8173db40c3
am:
02a75203a0
Change-Id: I72a3a8dc70d9baa18d93aa62d94b3c3b7fac4c76
Jason Monk [Wed, 21 Mar 2018 17:45:59 +0000 (17:45 +0000)]
Merge "Some Slices API refinement" into pi-dev
am:
1543171d3e
Change-Id: Ib921eac77b9154800aa784ec3d3f4846f788a9a7
TreeHugger Robot [Wed, 21 Mar 2018 17:45:25 +0000 (17:45 +0000)]
Merge "Update material_deep_teal_500 to #008577." into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 17:43:40 +0000 (17:43 +0000)]
Merge "Category message is sufficient for message notif" into pi-dev
Tej Singh [Wed, 21 Mar 2018 17:41:24 +0000 (17:41 +0000)]
Merge "Logging: Bluetooth Enabled"
am:
8173db40c3
Change-Id: I41cc9b255e777d137941aa305cbcb5d7de376b10
Benedict Wong [Wed, 21 Mar 2018 17:39:56 +0000 (17:39 +0000)]
Merge "Added implementation for VTI add/remove address" into pi-dev
am:
f801b8ae69 -s ours
Change-Id: I1f77872860e705606ba9f0c7f95200ee5bdbe499
Benedict Wong [Wed, 21 Mar 2018 17:34:08 +0000 (17:34 +0000)]
Merge "Add support for auth-only transforms" into pi-dev
am:
d7582684b6 -s ours
Change-Id: Id0bffdfbf90c4780108702bcd98c48d458292444
Adrian Roos [Wed, 21 Mar 2018 17:33:27 +0000 (17:33 +0000)]
Merge "Preserve letterbox while dragResizing" into pi-dev
Chavi Weingarten [Wed, 21 Mar 2018 17:30:32 +0000 (17:30 +0000)]
Merge "Merge transactions to parent if layer is going to be removed." into pi-dev
am:
c3a808d9cc
Change-Id: Ia2dbd9ead5de401739c633f5ea5942efac223f8a
Fyodor Kupolov [Wed, 21 Mar 2018 17:25:28 +0000 (17:25 +0000)]
Merge "Include additional information in the dumpsys" into pi-dev
Adrian Roos [Wed, 21 Mar 2018 17:25:27 +0000 (17:25 +0000)]
Merge "DisplayCutout: Add back always resource" into pi-dev
am:
0eb46d80d5
Change-Id: I879b3c7ec25da9bf55227e63e9d690f6d162db6e
Leon Scroggins [Wed, 21 Mar 2018 17:20:16 +0000 (17:20 +0000)]
Merge "Report native allocation size of AnimatedImageDrawable" into pi-dev
am:
d848f75f99
Change-Id: Ifc765e6ba33dcd7152e850ddbe88fc6b458f75af
David Brazdil [Wed, 21 Mar 2018 17:15:55 +0000 (17:15 +0000)]
Merge "Add new hidden API uses to light greylist" into pi-dev
am:
f344b3ead5
Change-Id: I011ff07281e1af5dcc89012e497b6183be792444
TreeHugger Robot [Wed, 21 Mar 2018 17:14:47 +0000 (17:14 +0000)]
Merge "WebView Tracing API: remove LARGE_BUFFER, make RECORD_CONTINUOUSLY the default mode" into pi-dev
Tim Volodine [Mon, 19 Mar 2018 20:07:23 +0000 (20:07 +0000)]
WebView Tracing API: remove LARGE_BUFFER, make RECORD_CONTINUOUSLY the default mode
This patch:
- remove the RECORD_UNTIL_FULL_LARGE_BUFFER tracing option, because
this does not appear really useful in the production setting as
the buffer size limit exceeds the device memory and can grow
uncontrollably large.
- make RECORD_CONTINUOUSLY the default mode for tracing, to make
sure the least memory is used by default (typically 4x less than the
previous default RECORD_UNTIL_FULL).
- add some missing IntDef values (to make them match with the constants)
BUG:
63750258
Test: CTS
Change-Id: Ib3698273dee776ebc7a8388fc1bd8c80255e3b63
TreeHugger Robot [Wed, 21 Mar 2018 17:09:25 +0000 (17:09 +0000)]
Merge "Make autofill save UI RTL compliant" into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 17:06:40 +0000 (17:06 +0000)]
Merge "Some Slices API refinement" into pi-dev
Benedict Wong [Wed, 21 Mar 2018 17:03:52 +0000 (17:03 +0000)]
Merge "Added implementation for VTI add/remove address" into pi-dev
Benedict Wong [Wed, 21 Mar 2018 17:03:48 +0000 (17:03 +0000)]
Merge "Add support for auth-only transforms" into pi-dev
Chavi Weingarten [Wed, 21 Mar 2018 17:02:09 +0000 (17:02 +0000)]
Merge "Merge transactions to parent if layer is going to be removed." into pi-dev
Beverly [Wed, 21 Mar 2018 16:56:27 +0000 (16:56 +0000)]
Merge "Get rid of upperbound on wireless charging anim" into pi-dev
am:
34730143de
Change-Id: Ib666b463571c8498cea7030af6a38d3483dbf361
TreeHugger Robot [Wed, 21 Mar 2018 16:50:32 +0000 (16:50 +0000)]
Merge "DisplayCutout: Add back always resource" into pi-dev
Leon Scroggins [Wed, 21 Mar 2018 16:48:19 +0000 (16:48 +0000)]
Merge "Report native allocation size of AnimatedImageDrawable" into pi-dev
Salvador Martinez [Wed, 21 Mar 2018 16:46:46 +0000 (16:46 +0000)]
Merge "Update logging util to not crash on null" into pi-dev
am:
d5eab8b668
Change-Id: Ieb5b3590e42d99c59592812afdbf9b22c8779fe9
Jason Monk [Wed, 21 Mar 2018 16:37:57 +0000 (16:37 +0000)]
Merge "UsageEvents for slices pinning" into pi-dev
am:
17d3b47e20
Change-Id: I559072719451cd2cff5b49f7d89c3ee92b995ac1
Mike Digman [Wed, 21 Mar 2018 16:32:56 +0000 (16:32 +0000)]
Merge "Ensure rotate disable2 flag can be set on boot" into pi-dev
am:
65808f3210
Change-Id: I094118c829df08c7dbd6db7a1bf38faedf013450
David Brazdil [Wed, 21 Mar 2018 16:28:17 +0000 (16:28 +0000)]
Merge "Add new hidden API uses to light greylist" into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 16:26:12 +0000 (16:26 +0000)]
Merge "Get rid of upperbound on wireless charging anim" into pi-dev
Treehugger Robot [Wed, 21 Mar 2018 16:25:27 +0000 (16:25 +0000)]
Merge "Logging: Bluetooth Enabled"
Mike Digman [Wed, 21 Mar 2018 16:25:25 +0000 (16:25 +0000)]
Merge "Update IME/keyboard switcher navbar icon to GM" into pi-dev
am:
7ae1fbb496
Change-Id: I109ee9e0efb3cc07742ceb8a845c3c8ea6efc602
Salvador Martinez [Wed, 21 Mar 2018 16:23:26 +0000 (16:23 +0000)]
Merge "Update logging util to not crash on null" into pi-dev
Bryce Lee [Wed, 21 Mar 2018 16:20:38 +0000 (16:20 +0000)]
Merge "Distinguish between bringing stack to front and delivering to top." into pi-dev
am:
696eb17cc8
Change-Id: Ic19f25a38e1b8ba35cfa4629645c785cad1d6492
Bryce Lee [Wed, 21 Mar 2018 16:14:56 +0000 (16:14 +0000)]
Merge "Add unit test for ActivityStackSupervisor#testApplySleepTokensLocked." into pi-dev
am:
c4bb25c299
Change-Id: Ic9daf100424371530b3fa6a855f1ebd1e527faea
Bryce Lee [Tue, 20 Mar 2018 20:58:53 +0000 (13:58 -0700)]
Ignore non-existent displays in #topRunningActivityLocked.
Previous changes aimed at driving display creation through
ActivityManagerService. However, there are still cases where
WindowManagerService will encounter the display first (such as add
window). A subsequent changelist enabled this out of band creation.
As a result the WindowManagerService and ActivityManagerService can
still have different lists of displays. This mismatch leads to
#topRunningActivityLocked processing null ActivityDisplays.
This changelist skips over displays not yet encountered by
ActivityManagerService in #topRunningActivityLocked. Such displays
have no stacks and therefore no activities that could be the top
running activity.
Test: atest FrameworksServicesTests:com.android.server.am.ActivityStackSupervisorTests#testTopRunningActivityLockedWithNonExistentDisplay
Fixes:
74593710
Change-Id: I316e5305f7ce233a04ecf18d605eebdf723b0920
TreeHugger Robot [Wed, 21 Mar 2018 16:07:32 +0000 (16:07 +0000)]
Merge "UsageEvents for slices pinning" into pi-dev
Rubin Xu [Wed, 21 Mar 2018 16:03:22 +0000 (16:03 +0000)]
Merge "Restore state if password change fails" into pi-dev
am:
655877cd84
Change-Id: Ide07b138b75ea7624362b20c87d4e1d580cc6270
Mike Digman [Wed, 21 Mar 2018 16:03:00 +0000 (16:03 +0000)]
Merge "Ensure rotate disable2 flag can be set on boot" into pi-dev
Mike Digman [Wed, 21 Mar 2018 16:02:45 +0000 (16:02 +0000)]
Merge "Update IME/keyboard switcher navbar icon to GM" into pi-dev
Bryce Lee [Wed, 21 Mar 2018 15:58:08 +0000 (15:58 +0000)]
Merge "Distinguish between bringing stack to front and delivering to top." into pi-dev
Bryce Lee [Wed, 21 Mar 2018 15:57:48 +0000 (15:57 +0000)]
Merge "Add unit test for ActivityStackSupervisor#testApplySleepTokensLocked." into pi-dev
David Brazdil [Tue, 20 Mar 2018 19:48:01 +0000 (19:48 +0000)]
Add new hidden API uses to light greylist
From common apps.
Bug:
64382372
Bug:
74430927
Test: make
Change-Id: I81c38a78fcdc7c33f54cd25823b301ba29638019
Amin Shaikh [Wed, 21 Mar 2018 15:51:22 +0000 (15:51 +0000)]
Merge "Update QS customizer add tiles string." into pi-dev
am:
323e41c6ae
Change-Id: I2533b051f6da1cdf7757eb5c44ca291f19076b61
Evan Laird [Wed, 21 Mar 2018 15:46:40 +0000 (15:46 +0000)]
Merge "Intercept touches in the emulated DisplayCutout" into pi-dev
am:
f40c8e074f
Change-Id: If95a878f0e34f1e6ffd79f209f445cfb2f42132b
TreeHugger Robot [Wed, 21 Mar 2018 15:41:34 +0000 (15:41 +0000)]
Merge "Restore state if password change fails" into pi-dev
Annie Meng [Wed, 21 Mar 2018 15:38:24 +0000 (15:38 +0000)]
Merge "DO NOT MERGE Update references to backup/restore agent timeouts" into pi-dev
am:
40bf2b0fd1
Change-Id: Ic5857e9cababce0f3d2f4eb586e2befe1b59bdd4
TreeHugger Robot [Wed, 21 Mar 2018 15:33:49 +0000 (15:33 +0000)]
Merge "Update QS customizer add tiles string." into pi-dev
David Brazdil [Wed, 21 Mar 2018 15:32:22 +0000 (15:32 +0000)]
Merge "More APIs on hidden API light greylist / vendor list" into pi-dev
am:
c931a9f315
Change-Id: I917a4033316d4c3ccf679b7ddf930118c27e3a8a
TreeHugger Robot [Wed, 21 Mar 2018 15:31:38 +0000 (15:31 +0000)]
Merge "Intercept touches in the emulated DisplayCutout" into pi-dev
Hector Dearman [Wed, 21 Mar 2018 15:24:42 +0000 (15:24 +0000)]
Merge "Rename persist.traced.enable to sys.traced.enable_override" into pi-dev
am:
3c7b3dd74d
Change-Id: Ibf222fd2d2bf56812f5952d6a3f1a7f684074a24
Lucas Dupin [Wed, 21 Mar 2018 15:18:37 +0000 (15:18 +0000)]
Merge "Animate clock after unlocking" into pi-dev
am:
23ac9ac522
Change-Id: If1b5ad18f2cc04de6a0fe6bdb73c79517036834f
Annie Meng [Wed, 21 Mar 2018 15:18:35 +0000 (15:18 +0000)]
Merge "DO NOT MERGE Update references to backup/restore agent timeouts" into pi-dev
David Brazdil [Wed, 21 Mar 2018 15:14:54 +0000 (15:14 +0000)]
Merge "More APIs on hidden API light greylist / vendor list" into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 15:09:25 +0000 (15:09 +0000)]
Merge "Rename persist.traced.enable to sys.traced.enable_override" into pi-dev
Lucas Dupin [Wed, 21 Mar 2018 15:02:44 +0000 (15:02 +0000)]
Merge "Animate clock after unlocking" into pi-dev
Beverly [Tue, 20 Mar 2018 19:42:12 +0000 (15:42 -0400)]
Category message is sufficient for message notif
If a notification is marked with category message, then
it is sufficient enough to be deemed a "message" notification.
However, to be considered an important message, we still
check if the message is from the default messaging app and has
category = message.
Change-Id: I4f2b502634b805919bdf8b82e3bdf475c0992bdd
Fixes:
76019310
Test: AttentionManagementVerifierActivity
Test: atest services/tests/uiservicestests/src/com/android/server/notification/NotificationComparatorTest.java
Beverly [Mon, 19 Mar 2018 14:42:06 +0000 (10:42 -0400)]
Get rid of upperbound on wireless charging anim
Previously, if the battery percentage was above 95%, then
wireless charging wouldn't turn the screen on nor play the
wireless charging animation. Now the charging
animation will trigger even if battery percentage is above 95%.
Test: manual
Change-Id: I531334548d41cba8a1a4c28dff484d3f2dfefe01
Fixes:
75029514
David Brazdil [Wed, 21 Mar 2018 14:27:20 +0000 (14:27 +0000)]
More APIs on hidden API light greylist / vendor list
New scan after updates.
Bug:
64382372
Bug:
76062566
Test: make
Change-Id: Ia2c67222bddccb0b7f607ee0ce8951611a668dc3
Jason Monk [Wed, 14 Mar 2018 13:20:39 +0000 (09:20 -0400)]
UsageEvents for slices pinning
Test: atest frameworks/base/services/tests/servicestests
Bug:
73455786
Change-Id: I6a37f5525c29d3f47aa37e262c8834840309ba44
Adrian Roos [Wed, 21 Mar 2018 13:44:13 +0000 (14:44 +0100)]
DisplayCutout: Add back always resource
Temporarily adds back "always" value for layoutInDisplayCutoutMode
until all usages have been migrated to "shortEdges".
Bug:
74983661
Test: make droid
Change-Id: I27189d17129a8dd6e5e9ac3aaf997967df21e8ef
Hector Dearman [Wed, 21 Mar 2018 11:55:19 +0000 (11:55 +0000)]
Rename persist.traced.enable to sys.traced.enable_override
Allowing for both a default in the system
image and an override form the server requires at least two properties.
Given that we're using two properties anyway we can change the
server override to match the pattern of the other flags and not be
a persisted setting.
Test: Manual.
Bug: b/
76077784
Merged-In: I98932085430cdeaf4ccd036a0751f119c0cdeb3c
Change-Id: I98932085430cdeaf4ccd036a0751f119c0cdeb3c
Robert Carr [Wed, 21 Mar 2018 13:41:57 +0000 (13:41 +0000)]
Merge "Correct exiting pip animation state." into pi-dev
am:
87b4c772a5
Change-Id: Ia6bd8813848662ba8da9047d0c47c028265057e4
TreeHugger Robot [Wed, 21 Mar 2018 13:29:37 +0000 (13:29 +0000)]
Merge "Correct exiting pip animation state." into pi-dev
Leon Scroggins III [Tue, 20 Mar 2018 15:11:13 +0000 (11:11 -0400)]
Report native allocation size of AnimatedImageDrawable
Bug:
73641604
Test: infeasible
Fix nNativeByteSize's return value to be jlong, instead of long.
Add up the bytes used by the SkAnimatedImage and SkPictures and store
them on the AnimatedImageDrawable for registration.
Note that this is an approximation, and it assumes it will be drawn to a
hardware canvas and animated.
Mathew Inwood [Wed, 21 Mar 2018 13:10:44 +0000 (13:10 +0000)]
Merge "Amend package whitelist." into pi-dev
am:
fc4ae7ec0e
Change-Id: Iead86f735071b1107afc2a018110af8f2a604c5b
Adrian Roos [Wed, 21 Mar 2018 13:05:27 +0000 (13:05 +0000)]
Merge "DisplayCutout: make dock divider cutout aware" into pi-dev
am:
f5239f00c5
Change-Id: I7bc25667a3c42ef683b8c656268686fc663c5ce4
TreeHugger Robot [Wed, 21 Mar 2018 12:52:46 +0000 (12:52 +0000)]
Merge "Amend package whitelist." into pi-dev
Adrian Roos [Wed, 21 Mar 2018 12:52:15 +0000 (12:52 +0000)]
Merge "DisplayCutout: make dock divider cutout aware" into pi-dev
Adrian Roos [Wed, 21 Mar 2018 12:48:26 +0000 (13:48 +0100)]
Preserve letterbox while dragResizing
Fixes an issue where the letterbox would disappear while entering
and leaving dragResizing, because this clears the hasDrawnState.
To fix this, also treat preserved surfaces as ready to show for
letterboxing purposes.
Change-Id: I4d6e1b1a27d99542370fde8924f126eca1ea80d5
Fixes:
76008154
Test: Enable double cutout, enter split screen, go home, touch slider verify the letterbox does not flicker.
Robert Berry [Wed, 21 Mar 2018 12:39:18 +0000 (12:39 +0000)]
Merge "Add RecoverySession importKeyChainSnapshot method" into pi-dev
am:
889e78cb28
Change-Id: Iae6f730236f5aaa15c39cf04bef5ebe925d51643
Bo Zhu [Wed, 21 Mar 2018 12:29:15 +0000 (12:29 +0000)]
Merge "Use the new root cert file under the core/ folder" into pi-dev
am:
82235880f6
Change-Id: I95c6f25ce33d9778dde668e807de38f6fec2c8ea
Robert Berry [Wed, 21 Mar 2018 12:25:37 +0000 (12:25 +0000)]
Merge "Add RecoverySession importKeyChainSnapshot method" into pi-dev
Gustav Sennton [Wed, 21 Mar 2018 12:17:45 +0000 (12:17 +0000)]
Merge "Add API WebView.getWebViewLooper()" into pi-dev
am:
6951716952
Change-Id: I912664ece4b41853dcac61f0b6adf11a0eb854c0
TreeHugger Robot [Wed, 21 Mar 2018 12:10:23 +0000 (12:10 +0000)]
Merge "Use the new root cert file under the core/ folder" into pi-dev
Rubin Xu [Wed, 21 Mar 2018 09:13:44 +0000 (09:13 +0000)]
Restore state if password change fails
Bug:
73299306
Fixes:
73299306
Test: Call LockPatternUtils.clearLock() with wrong password,
make sure device still unlocks after reboot
Change-Id: I640fc62cbe0c0c57e980455d4f499df02dee0832
TreeHugger Robot [Wed, 21 Mar 2018 11:59:28 +0000 (11:59 +0000)]
Merge "Add API WebView.getWebViewLooper()" into pi-dev
Amin Shaikh [Wed, 21 Mar 2018 11:39:24 +0000 (07:39 -0400)]
Update QS customizer add tiles string.
Change-Id: Iddea2dd8bd48b980e083fac447e905616031b365
Fixes:
27961533
Test: visual
Nicolas Geoffray [Wed, 21 Mar 2018 11:04:27 +0000 (11:04 +0000)]
Merge "Enable hidden API blacklist" into pi-dev
am:
34aae0daad
Change-Id: Ie71f420a40afcd63b0bf758e17fefe4ea59aee1b
OSDN Git Service
