Commit Graph

9311 Commits

Author SHA1 Message Date
Kevin Chyn
54e4260153 Merge "Add BiometricActionDisabledByAdminController" into sc-dev am: c3e64b14c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972616

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

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

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

Change-Id: I4229490565b01e6f764683bb7d87d0d75e63c5f3
2021-06-15 00:13:20 +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
0365d2850a Merge "Don't reset user VPN without reason" into sc-dev am: c0115519f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14717702

Change-Id: I4fb463bae9700c5e633ec10e5d6fe0090783734e
2021-06-10 15:36:37 +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
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
Nandana Dutt
3863979df8 Fix storage directory API docs
Android 10 did not support file path operations for apps in
scoped storage. But Android 11 and above do support file path
operations for such apps.

Fix docs for getExternalStorageDirectory() and
getExternalStoragePublicDirectory() to reflect the current level of support.

BUG: 153562415
Test: m docs

Change-Id: I8bc2a4aa266dbbcc391b415e6209ed6e5d56fe97
2021-05-27 15:57:02 +00:00
Jeff Sharkey
14016d39a6 Merge "Revert "Add user privacy sensitivity APIs."" into sc-dev 2021-05-27 11:59:21 +00:00
Treehugger Robot
a3ff04d175 Merge "Add documentation to Vibrator on foreground/background app behavior" am: 8ceda33e96 am: 53720c4394
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1567201

Change-Id: I5d8500c398b6504a29a3e438461b5bcd41b44a75
2021-05-26 19:40:23 +00:00
Treehugger Robot
8ceda33e96 Merge "Add documentation to Vibrator on foreground/background app behavior" 2021-05-26 18:43:56 +00:00
TreeHugger Robot
887404acd3 Merge "Add documentation to VibratorManager on foreground/background behavior" into sc-dev am: 03b86cd11f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14734462

Change-Id: I38f73b91541f9b292d3e714ed971606cba83d95c
2021-05-26 17:35:47 +00:00
TreeHugger Robot
03b86cd11f Merge "Add documentation to VibratorManager on foreground/background behavior" into sc-dev 2021-05-26 17:28:52 +00:00
Adam Bookatz
e6eb812d39 Merge "BatteryUsageStats - use bus end time" into sc-dev am: fdf919fbd5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14720951

Change-Id: I5b959441b3385cce1f9fb24a55e6ddadd671d56c
2021-05-26 17:23:45 +00:00
Adam Bookatz
fdf919fbd5 Merge "BatteryUsageStats - use bus end time" into sc-dev 2021-05-26 17:19:47 +00:00
Ytai Ben-tsvi
0d12eff29a Merge "Prevent double-closing of native handle in HidlMemory" into sc-dev am: c53f7a2d41
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14719253

Change-Id: I355a0ef827db2d00cee80c15317cf805c86cb7c2
2021-05-26 16:49:56 +00:00
Ytai Ben-tsvi
c53f7a2d41 Merge "Prevent double-closing of native handle in HidlMemory" into sc-dev 2021-05-26 16:41:14 +00:00
Lais Andrade
c76c77393f Add documentation to VibratorManager on foreground/background behavior
Add information to javadocs explaining that apps in background can
only vibrate the device if the given AudioAttributes usage is one of
notification, ringtone or alarm usages.

Bug: 146313440
Test: N/A
Change-Id: Ib0b8401539157f0ce2768aab281f3b23aae38dae
2021-05-26 15:11:11 +01:00
Ytai Ben-tsvi
d6560de944 Merge "Proper duping / closing of FileDescriptors" into sc-dev am: cd77682736
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14686828

Change-Id: I42b6153ddcaae220b50761bfe95028259b4bb35a
2021-05-26 11:10:28 +00:00
Steven Moreland
5d8ccf7931 Merge "Revert "binder: race condition by parcel finalize"" into sc-dev 2021-05-25 23:19:03 +00:00
Ytai Ben-tsvi
cd77682736 Merge "Proper duping / closing of FileDescriptors" into sc-dev 2021-05-25 21:49:43 +00:00
Steven Moreland
dfd993c108 Merge "Revert "binder: race condition by parcel finalize"" am: 58787794eb am: dfda61b6c7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1714912

Change-Id: Ib49169804c1fa120d8fdfc9cee3531bb0baa4a34
2021-05-25 17:42:12 +00:00
Steven Moreland
93e9cf4c35 Revert "binder: race condition by parcel finalize"
Revert "binder: race condition by parcel finalize"

Revert submission 1553275-Bug139327211_V5

Reason for revert: causing a different race condition? b/187218964
Reverted Changes:
I9345f4439:binder: race condition by parcel finalize
Ib06e38e22:binder: race condition by parcel finalize

Bug: 187218964

Change-Id: Iebf76febdad5e231c814f1f8de454931cb9352c5
Merged-In: Iebf76febdad5e231c814f1f8de454931cb9352c5
2021-05-25 17:37:42 +00:00
Adam Bookatz
c86b4777e0 BatteryUsageStats - use bus end time
Now that BUS contains an end time and a duration, use
those in the atom instead of estimating them from
the clock time that the request was made.

Bug: 187223764
Test: atest BatteryUsageStatsProtoTests
Change-Id: Ie69d42bfd19c3a0055e96a25ac33c16c0f7d1a3f
2021-05-25 10:27:29 -07:00
Steven Moreland
58787794eb Merge "Revert "binder: race condition by parcel finalize"" 2021-05-25 17:23:35 +00:00
Ytai Ben-Tsvi
808e525d57 Prevent double-closing of native handle in HidlMemory
Since the handle wasn't nullified, when the memory is explicitly
closed, the finalizer would attempt to close again, which results in
an exception.

Bug: 189213084
Test: Manual verification of ST use-cases, which uses this.
      Patch sent to partner for verification.
Change-Id: I4ac6bbdd88b3f729a022896adfed00effec48bd8
2021-05-25 08:20:59 -07:00
Ytai Ben-Tsvi
cad4e327bf Proper duping / closing of FileDescriptors
While looking into another bug, I noticed that the file descriptors
do not get properly duped when converting to HidlMemory and that they
aren't explicitly closed when creating a temporary instance of
SharedMemory.

Test: Manual verification of ST functionality, which uses these
      utilities.
Fixes: 188931943
Change-Id: I76322c56c58be5db8f1a40eb20eb3b96552412f9
2021-05-25 08:15:41 -07:00
Steven Moreland
a926598e89 Revert "binder: race condition by parcel finalize"
Revert "binder: race condition by parcel finalize"

Revert submission 1553275-Bug139327211_V5

Reason for revert: causing a different race condition? b/187218964
Reverted Changes:
I9345f4439:binder: race condition by parcel finalize
Ib06e38e22:binder: race condition by parcel finalize

Change-Id: Iebf76febdad5e231c814f1f8de454931cb9352c5
2021-05-24 19:56:04 +00:00