Merge "Check that Account Parcel has name and type." into oc-dev

1 files changed, 6 insertions, 0 deletions

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) {