commit 38c15a53e2d13005d501ce2e37da74c934f16b1d
author Ricky Wai <rickywai@google.com> Tue Feb 14 11:14:08 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 14 11:14:13 2017 +0000
tree 8a4d920fc49e4b8fe783c454afd50382888eac59
parent ba35595d543bc715b3459855b1e22b25faa40aa5
parent bf94d09d6e6044ac303569986114245772cdfece

Merge "Change "Long pressing work mode in quick settings" to managed profile settings"

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 22c2c59..0501077 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2296,6 +2296,18 @@
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
+        <activity android:name="Settings$ManagedProfileSettingsActivity"
+            android:label="@string/managed_profile_settings_title"
+            android:taskAffinity=""
+            android:parentActivityName="Settings"
+            android:permission="android.permission.MANAGE_USERS">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.MANAGED_PROFILE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.accounts.ManagedProfileSettings" />
+        </activity>
 
         <activity android:name="com.android.settings.accounts.AddAccountSettings"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"

src/com/android/settings/accounts/ManagedProfileSettings.java

diff --git a/src/com/android/settings/accounts/ManagedProfileSettings.java b/src/com/android/settings/accounts/ManagedProfileSettings.java
index 8c00be9..156631c 100644
--- a/src/com/android/settings/accounts/ManagedProfileSettings.java
+++ b/src/com/android/settings/accounts/ManagedProfileSettings.java
@@ -31,6 +31,7 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
 
@@ -97,7 +98,8 @@
                 }
             }
         }
-        return null;
+        // Return default managed profile for the current user.
+        return Utils.getManagedProfile(mUserManager);
     }
 
     private void loadDataAndPopulateUi() {