diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-11-10 19:56:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 19:56:49 +0000 |
| commit | e0efbc5fbbe7b2b5167fc41f4e618deaaad199e3 (patch) | |
| tree | 9fbb908757308ed4820986abe6b675fa3ac8eb08 /core/java/android | |
| parent | e422433ae5ad1a8a84b57f86ca32c8875b3cf827 (diff) | |
| parent | 01f2d401c90308b8b1378fb1fc23671816e74414 (diff) | |
Merge "Check that Account Parcel has name and type." into oc-dev am: 3349eaa9e8 am: 01f2d401c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12999920
Change-Id: I0e4803e7aafd730b9e21e49dc350ee51eedf42d8
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/accounts/Account.java | 6 |
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) { |