diff options
| -rw-r--r-- | services/core/java/com/android/server/power/AttentionDetector.java | 23 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/power/AttentionDetectorTest.java | 17 |
2 files changed, 1 insertions, 39 deletions
diff --git a/services/core/java/com/android/server/power/AttentionDetector.java b/services/core/java/com/android/server/power/AttentionDetector.java index cbdfc56d6aa4..06edd19a376a 100644 --- a/services/core/java/com/android/server/power/AttentionDetector.java +++ b/services/core/java/com/android/server/power/AttentionDetector.java @@ -18,14 +18,12 @@ package com.android.server.power; import static android.provider.DeviceConfig.NAMESPACE_ATTENTION_MANAGER_SERVICE; -import android.Manifest; import android.app.ActivityManager; import android.app.SynchronousUserSwitchObserver; import android.attention.AttentionManagerInternal; import android.attention.AttentionManagerInternal.AttentionCallbackInternal; import android.content.ContentResolver; import android.content.Context; -import android.content.pm.PackageManager; import android.database.ContentObserver; import android.os.Handler; import android.os.PowerManager; @@ -124,9 +122,6 @@ public class AttentionDetector { protected WindowManagerInternal mWindowManager; @VisibleForTesting - protected PackageManager mPackageManager; - - @VisibleForTesting protected ContentResolver mContentResolver; /** @@ -164,7 +159,6 @@ public class AttentionDetector { public void systemReady(Context context) { mContext = context; updateEnabledFromSettings(context); - mPackageManager = context.getPackageManager(); mContentResolver = context.getContentResolver(); mAttentionManager = LocalServices.getService(AttentionManagerInternal.class); mWindowManager = LocalServices.getService(WindowManagerInternal.class); @@ -192,14 +186,11 @@ public class AttentionDetector { public long updateUserActivity(long nextScreenDimming, long dimDurationMillis) { if (nextScreenDimming == mLastActedOnNextScreenDimming || !mIsSettingEnabled + || !isAttentionServiceSupported() || mWindowManager.isKeyguardShowingAndNotOccluded()) { return nextScreenDimming; } - if (!isAttentionServiceSupported() || !serviceHasSufficientPermissions()) { - return nextScreenDimming; - } - final long now = SystemClock.uptimeMillis(); final long whenToCheck = nextScreenDimming - getPreDimCheckDurationMillis(); final long whenToStopExtending = mLastUserActivityTime + getMaxExtensionMillis(); @@ -300,18 +291,6 @@ public class AttentionDetector { return mAttentionManager != null && mAttentionManager.isAttentionServiceSupported(); } - /** - * Returns {@code true} if the attention service has sufficient permissions, disables the - * depending features otherwise. - */ - @VisibleForTesting - boolean serviceHasSufficientPermissions() { - final String attentionPackage = mPackageManager.getAttentionServicePackageName(); - return attentionPackage != null && mPackageManager.checkPermission( - Manifest.permission.CAMERA, attentionPackage) - == PackageManager.PERMISSION_GRANTED; - } - public void dump(PrintWriter pw) { pw.println("AttentionDetector:"); pw.println(" mIsSettingEnabled=" + mIsSettingEnabled); diff --git a/services/tests/servicestests/src/com/android/server/power/AttentionDetectorTest.java b/services/tests/servicestests/src/com/android/server/power/AttentionDetectorTest.java index 4381bfdb0b56..af161ee8b818 100644 --- a/services/tests/servicestests/src/com/android/server/power/AttentionDetectorTest.java +++ b/services/tests/servicestests/src/com/android/server/power/AttentionDetectorTest.java @@ -39,7 +39,6 @@ import static org.mockito.Mockito.when; import android.attention.AttentionManagerInternal; import android.attention.AttentionManagerInternal.AttentionCallbackInternal; -import android.content.pm.PackageManager; import android.os.PowerManager; import android.os.PowerManagerInternal; import android.os.SystemClock; @@ -64,8 +63,6 @@ public class AttentionDetectorTest extends AndroidTestCase { private static final long DEFAULT_DIM_DURATION_MILLIS = 6_000L; @Mock - private PackageManager mPackageManager; - @Mock private AttentionManagerInternal mAttentionManagerInternal; @Mock private WindowManagerInternal mWindowManagerInternal; @@ -80,9 +77,6 @@ public class AttentionDetectorTest extends AndroidTestCase { @Before public void setUp() { MockitoAnnotations.initMocks(this); - when(mPackageManager.getAttentionServicePackageName()).thenReturn("com.google.android.as"); - when(mPackageManager.checkPermission(any(), any())).thenReturn( - PackageManager.PERMISSION_GRANTED); when(mAttentionManagerInternal.checkAttention(anyLong(), any())) .thenReturn(true); when(mWindowManagerInternal.isKeyguardShowingAndNotOccluded()).thenReturn(false); @@ -157,16 +151,6 @@ public class AttentionDetectorTest extends AndroidTestCase { } @Test - public void testOnUserActivity_doesntCheckIfNotSufficientPermissions() { - when(mPackageManager.checkPermission(any(), any())).thenReturn( - PackageManager.PERMISSION_DENIED); - - long when = registerAttention(); - verify(mAttentionManagerInternal, never()).checkAttention(anyLong(), any()); - assertThat(mNextDimming).isEqualTo(when); - } - - @Test public void testOnUserActivity_doesntCrashIfNoAttentionService() { mAttentionManagerInternal = null; registerAttention(); @@ -452,7 +436,6 @@ public class AttentionDetectorTest extends AndroidTestCase { super(AttentionDetectorTest.this.mOnUserAttention, new Object()); mAttentionManager = mAttentionManagerInternal; mWindowManager = mWindowManagerInternal; - mPackageManager = AttentionDetectorTest.this.mPackageManager; mContentResolver = getContext().getContentResolver(); } |