Commit Graph

16675 Commits

Author SHA1 Message Date
Gaurav Bhola
9260cf2831 Merge "Move the NotificationAccessConfirmationActivity component name to resource config so that it can be overlayed." into sc-v2-dev 2021-09-14 19:25:04 +00:00
PETER LIANG
d596ae37f4 Merge "Fix the title of the HW "Edit shortcuts" menu is truncated when the device is folded." into sc-v2-dev 2021-09-14 03:58:38 +00:00
Pavel Grafov
d730a09568 Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev am: a238881ee0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15778512

Change-Id: I44b1e9fa8d418ef84c1ab324306a00e47e5b4e9a
2021-09-13 14:08:56 +00:00
Pavel Grafov
a238881ee0 Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev 2021-09-13 13:52:26 +00:00
Michael Wachenschwanz
04dcc9e512 Merge "Ref count isolated uid usage in BatteryStats" into sc-qpr1-dev am: b85b750561
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15756344

Change-Id: I6998822dfe23a513d5c52a0c931bb906eb6d59b2
2021-09-09 23:54:51 +00:00
Michael Wachenschwanz
b85b750561 Merge "Ref count isolated uid usage in BatteryStats" into sc-qpr1-dev 2021-09-09 23:35:40 +00:00
Wu Ahan
7afe2f3723 Merge "Make sure the removeObservers be called correctly" into sc-dev am: 766eff7df1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15747424

Change-Id: Ia24326d6b43ca86e46511ebdaaee9718af701e98
2021-09-09 16:04:08 +00:00
TreeHugger Robot
9bcef36827 Merge "Enables scroll capture for WebView" into sc-v2-dev 2021-09-09 04:22:09 +00:00
Mark Renouf
d1b525354f Enables scroll capture for WebView
Bug: 190731582
Test: manual, long screenshot Gmail message
Change-Id: I16cd568ab155d308e444c448cc77e538c6415061
2021-09-08 22:08:13 -04:00
Michael Wachenschwanz
b028aa01c6 Ref count isolated uid usage in BatteryStats
Wakelock tracking in BatteryStats relies on the the isolated uid map
when tracking wakelocks from isolated uids. The map needs to keep the
isolated uid while it still has a  wakelock.

Bug: 194414351
Test: atest BatteryStatsNoteTest
Change-Id: I5e51f5f90191829d12fb080169520d9827b9906c
(cherry picked from commit 83c0928c34)
Merged-In: I5e51f5f90191829d12fb080169520d9827b9906c
2021-09-07 22:47:21 +00:00
Ahan Wu
6f787a7588 Shorten the timeout of finish call to 10 seconds
We have a minute timeout of finish call, it's a long duration,
shorten it to 10 seconds.

Bug: 196171638
Test: Manually
Change-Id: I4ff726bbac13fd90e7578074b5f11170816be7b1
2021-09-07 09:18:48 -08:00
Pavel Grafov
6553b4b249 Respect PASSWORD_QUALITY_MANAGED for biometrics
Bug: 195488124
Test: manual with a modified TestDPC
Change-Id: I3e5d0f6911e1fd785ac249b0dfeb2c7e4cca69df
2021-09-07 18:09:46 +01:00
Ahan Wu
59e29276f9 Make sure the removeObservers be called correctly
Handle the surface destroyed case and add a timeout for finish call.

Bug: 196171638
Bug: 197555842
Test: adb shell dumpsys SurfaceFlinger
Test: check the offscreen layers
Test: see 198714745#comment6
Change-Id: Ic6d2521d788c50e10b81b556849194a97f240376
Merged-In: Iec1eb82d1a4756a7b85c8fbdd05f4132a74c613c
2021-09-07 08:44:16 -08:00
Naomi Musgrave
052c311bb2 Merge "[MediaProjection] Do not start layer mirroring without a surface" into sc-v2-dev 2021-09-06 09:57:30 +00:00
Wu Ahan
506fa0bebd Merge "Make sure the removeObservers be called correctly" into sc-v2-dev 2021-09-06 03:18:43 +00:00
TreeHugger Robot
6bd19fab1c Merge "[DO NOT MERGE] Sync flicker from master to sc-v2" into sc-v2-dev 2021-09-04 00:15:31 +00:00
Gaurav Bhola
19c0a2c91a Move the NotificationAccessConfirmationActivity component name to resource config so that it can be overlayed.
- It will be overlayed by car_product.

Test: atest CompanionDeviceManagerTest
Bug: 191699828
Change-Id: I0f7d19d9a5e43d68affed8293745789d9b1b0adc
2021-09-03 18:04:49 +00:00
Ahan Wu
f0fda0d220 Make sure the removeObservers be called correctly
Handle the surface destroyed case and add a timeout for finish call.

Bug: 196171638
Test: adb shell dumpsys SurfaceFlinger
Test: check the offscreen layers
Change-Id: Id1c0e3a0aea1e27a5581a9c7bdcbe6562f8e2ab6
2021-09-03 06:05:43 -08:00
Naomi Musgrave
fcef782559 [MediaProjection] Do not start layer mirroring without a surface
An app may pass a null surface to MediaProjection#createVirtualDisplay,
and later set the surface on the VirtualDisplay. The display's state
will change from off to on when the surface is set.

When determining if layer mirroring should be started/updated in
DisplayContent, take the presence of the surface/display state
into account, to prevent the app from crashing.

Bug: 197863746
Test: atest WmTests:DisplayContentTests
Change-Id: I01af07fff681aab6fc8235c861375eb79118cbfe
2021-09-03 14:42:52 +01:00
Peter_Liang
a71cd04883 Fix the title of the HW "Edit shortcuts" menu is truncated when the device is folded.
Solution:
Remove the attribute configchanges and store the situation to let the dialog automatically be created again when layout changes.

Bug: 194072748
Test: manual test
Change-Id: I0d70af45720d796bed1115f1835eb66fc6ccadf3
2021-09-03 16:16:36 +08:00
Shawn Lin
97b0de7326 Merge "[DO NOT MERGE]Support rounded corner for multi-display devices" into sc-v2-dev 2021-09-03 03:57:09 +00:00
Joe Bolinger
c346dab881 Merge changes from topic "more-cancel-sc-qpr1-dev" into sc-qpr1-dev am: 16a7d2e7bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15727904

Change-Id: Id8fb1fac31177116d974bd99f1056f6565d986ea
2021-09-01 22:23:23 +00:00
Joe Bolinger
bdd477a5d1 Add requestId to authentication entry points.
The CancellationSignal passed into the authentication methods is not
associated with the request and can be used to cancel the current
operation, even if it is more recent. The new id prevents outdated
signals from being using.

Note that there are still issues with the Callbacks that are not
addressed (see bug for details).

Bug: 194405579
Bug: 189451155
Bug: 191716671
Test: atest com.android.systemui.biometrics com.android.server.biometrics

Change-Id: Id71be912cc88ae90df8087eb8f1a6fc3e110f883
2021-09-01 08:49:26 -07:00
Nataniel Borges
c8287a930f [DO NOT MERGE] Sync flicker from master to sc-v2
Flicker on master diverged form sc-v2, to make it easier to debug
flicker issues on sc-v2, push the current version of flicker into sc-v2

Test: atest FlickerTests WMShellFlickerTests
Bug: 188792659
Change-Id: I1c832bf32214b12ba4b708bccfc95cf259324844
2021-09-01 12:06:21 +00:00
Ming-Shin Lu
6902904e97 Refine WindowInsets logs
- Add WM_DEBUG_WINDOW_INSETS ProtoLogGroup to use for logging
  general Insets logs in WM core.
- Refine InsetsSourceProvider#updateVisibility proto log format
  to add insets type information.
- Add InsetsSurceControl#toString to print control target info.

Bug: 197189357
Test: adb shell wm logging enable-text WM_DEBUG_WINDOW_INSETS
Test: atest ProtoLogImplTest \
            ProtoLogViewerConfigReaderTest \
            WmTests:ProtoLogIntegrationTest \
            LogDataTypeTest \
            protologtool-tests
Change-Id: I1f01ce4d9fe5cb17f7bd60a424689260682b1dfc
2021-08-30 22:43:46 +08:00
shawnlin
6603444a76 [DO NOT MERGE]Support rounded corner for multi-display devices
- Add new array configs for every rounded corner configs.
- Update rounded corner drawable when a display changes in
  ScreenDecorations.

Bug: 131221697
Test: atest DisplayCutoutTest RoundedCornersTest LocalDisplayAdapterTest
      ScreenDecorationsTest
Change-Id: I1f32ff680609267010b05a39a5b8e84511bf1243
2021-08-25 15:58:28 +08:00
Neha Jain
fd8c882352 Merge "ims: Version support for uce feature tags" into sc-dev am: d446e80289 am: 5d29a96cab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15515803

Change-Id: Ib937dcefc2d5e7fe44636155c2b868696cdfac6c
2021-08-24 18:33:16 +00:00
Neha Jain
5d29a96cab Merge "ims: Version support for uce feature tags" into sc-dev am: d446e80289
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15515803

Change-Id: I57427075675705a05a172e7d04dcf2eb76e4dd23
2021-08-24 18:17:25 +00:00
Pavan Kumar M
6624e2aa57 ims: Version support for uce feature tags
Add version support for uce feature tags

Bug: 175092320
Bug: 193992611
Bug: 193543670
Change-Id: I8b62b9b9d7ae271bc623764d545db1320b4dc64f
2021-08-24 01:39:55 +00:00
Jeff DeCew
262b278197 Merge changes I09b3999a,I590be0ba into sc-qpr1-dev am: 10c7e2b811
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15549414

Change-Id: I9597ee3b59967386c95bb5aa2129ed5ea7b5e58d
2021-08-16 19:38:07 +00:00
Jeff DeCew
10c7e2b811 Merge changes I09b3999a,I590be0ba into sc-qpr1-dev
* changes:
  Use tertiary accent color for expander with unread count.
  Fix ContrastColorUtil.findContrastColorAgainstDark to return the valid color
2021-08-16 19:21:18 +00:00
Jeff DeCew
4c0e8a62e6 Fix ContrastColorUtil.findContrastColorAgainstDark to return the valid color
Fixes: 196600502
Test: atest ContrastColorUtilTest
Change-Id: I590be0ba30c03e867bf08558483239818b3aff82
2021-08-16 14:14:53 +00:00
Jeff DeCew
62a1033f13 Merge "Collapse the CallStyle buttons to just an icon instead of truncating text." into sc-qpr1-dev am: 44527690ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15559241

Change-Id: I9a60203a071be94737e09c9a1d0ffd77fe4323e8
2021-08-14 02:17:12 +00:00
Jeff DeCew
7ce358c005 Collapse the CallStyle buttons to just an icon instead of truncating text.
Fixes: 195019654
Test: post CallStyle notification without custom action; observe text
Test: post CallStyle notification with custom action; observe buttons shrink to icon only.
Test: repeat tests using various font and screen sizes.
Change-Id: Icbd6189a1e03494e481e8672263570ae2657f946
2021-08-13 15:52:48 +00:00
Nate Myren
7ebbcf1685 Merge "Add attribution info to start callbacks" into sc-dev am: 5d97f29218
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15446590

Change-Id: If5ddeb244befcaea57a3e53f741b94ec5bfd6dd0
2021-08-03 20:06:56 +00:00
Nate Myren
06d07d54db Add attribution info to start callbacks
Add attribution flags and chain IDs to start callbacks, and have the
PermissionUsageHelper listen for starts. This ensures that, if another
start happens while an op is already running, and has chain information,
then this chain information will be recorded.

Test: manual
Bug: 194198234
Change-Id: I0ab1aa0969b70e18001f4a814ea5689f9329a019
2021-08-03 08:25:31 -07:00
Wu Ahan
d6d30bf7f6 Merge "Support surface only instrumentation" into sc-v2-dev 2021-08-02 10:06:03 +00:00
Li Li
d2aeb490a8 Merge "Freezer: fix exception when parsing /proc/locks" into sc-dev am: ef12967b75
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15395534

Change-Id: I28f1b15ab636063727f02414a98896ee2679c6fc
2021-07-30 16:50:50 +00:00
Li Li
ef12967b75 Merge "Freezer: fix exception when parsing /proc/locks" into sc-dev 2021-07-30 16:35:16 +00:00
Ahan Wu
7141ab2619 Support surface only instrumentation
- Support surface only instrumentation.
- Add enums for pip and wallpaper instrumentation.

Bug: 170708749
Test: atest InteractionJankMonitorTest
Test: atest FrameTrackerTest
Change-Id: Iec1eb82d1a4756a7b85c8fbdd05f4132a74c613c
2021-07-29 19:21:31 -08:00
Daniel Solomon
070300e858 Merge "Revert "SCREEN_BRIGHTNESS - map 255 to current max"" into sc-dev am: d5e1458566
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404418

Change-Id: Ie65fbb748337a030492d515bbea94c551398b5f5
2021-07-29 19:15:35 +00:00
Hai Zhang
0f17f27c77 Merge "Only construct real Throwable objects in AndroidFuture.readThrowable()." into sc-dev am: af04dd2ad5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302018

Change-Id: I1bf40fe706b0f03443a8a6fbb6e8c84b0fa44402
2021-07-29 19:12:13 +00:00
Li Li
bbe06e7b59 Freezer: fix exception when parsing /proc/locks
The original code is based on /proc/locks manpage. Unfortunately, that
manpage is never correctly updated to include the new field for blocked
locks. The new code detects the extra field. As StringTokenizer is too
heavy, ProcFileReader is used for better performance.

Bug: 194756340
Test: FrameworksUtilTests com.android.internal.util.ProcFileReaderTest
Test: FrameworksCoreTests com.android.internal.os.ProcLocksReaderTest
Test: No /proc/locks parsing exception with blocked locks
Change-Id: I4c9763f9d3091f7d84d2e4b672d7e5cb78b33f59
2021-07-29 09:18:53 -07:00
Siim Sammul
76b63d54cf Merge "Do not make a getThreadTimeMicro() call when it is not needed. This was accidentally changed with https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080830" into sc-dev am: 6c852aeabc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15346904

Change-Id: Ibaae003e403fc6d20002a62241ec23a0fa97f2ce
2021-07-28 18:25:11 +00:00
Alison Cichowlas
7bed52f477 Merge "Sharesheet: remove 2 separators, restyle the 3rd." into sc-dev am: 832779a555
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377016

Change-Id: I37ce8ef56bc0cb8efd24e899406f30b7242738ae
2021-07-28 18:24:05 +00:00
Daniel Solomon
d5e1458566 Merge "Revert "SCREEN_BRIGHTNESS - map 255 to current max"" into sc-dev 2021-07-28 17:42:43 +00:00
Daniel Solomon
792229b553 Revert "SCREEN_BRIGHTNESS - map 255 to current max"
This reverts commit 002e656a51.

Reason for revert: Setting brightness using adb (adb shell settings put system screen_brightness ...) results in different brightness being set by DisplayPowerController each time.

Bug: 194791517
Test: atest HighBrightnessModeControllerTest
Test: manually test `settings put system screen_brightness 23` yields
      consistent results
Change-Id: I6b49253b46e4d09a1f4129d3df950c9d36eb6ede
2021-07-28 17:17:15 +00:00
Alison Cichowlas
82cee4bd0a Merge "Sharesheet: be more defensive about un-unparcelable intents." into sc-dev am: a1d1a38269
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15374840

Change-Id: I24bf7607ee67bfba322f0f03a62eb58745b98a79
2021-07-28 15:03:08 +00:00
Santos Cordon
28c5f05a22 Merge "SCREEN_BRIGHTNESS - map 255 to current max" into sc-dev am: e4e836a175
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15359296

Change-Id: I0e027bc0ecbdea29c8b86c1785dc514e69efdff8
2021-07-28 14:55:42 +00:00
Alison Cichowlas
b566f49ae4 Merge "Sharesheet: action bar is independent of WP tabs, should always launch as primary user." into sc-dev am: 9197f7b260
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15363687

Change-Id: I23d9a8b26412d255f50093f6b8f5cfa9bed00052
2021-07-28 14:50:52 +00:00