Commit Graph

9499 Commits

Author SHA1 Message Date
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
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
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
3f53bce726 Merge "Add documentation to Vibrator on foreground/background app behavior" am: 8ceda33e96 am: 53720c4394 am: a3ff04d175 am: 4e2916e5d3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1567201

Change-Id: Id423a5047560084aa908ad8b2d4e1217f8ab33ab
2021-05-26 20:18:41 +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
74718dd672 Merge "Add documentation to VibratorManager on foreground/background behavior" into sc-dev am: 03b86cd11f am: 8dd78439b7 am: 1b96873bef
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14734462

Change-Id: I0bcb9ed4dfc24ef2904c3a31ff01ef46b72efa0f
2021-05-26 18:11:07 +00:00
Adam Bookatz
70f4c58e99 Merge "BatteryUsageStats - use bus end time" into sc-dev am: fdf919fbd5 am: f5c559850b am: 62fe2b32c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14720951

Change-Id: I727959804d53b9c19f7b15081107c50676bdb68a
2021-05-26 18:09:01 +00:00
TreeHugger Robot
1b96873bef Merge "Add documentation to VibratorManager on foreground/background behavior" into sc-dev am: 03b86cd11f am: 8dd78439b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14734462

Change-Id: Ib23a2d29cf02cda50b59c67fed8795b725283ebe
2021-05-26 17:47:49 +00:00
Adam Bookatz
62fe2b32c8 Merge "BatteryUsageStats - use bus end time" into sc-dev am: fdf919fbd5 am: f5c559850b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14720951

Change-Id: Iea8114bf54b7ab9f81ed94815f12b8769e34d223
2021-05-26 17:46:52 +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
7c68e09284 Merge "Prevent double-closing of native handle in HidlMemory" into sc-dev am: c53f7a2d41 am: c087064034 am: 74517e5536
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14719253

Change-Id: I2aad855714789fe565e5830aa47c7f9025790d68
2021-05-26 17:02:55 +00:00
Ytai Ben-tsvi
74517e5536 Merge "Prevent double-closing of native handle in HidlMemory" into sc-dev am: c53f7a2d41 am: c087064034
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14719253

Change-Id: Iea6e50ef349379c6870e1a0e975c1c998cd626a2
2021-05-26 16:59:22 +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
dfa64b731f Merge "Proper duping / closing of FileDescriptors" into sc-dev am: cd77682736 am: e014f133ae am: 9c5f5dbefd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14686828

Change-Id: I9164906a59cdaca7a83bc2affa4f196981d7dc4b
2021-05-25 22:40:07 +00:00
Ytai Ben-tsvi
9c5f5dbefd Merge "Proper duping / closing of FileDescriptors" into sc-dev am: cd77682736 am: e014f133ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14686828

Change-Id: I3d0822d6378b2b336571ac8183fda83a7dfb7660
2021-05-25 22:23:55 +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
71b8af5789 Merge "Revert "binder: race condition by parcel finalize"" am: 58787794eb am: dfda61b6c7 am: dfd993c108 am: 3a99edcc6c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1714912

Change-Id: I45a9bdb83416a555957335d899aa3903421c93d6
2021-05-25 18:05:14 +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
Patrick Baumann
dff37ee6d2 Merge "Updates OWNERS files" into sc-dev 2021-05-24 18:30:19 +00:00
Dmitri Plotnikov
4b8a26bcaa Convert BatteryUsageStats to and from XML
Bug: 187223764
Test: atest FrameworksCoreTests:BatteryUsageStatsTest#testXml
Change-Id: I6aec09bfb87c1003ede1b24cce8cf474675d2448
2021-05-24 11:08:22 -07:00
Dmitri Plotnikov
7150be674a Merge "Add BatteryUsageStats.add(BatteryUsageStats)" 2021-05-24 17:03:14 +00:00
Soonil Nagarkar
2f06b5a085 Merge "Update location bypass allowlist" into sc-dev am: 20b934e7db am: 54d0f31169 am: 0e6e99d6d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14671675

Change-Id: I8ab762faa63cb39c2ea810248a830a4122aa49b5
2021-05-22 05:23:22 +00:00
Soonil Nagarkar
0e6e99d6d1 Merge "Update location bypass allowlist" into sc-dev am: 20b934e7db am: 54d0f31169
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14671675

Change-Id: I02e0183b1c3153f81881fa92f68e93f8b906d550
2021-05-22 05:01:15 +00:00
Soonil Nagarkar
5f247fea09 Merge "Update location bypass allowlist" into sc-dev am: 20b934e7db
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14671675

Change-Id: I1d4a6c88f9da605c1b3dec581bfbe90c867bde55
2021-05-22 04:36:59 +00:00
Soonil Nagarkar
20b934e7db Merge "Update location bypass allowlist" into sc-dev 2021-05-22 04:04:54 +00:00
Dmitri Plotnikov
63d9aecdbb Add BatteryUsageStats.add(BatteryUsageStats)
Bug: 187223764
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryUsageStatsTest
Change-Id: I1e5060d726fd0f4634fd658483e80a9ab02e24fb
2021-05-21 18:29:46 -07:00
Patrick Baumann
43628ca24c Updates OWNERS files
Bug: 186864416
Test: Builds
Change-Id: I04dfc5c2c7143825334ebc62742e335b8c889492
2021-05-21 14:13:18 -07:00
TreeHugger Robot
6accef1d0d Merge "BatteryUsageStats atom - frameworks/base" into sc-dev am: e4cc52acce am: 3ea3f384c5 am: 807011ff47
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14443150

Change-Id: I1f74e42226f73af3be4a14ca1d15ba678077d7ce
2021-05-21 16:55:59 +00:00