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

Commit 4a0e382e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use correct type for permission group name."

parents ba1c11f1 4b4798bb
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -5731,10 +5731,10 @@ package android.permission {
  }
  public final class RuntimePermissionUsageInfo implements android.os.Parcelable {
    ctor public RuntimePermissionUsageInfo(@NonNull CharSequence, int);
    ctor public RuntimePermissionUsageInfo(@NonNull String, int);
    method public int describeContents();
    method public int getAppAccessCount();
    method @NonNull public CharSequence getName();
    method @NonNull public String getName();
    method public void writeToParcel(android.os.Parcel, int);
    field @NonNull public static final android.os.Parcelable.Creator<android.permission.RuntimePermissionUsageInfo> CREATOR;
  }
+5 −5
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import android.os.Parcelable;
 */
@SystemApi
public final class RuntimePermissionUsageInfo implements Parcelable {
    private final @NonNull CharSequence mName;
    private final @NonNull String mName;
    private final int mNumUsers;

    /**
@@ -44,7 +44,7 @@ public final class RuntimePermissionUsageInfo implements Parcelable {
     * @param name The permission group name.
     * @param numUsers The number of apps that have used this permission.
     */
    public RuntimePermissionUsageInfo(@NonNull CharSequence name, int numUsers) {
    public RuntimePermissionUsageInfo(@NonNull String name, int numUsers) {
        checkNotNull(name);
        checkArgumentNonnegative(numUsers);

@@ -53,7 +53,7 @@ public final class RuntimePermissionUsageInfo implements Parcelable {
    }

    private RuntimePermissionUsageInfo(Parcel parcel) {
        this(parcel.readCharSequence(), parcel.readInt());
        this(parcel.readString(), parcel.readInt());
    }

    /**
@@ -68,7 +68,7 @@ public final class RuntimePermissionUsageInfo implements Parcelable {
     *
     * @return The name.
     */
    public @NonNull CharSequence getName() {
    public @NonNull String getName() {
        return mName;
    }

@@ -79,7 +79,7 @@ public final class RuntimePermissionUsageInfo implements Parcelable {

    @Override
    public void writeToParcel(Parcel parcel, int flags) {
        parcel.writeCharSequence(mName);
        parcel.writeString(mName);
        parcel.writeInt(mNumUsers);
    }