Merge "Update AccountManagerService checkKeyIntentParceledCorrectly." into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
1a3bef4300
@@ -4923,7 +4923,10 @@ public class AccountManagerService
|
|||||||
p.setDataPosition(0);
|
p.setDataPosition(0);
|
||||||
Bundle simulateBundle = p.readBundle();
|
Bundle simulateBundle = p.readBundle();
|
||||||
p.recycle();
|
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 simulateIntent = simulateBundle.getParcelable(AccountManager.KEY_INTENT,
|
||||||
Intent.class);
|
Intent.class);
|
||||||
if (intent == null) {
|
if (intent == null) {
|
||||||
|
|||||||
Reference in New Issue
Block a user