Commit Graph

9332 Commits

Author SHA1 Message Date
TreeHugger Robot
3536f1a68c Merge "Split long vibration composition using HAL limits" into sc-dev am: 55a8db6450 am: 5c6c3e1f59
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14807584

Change-Id: I95636922ec2ca5cd91181932b7c1ab560f87e46e
2021-06-22 21:48:09 +00:00
TreeHugger Robot
14faf554e8 Merge "Create config for audio haptic channels max value" into sc-dev am: 8affbdac22 am: a5df8afcd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15027757

Change-Id: Iee4c58a2d8d76f6205072424f2e1bf7f487dc78f
2021-06-22 21:47:40 +00:00
TreeHugger Robot
55a8db6450 Merge "Split long vibration composition using HAL limits" into sc-dev 2021-06-22 16:08:22 +00:00
Dmitri Plotnikov
c306b3924c Merge "Reduce size of BatteryUsageStats Parcel" into sc-dev am: 8b22190dfd am: 4211df1c5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15020275

Change-Id: Id7212adad5425855eee1d744f2e388a3dce12035
2021-06-22 15:10:55 +00:00
TreeHugger Robot
8affbdac22 Merge "Create config for audio haptic channels max value" into sc-dev 2021-06-22 14:59:21 +00:00
Lais Andrade
a1167c2a06 Split long vibration composition using HAL limits
Load composition and pwle limits from the HAL and apply them on
VibrationThread to split long vibrations in multiple calls.

This ensures that long vibration will be performed by the HAL.

Bug: 188431691
Fix: 183517124
Test: VibrationThreadTest & VibrationInfoTest
Change-Id: I09a04c7b1de331320d453899f59b01e4bbb42ac3
2021-06-22 15:36:23 +01:00
Lais Andrade
a2c4eda89c Create config for audio haptic channels max value
Leave the configuration empty by default, which should be ignored by the
audio framework and impose no limit to haptic signals.

Bug: 188025353
Test: N/A
Change-Id: I7553fc00d59d6b0dd52c679320880fc86c4c4aa7
2021-06-22 12:43:35 +01:00
Dmitri Plotnikov
8b22190dfd Merge "Reduce size of BatteryUsageStats Parcel" into sc-dev 2021-06-21 19:57:08 +00:00
Adam Bookatz
ba4d7b08fe Merge "TestApi for UserSystemPackageInstaller" into sc-dev am: b82d3b0b76 am: ee837e7aa1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14847036

Change-Id: I0f86c5cd9099a4a2e0da3fec078b7e31a2933ebf
2021-06-21 12:00:12 +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
b7dc17a958 Merge "Fix usage filter over UNKNOWN vibration" into sc-dev am: c100aeabbc am: f4f5cdf8d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14980865

Change-Id: I5f6b2790b1e74b8edc8b38396a8a9f9f6a7905d7
2021-06-17 21:34:51 +00:00
TreeHugger Robot
c100aeabbc Merge "Fix usage filter over UNKNOWN vibration" into sc-dev 2021-06-17 20:12:14 +00:00
Dmitri Plotnikov
041ab63598 Add BatteryUsageStatsQuery parameters: time range am: c24fb81627 am: 7703f73516
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14922773

Change-Id: I91d52f5313c6390b5dd13560c08defc3c2e95984
2021-06-17 17:50:19 +00:00
Dmitri Plotnikov
8593af3d72 Convert BatteryUsageStats to and from XML am: d82aa7e5c4 am: a4a8ded0ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14924566

Change-Id: I391bf719a2f4f8efb687ec2025c8451b8ea7491a
2021-06-17 17:50:11 +00:00
Dmitri Plotnikov
82c6a11d87 Add BatteryUsageStats.add(BatteryUsageStats) am: 36e0ae27a9 am: e1adca83fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14433337

Change-Id: I2cc3ab337bba9046cc04212eb1de5c81bb1f35b2
2021-06-17 17:50:07 +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
f64e108968 Merge "Add BiometricActionDisabledByAdminController" into sc-dev am: c3e64b14c5 am: e4cf95d54e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972616

Change-Id: Id429244dc874fcd31bb0741daf01c35a753b31d5
2021-06-17 02:05:25 +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
b775f7a5ee Merge "Fix bugs in LocationManagerService and AppOpsPolicy" into sc-dev am: a244ceeb2e am: 61a505c5c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14924835

Change-Id: If9b05ec193386af31f0169ea63d87ee026d6a4f8
2021-06-16 15:55:18 +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
be1741df05 Merge "Add BatteryUsageStatsProtoTests to presubmit" into sc-dev am: 0a9650dcde am: d3438e52c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14971175

Change-Id: Ica45b66cbe3298d135625448de67973cf5b736e4
2021-06-15 18:30:22 +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
e81338a65e Merge "Limit the number of UidBatteryConsumers included in the BatteryUsageStats atom" into sc-dev am: ab31594c96 am: 017c104815
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14948315

Change-Id: I2b9acdb160c1164936e9f849393208e53a8f5c08
2021-06-15 01:19:06 +00: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
Pavel Grafov
1b660860f6 Merge "Don't reset user VPN without reason" into sc-dev am: c0115519f6 am: b45b862d36
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14717702

Change-Id: Idc5548383f2d9819f999c1452ac05da6c0afa13d
2021-06-10 16:01:22 +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
d07356b09c Merge "Proper retrying DL installation sessions." into sc-dev am: aea3115776
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14910490

Change-Id: Ibba68d6cb54d35ffa058b9c0c0873aa208477bd7
2021-06-09 17:05:57 +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
Songchun Fan
4843872004 Merge "[metrics] log TotalDelayedReadsDurationMillis during ANR and Crash" into sc-dev am: 27d6aa2ec4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14824025

Change-Id: I2330d558ab54536251c8121eddf113484774f63b
2021-06-08 16:27:35 +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
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
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
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
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