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

Commit a3e1f211 authored by Daulet Zhanguzin's avatar Daulet Zhanguzin Committed by Tobias Thierer
Browse files

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

java.util.Objects.requireNonNull

Bug: 126528330

Test: Treehugger
Exempt-From-Owner-Approval: Global refactoring.
Change-Id: Ib2bf9304dd5fee4ea26d880df9e46eec8e56824a
parent 6aefe5f5

services/core/java/com/android/server/accounts/AccountManagerService.java

+25 −25
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ public class AccountManagerService 
            Log.v(TAG, "addAccountExplicitly: " + account + ", caller's uid " + callingUid

                    + ", pid " + Binder.getCallingPid());

        }

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

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

        if (!isAccountManagedByCaller(account.type, callingUid, userId)) {

            String msg = String.format("uid %s cannot explicitly add accounts of type: %s",

                    callingUid, account.type);
@@ -544,7 +544,7 @@ public class AccountManagerService 


    @Override

    public Map<String, Integer> getPackagesAndVisibilityForAccount(Account account) {

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

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

        int callingUid = Binder.getCallingUid();

        int userId = UserHandle.getCallingUserId();

        if (!isAccountManagedByCaller(account.type, callingUid, userId)
@@ -590,8 +590,8 @@ public class AccountManagerService 


    @Override

    public int getAccountVisibility(Account account, String packageName) {

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

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

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

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

        int callingUid = Binder.getCallingUid();

        int userId = UserHandle.getCallingUserId();

        if (!isAccountManagedByCaller(account.type, callingUid, userId)
@@ -659,7 +659,7 @@ public class AccountManagerService 
     */

    private Integer resolveAccountVisibility(Account account, @NonNull String packageName,

            UserAccounts accounts) {

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

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

        int uid = -1;

        try {

            long identityToken = clearCallingIdentity();
@@ -755,8 +755,8 @@ public class AccountManagerService 


    @Override

    public boolean setAccountVisibility(Account account, String packageName, int newVisibility) {

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

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

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

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

        int callingUid = Binder.getCallingUid();

        int userId = UserHandle.getCallingUserId();

        if (!isAccountManagedByCaller(account.type, callingUid, userId)
@@ -1525,7 +1525,7 @@ public class AccountManagerService 
                    + ", caller's uid " + Binder.getCallingUid()

                    + ", pid " + Binder.getCallingPid());

        }

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

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

        int userId = UserHandle.getCallingUserId();

        long identityToken = clearCallingIdentity();

        try {
@@ -1563,8 +1563,8 @@ public class AccountManagerService 
                    account, key, callingUid, Binder.getCallingPid());

            Log.v(TAG, msg);

        }

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

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

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

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

        int userId = UserHandle.getCallingUserId();

        if (!isAccountManagedByCaller(account.type, callingUid, userId)) {

            String msg = String.format(
@@ -1715,7 +1715,7 @@ public class AccountManagerService 
                    callingUid);

            Log.v(TAG, msg);

        }

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

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

        int userId = UserHandle.getCallingUserId();

        if (!isAccountManagedByCaller(account.type, callingUid, userId)) {

            String msg = String.format(
@@ -2401,8 +2401,8 @@ public class AccountManagerService 
    @Override

    public void invalidateAuthToken(String accountType, String authToken) {

        int callerUid = Binder.getCallingUid();

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

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

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

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

        if (Log.isLoggable(TAG, Log.VERBOSE)) {

            Log.v(TAG, "invalidateAuthToken: accountType " + accountType

                    + ", caller's uid " + callerUid
@@ -2518,8 +2518,8 @@ public class AccountManagerService 
                    + ", caller's uid " + callingUid

                    + ", pid " + Binder.getCallingPid());

        }

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

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

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

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

        int userId = UserHandle.getCallingUserId();

        if (!isAccountManagedByCaller(account.type, callingUid, userId)) {

            String msg = String.format(
@@ -2551,8 +2551,8 @@ public class AccountManagerService 
                    + ", caller's uid " + callingUid

                    + ", pid " + Binder.getCallingPid());

        }

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

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

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

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

        int userId = UserHandle.getCallingUserId();

        if (!isAccountManagedByCaller(account.type, callingUid, userId)) {

            String msg = String.format(
@@ -2578,7 +2578,7 @@ public class AccountManagerService 
                    + ", caller's uid " + callingUid

                    + ", pid " + Binder.getCallingPid());

        }

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

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

        int userId = UserHandle.getCallingUserId();

        if (!isAccountManagedByCaller(account.type, callingUid, userId)) {

            String msg = String.format(
@@ -2644,7 +2644,7 @@ public class AccountManagerService 
                    + ", caller's uid " + callingUid

                    + ", pid " + Binder.getCallingPid());

        }

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

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

        int userId = UserHandle.getCallingUserId();

        if (!isAccountManagedByCaller(account.type, callingUid, userId)) {

            String msg = String.format(
@@ -3946,9 +3946,9 @@ public class AccountManagerService 
        if (UserHandle.getAppId(Binder.getCallingUid()) != Process.SYSTEM_UID) {

            throw new SecurityException("Can be called only by system UID");

        }

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

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

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

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

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

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



        final int userId = userHandle.getIdentifier();
@@ -4022,9 +4022,9 @@ public class AccountManagerService 
            throw new SecurityException("Can be called only by system UID");

        }



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

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

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

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

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

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



        final int userId = userHandle.getIdentifier();

services/core/java/com/android/server/accounts/CryptoHelper.java

+3 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ import com.android.internal.util.Preconditions; 


import java.security.GeneralSecurityException;

import java.security.NoSuchAlgorithmException;

import java.util.Objects;



import javax.crypto.Cipher;

import javax.crypto.KeyGenerator;
@@ -54,7 +55,7 @@ import javax.crypto.spec.IvParameterSpec; 


    @NonNull

    /* default */ Bundle encryptBundle(@NonNull Bundle bundle) throws GeneralSecurityException {

        Preconditions.checkNotNull(bundle, "Cannot encrypt null bundle.");

        Objects.requireNonNull(bundle, "Cannot encrypt null bundle.");

        Parcel parcel = Parcel.obtain();

        bundle.writeToParcel(parcel, 0);

        byte[] clearBytes = parcel.marshall();
@@ -76,7 +77,7 @@ import javax.crypto.spec.IvParameterSpec; 


    @Nullable

    /* default */ Bundle decryptBundle(@NonNull Bundle bundle) throws GeneralSecurityException {

        Preconditions.checkNotNull(bundle, "Cannot decrypt null bundle.");

        Objects.requireNonNull(bundle, "Cannot decrypt null bundle.");

        byte[] iv = bundle.getByteArray(KEY_IV);

        byte[] encryptedBytes = bundle.getByteArray(KEY_CIPHER);

        byte[] mac = bundle.getByteArray(KEY_MAC);

services/core/java/com/android/server/accounts/TokenCache.java

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ import java.util.Objects; 
            String packageName,

            byte[] sigDigest,

            long expiryMillis) {

        Preconditions.checkNotNull(account);

        Objects.requireNonNull(account);

        if (token == null || System.currentTimeMillis() > expiryMillis) {

            return;

        }