Commit Graph

16560 Commits

Author SHA1 Message Date
Jeff Chang
0281b203d8 [RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity am: 9c5c42ad03
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16743243

Change-Id: I36a91c0de0d6a072f930277c0f235177b7822d33
2022-02-09 09:09:08 +00:00
Jeff Chang
9c5c42ad03 [RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity
A malicious application could overlay the activity. The overlay is
able to be tapped through, which can trick the user into starting a
harmful activity.

The CL added the flag SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS for
the activity to prevent the tapjacking/overlay attack.

Bug: 205595291
Test: atest CtsHarmfulAppWarningHostTestCases
Change-Id: Ia1a1ae0dc451e04bf5c31e3cb8cf30a0d8e32991
(cherry picked from commit a04b3666b8)
2022-01-28 03:19:44 +00:00
Dmitri Plotnikov
fb10be47c9 Zero out WiFi duration and power if ControllerActivityCounter is null
Bug: 200346841
Test: atest FrameworksCoreTests:WifiPowerCalculatorTest
Change-Id: I087e3b60c277c1d1a63b6c06e60ffcbe95224668
(cherry picked from commit 199f93ac3b)
2021-09-28 17:20:34 +00:00
Varun Shah
912d89451a Merge "Dismiss the suspend dialog if conditions have been modified." into sc-qpr1-dev 2021-09-24 17:54:45 +00:00
Dmitri Plotnikov
0c561475c3 Check custom component names before aggregating BatteryUsageStats snapshots
If the lists of custom power components do not match, a crash will occur.
Instead of causing a crash, simply skip incompatible snapshots.

Bug: 196040329
Bug: 200511361
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryUsageStatsProviderTest

Change-Id: I87ba605371a5f3119dcff33f6109e94ee46ab57d
(cherry picked from commit a1ea9ecd56)
2021-09-20 18:35:09 +00:00
Dmitri Plotnikov
50348e3120 Drop per-app measured energy when an OTA changes the set of energy components
Bug: 200123115
Test: atest BatteryStatsTests
Change-Id: I750a5c9fa3faa9757625b2d2494df1484b68016d
(cherry picked from commit 9cb960304e)
2021-09-17 23:10:56 +00:00
Varun Shah
777d87f91b Dismiss the suspend dialog if conditions have been modified.
Whenever suspension conditions change, if there is a user-visible
suspension-related dialog, dismiss it to ensure the user is never
looking at stale information.

Bug: 169137795
Test: atest SuspendPackagesBroadcastTest#sendPackagesSuspendModifiedForUser
Test: manual (steps below)
-enable EBS, tap on suspended app to see dialog
-enable Focus mode, ensure dialog is dismissed
-tap on suspended app again to see relevent dialog,
 disable Focus mode, ensure dialog is dismissed
-tap on suspended app again to see relevant dialog,
 disable EBS, ensure dialog is dismissed correctly
-can permute enable/disable steps to further verify

Change-Id: Ib1650f910f7441498424ab4bc92185ce432ac405
(cherry picked from commit 25e73a8b9e)
2021-09-17 22:35:26 +00:00
Bernardo Rufino
d9ba2df119 Merge "Remove sendCloseSystemDialogs() from PhoneFallbackEventHandler" into sc-qpr1-dev 2021-09-17 15:15:48 +00:00
Miranda Kephart
63fe7d7343 Fix direct share badges when sharing on work/personal profiles
Use the passed-in user instead of the current user to determine
whether or not to add the work profile badge to direct share
target app icons, so that personal share targets do not have the
badge (even when sharing something from the work profile) and
work/managed share targets do have it (even when sharing something
from the personal profile).

Test: manual; tested appearance sharing from personal->work and
from work->personal
Bug: 197388251
Fix: 197388251

Change-Id: Ieee50d46e8058a92efa5be8aae9859447531c270
2021-09-15 15:20:14 -04:00
Bernardo Rufino
1538b7fda7 Remove sendCloseSystemDialogs() from PhoneFallbackEventHandler
Today's flow of events is like this: key goes to focused app
(ViewRootImpl::processKeyEvent), the view hierarchy does not handle the
event, so ViewRootImpl uses FallbackEventHandler to invoke the fallback
action for this key.

The problem is that for many keys the app itself is closing system
dialogs before taking the appropriate action (often launching an
activity, eg. dialer for KEYCODE_CALL), but this is now prohibited in S
due to abuse of said action.

The long-term plan is to return to InputDispatcher the fact that the key
wasn't handled by the app and have ID call out to the policy, which will
launch the appropriate action and adjust the UI as it sees fit (close
system dialogs).

However, we need to prevent apps from crashing because of this, hence
this change for S still. The unfortunate effect is that system dialogs
won't be hidden in these cases, but this livable with until we properly
implement the infrastructure.

Bug: 199173862
Test: Simulate code-paths with affected keys and make sure apps don't
      crash:
      1. adb shell input keyevent --longpress KEYCODE_CALL
      2. adb shell input keyevent --longpress KEYCODE_CAMERA
Change-Id: I44ad41ac1eac9acc8320298ceb4c1b21bde8af5d
2021-09-15 15:25:47 +01: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
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
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
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
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
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
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
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
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
Li Li
ef12967b75 Merge "Freezer: fix exception when parsing /proc/locks" into sc-dev 2021-07-30 16:35:16 +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
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
Hai Zhang
af04dd2ad5 Merge "Only construct real Throwable objects in AndroidFuture.readThrowable()." into sc-dev 2021-07-28 01:23:12 +00:00
Siim Sammul
6c852aeabc 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 2021-07-26 09:14:43 +00:00
Alison Cichowlas
832779a555 Merge "Sharesheet: remove 2 separators, restyle the 3rd." into sc-dev 2021-07-24 05:53:04 +00:00
Alison Cichowlas
6e6455518c Sharesheet: remove 2 separators, restyle the 3rd.
Test: Manual
Bug: 178619070
Change-Id: I9a6797863be2d0220fb71b2b9ca1d04c1f279b02
2021-07-23 21:43:22 +00:00
Alison Cichowlas
a1d1a38269 Merge "Sharesheet: be more defensive about un-unparcelable intents." into sc-dev 2021-07-23 21:31:40 +00:00
Santos Cordon
e4e836a175 Merge "SCREEN_BRIGHTNESS - map 255 to current max" into sc-dev 2021-07-23 20:13:55 +00:00
Alison Cichowlas
417b15994a Sharesheet: be more defensive about un-unparcelable intents.
Test: atest ChooserActivityTest
Bug: 194359789
Change-Id: I2fb0c0e120f048042dea499e1ffc126989e0e2d2
2021-07-23 12:17:29 -04:00
Alison Cichowlas
9197f7b260 Merge "Sharesheet: action bar is independent of WP tabs, should always launch as primary user." into sc-dev 2021-07-23 14:54:12 +00:00
Alison Cichowlas
f0657fc49e Sharesheet: action bar is independent of WP tabs, should always launch
as primary user.

Bug: 193424706
Test: atest ChooserActivityTest; manual per bug steps

Change-Id: Ie680270fa6a62ec59f35715514bfc0232b0d12f9
2021-07-22 20:43:21 -04:00
Santos Cordon
002e656a51 SCREEN_BRIGHTNESS - map 255 to current max
Since the current max can change for brightness due to
high-brightnes-mode (HBM), make it so that 255 is always mapped
to the current max, which can be different when in HBM or normal
brightness mode.

Bug: 187784093
Test: atest HighBrightnessModeControllerTest
Test: manually verify 255 is used for max when in HBM or not.
Change-Id: Ib0631fc12de0e8e4c7c638901d82c362e79944c3
2021-07-22 18:34:37 +01:00
Siim Sammul
8f31e9d663 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

Bug: 193543224
Test: N/A no functionality change, just avoiding a method call
Change-Id: If4579e96cd5aab41a46f60b5133938e81d608cff
2021-07-22 09:22:56 +00:00
Nikita Ioffe
e501fd8379 Restrict what APEXes different installers can update
* Mainline APEXes can only be updated by a modulesInstaller (an entry
in whitelisted-staged-installer.xml with isModulesInstaller="true")

* The whitelisted-staged-installer.xml file can have only one entry with
isModulesInstaller="true"

* Vendor APEXes can only be updated by an installer defined in the
corresponding entry in vendor-apex-allowlist.xml.

BYPASS_INCLUSIVE_LANGUAGE_REASON=existing occurrences

Test: atest StagedInstallInternalTest
Test: atest GtsStagedInstallHostTestCases
Test: atest CtsRollbackManagerHostTestCases
Test: atest CtsStagedInstallHostTestCases
Bug: 190802380
Change-Id: I729abb5153df079fb6885016a4b41d0acc827e3c
2021-07-21 16:44:42 +01:00
Ahan Wu
65a3d5dfa4 Fix potential memory leak of FrameTracker
If begin and end invocations are at the same frame, the end vsync id
will be smaller than the begin vsync id, results in zero size jank info
array, the finish call will be missed as well, a leak happens.

Bug: 192140966
Test: atest FrameTrackerTest InteractionJankMonitorTest
Change-Id: I388558e60bdb84ad248a9afabe7776c4e6e67c57
2021-07-20 06:31:41 +00:00
Hai Zhang
2d6a545e30 Only construct real Throwable objects in AndroidFuture.readThrowable().
Bug: 186530450
Test: atest CtsSecurityTestCases:android.security.cts.AndroidFutureTest
Change-Id: Icc5ce702f0cd84e9136dee3c65f63619df697358
2021-07-16 19:02:23 +00:00
Dmitri Plotnikov
4162c032bf Merge "Fix BatteryStatsImplTest." into sc-dev 2021-07-16 00:26:16 +00:00
Dmitri Plotnikov
21dd5325fb Fix BatteryStatsImplTest.
Bug: 180015146
Test: atest FrameworksCoreTests:BatteryStatsImplTest

Change-Id: I6b43ca03ba816e12735ebd47d8cf61a6b1cee110
2021-07-15 14:51:18 -07:00
TreeHugger Robot
4820907a6b Merge "Make Verification text shrink to zero size for long names or large fonts." into sc-dev 2021-07-14 13:46:45 +00:00
Daniel Sandler
51204c444a Merge changes from topic "egg12" into sc-dev
* changes:
  Bubbling up some of these great new colors.
  AnalogClock: Allow subclasses to override the "now" instant.
2021-07-13 19:37:48 +00:00
Dan Sandler
28f8033d80 Bubbling up some of these great new colors.
Bug: 177962166
Test: adb shell am start -n android/com.android.internal.app.PlatLogoActivity
Change-Id: I92cfe3f9e2294d888dfaa5f30591885804d8302b
2021-07-13 09:52:29 -04:00
Jeff DeCew
b3f13370d4 Make Verification text shrink to zero size for long names or large fonts.
Fixes: 189723284
Test: manual
Change-Id: I19e327df59cd085870c04e266f053a87b35b8a54
2021-07-12 16:04:21 -04:00
Jeff DeCew
d14c60be51 Merge "Use SRC_ATOP instead of SRC_IN for blending the NotificationExpandButton" into sc-dev 2021-07-12 19:48:58 +00:00
Ahaan Ugale
e360fc69a7 Merge "Check/note ops when delivering HotwordDetectedResult" into sc-dev 2021-07-12 17:46:28 +00:00
Ahaan Ugale
c5e855a9d9 Check/note ops when delivering HotwordDetectedResult
This is partially a followup of
I80dabaf6ae0e781028dde16ead3321fbff319542 which removed these operations
from the SoundTrigger layer when the HotwordDetectionService is used.

Also fixes a race condition where the DSP event can go directly to the
Interactor if the DetectionService isn't connected.

Bug: 186164881
Test: atest HotwordDetectionServiceBasicTest
Test: manual - DSP and non-DSP
Change-Id: Iee3b00c6c08597ad1993fae677e9f8ae2f60744c
2021-07-12 17:42:24 +00:00