From c821ae1ee667a1fec217c8cdb8c6dc2bbb57e47a Mon Sep 17 00:00:00 2001 From: Alex Salo Date: Thu, 11 Apr 2019 14:41:57 -0700 Subject: [PATCH] Check for attention permissions If attention package does not have sufficient permissions - disable the setting. Bug: 130246574, 130350903 Test: make RunSettingsRoboTests and manually confirmed Change-Id: Ia7a86c940522e72f7e895d6aec7500f1ef6f9889 --- .../AdaptiveSleepPreferenceController.java | 26 ++++++++++++++- ...AdaptiveSleepPreferenceControllerTest.java | 33 +++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java index bd9d386327f..6aa71873c4d 100644 --- a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java +++ b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java @@ -15,9 +15,14 @@ package com.android.settings.display; import static android.provider.Settings.System.ADAPTIVE_SLEEP; +import android.Manifest; import android.content.Context; +import android.content.pm.PackageManager; import android.provider.Settings; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; @@ -27,16 +32,24 @@ public class AdaptiveSleepPreferenceController extends TogglePreferenceControlle private final String SYSTEM_KEY = ADAPTIVE_SLEEP; private final int DEFAULT_VALUE = 0; + private final boolean hasSufficientPermissions; + public AdaptiveSleepPreferenceController(Context context, String key) { super(context, key); + + final PackageManager packageManager = mContext.getPackageManager(); + final String attentionPackage = packageManager.getAttentionServicePackageName(); + hasSufficientPermissions = attentionPackage != null && packageManager.checkPermission( + Manifest.permission.CAMERA, attentionPackage) == PackageManager.PERMISSION_GRANTED; } @Override public boolean isChecked() { - return Settings.System.getInt(mContext.getContentResolver(), + return hasSufficientPermissions && Settings.System.getInt(mContext.getContentResolver(), SYSTEM_KEY, DEFAULT_VALUE) != DEFAULT_VALUE; } + @Override public boolean setChecked(boolean isChecked) { Settings.System.putInt(mContext.getContentResolver(), SYSTEM_KEY, @@ -64,4 +77,15 @@ public class AdaptiveSleepPreferenceController extends TogglePreferenceControlle ? R.string.adaptive_sleep_summary_on : R.string.adaptive_sleep_summary_off); } + + @Override + public void displayPreference(PreferenceScreen screen) { + super.displayPreference(screen); + final Preference preference = screen.findPreference(SYSTEM_KEY); + + if (preference != null) { + preference.setEnabled(hasSufficientPermissions); + } + + } } diff --git a/tests/robotests/src/com/android/settings/display/AdaptiveSleepPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AdaptiveSleepPreferenceControllerTest.java index d426e7aa7ba..9adb1ad2861 100644 --- a/tests/robotests/src/com/android/settings/display/AdaptiveSleepPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AdaptiveSleepPreferenceControllerTest.java @@ -20,15 +20,21 @@ import static android.provider.Settings.System.ADAPTIVE_SLEEP; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.when; + import android.content.ContentResolver; import android.content.Context; +import android.content.pm.PackageManager; import android.provider.Settings; import com.android.settings.R; +import com.android.settingslib.RestrictedPreference; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; @@ -42,6 +48,9 @@ public class AdaptiveSleepPreferenceControllerTest { private AdaptiveSleepPreferenceController mController; private ContentResolver mContentResolver; + @Mock + private PackageManager mPackageManager; + @Before public void setUp() { MockitoAnnotations.initMocks(this); @@ -49,6 +58,10 @@ public class AdaptiveSleepPreferenceControllerTest { mContext = RuntimeEnvironment.application; mContentResolver = mContext.getContentResolver(); mController = new AdaptiveSleepPreferenceController(mContext, PREFERENCE_KEY); + + + when(mPackageManager.checkPermission(any(), any())).thenReturn( + PackageManager.PERMISSION_GRANTED); } @Test @@ -114,4 +127,24 @@ public class AdaptiveSleepPreferenceControllerTest { new AdaptiveSleepPreferenceController(mContext, "any_key"); assertThat(controller.isSliceable()).isTrue(); } + + @Test + public void isChecked_returnsFalseWhenNotSufficientPermissions() { + when(mPackageManager.checkPermission(any(), any())).thenReturn( + PackageManager.PERMISSION_DENIED); + + mController.setChecked(true); + assertThat(mController.isChecked()).isFalse(); + } + + @Test + public void isEnabled_returnsFalseWhenNotSufficientPermissions() { + when(mPackageManager.checkPermission(any(), any())).thenReturn( + PackageManager.PERMISSION_DENIED); + + mController.setChecked(true); + final RestrictedPreference mPreference = new RestrictedPreference(mContext); + mController.updateState(mPreference); + assertThat(mPreference.isEnabled()).isFalse(); + } }