From 63f2c5963aa57c0ca726f50233a5b51dff7bf030 Mon Sep 17 00:00:00 2001 From: Yi Jiang Date: Mon, 27 Jan 2020 16:47:10 -0800 Subject: [PATCH] Moves Adaptive Sleep's settings from Settings.System to Settings.Secure Test: atest AdaptiveSleepPreferenceControllerTest Test: atest ContextualAdaptiveSleepSliceTest Bug: 139319542 Change-Id: I9923dc3b6995c89efc1c775ccd2f134af87fc202 --- .../settings/display/AdaptiveSleepPreferenceController.java | 2 +- .../contextualcards/slices/ContextualAdaptiveSleepSlice.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java index b736b79575f..7f85f7d8891 100644 --- a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java +++ b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java @@ -13,7 +13,7 @@ */ package com.android.settings.display; -import static android.provider.Settings.System.ADAPTIVE_SLEEP; +import static android.provider.Settings.Secure.ADAPTIVE_SLEEP; import android.Manifest; import android.content.Context; diff --git a/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java b/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java index c477abc986b..c94469a6cbe 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java @@ -129,7 +129,7 @@ public class ContextualAdaptiveSleepSlice implements CustomSliceable { */ private boolean isTurnedOn() { return Settings.System.getInt( - mContext.getContentResolver(), Settings.System.ADAPTIVE_SLEEP, 0) != 0; + mContext.getContentResolver(), Settings.Secure.ADAPTIVE_SLEEP, 0) != 0; } /**