Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f96d8b9 authored by Dmitry Dementyev's avatar Dmitry Dementyev Committed by Android (Google) Code Review
Browse files

Merge "Add @NonNull annotatation to Account.java"

parents d2de55d0 cff5e280

core/api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -3664,13 +3664,13 @@ package android.accounts { 
  }















  public class Account implements android.os.Parcelable {













    ctor public Account(String, String);













    ctor public Account(@NonNull String, @NonNull String);















    ctor public Account(android.os.Parcel);















    method public int describeContents();















    method public void writeToParcel(android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.accounts.Account> CREATOR;













    field public final String name;













    field public final String type;













    field @NonNull public final String name;













    field @NonNull public final String type;















  }





























  @Deprecated public class AccountAuthenticatorActivity extends android.app.Activity {

























core/java/android/accounts/Account.java



+4
−4




























Original line number
Diff line number
Diff line








@@ -45,8 +45,8 @@ public class Account implements Parcelable {













    @GuardedBy("sAccessedAccounts")















    private static final Set<Account> sAccessedAccounts = new ArraySet<>();





























    public final String name;













    public final String type;













    public final @NonNull String name;













    public final @NonNull String type;















    private String mSafeName;















    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)















    private final @Nullable String accessId;









@@ -65,7 +65,7 @@ public class Account implements Parcelable {













        return result;















    }





























    public Account(String name, String type) {













    public Account(@NonNull String name, @NonNull String type) {















        this(name, type, null);















    }

























@@ -79,7 +79,7 @@ public class Account implements Parcelable {













    /**















     * @hide















     */













    public Account(String name, String type, String accessId) {













    public Account(@NonNull String name, @NonNull String type, String accessId) {















        if (TextUtils.isEmpty(name)) {















            throw new IllegalArgumentException("the name must not be empty: " + name);















        }