mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
964877bbf6
wgetb96ee4a2d1.patch -O telephony-01.patch wgetc16e6e78c1.patch -O media-01.patch wgetd5771450d7.patch -O media-02.patch wgeta1370bd00c.patch -O nn-01.patch wgetce2776f4ca.patch -O bt-01.patch wget585f583ef5.patch -O bt-02.patch wgetc9905e7968.patch -O bt-03.patch wgetc93ec045f5.patch -O bt-04.patch wget89fb17d172.patch -O bt-05.patch wget14aed2455e.patch -O bt-06.patch wgetcd438ebc52.patch -O bt-07.patch wget27e7cdc4e5.patch -O nfc-01.patch wgetdfeb4270b8.patch -O launcher-01.patch wgetb1993f6cec.patch -O native-01.patch wgetdf4a9362cd.patch -O fwb-01.patch wgetb55563bb9d.patch -O fwb-02.patch wgeta80971a281.patch -O fwb-03.patch wget7e173b4383.patch -O fwb-04.patch wget44191b1c6b.patch -O fwb-05.patch wget8dc8dfe572.patch -O fwb-06.patch wget00a4224100.patch -O av-01.patch wget21623d1f43.patch -O settings-01.patch wgetfa5ec443d9.patch -O settings-02.patch wgetba4da9c7b3.patch -O settings-03.patch Signed-off-by: Tad <tad@spotco.us>
31 lines
1.6 KiB
Diff
31 lines
1.6 KiB
Diff
From 44191b1c6b55d9e09d8b5fca96176035abc18c31 Mon Sep 17 00:00:00 2001
|
|
From: Dmitry Dementyev <dementyev@google.com>
|
|
Date: Wed, 5 Jul 2023 10:45:04 -0700
|
|
Subject: [PATCH] Update AccountManagerService checkKeyIntentParceledCorrectly.
|
|
|
|
Bug: 265798288
|
|
Test: manual
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8476b140eed0235df4e8f07d94420a1471191b55)
|
|
Merged-In: Ia2030a9dc371dccadd4e188a529351ac4232bb4f
|
|
Change-Id: Ia2030a9dc371dccadd4e188a529351ac4232bb4f
|
|
---
|
|
.../com/android/server/accounts/AccountManagerService.java | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
|
|
index 1dc0942ceac5..7a51f5155a98 100644
|
|
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
|
|
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
|
|
@@ -4932,7 +4932,10 @@ private boolean checkKeyIntentParceledCorrectly(Bundle bundle) {
|
|
p.setDataPosition(0);
|
|
Bundle simulateBundle = p.readBundle();
|
|
p.recycle();
|
|
- Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT, Intent.class);
|
|
+ Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT);
|
|
+ if (intent != null && intent.getClass() != Intent.class) {
|
|
+ return false;
|
|
+ }
|
|
Intent simulateIntent = simulateBundle.getParcelable(AccountManager.KEY_INTENT,
|
|
Intent.class);
|
|
if (intent == null) {
|