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

Commit a703487d 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: I69e57498b89b2822eed09bb2688a3638c8903a7c
parent a46c4537

core/java/android/app/role/RoleControllerService.java

+8 −7
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.os.UserHandle; 
import com.android.internal.util.Preconditions;

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



import java.util.Objects;

import java.util.concurrent.Executor;



/**
@@ -82,7 +83,7 @@ public abstract class RoleControllerService extends Service { 
            public void grantDefaultRoles(RemoteCallback callback) {

                enforceCallerSystemUid("grantDefaultRoles");



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

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



                mWorkerHandler.sendMessage(PooledLambda.obtainMessage(

                        RoleControllerService::grantDefaultRoles, RoleControllerService.this,
@@ -97,7 +98,7 @@ public abstract class RoleControllerService extends Service { 
                Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty");

                Preconditions.checkStringNotEmpty(packageName,

                        "packageName cannot be null or empty");

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

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



                mWorkerHandler.sendMessage(PooledLambda.obtainMessage(

                        RoleControllerService::onAddRoleHolder, RoleControllerService.this,
@@ -112,7 +113,7 @@ public abstract class RoleControllerService extends Service { 
                Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty");

                Preconditions.checkStringNotEmpty(packageName,

                        "packageName cannot be null or empty");

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

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



                mWorkerHandler.sendMessage(PooledLambda.obtainMessage(

                        RoleControllerService::onRemoveRoleHolder, RoleControllerService.this,
@@ -124,7 +125,7 @@ public abstract class RoleControllerService extends Service { 
                enforceCallerSystemUid("onClearRoleHolders");



                Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty");

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

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



                mWorkerHandler.sendMessage(PooledLambda.obtainMessage(

                        RoleControllerService::onClearRoleHolders, RoleControllerService.this,
@@ -146,7 +147,7 @@ public abstract class RoleControllerService extends Service { 
                Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty");

                Preconditions.checkStringNotEmpty(packageName,

                        "packageName cannot be null or empty");

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

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



                boolean qualified = onIsApplicationQualifiedForRole(roleName, packageName);

                callback.sendResult(qualified ? Bundle.EMPTY : null);
@@ -160,7 +161,7 @@ public abstract class RoleControllerService extends Service { 
                Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty");

                Preconditions.checkStringNotEmpty(packageName,

                        "packageName cannot be null or empty");

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

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



                boolean visible = onIsApplicationVisibleForRole(roleName, packageName);

                callback.sendResult(visible ? Bundle.EMPTY : null);
@@ -171,7 +172,7 @@ public abstract class RoleControllerService extends Service { 
                enforceCallingPermission(Manifest.permission.MANAGE_ROLE_HOLDERS, null);



                Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty");

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

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



                boolean visible = onIsRoleVisible(roleName);

                callback.sendResult(visible ? Bundle.EMPTY : null);

core/java/android/app/role/RoleManager.java

+17 −16
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import com.android.internal.util.Preconditions; 
import com.android.internal.util.function.pooled.PooledLambda;



import java.util.List;

import java.util.Objects;

import java.util.concurrent.Executor;

import java.util.function.Consumer;
@@ -284,7 +285,7 @@ public final class RoleManager { 
    @TestApi

    public List<String> getRoleHoldersAsUser(@NonNull String roleName, @NonNull UserHandle user) {

        Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty");

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

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

        try {

            return mService.getRoleHoldersAsUser(roleName, user.getIdentifier());

        } catch (RemoteException e) {
@@ -321,9 +322,9 @@ public final class RoleManager { 
            @CallbackExecutor @NonNull Executor executor, @NonNull Consumer<Boolean> callback) {

        Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty");

        Preconditions.checkStringNotEmpty(packageName, "packageName cannot be null or empty");

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

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

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

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

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

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

        try {

            mService.addRoleHolderAsUser(roleName, packageName, flags, user.getIdentifier(),

                    createRemoteCallback(executor, callback));
@@ -360,9 +361,9 @@ public final class RoleManager { 
            @CallbackExecutor @NonNull Executor executor, @NonNull Consumer<Boolean> callback) {

        Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty");

        Preconditions.checkStringNotEmpty(packageName, "packageName cannot be null or empty");

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

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

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

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

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

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

        try {

            mService.removeRoleHolderAsUser(roleName, packageName, flags, user.getIdentifier(),

                    createRemoteCallback(executor, callback));
@@ -397,9 +398,9 @@ public final class RoleManager { 
            @NonNull UserHandle user, @CallbackExecutor @NonNull Executor executor,

            @NonNull Consumer<Boolean> callback) {

        Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty");

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

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

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

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

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

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

        try {

            mService.clearRoleHoldersAsUser(roleName, flags, user.getIdentifier(),

                    createRemoteCallback(executor, callback));
@@ -442,9 +443,9 @@ public final class RoleManager { 
    @TestApi

    public void addOnRoleHoldersChangedListenerAsUser(@CallbackExecutor @NonNull Executor executor,

            @NonNull OnRoleHoldersChangedListener listener, @NonNull UserHandle user) {

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

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

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

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

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

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

        int userId = user.getIdentifier();

        synchronized (mListenersLock) {

            ArrayMap<OnRoleHoldersChangedListener, OnRoleHoldersChangedListenerDelegate> listeners =
@@ -488,8 +489,8 @@ public final class RoleManager { 
    @TestApi

    public void removeOnRoleHoldersChangedListenerAsUser(

            @NonNull OnRoleHoldersChangedListener listener, @NonNull UserHandle user) {

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

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

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

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

        int userId = user.getIdentifier();

        synchronized (mListenersLock) {

            ArrayMap<OnRoleHoldersChangedListener, OnRoleHoldersChangedListenerDelegate> listeners =
@@ -529,7 +530,7 @@ public final class RoleManager { 
    @SystemApi

    @TestApi

    public void setRoleNamesFromController(@NonNull List<String> roleNames) {

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

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

        try {

            mService.setRoleNamesFromController(roleNames);

        } catch (RemoteException e) {