commit e3f721132a379799af10c8a8fc11db923f298af8
author Philip P. Moltmann <moltmann@google.com> Tue Aug 28 15:01:43 2018 -0700
committer Philip P. Moltmann <moltmann@google.com> Thu Aug 30 08:11:39 2018 -0700
tree a1879e362bff8c63ad4864db752c829e9e87ecd0
parent a59ce66b3beaec79c662d472467c73f6eaa90306

RestrictedLockUtils was split into ...Internal

This means that in some cases RestrictedLockUtils has to be used and in
some RestrictedLockUtilsInternal.

This causes a lot of trivial code changes.

I also updated the ordering of the imports in all affected files.

Bug: 110953302
Test: Built
      make -j RunSettingsRoboTests
Change-Id: I9bdf8b89134f853bae4f38c81af436715c73e924

src/com/android/settings/location/LocationEnabler.java

diff --git a/src/com/android/settings/location/LocationEnabler.java b/src/com/android/settings/location/LocationEnabler.java
index 65de6e2..20c2280 100644
--- a/src/com/android/settings/location/LocationEnabler.java
+++ b/src/com/android/settings/location/LocationEnabler.java
@@ -13,7 +13,7 @@
  */
 package com.android.settings.location;
 
-import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced;
+import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfRestrictionEnforced;
 import static com.android.settingslib.Utils.updateLocationEnabled;
 import static com.android.settingslib.Utils.updateLocationMode;
 
@@ -32,6 +32,7 @@
 
 import com.android.settings.Utils;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -168,14 +169,14 @@
                 mContext, UserManager.DISALLOW_SHARE_LOCATION, userId);
 
         if (admin == null) {
-            admin = RestrictedLockUtils.checkIfRestrictionEnforced(
+            admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
                     mContext, UserManager.DISALLOW_CONFIG_LOCATION, userId);
         }
         return admin;
     }
 
     boolean hasShareLocationRestriction(int userId) {
-        return RestrictedLockUtils.hasBaseUserRestriction(
+        return RestrictedLockUtilsInternal.hasBaseUserRestriction(
                 mContext, UserManager.DISALLOW_SHARE_LOCATION, userId);
     }