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

Commit 56053335 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 580c4a6e fdb9819b

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+163 −162

File changed.

Preview size limit exceeded, changes collapsed.

services/devicepolicy/java/com/android/server/devicepolicy/TransferOwnershipMetadataManager.java

+4 −3
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import java.io.FileInputStream; 
import java.io.FileOutputStream;

import java.io.IOException;

import java.nio.charset.StandardCharsets;

import java.util.Objects;



/**

 * Handles reading and writing of the owner transfer metadata file.
@@ -185,8 +186,8 @@ class TransferOwnershipMetadataManager { 
                @NonNull int userId, @NonNull String adminType) {

            this.sourceComponent = sourceComponent;

            this.targetComponent = targetComponent;

            Preconditions.checkNotNull(sourceComponent);

            Preconditions.checkNotNull(targetComponent);

            Objects.requireNonNull(sourceComponent);

            Objects.requireNonNull(targetComponent);

            Preconditions.checkStringNotEmpty(adminType);

            this.userId = userId;

            this.adminType = adminType;
@@ -199,7 +200,7 @@ class TransferOwnershipMetadataManager { 
        }



        private static ComponentName unflattenComponentUnchecked(String flatComponent) {

            Preconditions.checkNotNull(flatComponent);

            Objects.requireNonNull(flatComponent);

            return ComponentName.unflattenFromString(flatComponent);

        }

services/tests/servicestests/src/com/android/server/devicepolicy/MockUtils.java

+1 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ package com.android.server.devicepolicy; 


import com.google.common.base.Objects;



import com.android.internal.util.Preconditions;

import com.android.server.pm.UserRestrictionsUtils;



import android.content.ComponentName;
@@ -107,7 +106,7 @@ public class MockUtils { 
    }



    public static Bundle checkUserRestrictions(String... keys) {

        final Bundle expected = DpmTestUtils.newRestrictions(Preconditions.checkNotNull(keys));

        final Bundle expected = DpmTestUtils.newRestrictions(java.util.Objects.requireNonNull(keys));

        final Matcher<Bundle> m = new BaseMatcher<Bundle>() {

            @Override

            public boolean matches(Object item) {

services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ import android.util.ArrayMap; 
import android.util.Log;

import android.util.Pair;



import com.android.internal.util.Preconditions;

import com.android.server.LocalServices;

import com.android.server.SystemService;

import com.android.server.pm.LauncherAppsService.LauncherAppsImpl;
@@ -114,6 +113,7 @@ import java.util.LinkedHashMap; 
import java.util.List;

import java.util.Locale;

import java.util.Map;

import java.util.Objects;

import java.util.Set;

import java.util.function.BiFunction;

import java.util.function.BiPredicate;
@@ -1241,7 +1241,7 @@ public abstract class BaseShortcutManagerTest extends InstrumentationTestCase { 
    protected void setCaller(String packageName, int userId) {

        mInjectedClientPackage = packageName;

        mInjectedCallingUid =

                Preconditions.checkNotNull(getInjectedPackageInfo(packageName, userId, false),

                Objects.requireNonNull(getInjectedPackageInfo(packageName, userId, false),

                        "Unknown package").applicationInfo.uid;



        // Set up LauncherApps for this caller.