Merge "Use Settings.Global.putInt for PACKAGE_VERIFIER_ENABLE" into nyc-mr1-dev

This commit is contained in:
Fyodor Kupolov
2016-08-04 20:52:00 +00:00
committed by Android (Google) Code Review

View File

@@ -340,9 +340,8 @@ public class RetailDemoModeService extends SystemService {
UserHandle.SYSTEM); UserHandle.SYSTEM);
Settings.Secure.putIntForUser(getContext().getContentResolver(), Settings.Secure.putIntForUser(getContext().getContentResolver(),
Settings.Secure.SKIP_FIRST_USE_HINTS, 1, userInfo.id); Settings.Secure.SKIP_FIRST_USE_HINTS, 1, userInfo.id);
Settings.Secure.putIntForUser(getContext().getContentResolver(), Settings.Global.putInt(getContext().getContentResolver(),
Settings.Global.PACKAGE_VERIFIER_ENABLE, 0, userInfo.id); Settings.Global.PACKAGE_VERIFIER_ENABLE, 0);
grantRuntimePermissionToCamera(user); grantRuntimePermissionToCamera(user);
clearPrimaryCallLog(); clearPrimaryCallLog();
} }