commit f9447d6a933fbf26b0fd3ab1a5d2baeff90e62a9
author Anthony Hugh <ahugh@google.com> Tue Jul 16 16:23:00 2019 -0700
committer Anthony Hugh <ahugh@google.com> Wed Jul 17 15:18:08 2019 -0700
tree 63670f2abe8d662f560457015755d6e0418c07f2
parent 5ab3e6ff7c32f5326508651c13791bb9e6e2b376

Remove isCurrentProcessAdminUser()

Removed CarUserManagerHelper.isCurrentProcessAdminUser() and replaced
it with UserManager.isAdminUser().

Some classes were also updated to use UserHandle.myUserId() instead
of CarUserManagerHelper.getCurrentProcessUserInfo().  This was done
mostly so that we can remove some CarUserManagerHelper dependencies
and make the tests easier to understand.

Bug: 137136907
Test: atest CarSettingsRoboTests
Test: atest CarUserManagerHelperTest

Change-Id: Icb763b2d08d657c7b6af8adb29f4a2e1ca1d1e56

src/com/android/car/settings/system/DeveloperOptionsEntryPreferenceController.java

diff --git a/src/com/android/car/settings/system/DeveloperOptionsEntryPreferenceController.java b/src/com/android/car/settings/system/DeveloperOptionsEntryPreferenceController.java
index cb1e497..92c32b1 100644
--- a/src/com/android/car/settings/system/DeveloperOptionsEntryPreferenceController.java
+++ b/src/com/android/car/settings/system/DeveloperOptionsEntryPreferenceController.java
@@ -17,7 +17,6 @@
 package com.android.car.settings.system;
 
 import android.car.drivingstate.CarUxRestrictions;
-import android.car.userlib.CarUserManagerHelper;
 import android.content.Context;
 import android.os.UserManager;
 
@@ -30,13 +29,11 @@
 /** Controls the visibility of the developer options setting. */
 public class DeveloperOptionsEntryPreferenceController extends PreferenceController<Preference> {
 
-    private CarUserManagerHelper mCarUserManagerHelper;
     private UserManager mUserManager;
 
     public DeveloperOptionsEntryPreferenceController(Context context, String preferenceKey,
             FragmentController fragmentController, CarUxRestrictions uxRestrictions) {
         super(context, preferenceKey, fragmentController, uxRestrictions);
-        mCarUserManagerHelper = new CarUserManagerHelper(context);
         mUserManager = UserManager.get(context);
     }
 
@@ -47,7 +44,7 @@
 
     @Override
     protected int getAvailabilityStatus() {
-        return DevelopmentSettingsUtil.isDevelopmentSettingsEnabled(getContext(),
-                mCarUserManagerHelper, mUserManager) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+        return DevelopmentSettingsUtil.isDevelopmentSettingsEnabled(getContext(), mUserManager)
+                ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 }