commit 6593933d2b395a312cf2eb2fa623b3b4ce20cb7b
author Felipe Leme <felipeal@google.com> Thu Jun 17 00:26:25 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 17 00:26:25 2021 +0000
tree ead96ad307b7fa80a2451f36e7d33bd5acacde4b
parent 7f822b11766da03d852cc4ec9552c88ac21b820e
parent 036acd50a05f5b51c09cb45ddb4268f69425ac9e

Replaced DevicePolicyManagerInternal by DevicePolicyManagerLiteInternal am: 036acd50a0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/services/+/14947462

Change-Id: Ia1917a349a793aebdb2adc7936524d1d87d8ffdd

src/com/android/internal/car/CarDevicePolicySafetyChecker.java

diff --git a/src/com/android/internal/car/CarDevicePolicySafetyChecker.java b/src/com/android/internal/car/CarDevicePolicySafetyChecker.java
index 85854c9..0bc0c21 100644
--- a/src/com/android/internal/car/CarDevicePolicySafetyChecker.java
+++ b/src/com/android/internal/car/CarDevicePolicySafetyChecker.java
@@ -33,7 +33,7 @@
 
 import android.annotation.NonNull;
 import android.app.admin.DevicePolicyManager.DevicePolicyOperation;
-import android.app.admin.DevicePolicyManagerInternal;
+import android.app.admin.DevicePolicyManagerLiteInternal;
 import android.app.admin.DevicePolicySafetyChecker;
 import android.util.IndentingPrintWriter;
 import android.util.Slog;
@@ -42,6 +42,7 @@
 import com.android.server.LocalServices;
 
 import java.util.Arrays;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
@@ -73,17 +74,19 @@
     private final AtomicBoolean mSafe = new AtomicBoolean(true);
 
     private final DevicePolicySafetyChecker mCheckerImplementation;
-    private final DevicePolicyManagerInternal mDpmi;
+    private final DevicePolicyManagerLiteInternal mDpmi;
 
     CarDevicePolicySafetyChecker(DevicePolicySafetyChecker checkerImplementation) {
-        this(checkerImplementation, LocalServices.getService(DevicePolicyManagerInternal.class));
+        this(checkerImplementation,
+                LocalServices.getService(DevicePolicyManagerLiteInternal.class));
     }
 
     @VisibleForTesting
     CarDevicePolicySafetyChecker(DevicePolicySafetyChecker checkerImplementation,
-            DevicePolicyManagerInternal dpmi) {
-        mCheckerImplementation = checkerImplementation;
-        mDpmi = dpmi;
+            DevicePolicyManagerLiteInternal dpmi) {
+        mCheckerImplementation = Objects.requireNonNull(checkerImplementation,
+                "DevicePolicySafetyChecker cannot be null");
+        mDpmi = Objects.requireNonNull(dpmi, "DevicePolicyManagerLiteInternal cannot be null");
     }
 
     boolean isDevicePolicyOperationSafe(@DevicePolicyOperation int operation) {

tests/src/com/android/internal/car/CarDevicePolicySafetyCheckerTest.java

diff --git a/tests/src/com/android/internal/car/CarDevicePolicySafetyCheckerTest.java b/tests/src/com/android/internal/car/CarDevicePolicySafetyCheckerTest.java
index 9a643b3..ef50f92 100644
--- a/tests/src/com/android/internal/car/CarDevicePolicySafetyCheckerTest.java
+++ b/tests/src/com/android/internal/car/CarDevicePolicySafetyCheckerTest.java
@@ -23,7 +23,7 @@
 
 import android.app.admin.DevicePolicyManager;
 import android.app.admin.DevicePolicyManager.DevicePolicyOperation;
-import android.app.admin.DevicePolicyManagerInternal;
+import android.app.admin.DevicePolicyManagerLiteInternal;
 import android.app.admin.DevicePolicySafetyChecker;
 
 import org.junit.Before;
@@ -48,7 +48,7 @@
     private DevicePolicySafetyChecker mCheckerImplementation;
 
     @Mock
-    private DevicePolicyManagerInternal mDpmi;
+    private DevicePolicyManagerLiteInternal mDpmi;
 
     private CarDevicePolicySafetyChecker mChecker;