Merge "Enable SMS in carrier demo mode" into nyc-mr2-dev

This commit is contained in:
TreeHugger Robot
2017-02-01 05:13:58 +00:00
committed by Android (Google) Code Review

View File

@@ -353,6 +353,10 @@ public class RetailDemoModeService extends SystemService {
um.setUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS, false, user);
// Disallow rebooting in safe mode - controlled by user 0
um.setUserRestriction(UserManager.DISALLOW_SAFE_BOOT, true, UserHandle.SYSTEM);
if (mIsCarrierDemoMode) {
// Enable SMS in carrier demo mode.
um.setUserRestriction(UserManager.DISALLOW_SMS, false, user);
}
Settings.Secure.putIntForUser(getContext().getContentResolver(),
Settings.Secure.SKIP_FIRST_USE_HINTS, 1, userInfo.id);