Commit Graph

642433 Commits

Author SHA1 Message Date
Jerry Chang
c200310e02 Merge "Do not dismiss split if stages are not visible due to screen is sleeping" into sc-v2-dev 2021-05-25 10:48:07 +00:00
Jordan Demeulenaere
fce6b1c050 Merge "Register the remote animation before starting an intent." into sc-dev am: 8dab740d09
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14663313

Change-Id: If77af060e0d9b41d19ad0666698e02684dab020a
2021-05-25 08:35:27 +00:00
Jordan Demeulenaere
8dab740d09 Merge "Register the remote animation before starting an intent." into sc-dev 2021-05-25 07:56:33 +00:00
Jerry Chang
c04541c053 Do not dismiss split if stages are not visible due to screen is sleeping
Pass isSleeping information in TaskInfo to determine whether the task is
sleeping due to display state. Prevent to dismiss staged split when
both stages is not visible due to the display is sleeping, like keyguard
showing or screen off.

Bug: 188010345
Test: atest WMShellUnitTests
Test: verified staged split won't be dismissed while keyguard showing
and screen off.

Change-Id: I0ee8943b035a9e9f937c22d2a228913e597ac79f
2021-05-25 07:09:57 +00:00
Shan Huang
028c8bd001 Merge "Tweak dark area thresholds." into sc-dev am: 35a187904c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14700835

Change-Id: I30988838e9a4f0f563a46327d26eb78742890892
2021-05-25 06:35:56 +00:00
Shan Huang
35a187904c Merge "Tweak dark area thresholds." into sc-dev 2021-05-25 06:07:39 +00:00
Ming-Shin Lu
42d38d8e5e Merge "Wait enough time for WMS#waitForAnimationsToComplete" into sc-dev am: 127ea4faf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14702852

Change-Id: I5779ea05902740aa0dc33ca808a410ff0abe8509
2021-05-25 05:42:37 +00:00
Jerry Chang
4048fa7a26 Merge "Dismiss staged split after folded the device" into sc-v2-dev 2021-05-25 05:23:33 +00:00
Jerry Chang
4b5a0e2a1c Merge "Dismiss staged split when keyguard is occluded" into sc-v2-dev 2021-05-25 05:22:21 +00:00
Jerry Chang
85c712a6ba Merge "Prevent rendering divider bar into wrong orientation" into sc-v2-dev 2021-05-25 05:19:47 +00:00
Ming-Shin Lu
127ea4faf6 Merge "Wait enough time for WMS#waitForAnimationsToComplete" into sc-dev 2021-05-25 05:17:38 +00:00
Jerry Chang
3c96d58450 Merge "Fix broken layout after switched stage positions" into sc-v2-dev 2021-05-25 05:11:23 +00:00
Joe Bolinger
3134c919c4 Merge "Fix biometric tests that relied on a non-zero error reset delay." into sc-dev am: 72104bdf67
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14705316

Change-Id: Iee009640d30b829631ea93a377f561c90b42439e
2021-05-25 04:49:56 +00:00
Joe Bolinger
934dc7e820 Merge "Revert "Temporarily disable test."" into sc-dev am: cbc8bae156
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703966

Change-Id: I615478ddc34667adb4ebf0a96b1d621bde057953
2021-05-25 04:49:54 +00:00
TreeHugger Robot
9ff32c322a Merge "BatteryStatsService: Increase max power stats size" into sc-dev am: 1be708acab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14191071

Change-Id: I6342eb11b5977c22c37d00935bc51d852a24915a
2021-05-25 04:48:34 +00:00
Howard Chen
7bf46f89dd Merge "Corrupt the PersistentDataBlock payload explicitly in factory reset" into sc-dev am: 8199b2b1d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640276

Change-Id: Idf636265ba70eab8720c54a7db014270e53e8f7e
2021-05-25 04:48:17 +00:00
Joe Bolinger
72104bdf67 Merge "Fix biometric tests that relied on a non-zero error reset delay." into sc-dev 2021-05-25 04:41:50 +00:00
Joe Bolinger
cbc8bae156 Merge "Revert "Temporarily disable test."" into sc-dev 2021-05-25 04:41:50 +00:00
TreeHugger Robot
1be708acab Merge "BatteryStatsService: Increase max power stats size" into sc-dev 2021-05-25 04:33:34 +00:00
Howard Chen
8199b2b1d3 Merge "Corrupt the PersistentDataBlock payload explicitly in factory reset" into sc-dev 2021-05-25 04:23:43 +00:00
TreeHugger Robot
e73847fd8b Merge "Update javadoc for ACTION_VIEW_PERMISSION_USAGE" into sc-dev am: 09a4771708
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14704249

Change-Id: I28d6ac7fc488077a67bd94b1f51e43a716be81ce
2021-05-25 04:02:45 +00:00
Rhed Jao
4d7db289bf Merge "Enforce package visibility filter on the SharedLibraryInfo" into sc-dev am: dc61ccec60
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14661878

Change-Id: I08954f4e320c767343145395dae758cb3b22df6d
2021-05-25 04:02:01 +00:00
Joe Bolinger
f841c1086c Merge "Add biometric strength reset and fix CTS tests on multi sensor devices (mostly)" into sc-dev am: c584a39e67
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14637111

Change-Id: I1052dc3159da15426693340be915e1ec86bba474
2021-05-25 03:59:45 +00:00
TreeHugger Robot
09a4771708 Merge "Update javadoc for ACTION_VIEW_PERMISSION_USAGE" into sc-dev 2021-05-25 03:17:56 +00:00
Rhed Jao
dc61ccec60 Merge "Enforce package visibility filter on the SharedLibraryInfo" into sc-dev 2021-05-25 03:14:55 +00:00
Joe Bolinger
c584a39e67 Merge "Add biometric strength reset and fix CTS tests on multi sensor devices (mostly)" into sc-dev 2021-05-25 03:08:53 +00:00
Lucas Dupin
82cef4942f Merge "Tweak notification scrim easing" into sc-dev am: 89b92e20eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703953

Change-Id: I509e3047e0e198734cd90996001bdacfdace54cd
2021-05-25 02:18:35 +00:00
Howard Chen
eed1312a77 Corrupt the PersistentDataBlock payload explicitly in factory reset
The current formatPartitionLocked only sets the data length to zero and
leave the payload unchanged. If the client side ignores the header and
read the payload directly, it still has the chance to read old data.
This CL corrupts the payload explicitly in formatPartitionLocked.

Bug: 185369514
Test: \
  1. Flash device, wipe
  2. Go through SUW with a google account. Set a PIN.
  3. Factory Reset through Settings.
  4. In SUW, when setting up an account (or copy from an old device),
     it should not ask for the previous PIN.

Merged-In: Ib60c68e3e91a4f0a7fd4e86b462091995bbe4fe2
Change-Id: Ib60c68e3e91a4f0a7fd4e86b462091995bbe4fe2
2021-05-25 02:01:17 +00:00
Lucas Dupin
89b92e20eb Merge "Tweak notification scrim easing" into sc-dev 2021-05-25 01:58:23 +00:00
Minche Li
fc42ac85d8 Merge "Assigns the default value of the cache magnification mode" into sc-dev am: d772c72acb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14671952

Change-Id: Ia7af75f25cd265e3fbb2ee222f58eb7bfe964d15
2021-05-25 00:41:54 +00:00
Erik Wolsheimer
1c0a2f03e7 Merge "Describe time base/units on ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD" into sc-dev am: af00dc9264
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14707023

Change-Id: Ic3b0cb8491675620cb69cee70d71f2fb76fcc5e2
2021-05-25 00:41:41 +00:00
Minche Li
d772c72acb Merge "Assigns the default value of the cache magnification mode" into sc-dev 2021-05-25 00:38:28 +00:00
Guojing Yuan
5a67ef6b76 Update javadoc for ACTION_VIEW_PERMISSION_USAGE
Bug: 176902658

Test: N/A
Change-Id: Ic4928fed75ad986c13af704d13985602ba972553
2021-05-25 00:27:01 +00:00
Erik Wolsheimer
af00dc9264 Merge "Describe time base/units on ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD" into sc-dev 2021-05-25 00:24:18 +00:00
Erik Wolsheimer
350fa3e8b0 Describe time base/units on ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD
Bug: 188084977
Test: NA
Change-Id: I25aa1d6419cdec8f0a9508948451be9edbffa964
2021-05-24 17:20:06 -07:00
Christian Wailes
6a40747ffc [automerger skipped] Merge "RESTRICT AUTOMERGE: Revert "Register ART Service with the System Server"" into sc-dev am: 4a99888888 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14629766

Change-Id: I797823c09f09bd150098381034fbfb75e8c484c2
2021-05-24 22:59:34 +00:00
Lucas Dupin
03c5a30be7 Tweak notification scrim easing
A faster fade in that will help with:
- Avoid weird state where scrims and notifications overlap
- Better connection with launcher scrim (similar easing)
- Reduced overdraw, marking shade window as opaque earlier

Test: manual
Test: atest ScrimControllerTest
Fixes: 189118510
Change-Id: I47e357d1d6dd7ee8b8a0b68d37d808c85465375d
2021-05-24 15:52:58 -07:00
Christian Wailes
4a99888888 Merge "RESTRICT AUTOMERGE: Revert "Register ART Service with the System Server"" into sc-dev 2021-05-24 22:38:59 +00:00
Benjamin Schwartz
a99f3e0b13 BatteryStatsService: Increase max power stats size
Bug: 189120596
Test: Examined logcat
Change-Id: I9841adc7abef28d8171d3036ca79a0abf1839954
2021-05-24 22:23:28 +00:00
Ben Lin
445ff979f5 Merge changes I8f0af447,I669919d4 into sc-v2-dev
* changes:
  PiP: Show the wallpaper as part of the transition.
  PiP: Implement expand transition.
2021-05-24 22:19:27 +00:00
Calin Juravle
9de9ebb0eb Merge "Add cmdline as a compilation reason" into sc-dev am: a376aeb68f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703952

Change-Id: I1ad4fc3c39e5384569111593b3608ac35c18b29d
2021-05-24 21:56:50 +00:00
Calin Juravle
a376aeb68f Merge "Add cmdline as a compilation reason" into sc-dev 2021-05-24 21:34:27 +00:00
Hyunyoung Song
4062c9f6a9 Merge "ApiCouncil review round3 / setHidden, Query.getExtras" into sc-dev am: 46d6e25d25
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14683051

Change-Id: I774d7109e0296adcf2072ddf4659dcf2da3c5d04
2021-05-24 21:22:00 +00:00
Adam He
f58ee5eaa0 Merge "Make APIs abstract once AiAi has implemented them." into sc-dev am: 102dd28dd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14631836

Change-Id: I59cd1fe6205ed0fa4e4bc8349e98ddd2eb6696ec
2021-05-24 21:21:11 +00:00
Rachel Lee
c79d07b345 Merge "Use TraceUtils.h from gui shared library." into sc-dev am: e81c22a2c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14688150

Change-Id: I5932ce04690412ace7b9a9849263210a0ef2e9ed
2021-05-24 21:20:50 +00:00
TreeHugger Robot
255e1d22d4 Merge "Update associate API by adding certificate param" into sc-dev am: 06cd94a6de
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14686826

Change-Id: If8298c12710389537d97cfb80a0760cc9501e91a
2021-05-24 21:20:00 +00:00
Hyunyoung Song
46d6e25d25 Merge "ApiCouncil review round3 / setHidden, Query.getExtras" into sc-dev 2021-05-24 21:14:10 +00:00
Joe Bolinger
d8ea71fbc4 Add biometric strength reset and fix CTS tests on multi sensor devices (mostly)
Tests can still fail due to flakiness in cleanup (main cause seems to be stale enrollments).

Fix: 187250205
Test: atest CtsBiometricsTestCases

Change-Id: I3e379322277cde984f5a0112d38db60b9c6e360d
2021-05-24 14:09:32 -07:00
Adam He
102dd28dd0 Merge "Make APIs abstract once AiAi has implemented them." into sc-dev 2021-05-24 21:06:16 +00:00
Rachel Lee
e81c22a2c1 Merge "Use TraceUtils.h from gui shared library." into sc-dev 2021-05-24 21:04:39 +00:00