From f8a10959d25b6390091a6ebc352524f568770f0d Mon Sep 17 00:00:00 2001 From: Justin Klaassen Date: Tue, 31 Jan 2017 19:39:57 -0800 Subject: [PATCH] Enable SMS in carrier demo mode Fixes: 34861667 Test: manually verified default SMS app works in carrier demo mode. Change-Id: Ic6f1065954e5bb54c6b78b3d604811333f6863e4 --- .../com/android/server/retaildemo/RetailDemoModeService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java b/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java index 8a04d26d2b400..c6804cdf2a1ac 100644 --- a/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java +++ b/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java @@ -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);