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

Commit 1e4fd516 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 9611d753 c6c641f5

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ import java.util.Iterator; 
import java.util.List;

import java.util.Locale;

import java.util.Map;

import java.util.Objects;

import java.util.Set;



/**
@@ -6164,7 +6165,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
    final class LocalService extends ActivityTaskManagerInternal {

        @Override

        public SleepToken acquireSleepToken(String tag, int displayId) {

            Preconditions.checkNotNull(tag);

            Objects.requireNonNull(tag);

            return ActivityTaskManagerService.this.acquireSleepToken(tag, displayId);

        }
@@ -6221,7 +6222,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        @Override

        public int startActivitiesAsPackage(String packageName, int userId, Intent[] intents,

                Bundle bOptions) {

            Preconditions.checkNotNull(intents, "intents");

            Objects.requireNonNull(intents, "intents");

            final String[] resolvedTypes = new String[intents.length];



            // UID of the package on user userId.

services/core/java/com/android/server/wm/DragDropController.java

+2 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.view.View; 
import com.android.internal.util.Preconditions;

import com.android.server.wm.WindowManagerInternal.IDragDropCallback;



import java.util.Objects;

import java.util.concurrent.atomic.AtomicReference;



/**
@@ -74,7 +75,7 @@ class DragDropController { 
    }



    void registerCallback(IDragDropCallback callback) {

        Preconditions.checkNotNull(callback);

        Objects.requireNonNull(callback);

        mCallback.set(callback);

    }

services/core/java/com/android/server/wm/WindowManagerConstants.java

+3 −4
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ package com.android.server.wm; 
import static android.provider.AndroidDeviceConfig.KEY_SYSTEM_GESTURES_EXCLUDED_BY_PRE_Q_STICKY_IMMERSIVE;

import static android.provider.AndroidDeviceConfig.KEY_SYSTEM_GESTURE_EXCLUSION_LIMIT_DP;



import static com.android.internal.util.Preconditions.checkNotNull;



import android.provider.AndroidDeviceConfig;

import android.provider.DeviceConfig;
@@ -28,6 +26,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.server.wm.utils.DeviceConfigInterface;



import java.io.PrintWriter;

import java.util.Objects;

import java.util.concurrent.Executor;



/**
@@ -74,8 +73,8 @@ final class WindowManagerConstants { 
    WindowManagerConstants(WindowManagerGlobalLock globalLock,

            Runnable updateSystemGestureExclusionCallback,

            DeviceConfigInterface deviceConfig) {

        mGlobalLock = checkNotNull(globalLock);

        mUpdateSystemGestureExclusionCallback = checkNotNull(updateSystemGestureExclusionCallback);

        mGlobalLock = Objects.requireNonNull(globalLock);

        mUpdateSystemGestureExclusionCallback = Objects.requireNonNull(updateSystemGestureExclusionCallback);

        mDeviceConfig = deviceConfig;

        mListenerAndroid = this::onAndroidPropertiesChanged;

        mListenerWindowManager = this::onWindowPropertiesChanged;

services/core/java/com/android/server/wm/WindowManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ import java.util.Date; 
import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.Objects;

import java.util.function.Function;

import java.util.function.Supplier;
@@ -2864,7 +2865,7 @@ public class WindowManagerService extends IWindowManager.Stub 
            != PackageManager.PERMISSION_GRANTED) {

            throw new SecurityException("Requires DISABLE_KEYGUARD permission");

        }

        Preconditions.checkNotNull(token, "token is null");

        Objects.requireNonNull(token, "token is null");

        final int callingUid = Binder.getCallingUid();

        final long origIdentity = Binder.clearCallingIdentity();

        try {