Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
482,491 Commits 3 Branches 0 Tags
aa72b51c17cf40bc479989198009800a05d9262e
Commit Graph

482491 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerng Wang
aa72b51c17 [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev am: d66da66133 am: 9ebf723235 -s ours 
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

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

Change-Id: I0d0d1f7092a2ade6ab89bf72514445a24a7666c5
 2021-06-08 06:43:35 +00:00
SongFerng Wang
9ebf723235 Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev am: d66da66133 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440224

Change-Id: Ie22ef595d11fafb5e7751bb1bb3b8be8133239ac
 2021-06-08 06:23:01 +00:00
SongFerng Wang
20abbc5875 Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into rvc-dev 2021-06-08 05:59:52 +00:00
SongFerng Wang
d66da66133 Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev 2021-06-08 05:59:44 +00:00
lucaslin
e159dbb07f [automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: 0684e7a64a -s ours am: 0f311f7b28 -s ours am: 12f7871029 -s ours am: 1e169e7ef8 -s ours 
am skip reason: Merged-In I12050737291c7fa0ebff4e7411b91f4c6f57a413 with SHA-1 e97d1f5484 is already in history

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

Change-Id: Ie69d397dba7d67a0ac7ed9ea38cea867ac666748
 2021-05-12 18:47:54 +00:00
lucaslin
f793f6516e [automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: e97d1f5484 -s ours am: e100b24420 -s ours am: 0c2eb39dfb -s ours 
am skip reason: Merged-In I7b43940dc32826c70fa82f471b35bc5cb8394aad with SHA-1 c737926795 is already in history

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

Change-Id: I7e272f3ac4cd8b6cf94414494120302291c7df72
 2021-05-12 18:47:43 +00:00
Nate Myren
ccf88a6577 [automerger skipped] Ensure storage permission revoke happens for all users am: 387182eb49 am: 2f2fa37a18 -s ours 
am skip reason: Merged-In Ieb8bb9cde1576e9eee131338d393b8a3528341ec with SHA-1 37acd7ee52 is already in history

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

Change-Id: I03963a30b550540252d33374c2bcb568ddfc0bd4
 2021-05-12 18:47:24 +00:00
lucaslin
1e169e7ef8 [automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: 0684e7a64a -s ours am: 0f311f7b28 -s ours am: 12f7871029 -s ours 
am skip reason: Merged-In I12050737291c7fa0ebff4e7411b91f4c6f57a413 with SHA-1 e97d1f5484 is already in history

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

Change-Id: I10032a99e96a46e9d685c4b1ac6835ef342fca16
 2021-05-12 18:30:54 +00:00
lucaslin
0c2eb39dfb [automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: e97d1f5484 -s ours am: e100b24420 -s ours 
am skip reason: Merged-In I1b8b6a3f4390adbabf92fb9e48da61c47b08b2ec with SHA-1 e67b0c3aee is already in history

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

Change-Id: I1c25c89f9863d673c6b78be63556ffb63b6d720f
 2021-05-12 18:30:15 +00:00
lucaslin
12f7871029 [automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: 0684e7a64a -s ours am: 0f311f7b28 -s ours 
am skip reason: Merged-In I12050737291c7fa0ebff4e7411b91f4c6f57a413 with SHA-1 e97d1f5484 is already in history

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

Change-Id: Ic203ba11819ad24e6eb435132ff468a8a6c4b564
 2021-05-12 18:08:45 +00:00
lucaslin
e100b24420 [automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: e97d1f5484 -s ours 
am skip reason: Merged-In I1b8b6a3f4390adbabf92fb9e48da61c47b08b2ec with SHA-1 e67b0c3aee is already in history

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

Change-Id: Ia0244cd9791223e711c84a76215a3e242f04276b
 2021-05-12 18:08:28 +00:00
lucaslin
0f311f7b28 [automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: 0684e7a64a -s ours 
am skip reason: Merged-In I12050737291c7fa0ebff4e7411b91f4c6f57a413 with SHA-1 e97d1f5484 is already in history

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

Change-Id: Ia7cfcceb95501f9a0ed99a6c0f9b16f7162ecee5
 2021-05-12 18:06:44 +00:00
Nate Myren
2f2fa37a18 Ensure storage permission revoke happens for all users am: 387182eb49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14357211

Change-Id: Icf0e785e3ee908301240ca5c2eb63a8d21ac7b07
 2021-05-12 17:36:11 +00:00
Lucas Lin
542d796a9f Merge "Remove sendNetworkConditionsBroadcast" into rvc-dev 2021-05-12 17:08:42 +00:00
lucaslin
e97d1f5484 Fix the security issue that preloaded apps can get SSID & BSSID 
NetworkMonitor sends "android.net.conn.NETWORK_CONDITIONS_MEASURED"
broadcast with Wifi SSID & BSSID. The receiver of this broadcast
is only required to have "android.permission.ACCESS_NETWORK_CONDITIONS"
permission but not the "android.permission.ACCESS_FINE_LOCATION".
It's incorrect because if the apps want to know the Wifi SSID and
BSSID, they should get the run-time permission with user consent.
Since this broadcast is not used anymore, delete it and the related
code.

Bug: 175213041
Test: atest NetworkStackNextTests NetworkStackTests
Change-Id: I12050737291c7fa0ebff4e7411b91f4c6f57a413
Merged-In: I1b8b6a3f4390adbabf92fb9e48da61c47b08b2ec
Merged-In: I7b43940dc32826c70fa82f471b35bc5cb8394aad
 2021-05-12 09:16:38 +00:00
lucaslin
0684e7a64a Fix the security issue that preloaded apps can get SSID & BSSID 
NetworkMonitor sends "android.net.conn.NETWORK_CONDITIONS_MEASURED"
broadcast with Wifi SSID & BSSID. The receiver of this broadcast
is only required to have "android.permission.ACCESS_NETWORK_CONDITIONS"
permission but not the "android.permission.ACCESS_FINE_LOCATION".
It's incorrect because if the apps want to know the Wifi SSID and
BSSID, they should get the run-time permission with user consent.
Since this broadcast is not used anymore, delete it and the related
code.

Bug: 175213041
Test: atest NetworkStackNextTests NetworkStackTests
Change-Id: I12050737291c7fa0ebff4e7411b91f4c6f57a413
Merged-In: I12050737291c7fa0ebff4e7411b91f4c6f57a413
Merged-In: I7b43940dc32826c70fa82f471b35bc5cb8394aad
 2021-05-12 09:15:37 +00:00
lucaslin
c737926795 Remove sendNetworkConditionsBroadcast 
sendNetworkConditionsBroadcast is removed, so
TestNetworkStackService.kt cannot override it anymore,
otherwise there will be a build break when running this
test.
Also add a comment for NETWORK_CONDITIONS_MEASURED in
AndroidManifest.xml.

Bug: 175213041
Test: atest FrameworksNetIntegrationTests
Change-Id: I7b43940dc32826c70fa82f471b35bc5cb8394aad
Merged-In: I7b43940dc32826c70fa82f471b35bc5cb8394aad
 2021-05-11 01:12:56 +00:00
Baligh Uddin
c560d404a0 Merge "Migrate apex/permission to packages/modules/Permission" into rvc-dev 2021-05-07 22:16:55 +00:00
SongFerngWang
121c969e22 [security] SubscriptionGroup is exposed to unprivileged callers 
SubscriptionInfo.mGroupUUID is not cleared in
conditionallyRemoveIdentifiers if the caller only has READ_PHONE_STATE
(based on a check to checkReadPhoneState) and not READ_DEVICE_IDENTIFIERS.
Bug: 181053462
Test: atest SubscriptionManagerTest

Change-Id: Ic2b62523330dc6e2169ad851715c4ab3da3b29cf
Merged-In: Ic2b62523330dc6e2169ad851715c4ab3da3b29cf
 2021-05-06 03:47:47 +00:00
SongFerngWang
873d4bffb2 [security] SubscriptionGroup is exposed to unprivileged callers 
SubscriptionInfo.mGroupUUID is not cleared in
conditionallyRemoveIdentifiers if the caller only has READ_PHONE_STATE
(based on a check to checkReadPhoneState) and not READ_DEVICE_IDENTIFIERS.
Bug: 181053462
Test: atest SubscriptionManagerTest

Change-Id: Ic2b62523330dc6e2169ad851715c4ab3da3b29cf
Merged-In: Ic2b62523330dc6e2169ad851715c4ab3da3b29cf
 2021-05-06 03:43:49 +00:00
Baligh Uddin
3d533ae271 Migrate apex/permission to packages/modules/Permission 
BUG: 167963264
Test: TH
Merged-In: I38139a95761f70ad6a523888cdda2076ce65aa30
Change-Id: Id5e75ffb10d4a3c4ede300512d4d696b604e2e47
 2021-05-02 13:58:45 +00:00
Nate Myren
387182eb49 Ensure storage permission revoke happens for all users 
When revoking storage permissions due to storage escalation, ensure the
revoke happens for all users

Fixes: 186034260
Bug: 171430330
Test: atest --user-type secondary_user StorageEscalationTest
Merged-In: Ieb8bb9cde1576e9eee131338d393b8a3528341ec
Change-Id: Ieb8bb9cde1576e9eee131338d393b8a3528341ec
 2021-04-30 21:22:55 +00:00
Nate Myren
37acd7ee52 Ensure storage permission revoke happens for all users 
When revoking storage permissions due to storage escalation, ensure the
revoke happens for all users

Fixes: 186034260
Bug: 171430330
Test: atest --user-type secondary_user StorageEscalationTest
Merged-In: Ieb8bb9cde1576e9eee131338d393b8a3528341ec
Change-Id: Ieb8bb9cde1576e9eee131338d393b8a3528341ec
 2021-04-30 21:22:23 +00:00
Julia Reynolds
f08bd224bb [automerger skipped] Restrict alarm broadcast am: d61aae299c -s ours am: 08db350c8b -s ours am: 80b1e85c12 -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 f1e84b42b1 is already in history

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

Change-Id: I38139a95761f70ad6a523888cdda2076ce65aa30
 2021-04-29 18:28:02 +00:00
Julia Reynolds
80b1e85c12 [automerger skipped] Restrict alarm broadcast am: d61aae299c -s ours am: 08db350c8b -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 f1e84b42b1 is already in history

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

Change-Id: I26564121399185079e7dccd619971d57c21249bc
 2021-04-29 18:11:46 +00:00
Julia Reynolds
08db350c8b [automerger skipped] Restrict alarm broadcast am: d61aae299c -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 f1e84b42b1 is already in history

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

Change-Id: If437855aa9b9c788f2f03d3d3091c5034cf93ba7
 2021-04-29 17:48:51 +00:00
Julia Reynolds
d61aae299c Restrict alarm broadcast 
To android only

Test: NotificationManagerTest, NotificationManagerServiceTest
Bug: 175614289
Change-Id: I4f8e56729d90f8f5288d08881129b1c45d5790e7
Merged-In: I4f8e56729d90f8f5288d08881129b1c45d5790e7
(cherry picked from commit abf15b731a)
(cherry picked from commit 4056976f1e)
(cherry picked from commit f1e84b42b1)
 2021-04-29 15:30:43 +00:00
Aemon Cannon
9769b95c31 Merge "Add instrumented app to JAR path (isolated splits)" into qt-qpr1-dev am: d2317d0fac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14240125

Change-Id: Id18fda9f958e8b4555a044c866f7f695c440856a
 2021-04-28 23:19:50 +00:00
Aemon Cannon
d2317d0fac Merge "Add instrumented app to JAR path (isolated splits)" into qt-qpr1-dev 2021-04-28 22:38:41 +00:00
Julia Reynolds
26925dd638 [automerger skipped] Restrict alarm broadcast am: f1e84b42b1 -s ours am: eaf40f342d -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 7dfcfe85ae is already in history

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

Change-Id: Iaf9103ad8ba918cd3b836cc2ad63c07ef350a5e1
 2021-04-28 21:50:41 +00:00
Julia Reynolds
eaf40f342d [automerger skipped] Restrict alarm broadcast am: f1e84b42b1 -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 7dfcfe85ae is already in history

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

Change-Id: If58dd4cc98f8ac2066b79f274e99a0a5169c0d9a
 2021-04-28 21:18:10 +00:00
Julia Reynolds
f1e84b42b1 Restrict alarm broadcast 
To android only

Test: NotificationManagerTest, NotificationManagerServiceTest
Bug: 175614289
Change-Id: I4f8e56729d90f8f5288d08881129b1c45d5790e7
Merged-In: I4f8e56729d90f8f5288d08881129b1c45d5790e7
(cherry picked from commit abf15b731a)
(cherry picked from commit 4056976f1e)
 2021-04-28 17:35:03 +00:00
Julia Reynolds
2a061f2e25 [automerger skipped] Merge "Restrict alarm broadcast" into oc-mr1-dev am: 3b0fc6bd38 am: d749dc3510 am: fd89965284 am: 90ef2704fa -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 4056976f1e is already in history

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

Change-Id: I1a85b8c3024307a9d780eb1c404a9baa17a4f696
 2021-04-27 22:27:00 +00:00
Louis Chang
6adacfab63 [automerger skipped] Detects all activities for whether showing work challenge am: 6820d70823 -s ours am: 1c750cd367 -s ours am: b64eddc2c9 -s ours am: aecf7c267d -s ours 
am skip reason: Merged-In I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 69b3a3cd04 is already in history

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

Change-Id: I4559f227416180c37564a99318a1945f4c768382
 2021-04-27 22:26:12 +00:00
Louis Chang
dcb100da76 [automerger skipped] Detects all activities for whether showing work challenge am: fe5e1432cf -s ours am: 850810d0fd -s ours am: 62c71ab0fd -s ours 
am skip reason: Merged-In I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 69b3a3cd04 is already in history

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

Change-Id: Ia8578dced1d3716449255ba7df4f98c7e74bee5b
 2021-04-27 22:25:28 +00:00
Louis Chang
82fa6e3769 [automerger skipped] Detects all activities for whether showing work challenge am: 69b3a3cd04 am: d5c18447be -s ours 
am skip reason: Merged-In I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 27a2a5f986 is already in history

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

Change-Id: If523fdd2f55df58fb2beed1c95c6fd46248d5a45
 2021-04-27 22:24:45 +00:00
Beth Thibodeau
b32d4d538b Merge "Increase maximum allowed size for status bar icons" into pi-dev am: d17b979843 am: e219886035 am: b0d6e6cd57 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14054747

Change-Id: I8e76d41d7afd0a92808e5e5a62013ea15dddcb0f
 2021-04-27 22:23:44 +00:00
Chris Tate
91fbccc817 [automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into oc-mr1-dev am: 6cc887c00d -s ours am: 2bec84a794 -s ours am: 9cd02f1d7f am: 22feb668e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c77d745a97304c67aa80741298b3d539eaa85f1
 2021-04-27 22:22:30 +00:00
Chris Tate
eff05e86d3 [automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into pi-dev am: 1735cdeea4 -s ours am: 76a15c06f4 -s ours am: e0a844da8b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I81ae3d27ab83ef0f8197275b956c7e35de3338d5
 2021-04-27 22:20:53 +00:00
Chris Tate
0dbc306379 [automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into qt-dev am: 7b0067c950 am: 05dd5f18e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia646150ba7ecb4342542dc3601789b056fb91710
 2021-04-27 22:20:04 +00:00
Christopher Tate
11f4032b5e [automerger skipped] DO NOT MERGE - Disallow deletion of channels with FGS notifications am: 88380a00d5 am: 3c507386ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8dea7a8e26803efd6cdbf87ffedaf32f6f2420c1
 2021-04-27 22:19:44 +00:00
Beth Thibodeau
c7930c4045 Increase maximum allowed size for status bar icons am: 8875da5207 am: cc35c516df am: 39ecfe9aed am: 8d4ac0f225 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14033398

Change-Id: I090f9210434eff0345d0dc6643ff87c24432bf07
 2021-04-27 22:19:05 +00:00
Beth Thibodeau
eded1d8a7c Increase maximum allowed size for status bar icons am: 92106a58df am: fcd571f060 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14053514

Change-Id: I494cd6ff1ea1291e8b4cd5883e6e573114816dcc
 2021-04-27 22:18:34 +00:00
yawanng
4c38925244 [automerger skipped] Adds caller check to getAllPackages() am: 264dea63b0 -s ours am: 2f4ff31a2e -s ours am: e57bd828a9 -s ours 
am skip reason: Merged-In I77460ae19a4d41151577646441f11e2eddbb741a with SHA-1 9b694ef4d4 is already in history

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

Change-Id: If73b6306d49d489850b0d17359f4df743d7829b4
 2021-04-27 22:18:19 +00:00
Patrick Baumann
3a5b3f8a88 [automerger skipped] Revert "Adds caller check to getAllPackages()" am: 8d900812b7 -s ours am: 2db12a46a9 -s ours am: d1c3879708 -s ours 
am skip reason: Merged-In I77460ae19a4d41151577646441f11e2eddbb741a with SHA-1 9b694ef4d4 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Ib547c7fae128b15521d20ffafcba070c9076783c
 2021-04-27 22:18:01 +00:00
TreeHugger Robot
130459160f [automerger skipped] Merge "Revoke storage on SDK downgrade or new full storage request" into qt-dev am: d035f1b963 am: dcbef79eb9 -s ours 
am skip reason: Merged-In Ia6bd5658b77a26ab15fea013ec875050457473e0 with SHA-1 09080dc177 is already in history

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

Change-Id: I1683d8965087c7174448e986a3262dd9dd95285f
 2021-04-27 22:14:02 +00:00
TreeHugger Robot
45d5be1254 Merge "Limit maximum allowed size for a status bar icon" into oc-mr1-dev am: 7e6da1776d am: a9aaed5d47 am: cdbee965a7 am: 71f344b36a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430253

Change-Id: Icdea763e039c4a35fd49e3c70631dbef86abe0cd
 2021-04-27 22:13:11 +00:00
Beth Thibodeau
2bb50aba75 Merge "Limit maximum allowed size for a status bar icon" into qt-dev am: 81a7a760c8 am: 6540ebaf5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430605

Change-Id: Ia05cbabaa0151a2e064820032368de8fc2f88f37
 2021-04-27 22:12:29 +00:00
Beth Thibodeau
bc6f5f8bf8 [automerger skipped] Merge "Limit maximum allowed size for a status bar icon" into pi-dev am: ed7118d8bf am: 04043de40c am: c7731486df -s ours 
am skip reason: skipped by user ethibodeau

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

Change-Id: I9a0c18bedfa7b328a9983560a123d704bc3b6370
 2021-04-27 22:11:39 +00:00
TreeHugger Robot
8e2813e52b [automerger skipped] Merge "Adds caller check to getAllPackages()" into oc-mr1-dev am: 835ab4eb82 -s ours am: 38fb80f008 -s ours am: 263adb234a -s ours am: 463477087d -s ours 
am skip reason: Merged-In I77460ae19a4d41151577646441f11e2eddbb741a with SHA-1 9b694ef4d4 is already in history

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

Change-Id: Id64697d60c6c378fd325d03fc07973823d14dfee
 2021-04-27 21:43:08 +00:00