Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't reset adaptive_sleep setting

Browse Source 
Always respect user setting since we can't meaningfully recover from
the loss.

Bug: 153765285
Test: manually
Change-Id: I29f3b82e2c40d80c36721882724846a7439454eb
This commit is contained in:
Alex Salo
2020-04-09 16:32:49 -07:00
parent 03f9a814a5
commit b20aa8b110
2 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/power/AttentionDetector.java
View File

@@ -17,7 +17,6 @@
package com.android.server.power;
import static android.provider.DeviceConfig.NAMESPACE_ATTENTION_MANAGER_SERVICE;
import static android.provider.Settings.Secure.ADAPTIVE_SLEEP;
import android.Manifest;
import android.app.ActivityManager;
@@ -192,9 +191,6 @@ public class AttentionDetector {
}
if (!isAttentionServiceSupported() || !serviceHasSufficientPermissions()) {
// Turns off adaptive sleep in settings for all users if attention service is not
// available. The setting itself should also be grayed out in this case.
Settings.Secure.putInt(mContentResolver, ADAPTIVE_SLEEP, 0);
return nextScreenDimming;
}

11
services/tests/servicestests/src/com/android/server/power/AttentionDetectorTest.java
View File

@@ -157,17 +157,6 @@ public class AttentionDetectorTest extends AndroidTestCase {
assertThat(mNextDimming).isEqualTo(when);
}
@Test
public void testOnUserActivity_disablesSettingIfNotSufficientPermissions() {
when(mPackageManager.checkPermission(any(), any())).thenReturn(
PackageManager.PERMISSION_DENIED);
registerAttention();
boolean enabled = Settings.Secure.getIntForUser(getContext().getContentResolver(),
Settings.Secure.ADAPTIVE_SLEEP, 0, UserHandle.USER_CURRENT) == 1;
assertFalse(enabled);
}
@Test
public void testOnUserActivity_doesntCrashIfNoAttentionService() {
mAttentionManagerInternal = null;