Merge "Update AccountManagerService checkKeyIntentParceledCorrectly." into rvc-dev am: d40861be65 am: 8271466531 am: c0cf1e4a4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23883016 Change-Id: I9504969069c4af457fad151d087d177e5bea14aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -4923,6 +4923,9 @@ public class AccountManagerService
|
||||
Bundle simulateBundle = p.readBundle();
|
||||
p.recycle();
|
||||
Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT);
|
||||
if (intent != null && intent.getClass() != Intent.class) {
|
||||
return false;
|
||||
}
|
||||
Intent simulateIntent = simulateBundle.getParcelable(AccountManager.KEY_INTENT);
|
||||
if (intent == null) {
|
||||
return (simulateIntent == null);
|
||||
|
||||
Reference in New Issue
Block a user