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

Allow FR in carrier demo mode

Browse Source 
Bug: 62133292
Test: make RunSettingsRoboTests -j100, and manually verified FR is
available in carrier demo mode.

Change-Id: Ia793bf234b229da0490accfea6d44b72395a04bc
This commit is contained in:
Christine Franks
2017-05-26 18:23:38 -07:00
parent 552e3c4dba
commit 2d0293951a
4 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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