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

Merge "Allow FR in carrier demo mode" into oc-dev am: 9ef166a578

Browse Source 
am: d974ccb625

Change-Id: I8d693fd2d41f73b53416ee83d7b289496765c660
This commit is contained in:
Christine Franks
2017-05-31 22:54:31 +00:00
committed by android-build-merger
parent 3c666f0b27 d974ccb625
commit c101dda9f7
4 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/SettingsActivity.java
View File

@@ -842,8 +842,7 @@ public class SettingsActivity extends SettingsDrawerActivity
// Enable/disable backup settings depending on whether the user is admin.
setTileEnabled(new ComponentName(packageName,
BackupSettingsActivity.class.getName()), true,
isAdmin || Utils.isCarrierDemoUser(this));
BackupSettingsActivity.class.getName()), true, isAdmin);
setTileEnabled(new ComponentName(packageName,
Settings.WifiDisplaySettingsActivity.class.getName()),

5
src/com/android/settings/system/FactoryResetPreferenceController.java
View File

@@ -24,6 +24,7 @@ import android.os.UserManager;
import android.support.v7.preference.Preference;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceController;
import java.util.List;
@@ -41,10 +42,10 @@ public class FactoryResetPreferenceController extends PreferenceController {
mAm = (AccountManager) context.getSystemService(Context.ACCOUNT_SERVICE);
}
/** Hide "Factory reset" settings for secondary users. */
/** Hide "Factory reset" settings for secondary users, except demo users. */
@Override
public boolean isAvailable() {
return mUm.isAdminUser();
return mUm.isAdminUser() || Utils.isCarrierDemoUser(mContext);
}
@Override