commit a218a31e5f88e15ee365b4fc165787ade090580a
author Anthony Hugh <ahugh@google.com> Thu Sep 26 15:57:52 2019 -0700
committer Anthony Hugh <ahugh@google.com> Mon Sep 30 15:54:49 2019 -0700
tree c496fed389303e33ea1fa44f55ddadea88f96b41
parent 65421f4e29d80166d9cc06a90bcf5fa00cddcff9

Refactor isCurrentProcessUserHasRestriction()

CarUserManagerHelper is in the process of getting deprecated and
removed.  The isCurrentProcessUserHasRestriction() method is only a
wrapper method for UserManager API calls.

This CL updates Settings to call UserManager directly.

Bug: 137136907
Test: atest CarSettingsRoboTests
Test: atest CarUserManagerHelperTest
Change-Id: I52cc903169dc91354043ddd9b580743d3eb5acdf

tests/robotests/src/com/android/car/settings/applications/ApplicationDetailsFragmentTest.java

diff --git a/tests/robotests/src/com/android/car/settings/applications/ApplicationDetailsFragmentTest.java b/tests/robotests/src/com/android/car/settings/applications/ApplicationDetailsFragmentTest.java
index 8c9ac2a..7da1425 100644
--- a/tests/robotests/src/com/android/car/settings/applications/ApplicationDetailsFragmentTest.java
+++ b/tests/robotests/src/com/android/car/settings/applications/ApplicationDetailsFragmentTest.java
@@ -157,8 +157,8 @@
         getShadowPackageManager().addPackage(createPackageInfoWithApplicationInfo(PACKAGE_NAME));
         mActivity.launchFragment(mFragment);
 
-        when(mCarUserManagerHelper.isCurrentProcessUserHasRestriction(
-                UserManager.DISALLOW_APPS_CONTROL)).thenReturn(true);
+        getShadowUserManager().setUserRestriction(
+                UserHandle.of(UserHandle.myUserId()), UserManager.DISALLOW_APPS_CONTROL, true);
         mController.start();
 
         assertThat(findForceStopButton(mActivity).isEnabled()).isFalse();
@@ -436,8 +436,8 @@
         getShadowPackageManager().addPackage(createPackageInfoWithApplicationInfo(PACKAGE_NAME));
         mActivity.launchFragment(mFragment);
 
-        when(mCarUserManagerHelper.isCurrentProcessUserHasRestriction(
-                UserManager.DISALLOW_APPS_CONTROL)).thenReturn(true);
+        getShadowUserManager().setUserRestriction(
+                UserHandle.of(UserHandle.myUserId()), UserManager.DISALLOW_APPS_CONTROL, true);
         mController.start();
 
         assertThat(findUninstallButton(mActivity).isEnabled()).isFalse();
@@ -448,8 +448,8 @@
         getShadowPackageManager().addPackage(createPackageInfoWithApplicationInfo(PACKAGE_NAME));
         mActivity.launchFragment(mFragment);
 
-        when(mCarUserManagerHelper.isCurrentProcessUserHasRestriction(
-                UserManager.DISALLOW_UNINSTALL_APPS)).thenReturn(true);
+        getShadowUserManager().setUserRestriction(
+                UserHandle.of(UserHandle.myUserId()), UserManager.DISALLOW_UNINSTALL_APPS, true);
         mController.start();
 
         assertThat(findUninstallButton(mActivity).isEnabled()).isFalse();