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

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

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

Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull"
parents 9cb5cdae 71339a9b

core/java/com/android/internal/app/AbstractMultiProfilePagerAdapter.java

+4 −3
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 * limitations under the License.

 */

package com.android.internal.app;



import android.annotation.IntDef;

import android.annotation.Nullable;

import android.content.Context;
@@ -23,10 +24,10 @@ import android.view.ViewGroup; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.widget.PagerAdapter;



import com.android.internal.util.Preconditions;

import com.android.internal.widget.ViewPager;



import java.util.Objects;



/**

 * Skeletal {@link PagerAdapter} implementation of a work or personal profile page for

 * intent resolution (including share sheet).
@@ -42,7 +43,7 @@ public abstract class AbstractMultiProfilePagerAdapter extends PagerAdapter { 
    private int mCurrentPage;



    AbstractMultiProfilePagerAdapter(Context context, int currentPage) {

        mContext = Preconditions.checkNotNull(context);

        mContext = Objects.requireNonNull(context);

        mCurrentPage = currentPage;

    }

core/java/com/android/internal/content/PackageMonitor.java

+2 −2
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ import android.os.UserHandle; 
import android.util.Slog;



import com.android.internal.os.BackgroundThread;

import com.android.internal.util.Preconditions;



import java.util.HashSet;

import java.util.Objects;



/**

 * Helper class for monitoring the state of packages: adding, removing,
@@ -93,7 +93,7 @@ public abstract class PackageMonitor extends android.content.BroadcastReceiver { 
            throw new IllegalStateException("Already registered");

        }

        mRegisteredContext = context;

        mRegisteredHandler = Preconditions.checkNotNull(handler);

        mRegisteredHandler = Objects.requireNonNull(handler);

        if (user != null) {

            context.registerReceiverAsUser(this, user, sPackageFilt, null, mRegisteredHandler);

            context.registerReceiverAsUser(this, user, sNonDataFilt, null, mRegisteredHandler);

core/java/com/android/internal/infra/ServiceConnector.java

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.text.TextUtils; 
import android.util.DebugUtils;

import android.util.Log;



import com.android.internal.util.Preconditions;

import com.android.internal.util.function.pooled.PooledLambda;



import java.io.PrintWriter;
@@ -40,6 +39,7 @@ import java.util.ArrayDeque; 
import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.Objects;

import java.util.Queue;

import java.util.concurrent.CompletableFuture;

import java.util.concurrent.CompletionStage;
@@ -352,7 +352,7 @@ public interface ServiceConnector<I extends IInterface> { 
        @Override

        public <R> CompletionAwareJob<I, R> postForResult(@NonNull Job<I, R> job) {

            CompletionAwareJob<I, R> task = new CompletionAwareJob<>();

            task.mDelegate = Preconditions.checkNotNull(job);

            task.mDelegate = Objects.requireNonNull(job);

            enqueue(task);

            return task;

        }
@@ -360,7 +360,7 @@ public interface ServiceConnector<I extends IInterface> { 
        @Override

        public <R> AndroidFuture<R> postAsync(@NonNull Job<I, CompletableFuture<R>> job) {

            CompletionAwareJob<I, R> task = new CompletionAwareJob<>();

            task.mDelegate = Preconditions.checkNotNull((Job) job);

            task.mDelegate = Objects.requireNonNull((Job) job);

            task.mAsync = true;

            enqueue(task);

            return task;

core/java/com/android/internal/infra/WhitelistHelper.java

+4 −5
Original line number Diff line number Diff line
@@ -23,10 +23,9 @@ import android.util.ArrayMap; 
import android.util.ArraySet;

import android.util.Log;



import com.android.internal.util.Preconditions;



import java.io.PrintWriter;

import java.util.List;

import java.util.Objects;



/**

 * Helper class for keeping track of whitelisted packages/activities.
@@ -107,7 +106,7 @@ public final class WhitelistHelper { 
     * Returns {@code true} if the entire package is whitelisted.

     */

    public boolean isWhitelisted(@NonNull String packageName) {

        Preconditions.checkNotNull(packageName);

        Objects.requireNonNull(packageName);



        if (mWhitelistedPackages == null) return false;
@@ -119,7 +118,7 @@ public final class WhitelistHelper { 
     * Returns {@code true} if the specified activity is whitelisted.

     */

    public boolean isWhitelisted(@NonNull ComponentName componentName) {

        Preconditions.checkNotNull(componentName);

        Objects.requireNonNull(componentName);



        final String packageName = componentName.getPackageName();

        final ArraySet<ComponentName> whitelistedComponents = getWhitelistedComponents(packageName);
@@ -136,7 +135,7 @@ public final class WhitelistHelper { 
     */

    @Nullable

    public ArraySet<ComponentName> getWhitelistedComponents(@NonNull String packageName) {

        Preconditions.checkNotNull(packageName);

        Objects.requireNonNull(packageName);



        return mWhitelistedPackages == null ? null : mWhitelistedPackages.get(packageName);

    }

core/java/com/android/internal/os/FuseAppLoop.java

+6 −5
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.internal.util.Preconditions; 
import java.util.HashMap;

import java.util.LinkedList;

import java.util.Map;

import java.util.Objects;

import java.util.concurrent.ThreadFactory;



public class FuseAppLoop implements Handler.Callback {
@@ -92,8 +93,8 @@ public class FuseAppLoop implements Handler.Callback { 
    public int registerCallback(@NonNull ProxyFileDescriptorCallback callback,

            @NonNull Handler handler) throws FuseUnavailableMountException {

        synchronized (mLock) {

            Preconditions.checkNotNull(callback);

            Preconditions.checkNotNull(handler);

            Objects.requireNonNull(callback);

            Objects.requireNonNull(handler);

            Preconditions.checkState(

                    mCallbackMap.size() < Integer.MAX_VALUE - MIN_INODE, "Too many opened files.");

            Preconditions.checkArgument(
@@ -333,8 +334,8 @@ public class FuseAppLoop implements Handler.Callback { 
        boolean opened;



        CallbackEntry(ProxyFileDescriptorCallback callback, Handler handler) {

            this.callback = Preconditions.checkNotNull(callback);

            this.handler = Preconditions.checkNotNull(handler);

            this.callback = Objects.requireNonNull(callback);

            this.handler = Objects.requireNonNull(handler);

        }



        long getThreadId() {
@@ -368,7 +369,7 @@ public class FuseAppLoop implements Handler.Callback { 


        void stopUsing(long threadId) {

            final BytesMapEntry entry = mEntries.get(threadId);

            Preconditions.checkNotNull(entry);

            Objects.requireNonNull(entry);

            entry.counter--;

            if (entry.counter <= 0) {

                mEntries.remove(threadId);