PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ricky Wai
2017-02-14 11:14:08 +00:00
committed by Android (Google) Code Review
parent ba35595d54 bf94d09d6e
commit 38c15a53e2
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/accounts/ManagedProfileSettings.java
View File

@@ -31,6 +31,7 @@ import android.util.Log;
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 @@ public class ManagedProfileSettings extends SettingsPreferenceFragment
}
}
}
return null;
// Return default managed profile for the current user.
return Utils.getManagedProfile(mUserManager);
}
private void loadDataAndPopulateUi() {