Commit Graph

9453 Commits

Author SHA1 Message Date
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
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
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
TreeHugger Robot
3ea3f384c5 Merge "BatteryUsageStats atom - frameworks/base" into sc-dev am: e4cc52acce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14443150

Change-Id: I189e5d444c0291e8885f1ec7898c985421a66e7a
2021-05-21 16:30:25 +00:00
Soonil Nagarkar
1ea818347e Update location bypass allowlist
Create a new DeviceConfig entry to replace the prior Settings entry on
which the location ignore settings allowlist is based. This allows us to
allowlist based on attribution tag, and eliminate holes for large
applications.

Test: manual + CTS + GTS
Bug: 187421886
Change-Id: I31e61db79b93e202bd8c66efae1bb5aaf0c88ff5
2021-05-21 09:25:47 -07:00
TreeHugger Robot
e4cc52acce Merge "BatteryUsageStats atom - frameworks/base" into sc-dev 2021-05-21 16:22:42 +00:00
Meng Wang
65d51f9fb6 Merge "PersistableBundle.restoreFromXml should return a mutable bundle." am: ffb1899ba2 am: c13f8d0fe7 am: e494cdfbb8 am: 96df15eeb0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679293

Change-Id: I25a116ba8f90171d46e581bd770dbc8ffbb68b56
2021-05-20 20:40:00 +00:00
Meng Wang
e494cdfbb8 Merge "PersistableBundle.restoreFromXml should return a mutable bundle." am: ffb1899ba2 am: c13f8d0fe7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679293

Change-Id: I96b86027bb82fbff281d129f06f159df4dc2904e
2021-05-20 20:07:37 +00:00
Meng Wang
ffb1899ba2 Merge "PersistableBundle.restoreFromXml should return a mutable bundle." 2021-05-20 19:13:26 +00:00
Corina Grigoras
dd4426d832 Merge "Clarify javadocs about mode to parse file." into sc-dev am: b84e828974 am: 9edbfddf0d am: 9e319ab210
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14621143

Change-Id: I1979aefaffb82e5aba3a7c4ca11fd87ca039baf4
2021-05-20 14:25:15 +00:00
Corina Grigoras
9edbfddf0d Merge "Clarify javadocs about mode to parse file." into sc-dev am: b84e828974
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14621143

Change-Id: I2621e13c20b79ec86cdc201afdeb2905e690e9a3
2021-05-20 14:20:48 +00:00
Corina Grigoras
b84e828974 Merge "Clarify javadocs about mode to parse file." into sc-dev 2021-05-20 14:10:22 +00:00
Hai Zhang
4fa99b7824 Merge "Add user privacy sensitivity APIs." into sc-dev am: c06af26cc0 am: 6046b7c865 am: 9736946594
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14648047

Change-Id: Id0d61f0c3d77d34aa94198fa2c0b25fae4479432
2021-05-20 05:16:01 +00:00
Rubin Xu
a53a703b09 Merge "Add device admin restrictions for mic/cam toggles" into sc-dev am: e25a1b3d91 am: 819e5e93f5 am: 7057db019a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14254683

Change-Id: I6d9cdd544aafa173375bac99182319f4da971c20
2021-05-20 04:58:32 +00:00
Steven Moreland
3a1dcf4a4d Merge "Parcel: document enforceInterface" into sc-dev am: f07675c46c am: 3926e02029 am: 821f42feb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14631434

Change-Id: I6060746178f7ed46320aaf0caa5b0790429423a8
2021-05-20 04:57:07 +00:00
TreeHugger Robot
cba1820514 Merge "Add hasExternalControl hidden API to Vibrator" into sc-dev am: c5efbf1dba am: d20b62d8e2 am: e907b1e861
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14621133

Change-Id: Ieb585236c02d0e57735fcafad44fa0940a1cd5b5
2021-05-20 01:08:36 +00:00
Patrick Baumann
fd55b563bb Merge changes I04dfc5c2,Idc7e1f3c am: 1ef34e9022 am: 4c56bac295 am: 62bf50bbd8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705089

Change-Id: I78aa27d7521a981d3ef7494c3c2d20b44b048213
2021-05-20 00:22:15 +00:00
Hai Zhang
9736946594 Merge "Add user privacy sensitivity APIs." into sc-dev am: c06af26cc0 am: 6046b7c865
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14648047

Change-Id: I91b81b45fd807d09617f1f6a431c17ae7cc8ac43
2021-05-19 23:49:08 +00:00
Hai Zhang
7a282110fc Merge "Add user privacy sensitivity APIs." into sc-dev am: c06af26cc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14648047

Change-Id: Ia809aa9da958dd90813325576d5b8b924f6a6ba8
2021-05-19 23:33:32 +00:00
Hai Zhang
56c0aa6573 Add user privacy sensitivity APIs.
Bug: 188435815
Test: presubmit
Change-Id: I5925beca072054bec5db86946fc0243ab8f9f17a
2021-05-19 20:39:40 +00:00
Rubin Xu
7057db019a Merge "Add device admin restrictions for mic/cam toggles" into sc-dev am: e25a1b3d91 am: 819e5e93f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14254683

Change-Id: I1c452779470fc549fcb4608a9410fe05607c38ac
2021-05-19 18:40:18 +00:00
Steven Moreland
821f42feb9 Merge "Parcel: document enforceInterface" into sc-dev am: f07675c46c am: 3926e02029
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14631434

Change-Id: I220565f88b11ef60420df7f25deaa1d7f6ea64a2
2021-05-19 18:39:56 +00:00
Rubin Xu
23d868b823 Merge "Add device admin restrictions for mic/cam toggles" into sc-dev am: e25a1b3d91
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14254683

Change-Id: Iaeb25064641c92a65d79a99f3df8a1465f43bd2d
2021-05-19 18:23:41 +00:00
Steven Moreland
7624c40762 Merge "Parcel: document enforceInterface" into sc-dev am: f07675c46c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14631434

Change-Id: Id91f44ef9da8b1229c506b6008bfe7feebc7d589
2021-05-19 18:22:56 +00:00
Rubin Xu
e25a1b3d91 Merge "Add device admin restrictions for mic/cam toggles" into sc-dev 2021-05-19 18:03:36 +00:00
Steven Moreland
f07675c46c Merge "Parcel: document enforceInterface" into sc-dev 2021-05-19 18:02:16 +00:00
TreeHugger Robot
e907b1e861 Merge "Add hasExternalControl hidden API to Vibrator" into sc-dev am: c5efbf1dba am: d20b62d8e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14621133

Change-Id: I5f137de481a90f7cfb9488de59cc7a4218dc84f0
2021-05-19 13:15:09 +00:00
TreeHugger Robot
642f85f0dd Merge "Add hasExternalControl hidden API to Vibrator" into sc-dev am: c5efbf1dba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14621133

Change-Id: Ie2a95ee53cc83affc91136c971d8f2f0969dbe0d
2021-05-19 12:57:09 +00:00
TreeHugger Robot
c5efbf1dba Merge "Add hasExternalControl hidden API to Vibrator" into sc-dev 2021-05-19 12:50:27 +00:00
Steven Moreland
d0c8e40b98 Parcel: document enforceInterface
Bug: 188022639
Test: N/A
Change-Id: I7a40b7ad0353920f0b5bd395cf46c04fd6c2b6e2
2021-05-19 00:47:32 +00:00
Patrick Baumann
62bf50bbd8 Merge changes I04dfc5c2,Idc7e1f3c am: 1ef34e9022 am: 4c56bac295
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705089

Change-Id: Ibea92e6623d660b0bcbc324c8f188642841160dd
2021-05-18 23:16:02 +00:00
Evan Severson
6ab2d13922 Add device admin restrictions for mic/cam toggles
Introduces DISALLOW_CAMERA_TOGGLE and DISALLOW_MICROPHONE_TOGGLE
which are Device Owner restrictions to prevent the user from
turning off global camera & microphone access on a fully-managed
device.

Test: atest DeviceOwnerTest#testSensorToggleRestriction
Test: atest UserRestrictionsTest
Bug: 184927615
Change-Id: I500f1283689497812bd2df606e35abe6d9d91c61
2021-05-18 23:22:38 +01:00
Patrick Baumann
1ef34e9022 Merge changes I04dfc5c2,Idc7e1f3c
* changes:
  Updates OWNERS files
  Update OWNERS file.
2021-05-18 19:03:06 +00:00
Corina
8cd8c9901d Clarify javadocs about mode to parse file.
Bug: 185900460
Test: atest
Change-Id: I72b743affd9c1c47650c4249e855676203033f5e
2021-05-18 17:17:27 +00:00
Lais Andrade
a8bef3d484 Add hasExternalControl hidden API to Vibrator
This capability will be queried by the AudioManager to be used to define
if the device has haptic playback capabilities.

Fix: 187227888
Test: N/A
Change-Id: Idc046d2fee12b3317db25975b29cf96f5f9c41b3
2021-05-18 13:23:15 +01:00
Gavin Corkery
e4400d331a Merge "Add per-file bugreporting OWNERS" am: 324a5e53a9 am: 589f728b5a am: b81e3635e3 am: f8b9d5cd0b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706699

Change-Id: Ic309b6a53d709582c95d111092d93c860e522657
2021-05-14 16:42:16 +00:00
Gavin Corkery
f8b9d5cd0b Merge "Add per-file bugreporting OWNERS" am: 324a5e53a9 am: 589f728b5a am: b81e3635e3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706699

Change-Id: Ia50c7f70cf37f42399f3b447f03a4857473e739c
2021-05-14 16:36:47 +00:00
Gavin Corkery
b81e3635e3 Merge "Add per-file bugreporting OWNERS" am: 324a5e53a9 am: 589f728b5a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706699

Change-Id: I3dfb6041919201ad6129da0d33101c768d471918
2021-05-14 16:20:11 +00:00
Patrick Baumann
e6c0a4f8ce Updates OWNERS files
Bug: 186864416
Test: Builds
Change-Id: I04dfc5c2c7143825334ebc62742e335b8c889492
2021-05-14 15:45:42 +00:00
Dmitri Plotnikov
8c9e91f040 Merge "Add stats session end timestamp and duration to BatteryUsageStats" into sc-dev am: 14bc81b983
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14455100

Change-Id: I247eb6df208a307cb2ad18e273cc6e84b786695e
2021-05-13 23:21:38 +00:00
Dmitri Plotnikov
c076e7112e Add stats session end timestamp and duration to BatteryUsageStats
Bug: 187223764
Test: atest FrameworksCoreTests:BatteryStatsTests
Change-Id: Iba97050c067cae7945276798273dd328fe040ef9
2021-05-13 11:49:09 -07:00
Adam Bookatz
2f3abb4441 BatteryUsageStats atom - frameworks/base
Writes the BatteryUsageStats atoms.proto atoms
based on the current BatteryUsageStats data in BatteryStats.

Does NOT write the past pre-reset snapshot atoms; that is
an adventure for a future cl.

Bug: 184095105
Test: atest BatteryUsageStatsProtoTests
Test: statsd_testdrive <atomId>
Change-Id: I2fc5a983deb58d7d393c0696db2165b124c94dc2
2021-05-13 11:40:26 -07:00
Gavin Corkery
fbc73d84cd Add per-file bugreporting OWNERS
Test: Builds
Bug: 188024968
Change-Id: Id4cf779314460ce5909ec14c84af063890b0dbca
2021-05-13 14:17:33 +01:00
TreeHugger Robot
c64a874ad0 Merge "Atoms.proto PROFILE_CLONE entry" into sc-dev am: 9d7540c17e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14495614

Change-Id: I703cd3b5f4d32880526b78fdb897e53c185a486e
2021-05-12 22:22:23 +00:00
TreeHugger Robot
9d7540c17e Merge "Atoms.proto PROFILE_CLONE entry" into sc-dev 2021-05-12 22:02:45 +00:00
Lajos Molnar
78e3ec13f0 Merge "build: allow MEDIA_PERFORMANCE_CLASS for R" into sc-dev am: 22ceced5a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14366303

Change-Id: I7380968507847218c71de9fd9e7a0becdaae7fd8
2021-05-11 23:10:52 +00:00
Lajos Molnar
22ceced5a7 Merge "build: allow MEDIA_PERFORMANCE_CLASS for R" into sc-dev 2021-05-11 23:09:12 +00:00