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

Commit 0af97d60 authored by Daulet Zhanguzin's avatar Daulet Zhanguzin
Browse files

Replace com.android.internal.util.Preconditions.checkNotNull with 

java.util.Objects.requireNonNull

Bug: 126528330

Test: Treehugger
Change-Id: I42117ebfb640e3b0b133183e5e146860bed8471a
parent 7b36ffb0

core/java/android/app/ActivityThread.java

+1 −1
Original line number Diff line number Diff line
@@ -3659,7 +3659,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
                    r.activity, Looper.myLooper());

        }

        r.activity.onGetDirectActions(cancellationSignal, (actions) -> {

            Preconditions.checkNotNull(actions);

            Objects.requireNonNull(actions);

            Preconditions.checkCollectionElementsNotNull(actions, "actions");

            if (!actions.isEmpty()) {

                final int actionCount = actions.size();

core/java/android/app/AppOpsManager.java

+5 −5
Original line number Diff line number Diff line
@@ -5517,8 +5517,8 @@ public class AppOpsManager { 
    @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS)

    public void getHistoricalOps(@NonNull HistoricalOpsRequest request,

            @NonNull Executor executor, @NonNull Consumer<HistoricalOps> callback) {

        Preconditions.checkNotNull(executor, "executor cannot be null");

        Preconditions.checkNotNull(callback, "callback cannot be null");

        Objects.requireNonNull(executor, "executor cannot be null");

        Objects.requireNonNull(callback, "callback cannot be null");

        try {

            mService.getHistoricalOps(request.mUid, request.mPackageName, request.mOpNames,

                    request.mBeginTimeMillis, request.mEndTimeMillis, request.mFlags,
@@ -5556,8 +5556,8 @@ public class AppOpsManager { 
    @RequiresPermission(Manifest.permission.MANAGE_APPOPS)

    public void getHistoricalOpsFromDiskRaw(@NonNull HistoricalOpsRequest request,

            @Nullable Executor executor, @NonNull Consumer<HistoricalOps> callback) {

        Preconditions.checkNotNull(executor, "executor cannot be null");

        Preconditions.checkNotNull(callback, "callback cannot be null");

        Objects.requireNonNull(executor, "executor cannot be null");

        Objects.requireNonNull(callback, "callback cannot be null");

        try {

            mService.getHistoricalOpsFromDiskRaw(request.mUid, request.mPackageName,

                    request.mOpNames, request.mBeginTimeMillis, request.mEndTimeMillis,
@@ -7062,7 +7062,7 @@ public class AppOpsManager { 
        private final IAppOpsAsyncNotedCallback mAsyncCb = new IAppOpsAsyncNotedCallback.Stub() {

            @Override

            public void opNoted(AsyncNotedAppOp op) {

                Preconditions.checkNotNull(op);

                Objects.requireNonNull(op);



                getAsyncNotedExecutor().execute(() -> onAsyncNoted(op));

            }

core/java/android/app/ApplicationPackageManager.java

+9 −10
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ import android.view.Display; 
import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.os.SomeArgs;

import com.android.internal.util.Preconditions;

import com.android.internal.util.UserIcons;



import dalvik.system.VMRuntime;
@@ -2149,7 +2148,7 @@ public class ApplicationPackageManager extends PackageManager { 
            } else if (vol.isPrimaryPhysical()) {

                volumeUuid = StorageManager.UUID_PRIMARY_PHYSICAL;

            } else {

                volumeUuid = Preconditions.checkNotNull(vol.fsUuid);

                volumeUuid = Objects.requireNonNull(vol.fsUuid);

            }



            return mPM.movePackage(packageName, volumeUuid);
@@ -2259,7 +2258,7 @@ public class ApplicationPackageManager extends PackageManager { 
            } else if (vol.isPrimaryPhysical()) {

                volumeUuid = StorageManager.UUID_PRIMARY_PHYSICAL;

            } else {

                volumeUuid = Preconditions.checkNotNull(vol.fsUuid);

                volumeUuid = Objects.requireNonNull(vol.fsUuid);

            }



            return mPM.movePrimaryStorage(volumeUuid);
@@ -2661,8 +2660,8 @@ public class ApplicationPackageManager extends PackageManager { 
    /** @hide */

    @Override

    public KeySet getKeySetByAlias(String packageName, String alias) {

        Preconditions.checkNotNull(packageName);

        Preconditions.checkNotNull(alias);

        Objects.requireNonNull(packageName);

        Objects.requireNonNull(alias);

        try {

            return mPM.getKeySetByAlias(packageName, alias);

        } catch (RemoteException e) {
@@ -2673,7 +2672,7 @@ public class ApplicationPackageManager extends PackageManager { 
    /** @hide */

    @Override

    public KeySet getSigningKeySet(String packageName) {

        Preconditions.checkNotNull(packageName);

        Objects.requireNonNull(packageName);

        try {

            return mPM.getSigningKeySet(packageName);

        } catch (RemoteException e) {
@@ -2684,8 +2683,8 @@ public class ApplicationPackageManager extends PackageManager { 
    /** @hide */

    @Override

    public boolean isSignedBy(String packageName, KeySet ks) {

        Preconditions.checkNotNull(packageName);

        Preconditions.checkNotNull(ks);

        Objects.requireNonNull(packageName);

        Objects.requireNonNull(ks);

        try {

            return mPM.isPackageSignedByKeySet(packageName, ks);

        } catch (RemoteException e) {
@@ -2696,8 +2695,8 @@ public class ApplicationPackageManager extends PackageManager { 
    /** @hide */

    @Override

    public boolean isSignedByExactly(String packageName, KeySet ks) {

        Preconditions.checkNotNull(packageName);

        Preconditions.checkNotNull(ks);

        Objects.requireNonNull(packageName);

        Objects.requireNonNull(ks);

        try {

            return mPM.isPackageSignedByKeySetExactly(packageName, ks);

        } catch (RemoteException e) {

core/java/android/app/AuthenticationRequiredException.java

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import android.content.ContentResolver; 
import android.os.Parcel;

import android.os.Parcelable;



import com.android.internal.util.Preconditions;

import java.util.Objects;



/**

 * Specialization of {@link SecurityException} that is thrown when authentication is needed from the
@@ -60,7 +60,7 @@ public final class AuthenticationRequiredException extends SecurityException imp 
     */

    public AuthenticationRequiredException(Throwable cause, PendingIntent userAction) {

        super(cause.getMessage());

        mUserAction = Preconditions.checkNotNull(userAction);

        mUserAction = Objects.requireNonNull(userAction);

    }



    /**

core/java/android/app/ContextImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -2794,7 +2794,7 @@ class ContextImpl extends Context { 


        public ApplicationContentResolver(Context context, ActivityThread mainThread) {

            super(context);

            mMainThread = Preconditions.checkNotNull(mainThread);

            mMainThread = Objects.requireNonNull(mainThread);

        }



        @Override