Dmitri Plotnikov
460e083566
Merge "Reduce size of BatteryUsageStats Parcel" into sc-dev am: 8b22190dfd am: 8190364e45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15020275
Change-Id: Id0fa495f5b4b8b147fe8db24739944b2f74db113
2021-06-21 20:22:50 +00:00
Dmitri Plotnikov
8b22190dfd
Merge "Reduce size of BatteryUsageStats Parcel" into sc-dev
2021-06-21 19:57:08 +00:00
Adam Bookatz
de5d4f94e2
Merge "TestApi for UserSystemPackageInstaller" into sc-dev am: b82d3b0b76 am: 2210d80a3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14847036
Change-Id: Ib3ca613f4ba2cee4aa9f7b4d3ef627e36fd069e2
2021-06-18 19:42:17 +00:00
Adam Bookatz
b82d3b0b76
Merge "TestApi for UserSystemPackageInstaller" into sc-dev
2021-06-18 19:05:49 +00:00
Dmitri Plotnikov
b59cb7202e
Reduce size of BatteryUsageStats Parcel
...
Bug: 191237968
Test: atest FrameworksCoreTests:BatteryUsageStatsTest
Change-Id: I89ec1b7f31935d65b170f180ff6cab4352e7ccbf
2021-06-17 17:27:00 -07:00
TreeHugger Robot
60a09f5815
Merge "Fix usage filter over UNKNOWN vibration" into sc-dev am: c100aeabbc am: fdc71a267b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14980865
Change-Id: I9f7c2b1e70fbfe7f92d00410e89f4af13e89e53c
2021-06-17 21:34:09 +00:00
TreeHugger Robot
c100aeabbc
Merge "Fix usage filter over UNKNOWN vibration" into sc-dev
2021-06-17 20:12:14 +00:00
Lais Andrade
ba57b002d3
Fix usage filter over UNKNOWN vibration
...
The usageFilter parameter added to Vibrator.cancel is always cancelling
UNKNOWN vibrations (usage = 0). The filter should only cancel them if
the value is the same usage, or if all usages are being cancelled.
Fix: 182440404
Test: VibratorManagerServiceTest
Change-Id: Ibf33fe24e5253501e751b027cbf4b68564d82929
2021-06-17 15:30:11 +01:00
Dmitri Plotnikov
c24fb81627
Add BatteryUsageStatsQuery parameters: time range
...
Bug: 187223764
Test: atest FrameworksCoreTests:BatteryUsageStatsProviderTest
Change-Id: If370360695a3f0327f07457abac1fd02164864e1
Merged-In: If370360695a3f0327f07457abac1fd02164864e1
(cherry picked from commit 6ea400b27c )
2021-06-17 05:24:37 +00:00
Dmitri Plotnikov
d82aa7e5c4
Convert BatteryUsageStats to and from XML
...
Bug: 187223764
Test: atest FrameworksCoreTests:BatteryUsageStatsTest#testXml
Change-Id: I6aec09bfb87c1003ede1b24cce8cf474675d2448
Merged-In: I6aec09bfb87c1003ede1b24cce8cf474675d2448
(cherry picked from commit 4b8a26bcaa )
2021-06-16 22:21:05 -07:00
Dmitri Plotnikov
36e0ae27a9
Add BatteryUsageStats.add(BatteryUsageStats)
...
Bug: 187223764
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryUsageStatsTest
Change-Id: I1e5060d726fd0f4634fd658483e80a9ab02e24fb
Merged-In: I1e5060d726fd0f4634fd658483e80a9ab02e24fb
(cherry picked from commit 63d9aecdbb )
2021-06-16 22:18:09 -07:00
Kevin Chyn
8a4df4ade3
Merge "Add BiometricActionDisabledByAdminController" into sc-dev am: c3e64b14c5 am: 2fe7d4ebed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972616
Change-Id: I4c6c7b65a994b9e2be0e46b39b9d899dc7aed28a
2021-06-17 02:13:43 +00:00
Kevin Chyn
c3e64b14c5
Merge "Add BiometricActionDisabledByAdminController" into sc-dev
2021-06-17 01:27:03 +00:00
Kevin Chyn
4e84b8849a
Add BiometricActionDisabledByAdminController
...
1) Adds UserManager#DISALLOW_BIOMETRIC. We actually need to
pass a restriction from settings to ActionDisabledByAdmin area,
otherwise the biometric-specific dialog would be shown outside of
biometric flows.
2) Adds an interface to ActionDisabledByAdminController to return a
optional OnClickListener for the positive dialog button
3) Returns an instance of the biometric controller when conditions
are met
4) Adds string interfaces to DeviceAdminStringProvider to retrieve
biometric-specific strings
Bug: 188847063
Bug: 191306258
Test: manual
Change-Id: Iaeffdeb1336d5db56d464104cdc7677b9021f609
2021-06-16 16:41:14 -07:00
Soonil Nagarkar
bebccfb3bf
Merge "Fix bugs in LocationManagerService and AppOpsPolicy" into sc-dev am: a244ceeb2e am: ce62675539
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14924835
Change-Id: I0a0afba6aaf6e27899c2c1c31f271e4be50b6f2e
2021-06-16 15:58:52 +00:00
Soonil Nagarkar
a244ceeb2e
Merge "Fix bugs in LocationManagerService and AppOpsPolicy" into sc-dev
2021-06-16 15:37:32 +00:00
TreeHugger Robot
36628604bc
Merge "Add BatteryUsageStatsProtoTests to presubmit" into sc-dev am: 0a9650dcde am: c42ccdd692
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14971175
Change-Id: I97f6073cc2d3a2d8dd0d74c73aba2a95b57c41f0
2021-06-15 18:29:51 +00:00
TreeHugger Robot
0a9650dcde
Merge "Add BatteryUsageStatsProtoTests to presubmit" into sc-dev
2021-06-15 18:02:16 +00:00
Soonil Nagarkar
4aa42bdb17
Fix bugs in LocationManagerService and AppOpsPolicy
...
LocationManagerService was overwriting location source appops tag
information whenever a location provider changed state. Since multiple
location providers can correspond to the same uid/app id, this could
lead to loss of tags. This is fixed by recalculating the set of tag for
an entire app id any time a uid changes.
AppOpsPolicy had a bug where tag lists coming from different uids under
the same appid would inappropriately overwrite each other. This is fixed
by modifying the internal/external APIs to work in terms of appid rather
than uid, so that it is someone else's responsibility to ensure the
result is valid for the app id as a whole.
Also fixes a bug where LMS assumes tag listeners are added prior to any
providers. If listeners are added after some providers they will miss
updates. Fixed by always updating the listener on registration.
Bug: 190073375
Test: manual
Change-Id: Ib52d752d857b6ac3b6683186a8d1bbcb814fb798
2021-06-15 08:45:44 -07:00
Dmitri Plotnikov
b2baae41c2
Add BatteryUsageStatsProtoTests to presubmit
...
Bug: 189221904
Test: atest --test-mapping frameworks/base/core/java/android/os
Test: atest --test-mapping frameworks/base/core/java/com/android/internal/os
Change-Id: Id279e899a19c81726cabb5e134a199bb3c367475
2021-06-14 18:56:55 -07:00
Dmitri Plotnikov
969e4064ac
Limit the number of UidBatteryConsumers included in the BatteryUsageStats atom
...
Bug: 189225426
Test: atest BatteryUsageStatsProtoTests:BatteryUsageStatsPulledTest
Change-Id: Ic9866962330f0b51727e5202560d97ffac0b8980
Merged-In: Ic9866962330f0b51727e5202560d97ffac0b8980
2021-06-14 11:53:48 -07:00
Dmitri Plotnikov
4e17d25774
Limit the number of UidBatteryConsumers included in the BatteryUsageStats atom
...
Bug: 189225426
Test: atest BatteryUsageStatsProtoTests:BatteryUsageStatsPulledTest
Change-Id: Ic9866962330f0b51727e5202560d97ffac0b8980
2021-06-14 11:51:41 -07:00
Pavel Grafov
b620951b84
Merge "Don't reset user VPN without reason" into sc-dev am: c0115519f6 am: f74b5d16c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14717702
Change-Id: I1b8e37af88cd7ec00b7e084e85eaea019e0fd11e
2021-06-10 16:02:44 +00:00
Pavel Grafov
c0115519f6
Merge "Don't reset user VPN without reason" into sc-dev
2021-06-10 15:31:04 +00:00
TreeHugger Robot
89788e24cd
Merge "Proper retrying DL installation sessions." into sc-dev am: aea3115776 am: 36b9c31b43
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14910490
Change-Id: I8580191ac095639339dfe18a5578000d02f95b8b
2021-06-09 17:22:58 +00:00
Dmitri Plotnikov
0429fc7527
Merge changes I3c27deb5,If3703606,I66bbb173
...
* changes:
Implement battery_usage_stats_before_reset pull atom
Add BatteryUsageStatsQuery parameters: time range
Implement BatteryUsageStatsStore
2021-06-09 17:21:30 +00:00
Pavel Grafov
d406212ac2
Don't reset user VPN without reason
...
When DPM.setAlwaysOnVpn is called with package=null, it resets
any VPN configured by the user. With this change it won't happen
anymore: it will only reset VPN configuration if it was previously
configured by the admin.
If an admin actually wants to remove any user configured VPN, they
can enforce DISALLOW_CONFIG_VPN restriction which will remove any
user VPNs and will prevent the user from configuring a new one.
+ Also make sure that when the DPC removes an always-on VPN
configuration, the package loses ability to start VPN until the
user authorizes it again.
Bug: 139823667
Test: atest com.android.server.devicepolicy.DevicePolicyManagerTest
Change-Id: Ia703015b4e8d7eaf156358d7eb000d6f58d32238
2021-06-09 14:22:01 +01:00
Alex Buynytskyy
4bafd4ddd8
Proper retrying DL installation sessions.
...
Plus more robust handling of broken DLs.
Bug: 190012477
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest com.google.android.packageinstallerv2proxy.host.gts.IncrementalInstallerHostTest
Change-Id: I5cb037d49cd2b140bed1045c99f072112495acfc
2021-06-08 17:41:47 -07:00
Keun-young Park
1722914fc5
Merge "Allow SharedMemory creation from ParcelFileDescriptor"
2021-06-08 23:45:48 +00:00
Dmitri Plotnikov
6ea400b27c
Add BatteryUsageStatsQuery parameters: time range
...
Bug: 187223764
Test: atest FrameworksCoreTests:BatteryUsageStatsProviderTest
Change-Id: If370360695a3f0327f07457abac1fd02164864e1
2021-06-08 13:45:41 -07:00
Songchun Fan
6ad5139919
Merge "[metrics] log TotalDelayedReadsDurationMillis during ANR and Crash" into sc-dev am: 27d6aa2ec4 am: b793470e6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14824025
Change-Id: Ifeca05ca9e1b0820fc2d5ef65036f351d7c8f90d
2021-06-08 16:40:59 +00:00
Adam Bookatz
55fdb3106a
TestApi for UserSystemPackageInstaller
...
Introduces a TestApi that lists which system packages
will be pre-installed for the given user type, for
use with CTS tests that need to predict which packages
are installed on a new user.
Test: atest com.android.cts.devicepolicy.DeviceOwnerTest#testCreateAndManageUser_LeaveAllSystemApps
Bug: 189873486
Change-Id: I471c5da55f8cf500a07de5773050a997ea391892
2021-06-07 14:33:35 -07:00
Songchun Fan
e8b6bcf6cc
[metrics] log TotalDelayedReadsDurationMillis during ANR and Crash
...
BUG: 187354818
Test: atest android.cts.statsdatom.incremental.AppErrorAtomTests
Change-Id: I54de2d558248a65775452474464ea3f786bf5c55
2021-06-07 12:12:58 -07:00
Keun young Park
d397f0e17d
Allow SharedMemory creation from ParcelFileDescriptor
...
- added as system module api
- Will be used to get shared memory from stable AIDL where only
ParcelFileDescriptor is available.
- Usage / test will be added to p/s/Car later.
Bug: 188780895
Test: build only
Change-Id: I8a634062d10ff0c114f3add1d2a5e8056f17b788
2021-06-04 16:05:21 -07:00
Jeff Sharkey
dbfae6ddc7
Merge changes from topic "may27-sdk" into sc-dev am: e6fb6087aa am: b3a4448be3 am: 77499b3231
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14749815
Change-Id: I759a5582a387d95bb13ad726817b0bcba86e841d
2021-06-02 20:27:34 +00:00
Jeff Sharkey
b3a4448be3
Merge changes from topic "may27-sdk" into sc-dev am: e6fb6087aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14749815
Change-Id: I9ac77657a3bde896f7a90fa9879daf66f5f7a35a
2021-06-02 20:14:07 +00:00
Jeff Sharkey
e6fb6087aa
Merge changes from topic "may27-sdk" into sc-dev
...
* changes:
Finalize resource IDs; script to help in future.
platform/frameworks/base/ - S is now 31
2021-06-02 20:11:14 +00:00
Lais Andrade
085266a2ca
Remove non-zero amplitude validation for waveforms am: c0c482736b am: 95c8656802 am: 3164090c83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703097
Change-Id: If8807f323e110dc604bab07657d29b7e173dec41
2021-06-02 14:20:04 +00:00
Lais Andrade
95c8656802
Remove non-zero amplitude validation for waveforms am: c0c482736b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703097
Change-Id: I91effcc0155767c71fc2c5840279f7f06983b27e
2021-06-02 13:18:46 +00:00
Lais Andrade
c0c482736b
Remove non-zero amplitude validation for waveforms
...
The validation does not exist in Android R and is causing apps to start
crashing in S.
The validation for the static API createOneShot was maintained, as it
already existed in previous releases.
Fix: 184890231
Test: VibrationEffectTest
Change-Id: I606c943a35ddd68ccacab76f0047b9a276b5cf28
2021-06-02 12:26:35 +01:00
TreeHugger Robot
94b2261f04
Merge "Clarify what ignoring battery optimizations means." into sc-dev am: 1b3424aa94 am: dba9178b42 am: 4a1227f074
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14748399
Change-Id: I9cff2c39eb6239ff52ff78f0907d4c7db1147a45
2021-06-01 15:38:44 +00:00
TreeHugger Robot
dba9178b42
Merge "Clarify what ignoring battery optimizations means." into sc-dev am: 1b3424aa94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14748399
Change-Id: Ie4ff90c685e9cac8674f326967c7c117eff12843
2021-06-01 14:59:36 +00:00
TreeHugger Robot
1b3424aa94
Merge "Clarify what ignoring battery optimizations means." into sc-dev
2021-06-01 14:39:55 +00:00
Jeff Sharkey
7c5f4337fd
platform/frameworks/base/ - S is now 31
...
Bug: 171506470
Test: Build
Change-Id: I46d4df5f27783a96a58c966b113391ea3bc112cb
2021-06-01 06:48:51 -06:00
TreeHugger Robot
331609e51b
Merge "Fix storage directory API docs" into sc-dev am: 787c2a6d2a am: 564dc9758b am: c5cc43ae98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14733694
Change-Id: I68dd9561ee6b509c36c80cdaa92e83162f9c9bfd
2021-05-28 03:18:11 +00:00
Jeff Sharkey
19e14f1d4c
Merge "Revert "Add user privacy sensitivity APIs."" into sc-dev am: 14016d39a6 am: c3943f2be7 am: d02d709d8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14669180
Change-Id: Icf9a664e58bdab771768890978bf81c93698a30e
2021-05-28 03:03:54 +00:00
TreeHugger Robot
564dc9758b
Merge "Fix storage directory API docs" into sc-dev am: 787c2a6d2a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14733694
Change-Id: Iec00a3d2fc4f5b46649a6692d38beed443022c1c
2021-05-28 02:47:26 +00:00
Jeff Sharkey
c3943f2be7
Merge "Revert "Add user privacy sensitivity APIs."" into sc-dev am: 14016d39a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14669180
Change-Id: I00c7e75726e73f7a4f6b2a5a5a0494c47e98e72c
2021-05-28 02:26:03 +00:00
TreeHugger Robot
787c2a6d2a
Merge "Fix storage directory API docs" into sc-dev
2021-05-27 20:34:54 +00:00
Kweku Adams
b4582d98c5
Clarify what ignoring battery optimizations means.
...
Add some more definition to what it means to be on the power allowlist.
Bug: 173547576
Test: N/A
Change-Id: I6c6bd3248dc39877e560656e787ef02adf7d279f
2021-05-27 09:22:05 -07:00