Commit Graph

678815 Commits

Author SHA1 Message Date
Gopalakrishnan Nallasamy
c576d0cb38 Merge "MediaCodecInfo: Add constant for YUVP010 color format" am: 0781fcf7da am: 6e5f8b40b3 am: b98ee4553d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894738

Change-Id: I3ba618b5c75ba499f00d4b76f05146973fb90344
2021-11-18 09:06:54 +00:00
Gopalakrishnan Nallasamy
b98ee4553d Merge "MediaCodecInfo: Add constant for YUVP010 color format" am: 0781fcf7da am: 6e5f8b40b3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894738

Change-Id: Ib5367c8dab3f0ad87f4d3a484cd811a170589c43
2021-11-18 08:54:00 +00:00
Treehugger Robot
23f999acc8 Merge changes I044d0363,I0be3b802,Ib584ea57,I92291023 am: 10640379e4 am: b74f548024 am: 2a267e483a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1888339

Change-Id: I6e1574f67ac45ec8b2f4ae863633ced57acb2b8b
2021-11-18 08:47:07 +00:00
Gopalakrishnan Nallasamy
6e5f8b40b3 Merge "MediaCodecInfo: Add constant for YUVP010 color format" am: 0781fcf7da
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894738

Change-Id: I78b78832b68114966fe9afd02dcfa4407dddfad6
2021-11-18 08:41:28 +00:00
Treehugger Robot
2a267e483a Merge changes I044d0363,I0be3b802,Ib584ea57,I92291023 am: 10640379e4 am: b74f548024
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1888339

Change-Id: Ie2f10aa2f1222022eb46aeb5b4a5c250053ac954
2021-11-18 08:30:21 +00:00
Gopalakrishnan Nallasamy
0781fcf7da Merge "MediaCodecInfo: Add constant for YUVP010 color format" 2021-11-18 08:21:35 +00:00
Gopalakrishnan Nallasamy
f71f4089d8 MediaCodecInfo: Add constant for YUVP010 color format
Bug: 206456921

Test: atest android.media.cts.ImageReaderDecoderTest
Change-Id: Ia93bd25ede40b39d6b799990c01e35b90a8ad8d4
2021-11-18 08:19:32 +00:00
Treehugger Robot
b74f548024 Merge changes I044d0363,I0be3b802,Ib584ea57,I92291023 am: 10640379e4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1888339

Change-Id: Ie6ea902d71f69457ddc85b5be41c9dbc7086dfbd
2021-11-18 08:12:33 +00:00
Treehugger Robot
10640379e4 Merge changes I044d0363,I0be3b802,Ib584ea57,I92291023
* changes:
  bpf is required so /sys/fs/bpf/map_netd_app_uid_stats_map always exists
  bpf is required - remove mUseBpfTrafficStats field
  bpf is required - remove checkBpfStatsEnable()
  remove qtaguid parsing
2021-11-18 07:52:14 +00:00
Treehugger Robot
7a6c6d2aa6 Merge "health: BatteryService etc. use health AIDL HAL" am: 104adeeb75 am: 2cbfa143b6 am: b7b981793e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1883551

Change-Id: Ibc0e54c8ffe02ac4b5c4481e6398ec0702bf9055
2021-11-18 07:11:05 +00:00
Treehugger Robot
b7b981793e Merge "health: BatteryService etc. use health AIDL HAL" am: 104adeeb75 am: 2cbfa143b6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1883551

Change-Id: I8840fba9cf1e69ddd6b8659ab512e7c13b19baec
2021-11-18 06:53:14 +00:00
Treehugger Robot
2cbfa143b6 Merge "health: BatteryService etc. use health AIDL HAL" am: 104adeeb75
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1883551

Change-Id: Icd85791dc6b57f8993f500306ed1e7a9f86fd218
2021-11-18 06:36:34 +00:00
Treehugger Robot
104adeeb75 Merge "health: BatteryService etc. use health AIDL HAL" 2021-11-18 06:20:40 +00:00
Maciej Żenczykowski
1af65153da bpf is required so /sys/fs/bpf/map_netd_app_uid_stats_map always exists
(we cannot just remove the argument, since the test code path still
 goes via the legacy xt_qtaguid code paths with sample data)

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I044d0363aaab0dbbb90c40ca466cc48f169d649a
2021-11-18 06:11:00 +00:00
Maciej Żenczykowski
c9b46078fc bpf is required - remove mUseBpfTrafficStats field
Test: git grep mUseBpfTrafficStats
  TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0be3b802e2ebd175b2a58061bf821aba02a8ec8a
2021-11-18 06:10:46 +00:00
Maciej Żenczykowski
068d57a579 bpf is required - remove checkBpfStatsEnable()
Test: git grep 'nativeGetTotalStat|nativeGetIfaceStat|nativeGetUidStat'
    - shows all locations have been updated
  git grep 'checkBpfStatsEnable'
    - find nothings relevant (just services/art-profile)
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib584ea57c39d5ab0605787b05133097fd2c82a39
2021-11-18 06:10:35 +00:00
Maciej Żenczykowski
536a03632e remove qtaguid parsing
This removes the legacy (and untested) xt_qtaguid
non-ebpf code path (ie. dead code).

Test: git grep 'QTAGUID_IFACE_STATS|QTAGUID_UID_STATS|parseIfaceStats|parseUidStats'
  finds nothing
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I922910238474f2cfb74eba19b219bc792ce4abc3
2021-11-18 06:10:14 +00:00
Yifan Hong
999f26ca03 health: BatteryService etc. use health AIDL HAL
Also add tests to ensure that HealthServiceWrapper.create
prioritize using the AIDL HAL, and service callbacks are
working.

Test: frameworks test
Test: install HAL on cuttlefish then boot
Bug: 177269435

Change-Id: Ic667a49528c63343fe602f193c0958f2ee57c04e
2021-11-18 04:48:07 +00:00
Dave Mankoff
7109e5decd [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: d7097b817b am: f6e612d73e -s ours am: 66460c8ff4 -s ours am: 753d2a043c -s ours am: 8373d1149d -s ours am: d3d6679d4b -s ours am: 052e9d8f1c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264332

Change-Id: I851bedb9a3620918176acdd1979d7cb4c260b2e6
2021-11-18 00:29:59 +00:00
Dave Mankoff
962e9f5d7c [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: d7097b817b am: f6e612d73e -s ours am: 66460c8ff4 -s ours am: 83a6d4fc67 -s ours am: db11069435 -s ours am: 35acb5d0b0 -s ours am: 7ba79a4ce5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264332

Change-Id: I76a58d1dd04f233e7b57fa8d145b1257f7323ba4
2021-11-18 00:29:46 +00:00
Dave Mankoff
052e9d8f1c [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: d7097b817b am: f6e612d73e -s ours am: 66460c8ff4 -s ours am: 753d2a043c -s ours am: 8373d1149d -s ours am: d3d6679d4b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264332

Change-Id: I4cc61e3875bf5f61e203aba32d4ef46714cf08ce
2021-11-18 00:13:20 +00:00
Dave Mankoff
7ba79a4ce5 [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: d7097b817b am: f6e612d73e -s ours am: 66460c8ff4 -s ours am: 83a6d4fc67 -s ours am: db11069435 -s ours am: 35acb5d0b0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264332

Change-Id: Icc60ad93cae32a34d9ca8bc7f8e3bf7a7b0d1d88
2021-11-18 00:13:00 +00:00
Dave Mankoff
d3d6679d4b [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: d7097b817b am: f6e612d73e -s ours am: 66460c8ff4 -s ours am: 753d2a043c -s ours am: 8373d1149d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264332

Change-Id: I6eed55c6649047b83c543c12e70e0319488be87a
2021-11-17 23:55:04 +00:00
Dave Mankoff
35acb5d0b0 [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: d7097b817b am: f6e612d73e -s ours am: 66460c8ff4 -s ours am: 83a6d4fc67 -s ours am: db11069435 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264332

Change-Id: I2cb4f0ae14d8d7ba4ecd1db2b5f812cf705cde57
2021-11-17 23:54:57 +00:00
Dave Mankoff
8373d1149d [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: d7097b817b am: f6e612d73e -s ours am: 66460c8ff4 -s ours am: 753d2a043c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264332

Change-Id: I31e539e73359beca44cab6e67bca724c36e66ba3
2021-11-17 23:36:13 +00:00
Treehugger Robot
95c68c6024 Merge "SystemPreparer: remove support for FDE devices" am: 98f0a11a8a am: 7e0aeb84b0 am: 0ae29439c6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1889876

Change-Id: Ice36d05d07c69fbd84e6a9a5f3f173769b0551c7
2021-11-17 23:35:23 +00:00
Dave Mankoff
db11069435 [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: d7097b817b am: f6e612d73e -s ours am: 66460c8ff4 -s ours am: 83a6d4fc67 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264332

Change-Id: I67b2e1b66b8e47454950229fd5fd03b067b20849
2021-11-17 23:35:11 +00:00
Dave Mankoff
753d2a043c [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: d7097b817b am: f6e612d73e -s ours am: 66460c8ff4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264332

Change-Id: Ie3ceb6c012fbe9d89410ea590683800ae8c70f6e
2021-11-17 23:18:31 +00:00
Dave Mankoff
83a6d4fc67 [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: d7097b817b am: f6e612d73e -s ours am: 66460c8ff4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264332

Change-Id: Iaaec2dd1daeec95bbeca9d182784dd0a07c3882c
2021-11-17 23:17:45 +00:00
Treehugger Robot
0ae29439c6 Merge "SystemPreparer: remove support for FDE devices" am: 98f0a11a8a am: 7e0aeb84b0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1889876

Change-Id: I2fefd73660eac28489bfa05a795f758ca17df325
2021-11-17 23:17:36 +00:00
Treehugger Robot
7e0aeb84b0 Merge "SystemPreparer: remove support for FDE devices" am: 98f0a11a8a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1889876

Change-Id: I4041e5e2945fae7ec8551afcef5a0fb671414628
2021-11-17 23:01:06 +00:00
Dave Mankoff
66460c8ff4 [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: d7097b817b am: f6e612d73e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264332

Change-Id: I9c28325d581bb00c94226d960e47903185002d5c
2021-11-17 23:00:23 +00:00
Dave Mankoff
a0bd3fa38d [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: 1b13bc873c am: 07295bc2cc -s ours am: 0d2d80a873 -s ours am: 78144de54a -s ours am: 1d5f020b90 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264331

Change-Id: Ia8b97eb01ec2856a86c78d2bdc61bf03df36d805
2021-11-17 22:53:47 +00:00
Dave Mankoff
f510d9c5fb [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: 1b13bc873c -s ours am: 47e7bbb1a4 -s ours am: 63ee275976 -s ours am: 56a0023c29 -s ours am: dc720ea32a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264331

Change-Id: I01da9c325ab40230c83bcc995532688b82d75be7
2021-11-17 22:53:37 +00:00
Treehugger Robot
55c7de1e14 Merge "[PeopleService] Catch exception when failed to query call log." am: 9220245e47 am: 9966ff4bc5 am: 8d57a8c7b2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878225

Change-Id: I27ebe65926e140da27352646073dc8a936008e14
2021-11-17 22:53:19 +00:00
Treehugger Robot
98f0a11a8a Merge "SystemPreparer: remove support for FDE devices" 2021-11-17 22:48:27 +00:00
Dave Mankoff
f6e612d73e RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: d7097b817b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264332

Change-Id: I8a869e7e01eeb501bff3d270a85d90612f0bb53d
2021-11-17 22:45:25 +00:00
Dave Mankoff
1d5f020b90 [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: 1b13bc873c am: 07295bc2cc -s ours am: 0d2d80a873 -s ours am: 78144de54a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264331

Change-Id: Ic683d7a100a88cc622a32367947667e75f10ccbd
2021-11-17 22:40:31 +00:00
Dave Mankoff
dc720ea32a [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: 1b13bc873c -s ours am: 47e7bbb1a4 -s ours am: 63ee275976 -s ours am: 56a0023c29 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264331

Change-Id: Ib7fda98c7feb34450d2c145ab699f1f35d0eff29
2021-11-17 22:40:15 +00:00
Treehugger Robot
8d57a8c7b2 Merge "[PeopleService] Catch exception when failed to query call log." am: 9220245e47 am: 9966ff4bc5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878225

Change-Id: I9a74ae94a66c0c3a761bdc18d8be069a872c9cfc
2021-11-17 22:39:42 +00:00
Dave Mankoff
78144de54a [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: 1b13bc873c am: 07295bc2cc -s ours am: 0d2d80a873 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264331

Change-Id: I86d9e98903b9a7d2e540ce750e94884fa675db42
2021-11-17 22:21:06 +00:00
Dave Mankoff
56a0023c29 [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: 1b13bc873c -s ours am: 47e7bbb1a4 -s ours am: 63ee275976 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264331

Change-Id: Ibdfbfc359cd9167074344c45b4c1d8227b65e8d2
2021-11-17 22:21:01 +00:00
Treehugger Robot
9966ff4bc5 Merge "[PeopleService] Catch exception when failed to query call log." am: 9220245e47
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878225

Change-Id: Iedf435a92edc51083030b44c4a7bc3fa293efa8b
2021-11-17 22:20:18 +00:00
Dave Mankoff
0d2d80a873 [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: 1b13bc873c am: 07295bc2cc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264331

Change-Id: Ibf71d7ab511940e3175a4637a6a8b47b622e0361
2021-11-17 22:01:07 +00:00
Treehugger Robot
9220245e47 Merge "[PeopleService] Catch exception when failed to query call log." 2021-11-17 21:59:43 +00:00
Dave Mankoff
63ee275976 [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: 1b13bc873c -s ours am: 47e7bbb1a4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264331

Change-Id: I31cfd8c30931738392dcab705da5654d89bb0c3f
2021-11-17 21:59:37 +00:00
Dave Mankoff
07295bc2cc RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: 1b13bc873c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264331

Change-Id: I670b430db5f4836b9d447882a4740d6b8496a014
2021-11-17 21:48:22 +00:00
Daniel Norman
33524eb02d Merge "PackageManagerService: Check for duplicate inactive factory packages" am: 2df3d4e066 am: 9370336358 am: 3dd1c5cff5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894442

Change-Id: I4d639b93ded6d761c31dbe7c0efd8795a9bb4fe1
2021-11-17 21:48:20 +00:00
Dave Mankoff
47e7bbb1a4 [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: 1b13bc873c -s ours
am skip reason: Merged-In I56589865427b10e2eab68e1ed2e7c290572a9edc with SHA-1 daba01ddf8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264331

Change-Id: I39d53ac5e756025317d22b4d4734eb3655fbab69
2021-11-17 21:47:28 +00:00
Jeff Sharkey
b70edbe2fa Merge "Add OWNERS file for AttestationVerificationTest" am: 1716adec5c am: 0229c828ef am: 7e98d3ece9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1895603

Change-Id: I8a61aa9a0b01513b6ff2da0b4d9d549405e52fe2
2021-11-17 21:47:21 +00:00