commit a0dd987d20f224a6419f0680fab232287e8c5aec
author Christine Franks <christyfranks@google.com> Tue Jul 11 17:32:57 2017 -0700
committer Christine Franks <christyfranks@google.com> Tue Jul 25 13:31:12 2017 -0700
tree abbfe662c0c8366eae710eec37999bceee81e85d
parent 262aacd3530e47ba92f4b8a866a3c7203a01028b

Restrict changing wi-fi networks

Bug: 31852835
Test: manual - verify unrestricted as regular user, but that a password
is required in demo mode.
Change-Id: I60f95ccbb10ba728b384b9c8c2ae723934fb2928

src/com/android/settings/Utils.java

diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 2b2ca8c..eecc8c2 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -74,7 +74,6 @@
 import android.provider.ContactsContract.Profile;
 import android.provider.ContactsContract.RawContacts;
 import android.provider.Settings;
-import android.provider.Settings.Secure;
 import android.support.annotation.StringRes;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceGroup;
@@ -1282,13 +1281,12 @@
     }
 
     public static String getDemoModePackageName(Context context) {
-        return context.getResources().getString(
-                com.android.internal.R.string.config_demoModePackage);
+        return context.getString(com.android.internal.R.string.config_demoModePackage);
     }
 
     /**
      * Returns if a given user is a profile of another user.
-     * @param user The user whose profiles will be checked.
+     * @param user The user whose profiles wibe checked.
      * @param profile The (potential) profile.
      * @return if the profile is actually a profile
      */