LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,441 Commits 2 Branches 0 Tags
03a094dfce685aabbe5eb579e24f3bf6e3457d13
Commit Graph

2441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Chien
03a094dfce Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: f1b2407490 am: b4ac5bc5b4 am: b05fa7f798 am: a7cec49bfc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348

Change-Id: I53318fdc3d116127dd9d22bb449b8868313a38ba
 2020-06-12 18:10:27 +00:00
Mark Chien
a7cec49bfc Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: f1b2407490 am: b4ac5bc5b4 am: b05fa7f798 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348

Change-Id: Ia73e1fdbf77d04d45bda1b5486c18d8d837bf692
 2020-06-12 18:07:42 +00:00
Mark Chien
b05fa7f798 Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: f1b2407490 am: b4ac5bc5b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348

Change-Id: I802dd4ee567f4210b2ad36287ff20ee706800c6d
 2020-06-12 17:55:55 +00:00
Mark Chien
b4ac5bc5b4 Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: f1b2407490 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348

Change-Id: I9436ba6a4fe7ef3eb38316d831e047957302bc49
 2020-06-12 17:45:36 +00:00
Mark Chien
f1b2407490 Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev 2020-06-12 17:33:24 +00:00
Mark Chien
9988903174 Revert "Pass entitlement configuration to Settings for entitlement check" 
Original CL has dependencies with unmerged settings change: https://googleplex-android-review.git.corp.google.com/c/platform/packages/apps/Settings/+/11524847
They should be in the same topic, revert it first. Will resume it and put the same with settings part CL.

This reverts commit 217d7b01f8.

Reason for revert: This break hotspot because it should merged with settings part together.

Bug: 158836492

Change-Id: I94d3ee25168cfb3d125030654c4bb8ddd670abfc
 2020-06-12 15:29:39 +00:00
TreeHugger Robot
371bb614f1 Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6 am: 56a635ceb5 am: ad747f81bd am: dd9b25c143 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353

Change-Id: Idb554be4f0f858077245fc38e309e4e91dbf175f
 2020-06-11 16:21:55 +00:00
TreeHugger Robot
161cffb309 Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6 am: 10ede1fcae am: b605d649f4 am: 21bc0cd211 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353

Change-Id: I17826a8e30c9773555fad9ce03144beaa352e45b
 2020-06-11 16:20:18 +00:00
TreeHugger Robot
8613dab375 Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6 am: 56a635ceb5 am: aa0f47ccb3 am: 1f6f0a7743 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353

Change-Id: I9d0da41702117523bc1570ce9eead4283192b768
 2020-06-11 16:19:17 +00:00
TreeHugger Robot
dd9b25c143 Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6 am: 56a635ceb5 am: ad747f81bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353

Change-Id: I6f0413279316aae198054ca1225b5eddbd242b4e
 2020-06-11 15:58:39 +00:00
TreeHugger Robot
21bc0cd211 Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6 am: 10ede1fcae am: b605d649f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353

Change-Id: I0fead8f6fbab6e9594fc7380c959872c0ebb65b7
 2020-06-11 15:57:44 +00:00
TreeHugger Robot
1f6f0a7743 Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6 am: 56a635ceb5 am: aa0f47ccb3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353

Change-Id: I4ad9c2e14018c888e9a0b27f0b16643f233a7f6b
 2020-06-11 15:57:28 +00:00
TreeHugger Robot
ad747f81bd Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6 am: 56a635ceb5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353

Change-Id: I0d326e4d6903469a6dd398ce4a2c6117c63b1f36
 2020-06-11 15:45:20 +00:00
TreeHugger Robot
b605d649f4 Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6 am: 10ede1fcae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353

Change-Id: Ia9a0de93d250d0e153d467224a705af3f58e5501
 2020-06-11 15:42:40 +00:00
TreeHugger Robot
56a635ceb5 Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353

Change-Id: I332e6f8965c1571508b310115c45cd4588c933ea
 2020-06-11 15:15:15 +00:00
TreeHugger Robot
10ede1fcae Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353

Change-Id: I213f7fa7116f58ae63cb32ecbf9f62e8306a83d2
 2020-06-11 15:14:42 +00:00
TreeHugger Robot
03cfdd49b6 Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev 2020-06-11 15:00:57 +00:00
markchien
217d7b01f8 Pass entitlement configuration to Settings for entitlement check 
Tethering resource configuration is move from framwork to tethering
module. Since tethering resource would not be accessible from outside
of tethering module, EntitlementManager would tell Settings the
entitlement configuration via intent extra when run entitlement check.

Bug: 146918263
Test: atest TetheringTests
Change-Id: I6f23553bb1da5f0b767f920b32a86fafb9e00b9e
 2020-06-11 13:53:27 +08:00
Mark Chien
d8f75212ea [automerger skipped] Merge "Move TetheringTests to presubmit" into rvc-dev am: ccf1551ed0 am: 637de75575 -s ours am: db97500dd3 -s ours am: 1b86312490 -s ours 
am skip reason: Change-Id I80d29d06fde5a718c31a0a5ad2e2562be5bf419f with SHA-1 0fffc85052 is in history

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

Change-Id: If06fe4314871da685be7be596ebb639004b0637e
 2020-06-11 01:51:04 +00:00
Mark Chien
1f759d1257 [automerger skipped] Merge "Move TetheringTests to presubmit" into rvc-dev am: ccf1551ed0 -s ours am: ae4227ca95 -s ours am: 18cab6e6fb -s ours am: 57b62408c7 -s ours 
am skip reason: Change-Id I80d29d06fde5a718c31a0a5ad2e2562be5bf419f with SHA-1 0fffc85052 is in history

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

Change-Id: I7943770f34c80c4b6c1f9ee7cb16bbeaffdb0bbd
 2020-06-11 01:50:45 +00:00
Mark Chien
cb13c3264d [automerger skipped] Merge "Move TetheringTests to presubmit" into rvc-dev am: ccf1551ed0 am: 637de75575 am: f9b5371ae1 -s ours am: 3d1248a6ca -s ours 
am skip reason: Change-Id I80d29d06fde5a718c31a0a5ad2e2562be5bf419f with SHA-1 8e2f49b3da is in history

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

Change-Id: I1a8b0f7ce9ecc9834becff1257b30b9d0e300d4d
 2020-06-11 01:49:20 +00:00
Mark Chien
1b86312490 [automerger skipped] Merge "Move TetheringTests to presubmit" into rvc-dev am: ccf1551ed0 am: 637de75575 -s ours am: db97500dd3 -s ours 
am skip reason: Change-Id I80d29d06fde5a718c31a0a5ad2e2562be5bf419f with SHA-1 0fffc85052 is in history

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

Change-Id: Ieb4e3447ff41e51fa1435b35700b77630c99c498
 2020-06-11 01:45:46 +00:00
Mark Chien
57b62408c7 [automerger skipped] Merge "Move TetheringTests to presubmit" into rvc-dev am: ccf1551ed0 -s ours am: ae4227ca95 -s ours am: 18cab6e6fb -s ours 
am skip reason: Change-Id I80d29d06fde5a718c31a0a5ad2e2562be5bf419f with SHA-1 0fffc85052 is in history

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

Change-Id: I6ee0e6c632ae6994f77cdca80c136ed90d18e43a
 2020-06-11 01:45:39 +00:00
Mark Chien
db97500dd3 [automerger skipped] Merge "Move TetheringTests to presubmit" into rvc-dev am: ccf1551ed0 am: 637de75575 -s ours 
am skip reason: Change-Id I80d29d06fde5a718c31a0a5ad2e2562be5bf419f with SHA-1 0fffc85052 is in history

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

Change-Id: I9e40516a92566660e8c78a6759bfdc344ff19256
 2020-06-11 01:45:30 +00:00
Mark Chien
18cab6e6fb [automerger skipped] Merge "Move TetheringTests to presubmit" into rvc-dev am: ccf1551ed0 -s ours am: ae4227ca95 -s ours 
am skip reason: Change-Id I80d29d06fde5a718c31a0a5ad2e2562be5bf419f with SHA-1 8e2f49b3da is in history

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

Change-Id: I02cf4f9233b7f43b92b5ca06e63f09f575b0956b
 2020-06-11 01:44:49 +00:00
Mark Chien
3d1248a6ca [automerger skipped] Merge "Move TetheringTests to presubmit" into rvc-dev am: ccf1551ed0 am: 637de75575 am: f9b5371ae1 -s ours 
am skip reason: Change-Id I80d29d06fde5a718c31a0a5ad2e2562be5bf419f with SHA-1 8e2f49b3da is in history

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

Change-Id: I5c268f9d6f484e1e41f7cc86c2ddedf515c24b58
 2020-06-11 01:44:46 +00:00
Mark Chien
637de75575 Merge "Move TetheringTests to presubmit" into rvc-dev am: ccf1551ed0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818359

Change-Id: I839176744df185f47b0020ce7c3f74084934bd55
 2020-06-11 01:38:37 +00:00
Mark Chien
ae4227ca95 [automerger skipped] Merge "Move TetheringTests to presubmit" into rvc-dev am: ccf1551ed0 -s ours 
am skip reason: Change-Id I80d29d06fde5a718c31a0a5ad2e2562be5bf419f with SHA-1 8e2f49b3da is in history

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

Change-Id: Ifbc27109febcaa49a6378ee3c3f8e54a444cc091
 2020-06-11 01:37:43 +00:00
Mark Chien
ccf1551ed0 Merge "Move TetheringTests to presubmit" into rvc-dev 2020-06-11 01:35:38 +00:00
TreeHugger Robot
2f3a11a1fc [automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450 -s ours am: 1a3a459639 -s ours am: 089b4078b5 -s ours am: 8feee2b04c -s ours 
am skip reason: Change-Id I49187aee8a004caa890e2a73c0a28d280215c7d4 with SHA-1 5a07338239 is in history

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

Change-Id: I88095372eb18a0574e5469a5ac4fcaadca3e9f5b
 2020-06-10 18:50:58 +00:00
TreeHugger Robot
d15b68f1b9 [automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450 am: 8bc0ca8c74 -s ours am: c5e6b206a4 -s ours am: e1c7c5e786 -s ours 
am skip reason: Change-Id I49187aee8a004caa890e2a73c0a28d280215c7d4 with SHA-1 5a07338239 is in history

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

Change-Id: Ie75124696026387be93d8bc95d731a2eedbf3a36
 2020-06-10 18:49:36 +00:00
TreeHugger Robot
4bfbe4aa2b [automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450 am: 8bc0ca8c74 am: d21e2c925a -s ours am: 05af655fc4 -s ours 
am skip reason: Change-Id I49187aee8a004caa890e2a73c0a28d280215c7d4 with SHA-1 3fe5434d19 is in history

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

Change-Id: I079b40ea0e229291ab57e4b83124cd15f419cc66
 2020-06-10 18:48:46 +00:00
TreeHugger Robot
8feee2b04c [automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450 -s ours am: 1a3a459639 -s ours am: 089b4078b5 -s ours 
am skip reason: Change-Id I49187aee8a004caa890e2a73c0a28d280215c7d4 with SHA-1 5a07338239 is in history

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

Change-Id: Ieb94d16f8725bc70a8c00a6cf8c0e950be3821db
 2020-06-10 18:39:25 +00:00
TreeHugger Robot
e1c7c5e786 [automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450 am: 8bc0ca8c74 -s ours am: c5e6b206a4 -s ours 
am skip reason: Change-Id I49187aee8a004caa890e2a73c0a28d280215c7d4 with SHA-1 5a07338239 is in history

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

Change-Id: Icbeb93e5c13642929ade573c7968c7c68c240fc5
 2020-06-10 18:37:28 +00:00
TreeHugger Robot
05af655fc4 [automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450 am: 8bc0ca8c74 am: d21e2c925a -s ours 
am skip reason: Change-Id I49187aee8a004caa890e2a73c0a28d280215c7d4 with SHA-1 3fe5434d19 is in history

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

Change-Id: I74712ec7274fcd37f3e4006ca7dc398a73a27e18
 2020-06-10 18:37:11 +00:00
TreeHugger Robot
089b4078b5 [automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450 -s ours am: 1a3a459639 -s ours 
am skip reason: Change-Id I49187aee8a004caa890e2a73c0a28d280215c7d4 with SHA-1 5a07338239 is in history

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

Change-Id: Ia99757195a8359a700a5dd0bf692ff954d623c4c
 2020-06-10 18:27:08 +00:00
TreeHugger Robot
c5e6b206a4 [automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450 am: 8bc0ca8c74 -s ours 
am skip reason: Change-Id I49187aee8a004caa890e2a73c0a28d280215c7d4 with SHA-1 3fe5434d19 is in history

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

Change-Id: I77d1d15d284190ee98321f7dfb8eaf8abd367fb9
 2020-06-10 18:25:26 +00:00
TreeHugger Robot
8bc0ca8c74 Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11596544

Change-Id: I73dbaf73122522f7385520a8cee46c9299853b7c
 2020-06-10 18:09:43 +00:00
TreeHugger Robot
1a3a459639 [automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450 -s ours 
am skip reason: Change-Id I49187aee8a004caa890e2a73c0a28d280215c7d4 with SHA-1 3fe5434d19 is in history

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

Change-Id: I8aa04d98967bc31dafdf7265e65b994274daf868
 2020-06-10 18:09:36 +00:00
TreeHugger Robot
34d101b450 Merge "Make tether settings intent explicit" into rvc-dev 2020-06-10 17:47:19 +00:00
paulhu
5a07338239 Make tether settings intent explicit 
Currently tethering notification is sending a pending intent for
redirecting user to tether settings page. However, this intent
is implicit that only create with
Settings.ACTION_TETHER_SETTINGS. For security reasons, this
intetnt should specify an explicit component to be delivered to.
Thus, specify the settings package name to this intent.

Test: atest TetheringTests
Bug: 156353008
Change-Id: I49187aee8a004caa890e2a73c0a28d280215c7d4
Merged-In: I49187aee8a004caa890e2a73c0a28d280215c7d4
 2020-06-10 23:48:13 +08:00
TreeHugger Robot
9e52d5efba [automerger skipped] Merge changes from topic "am-be6a9190f28c4c1fa3990ea22425f5b8-rvc-dev" into rvc-dev am: 8ef4c5bac0 am: c6298512e4 -s ours am: 8188870684 -s ours am: 8d071edd2e -s ours 
am skip reason: Change-Id I829d36339973f9473fe6b616c48aa288f18d1c46 with SHA-1 7c538fa7ff is in history

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

Change-Id: I91792a719a4347485c4b3b411c07e17bcde85947
 2020-06-10 07:34:45 +00:00
Lorenzo Colitti
1ce3beec2e [automerger skipped] [BOT.9] Add unit test for data warning in BpfCoordinator am: 1aa15dab62 am: 40e28391e5 -s ours am: e7b6ad5bfc -s ours am: 51428d92bb -s ours 
am skip reason: Change-Id Ic1f37de75b064d7c8717e1b496e13174bb8693ec with SHA-1 1aa15dab62 is in history

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

Change-Id: I8b862a216e04981bdcbcd511f1c34acd5a07848d
 2020-06-10 07:34:41 +00:00
Lorenzo Colitti
965162ea78 [automerger skipped] [BOT.4] Make BpfCoordinator to support data warning am: 11b88351c0 am: d0ca099573 -s ours am: 1d7c1bded8 -s ours am: 3b580215b4 -s ours 
am skip reason: Change-Id Ibf25560ca2e9f003d8eba01361dc7d35ec1b1627 with SHA-1 11b88351c0 is in history

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

Change-Id: Iab390e263d33dae90c52d59124da1e6725512047
 2020-06-10 07:34:27 +00:00
Hungming Chen
72bd97cd9c [automerger skipped] [BOT.5] Move class Ipv6ForwardingRule from IpServer to the coordinator am: 810a381cd4 am: 41c971a024 -s ours am: 2496028dee -s ours am: ada520f82c -s ours 
am skip reason: Change-Id I85316ef09ff3c9389ded11dcc384493d699da48e with SHA-1 810a381cd4 is in history

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

Change-Id: Idf6950f107ca3095010ffe289d1bf8b9ae839057
 2020-06-10 07:34:08 +00:00
Hungming Chen
2f7f17464c [automerger skipped] [BOT.3] Add unit test for polling network stats in the coordinator am: 6442858f9d am: a2f02c617e -s ours am: 8d4bbf4f2f -s ours am: c54a0c2a93 -s ours 
am skip reason: Change-Id Ib1756159a2047c5db7d31359b0f288f840bd1bb1 with SHA-1 6442858f9d is in history

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

Change-Id: Idd30eb2bd0e5070c462e1d72695bba8fd5243f82
 2020-06-10 07:34:04 +00:00
Hungming Chen
84d6fd54dd [automerger skipped] [BOT.2] Create a coordinator and stats provider to provide tether stats am: d50f53b58a am: 81d15877d4 -s ours am: 9269de4a72 -s ours am: 82269fdb2c -s ours 
am skip reason: Change-Id I22e71f87b67668f7e733e4f215d93bf5b2c9380d with SHA-1 d50f53b58a is in history

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

Change-Id: Ic326d6d54c8fade8d141d89846961f7c8468d2e2
 2020-06-10 07:33:45 +00:00
Hungming Chen
9cc8448a38 [automerger skipped] [BOT.1] Add a class ForwardedStats in TetheringUtils am: 020cb554f5 am: 3b29ab8c1b -s ours am: fa2109f84a -s ours am: 8637dd3b14 -s ours 
am skip reason: Change-Id Ie8725f95c3ddd5fb3811d479de32d2c1f7dcb493 with SHA-1 020cb554f5 is in history

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

Change-Id: I51124b53636d46a2fbf7ccddd511f1bcd8d938a3
 2020-06-10 07:33:31 +00:00
TreeHugger Robot
536316aafc [automerger skipped] Merge changes from topic "am-be6a9190f28c4c1fa3990ea22425f5b8-rvc-dev" into rvc-dev am: 8ef4c5bac0 -s ours am: ea022aada2 -s ours am: 9cff08e68b -s ours am: a046f97ad2 -s ours 
am skip reason: Change-Id I829d36339973f9473fe6b616c48aa288f18d1c46 with SHA-1 269c0886ed is in history

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

Change-Id: I6650adc731de0049151e5a872d946ccf0c6a3a32
 2020-06-10 07:31:31 +00:00
TreeHugger Robot
8d071edd2e [automerger skipped] Merge changes from topic "am-be6a9190f28c4c1fa3990ea22425f5b8-rvc-dev" into rvc-dev am: 8ef4c5bac0 am: c6298512e4 -s ours am: 8188870684 -s ours 
am skip reason: Change-Id I829d36339973f9473fe6b616c48aa288f18d1c46 with SHA-1 7c538fa7ff is in history

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

Change-Id: I55397954c2c6ce08a9e12fb97191a52d70dde662
 2020-06-10 07:16:51 +00:00