Commit Graph

9362 Commits

Author SHA1 Message Date
Jeff Sharkey
7351d81a06 Merge "Consistent version documentation." into sc-dev am: af2d4c8c8f am: f0f641d21d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15275398

Change-Id: Ic897809076ce278e2e7194a17308ad9394121114
2021-07-14 15:45:23 +00:00
Jeff Sharkey
f0f641d21d Merge "Consistent version documentation." into sc-dev am: af2d4c8c8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15275398

Change-Id: Ia258cc5ac7a7bd4887422eb0a4d57f9c22fa5ae1
2021-07-14 15:33:27 +00:00
Jeff Sharkey
866af3b915 Consistent version documentation.
Aligns description of all VERSION_CODES based on details at:
https://en.wikipedia.org/wiki/Android_version_history

Bug: 193421818
Change-Id: I0ccb2480b5255b0e3a61a82d6be75f746166e536
2021-07-13 13:17:18 -06:00
Dmitri Plotnikov
b40a34e68e Merge "Address race condition in procstate time tracking" into sc-dev am: b1f548e3e4 am: f99c289be5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15177890

Change-Id: Ic176c205eb9403ce5c880474ff6132abe5780091
2021-07-03 00:19:53 +00:00
Dmitri Plotnikov
f99c289be5 Merge "Address race condition in procstate time tracking" into sc-dev am: b1f548e3e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15177890

Change-Id: I322ee8c8ab5b64607c2815ae28122b9667fbc67c
2021-07-03 00:18:57 +00:00
Dmitri Plotnikov
dc3a78354e Address race condition in procstate time tracking
The issue occurs when the application proc state changes
rapidly, e.g. from FOREGROUND to BACKGROUND to CACHED.
The original code would sometimes attribute the time slice
to the wrong proc state.

Bug: 192550308
Test: (on cuttlefish) atest --rerun-until-failure 300 FrameworksCoreTests:com.android.internal.os.BstatsCpuTimesValidationTest -- --abi x86_64

Change-Id: Ic22bbfa3aae701014fc016ec9e2d32b1c528d462
2021-07-01 22:04:28 -07:00
TreeHugger Robot
b3e392b364 Merge "FileBridge: use a ByteBuffer for the temp buffer" into sc-dev am: 64dcdac602 am: 88aa0bcc1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15100555

Change-Id: I916e311b0c3816221ae8530b4552e708b044c517
2021-06-25 21:43:55 +00:00
TreeHugger Robot
f0dfbe020d Merge "FileBridge: use a ByteBuffer for the temp buffer" into sc-dev am: 64dcdac602
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15100555

Change-Id: If64fd555e446b76d76fb557bb34522f945ed844a
2021-06-25 21:30:43 +00:00
TreeHugger Robot
88aa0bcc1c Merge "FileBridge: use a ByteBuffer for the temp buffer" into sc-dev am: 64dcdac602
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15100555

Change-Id: If54c5779dbb27cc24b0f270ee5a49bb1cc88fe33
2021-06-25 21:29:47 +00:00
TreeHugger Robot
64dcdac602 Merge "FileBridge: use a ByteBuffer for the temp buffer" into sc-dev 2021-06-25 21:25:40 +00:00
Tim Murray
8c37737cbc FileBridge: use a ByteBuffer for the temp buffer
Using a direct ByteBuffer allows the buffer to be passed to/from JNI
without intermediate copies.

Test: FileBridgeTests, apps get installed without allocation churn
Bug: 192020559
Change-Id: Ic5965c94ba14de6599af67d2e3bba33cd9996046
2021-06-25 11:14:53 -07:00
Nandana Dutt
27bb9a53f4 Merge "Undeprecate storage directory APIs" into sc-v2-dev am: 19325e4648
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080410

Change-Id: I3c18042f36ccaaa0d4ff20fb5694285d68eb3af2
2021-06-25 11:00:27 +00:00
Nandana Dutt
19325e4648 Merge "Undeprecate storage directory APIs" into sc-v2-dev 2021-06-25 10:50:42 +00:00
TreeHugger Robot
6b61b1b599 Merge "Fix SystemVibrator constant support checks on device without vibrator" into sc-dev am: a02615b9cc am: 58436298c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15054858

Change-Id: Ic491b701db9edc81fdca6cfacb707800e134d452
2021-06-24 14:35:26 +00:00
TreeHugger Robot
b474cc0757 Merge "Fix SystemVibrator constant support checks on device without vibrator" into sc-dev am: a02615b9cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15054858

Change-Id: I4805c35f08126378eed3e1ccdff90819ce7ac110
2021-06-24 14:26:12 +00:00
Lais Andrade
efc9cc93be Fix SystemVibrator constant support checks on device without vibrator
Fix the implementation of SystemVibrator to return always no support to
all effect and primitive constants on devices with no vibrator.

Fix: 191414125
Test: FrameworksCoreTests:VibratorTest
Change-Id: I0fd9e27d6e2890df9ee206029488ea70ff50712d
2021-06-24 12:33:40 +01:00
Nandana Dutt
9f77f7f31b Undeprecate storage directory APIs
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.

Undeprecate getExternalStorageDirectory() and
getExternalStoragePublicDirectory() to reflect the current level of
support.

BUG: 153562415
Test: m
Change-Id: Ibd93ca07a0c08b11a82b70dca8c2cd7d49600354
(cherry picked from commit 74bf4e682d)
2021-06-23 11:40:17 +00:00
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
c536559f00 Merge "Split long vibration composition using HAL limits" into sc-dev am: 55a8db6450
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14807584

Change-Id: I97b1b2584a05db04ccaf25fe2cc63807e451c10b
2021-06-22 16:30:22 +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
f9036d82b1 Merge "Create config for audio haptic channels max value" into sc-dev am: 8affbdac22
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15027757

Change-Id: I92135cff69068350d3bb65f33efe42fca7d90454
2021-06-22 15:02:47 +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
0c6fb4926e Merge "Reduce size of BatteryUsageStats Parcel" into sc-dev am: 8b22190dfd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15020275

Change-Id: Iaca25ed1dfb3626aba7dee19684cc9471f468ef1
2021-06-21 20:09:34 +00: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
bba5a313f3 Merge "TestApi for UserSystemPackageInstaller" into sc-dev am: b82d3b0b76
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14847036

Change-Id: Id12e73bca6046758c548f47af0f8c5579bdd04d8
2021-06-18 19:27:14 +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
58774b9c8d Merge "Fix usage filter over UNKNOWN vibration" into sc-dev am: c100aeabbc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14980865

Change-Id: If137ddaf28c2760c3fec8ff6ae0297e206484f16
2021-06-17 21:21:57 +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
Dmitri Plotnikov
376aed6bba Add BatteryUsageStatsQuery parameters: time range am: c24fb81627
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14922773

Change-Id: I8c31a2ced556edda35c10d1a61c882a762daa4a7
2021-06-17 17:31:20 +00:00
Dmitri Plotnikov
71f5b12c59 Convert BatteryUsageStats to and from XML am: d82aa7e5c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14924566

Change-Id: I3b26ea5eda912cbd933335074a417544d3ddb250
2021-06-17 17:31:10 +00:00
Dmitri Plotnikov
7cd1108de1 Add BatteryUsageStats.add(BatteryUsageStats) am: 36e0ae27a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14433337

Change-Id: I3db68694883fbf0da74c14a23bda1519ac233c39
2021-06-17 17:31:04 +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
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
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