diff options
Diffstat (limited to 'services/core/java/com/android')
5 files changed, 7 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java index 10b0bdd..81cbc19 100644 --- a/services/core/java/com/android/server/LockSettingsService.java +++ b/services/core/java/com/android/server/LockSettingsService.java @@ -839,6 +839,7 @@ public class LockSettingsService extends ILockSettings.Stub { Secure.LOCK_PATTERN_SIZE, Secure.LOCK_DOTS_VISIBLE, Secure.LOCK_SHOW_ERROR_PATH, + Secure.LOCK_SEPARATE_ENCRYPTION_PASSWORD }; // Reading these settings needs the contacts permission diff --git a/services/core/java/com/android/server/connectivity/NetworkMonitor.java b/services/core/java/com/android/server/connectivity/NetworkMonitor.java index 5108564..5b632d6 100644 --- a/services/core/java/com/android/server/connectivity/NetworkMonitor.java +++ b/services/core/java/com/android/server/connectivity/NetworkMonitor.java @@ -270,9 +270,6 @@ public class NetworkMonitor extends StateMachine { mLingerDelayMs = SystemProperties.getInt(LINGER_DELAY_PROPERTY, DEFAULT_LINGER_DELAY_MS); - mIsCaptivePortalCheckEnabled = Settings.Global.getInt(mContext.getContentResolver(), - Settings.Global.CAPTIVE_PORTAL_DETECTION_ENABLED, 1) == 1; - start(); } diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 6339007..f0c4a62 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -1443,8 +1443,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { } boolean isUserSetupComplete() { - return CMSettings.Secure.getIntForUser(mContext.getContentResolver(), - CMSettings.Secure.CM_SETUP_WIZARD_COMPLETED, 0, UserHandle.USER_CURRENT) != 0; + return Settings.Secure.getIntForUser(mContext.getContentResolver(), + Settings.Secure.USER_SETUP_COMPLETE, 0, UserHandle.USER_CURRENT) != 0; } private void handleShortPressOnHome() { diff --git a/services/core/java/com/android/server/power/ShutdownThread.java b/services/core/java/com/android/server/power/ShutdownThread.java index 36a9ca2..76acf9d 100644 --- a/services/core/java/com/android/server/power/ShutdownThread.java +++ b/services/core/java/com/android/server/power/ShutdownThread.java @@ -174,7 +174,7 @@ public final class ShutdownThread extends Thread { KeyguardManager km = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE); boolean keyguardLocked = km.inKeyguardRestrictedInputMode() && km.isKeyguardSecure(); boolean advancedRebootEnabled = CMSettings.Secure.getInt(context.getContentResolver(), - CMSettings.Secure.ADVANCED_REBOOT, 0) == 1; + CMSettings.Secure.ADVANCED_REBOOT, 1) == 1; boolean isPrimaryUser = UserHandle.getCallingUserId() == UserHandle.USER_OWNER; return advancedRebootEnabled && !keyguardLocked && isPrimaryUser; diff --git a/services/core/java/com/android/server/wm/ScreenRotationAnimation.java b/services/core/java/com/android/server/wm/ScreenRotationAnimation.java index 7e5c807..36a2474 100644 --- a/services/core/java/com/android/server/wm/ScreenRotationAnimation.java +++ b/services/core/java/com/android/server/wm/ScreenRotationAnimation.java @@ -260,6 +260,9 @@ class ScreenRotationAnimation { if (isSecure) { flags |= SurfaceControl.SECURE; } + if (android.os.SystemProperties.get("ro.softwaregl").equals("1")) { + flags |= SurfaceControl.FX_SURFACE_DIM; + } if (WindowManagerService.DEBUG_SURFACE_TRACE) { mSurfaceControl = new SurfaceTrace(session, "ScreenshotSurface", |