Commit Graph

16609 Commits

Author SHA1 Message Date
Treehugger Robot
c1ceac41b8 Merge "Fix RRO loading from inside APEXes." am: de3baffb29 am: 23cd20c926 am: 09341a5ec4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1830600

Change-Id: I47f88d5567eeccdf1d19d2d337d47d168ec98bf5
2021-10-26 23:16:06 +00:00
Treehugger Robot
09341a5ec4 Merge "Fix RRO loading from inside APEXes." am: de3baffb29 am: 23cd20c926
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1830600

Change-Id: I2d2fdda8b4f0fc6f4c9b32ca3e2e1c810b3d5384
2021-10-26 22:46:40 +00:00
Daniel Norman
653a1c1a28 Fix RRO loading from inside APEXes.
APEXes can already contain RRO APKs by using the 'rro' apex Soong
module field. However, these RROs were not being loaded properly by
Zygote or PackageManagerService.

For all RROs inside APEXes, the RRO uses the same overlay config that
is used for other RROs on the APEX's preinstalled partition.

For RROs targeting 'android', which are installed by Zygote
using AssetManager:
1. OverlayConfig looks for active APEXes in the apex-info-list file,
   which is already accessible to Zygote.
2. OverlayConfig passes the APEX module names to OverlayConfigParser,
   for each preinstalled-partition.
3. OverlayConfigParser uses OverlayScanner to scan the
   each /apex/<APEX>/overlay directory.

For other RROs:
1. PackageManagerService already parses and provides RROs inside APEXes
   to OverlayConfig.
2. RROs inside APEXes used to have no config rule applied because their
   path prefix (/apex/) did not match any partition rule. Now, their
   preinstalled path is used instead.

Bug: 199200417
Test: Define a static RRO targeting 'android' inside a /vendor APEX.
      Define a static RRO for settings provider inside a /vendor APEX.
      Observe APEXes are enabled by default.
Test: Make a change to an RRO inside a /vendor APEX.
      m <apex>; adb install <apex artifact>; adb reboot;
      Observe change has taken effect.
Change-Id: I2bce9bc704789329b8c6aac6d476f17ff6718e0f
Merged-In: I2bce9bc704789329b8c6aac6d476f17ff6718e0f
2021-10-25 13:04:24 -07:00
Rahul Sabnis
6f74b5dd8b Merge "Adding @SystemApi annotation to Bluetooth energy stats." am: a12c77ab44 am: a125c31d21 am: f91171d35e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1854179

Change-Id: Ib49bb57260772b4200a11bb59e010ad8b8aa172e
2021-10-25 17:09:57 +00:00
Rahul Sabnis
f91171d35e Merge "Adding @SystemApi annotation to Bluetooth energy stats." am: a12c77ab44 am: a125c31d21
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1854179

Change-Id: Id4834acb7d38f9bd98e1eb29b9be0636a2f27a73
2021-10-25 16:53:04 +00:00
Etienne Ruffieux
d372361fe3 Adding @SystemApi annotation to Bluetooth energy stats.
Added @SystemApi annotation to BluetoothActivityEnergyInfo
and UidTraffic getters for mainline compatibility. Replaced
raw array by List. Deleted unused constructors.

Tag: #feature
Bug: 200201373
Test: Manual
Change-Id: Id93215f48bf08d31ac269af9e064cf598f50b6d3
2021-10-21 20:39:31 +00:00
TreeHugger Robot
bfe149f2ed Merge "Zero out WiFi duration and power if ControllerActivityCounter is null" into sc-qpr1-dev am: c410f29893
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934611

Change-Id: Iee9dbf00b4568400c319a348587018bfa3e6fb77
2021-09-29 00:43:25 +00:00
Xin Li
8891d70334 Merge SP1A.210812.016
Merged-In: I8b62b9b9d7ae271bc623764d545db1320b4dc64f
Change-Id: I458ed7f2eb8603f5e89c1d73bc0f0d52b826973e
2021-09-28 19:26:36 +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
12c61b00c0 Merge "Dismiss the suspend dialog if conditions have been modified." into sc-qpr1-dev am: 912d89451a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15853562

Change-Id: Ieead99da9e0ed20b30b9add94c8003ae69ef9424
2021-09-24 18:07:21 +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
TreeHugger Robot
4ff921f559 Merge "Check custom component names before aggregating BatteryUsageStats snapshots" into sc-qpr1-dev am: 0ef5152b17
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15872124

Change-Id: Ib40da10e9db2ee290e1c65681e25862b0c6b7e35
2021-09-20 20:51:11 +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
e4cc934175 Drop per-app measured energy when an OTA changes the set of energy components am: 50348e3120
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15857253

Change-Id: I509be3ae6643864524529c06a61229c11b0ae008
2021-09-18 03:53:48 +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
5a2619c678 Merge "Remove sendCloseSystemDialogs() from PhoneFallbackEventHandler" into sc-qpr1-dev am: d9ba2df119
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15836011

Change-Id: I9a03f509116603c2286b2c385af4587bd8dd9b09
2021-09-17 15:29:37 +00:00
Bernardo Rufino
d9ba2df119 Merge "Remove sendCloseSystemDialogs() from PhoneFallbackEventHandler" into sc-qpr1-dev 2021-09-17 15:15:48 +00:00
Miranda Kephart
0d5e670809 Merge "Fix direct share badges when sharing on work/personal profiles" into sc-qpr1-dev am: b51d58e6fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15839049

Change-Id: I4ff949f7732fd4915b835e33a466165ab9d3c4f4
2021-09-16 14:03:52 +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
a9a29b6ffe 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: I7dd1ea2b9c10a2410917fe89fb50ad8a17f2c3ea
2021-09-13 14:09:29 +00:00
Pavel Grafov
a238881ee0 Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev 2021-09-13 13:52:26 +00:00
Dmitri Plotnikov
58214c18dd Merge "Add OWNERS for BatteryStats related files" am: a84bdc93a8 am: cc225325e3 am: e69a707085
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822145

Change-Id: Iedc246526e371342096d6e3354b0e742bd4c855c
2021-09-10 18:56:26 +00:00
Dmitri Plotnikov
e69a707085 Merge "Add OWNERS for BatteryStats related files" am: a84bdc93a8 am: cc225325e3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822145

Change-Id: I531bd2c8da470bbde94135dfdddc425de5dbbf9c
2021-09-10 18:41:20 +00:00
Dmitri Plotnikov
cc225325e3 Merge "Add OWNERS for BatteryStats related files" am: a84bdc93a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822145

Change-Id: If3cc87baf6a2249634e3f35ea8683177d9ace1c9
2021-09-10 18:20:32 +00:00
Dmitri Plotnikov
9fca835a97 Add OWNERS for BatteryStats related files
Test: N/A

Change-Id: I6b17062eaf538849389528619067504f18e7b2ab
2021-09-09 18:24:17 -07:00
Michael Wachenschwanz
493f8b0569 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: I6eb80336c52e2046180802d6813c7e9dafb92e47
2021-09-09 23:54:45 +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
Wu Ahan
819d63139f Merge "Make sure the removeObservers be called correctly" into sc-dev am: 766eff7df1 am: db108bdf5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15747424

Change-Id: Ib41b1c0347d440c0537ee157fe03327a03a1e3d2
2021-09-08 12:32:54 +00:00
Wu Ahan
db108bdf5f 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: I8e7f11c28c9e76702f422e5153d250f5750e8138
2021-09-08 12:22:40 +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
Hall Liu
f4fe3ac665 Update and expose ModemActivityInfo
Update ModemActivityInfo to present a nicer API surface and expose it as
a SystemApi. Also change clients in BatteryStats to match the new
surface.

This is part 1. Part 2 will modify the methods in TelephonyManager to
use a more up-to-standards threading model.

Bug: 170427831
Test: atest ModemActivityInfoTest
Change-Id: I762ed949342861c75d94eafce88335e7bd8c9139
Merged-In: I762ed949342861c75d94eafce88335e7bd8c9139
2021-09-07 11:40:55 -07: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
Treehugger Robot
0fa9d2ef6b Merge "Add suppressLintAnnotation on state.java" 2021-09-07 15:51:39 +00:00
wescande
4d65834880 Add suppressLintAnnotation on state.java
Test: Build
Merged-In: I02aa127e8e07f239561f4f2a3bbdfc6fccb82f7f
Change-Id: I5a22ebe6473fbf38494e20d629e763c331b1e1e6
2021-09-07 16:43:09 +02:00
Treehugger Robot
0ee62e910b Merge "create library for mainline module" am: c59870928e am: 26531301a0 am: eeecbc866f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818896

Change-Id: If4d803fb10b4fe5f77b308200ed93fd43681190e
2021-09-07 14:33:34 +00:00
Treehugger Robot
eeecbc866f Merge "create library for mainline module" am: c59870928e am: 26531301a0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818896

Change-Id: Ic3137a8521f0cca651292a9a56cddde54a138ea7
2021-09-07 14:21:56 +00:00
Treehugger Robot
26531301a0 Merge "create library for mainline module" am: c59870928e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818896

Change-Id: I048c27593314c00706f29db19b6d20ed4b899ae2
2021-09-07 14:00:18 +00:00
William Escande
a6fb9459cc create library for mainline module
This library is a temporary work to link all mainline module using
statemachine.
Once this is done, we will be able to move the library to
frameworks/libs/modules-utils

also fix some typo in state* files

Bug: 198418216
Tag: #refactor
Test: None
Change-Id: I1bec7c7bdb25bf3397a742a356aa1f18fddf7d89
2021-09-06 15:28:09 +00:00
Joe Bolinger
02eb16d887 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: Id9964610269328c04806b44d10b9bb555b1f63e0
2021-09-01 22:23:39 +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
Daniel Norman
fd9b35d4de Merge "Allow APEXes permission XMLs to declare features." am: ada5fb65b5 am: 2b3dbdd95b am: d0c69c2298
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1810683

Change-Id: Id1e4ac300e6cd25369a092285fc28d0576e0d96c
2021-08-30 19:49:24 +00:00
Daniel Norman
d0c69c2298 Merge "Allow APEXes permission XMLs to declare features." am: ada5fb65b5 am: 2b3dbdd95b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1810683

Change-Id: I1f429e9506dc522cc29d3b4ecba8b33d6982eb55
2021-08-30 19:32:25 +00:00
Daniel Norman
2b3dbdd95b Merge "Allow APEXes permission XMLs to declare features." am: ada5fb65b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1810683

Change-Id: I2385e0b45e15f204382ec5eeee24ce3d62b17064
2021-08-30 19:11:58 +00:00
Daniel Norman
ada5fb65b5 Merge "Allow APEXes permission XMLs to declare features." 2021-08-30 19:09:21 +00:00
Daniel Norman
5f0797723c Allow APEXes permission XMLs to declare features.
This allows APEXes to include permission XMLs like the NFC XMLs in
frameworks/native/data/etc which declare NFC features.

(This also enables `unavailable-feature` declarations.)

Bug: 197680726
Test: Include an NFC permission XML in an APEX.
      Observe feature is set correctly in logs and by
      enabling NFC in Settings app.
Change-Id: Ied425b8897ab80df250d42cfbf0525634ed948aa
2021-08-26 11:57:23 -07:00
Orion Hodson
868634f0bb Merge "Drop system_server dexopt in ZygoteInit" am: 5e1c9fe7fc am: b55a7938a6 am: f08df3a589
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1806016

Change-Id: I344c6a25a3a0f20bdc825107c4bc11142713b2ea
2021-08-26 15:21:28 +00:00