From 0992000acea457142cb2b715a106057d6cee9166 Mon Sep 17 00:00:00 2001 From: Dmitry Dementyev Date: Mon, 8 Apr 2019 16:13:21 -0700 Subject: Check that Account Parcel has name and type. Bug: 129287265 Test: manual Change-Id: I8431eb27cc4c6dfd3048b28ff635474f14433308 (cherry picked from commit 32e85796389f57e2539c28f9e670277ab610459a) --- core/java/android/accounts/Account.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index b6e85f18a695..3f90f36fb2a1 100644 --- a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java @@ -88,6 +88,12 @@ public class Account implements Parcelable { public Account(Parcel in) { this.name = in.readString(); this.type = in.readString(); + if (TextUtils.isEmpty(name)) { + throw new android.os.BadParcelableException("the name must not be empty: " + name); + } + if (TextUtils.isEmpty(type)) { + throw new android.os.BadParcelableException("the type must not be empty: " + type); + } this.accessId = in.readString(); if (accessId != null) { synchronized (sAccessedAccounts) { -- cgit v1.2.3-59-g8ed1b