Merge "Fixes broken Settings test." into udc-dev
diff --git a/src/com/android/settings/biometrics/BiometricEnrollActivity.java b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
index f0c1ed1..4d05946 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollActivity.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
@@ -35,6 +35,7 @@
import android.hardware.biometrics.BiometricManager;
import android.hardware.biometrics.BiometricManager.Authenticators;
import android.hardware.biometrics.BiometricManager.BiometricError;
+import android.hardware.biometrics.SensorProperties;
import android.hardware.face.FaceManager;
import android.hardware.face.FaceSensorPropertiesInternal;
import android.hardware.fingerprint.FingerprintManager;
@@ -198,7 +199,7 @@
// Default behavior is to enroll BIOMETRIC_WEAK or above. See ACTION_BIOMETRIC_ENROLL.
final int authenticators = getIntent().getIntExtra(
EXTRA_BIOMETRIC_AUTHENTICATORS_ALLOWED, Authenticators.BIOMETRIC_WEAK);
- Log.d(TAG, "Authenticators: " + authenticators);
+ Log.d(TAG, "Authenticators: " + BiometricManager.authenticatorToStr(authenticators));
mParentalOptionsRequired = intent.getBooleanExtra(EXTRA_REQUIRE_PARENTAL_CONSENT, false);
mSkipReturnToParent = intent.getBooleanExtra(EXTRA_SKIP_RETURN_TO_PARENT, false);
@@ -222,9 +223,16 @@
final FaceSensorPropertiesInternal props = faceProperties.get(0);
final int maxEnrolls =
isSetupWizard ? maxFacesEnrollableIfSUW : props.maxEnrollmentsPerUser;
+ final boolean isFaceStrong =
+ props.sensorStrength == SensorProperties.STRENGTH_STRONG;
mIsFaceEnrollable =
faceManager.getEnrolledFaces(mUserId).size() < maxEnrolls;
+ // If we expect strong bio only, check if face is strong
+ if (authenticators == Authenticators.BIOMETRIC_STRONG && !isFaceStrong) {
+ mIsFaceEnrollable = false;
+ }
+
final boolean parentalConsent = isSetupWizard || (mParentalOptionsRequired
&& !WizardManagerHelper.isUserSetupComplete(this));
if (parentalConsent && isMultiSensor && mIsFaceEnrollable) {
@@ -278,6 +286,9 @@
private void updateFingerprintEnrollable(boolean isSetupWizard) {
if (mHasFeatureFingerprint) {
+ final int authenticators = getIntent().getIntExtra(
+ EXTRA_BIOMETRIC_AUTHENTICATORS_ALLOWED, Authenticators.BIOMETRIC_WEAK);
+
final FingerprintManager fpManager = getSystemService(FingerprintManager.class);
final List<FingerprintSensorPropertiesInternal> fpProperties =
fpManager.getSensorPropertiesInternal();
@@ -287,8 +298,15 @@
final int maxEnrolls =
isSetupWizard ? maxFingerprintsEnrollableIfSUW
: fpProperties.get(0).maxEnrollmentsPerUser;
+ final boolean isFingerprintStrong =
+ fpProperties.get(0).sensorStrength == SensorProperties.STRENGTH_STRONG;
mIsFingerprintEnrollable =
fpManager.getEnrolledFingerprints(mUserId).size() < maxEnrolls;
+
+ // If we expect strong bio only, check if fingerprint is strong
+ if (authenticators == Authenticators.BIOMETRIC_STRONG && !isFingerprintStrong) {
+ mIsFingerprintEnrollable = false;
+ }
}
}
}
@@ -308,8 +326,8 @@
}
}
- boolean canUseFace = mHasFeatureFace;
- boolean canUseFingerprint = mHasFeatureFingerprint;
+ boolean canUseFace = mIsFaceEnrollable;
+ boolean canUseFingerprint = mIsFingerprintEnrollable;
if (mParentalOptionsRequired) {
if (mParentalOptions == null) {
throw new IllegalStateException("consent options required, but not set");
@@ -612,11 +630,11 @@
Intent intent = BiometricUtils.getChooseLockIntent(this, getIntent());
intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_INSECURE_OPTIONS, true);
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, true);
- if (mHasFeatureFingerprint && mHasFeatureFace) {
+ if (mIsFingerprintEnrollable && mIsFaceEnrollable) {
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_BIOMETRICS, true);
- } else if (mHasFeatureFace) {
+ } else if (mIsFaceEnrollable) {
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE, true);
- } else if (mHasFeatureFingerprint) {
+ } else if (mIsFingerprintEnrollable) {
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, true);
}
diff --git a/src/com/android/settings/notification/app/AppNotificationSettings.java b/src/com/android/settings/notification/app/AppNotificationSettings.java
index 5a14bc9..4ebac0f 100644
--- a/src/com/android/settings/notification/app/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/app/AppNotificationSettings.java
@@ -18,18 +18,11 @@
import android.app.settings.SettingsEnums;
import android.content.Context;
-import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-import androidx.recyclerview.widget.RecyclerView;
-
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
-import com.android.settings.Utils;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
diff --git a/src/com/android/settings/spa/core/instrumentation/SpaLogProvider.kt b/src/com/android/settings/spa/core/instrumentation/SpaLogProvider.kt
index 31d5797..600a2e6 100644
--- a/src/com/android/settings/spa/core/instrumentation/SpaLogProvider.kt
+++ b/src/com/android/settings/spa/core/instrumentation/SpaLogProvider.kt
@@ -123,8 +123,8 @@
return ElapsedTimeUtils.getElapsedTime(System.currentTimeMillis())
}
- //TODO(b/253979024): Will be implemented in subsequent CLs.
- private fun getPageIdByEntryId(id: String): String {
+ //TODO(b/253979024): Will be implemented in subsequent CLs. Remove @Suppress when done.
+ private fun getPageIdByEntryId(@Suppress("UNUSED_PARAMETER") id: String): String {
return ""
}
}
diff --git a/src/com/android/settings/spa/network/AirplaneModePreference.kt b/src/com/android/settings/spa/network/AirplaneModePreference.kt
index 4af3221..462c121 100644
--- a/src/com/android/settings/spa/network/AirplaneModePreference.kt
+++ b/src/com/android/settings/spa/network/AirplaneModePreference.kt
@@ -52,7 +52,7 @@
}
private class AirplaneModeController(private val context: Context) : OnAirplaneModeChangedListener {
- private var airplaneModeEnabler = AirplaneModeEnabler(context, this)!!
+ private var airplaneModeEnabler = AirplaneModeEnabler(context, this)
private val _airplaneModeState = MutableLiveData<Boolean>()
val airplaneModeState: LiveData<Boolean>
get() = _airplaneModeState
diff --git a/tests/componenttests/src/com/android/settings/biometrics/BiometricEnrollActivityTest.java b/tests/componenttests/src/com/android/settings/biometrics/BiometricEnrollActivityTest.java
index c5e3a19..0cb73c1 100644
--- a/tests/componenttests/src/com/android/settings/biometrics/BiometricEnrollActivityTest.java
+++ b/tests/componenttests/src/com/android/settings/biometrics/BiometricEnrollActivityTest.java
@@ -16,6 +16,7 @@
package com.android.settings.biometrics;
+import static android.hardware.biometrics.BiometricManager.Authenticators.BIOMETRIC_STRONG;
import static android.provider.Settings.ACTION_BIOMETRIC_ENROLL;
import static androidx.test.espresso.intent.Intents.intended;
@@ -33,7 +34,13 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
+import android.hardware.biometrics.SensorProperties;
+import android.hardware.face.FaceManager;
+import android.hardware.face.FaceSensorPropertiesInternal;
+import android.hardware.fingerprint.FingerprintManager;
+import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
import android.os.UserHandle;
+import android.provider.Settings;
import androidx.test.core.app.ActivityScenario;
import androidx.test.core.app.ApplicationProvider;
@@ -56,6 +63,8 @@
import org.junit.Test;
import org.junit.runner.RunWith;
+import java.util.List;
+
@RunWith(AndroidJUnit4.class)
@MediumTest
public class BiometricEnrollActivityTest {
@@ -67,6 +76,8 @@
private final Context mContext = ApplicationProvider.getApplicationContext();
private boolean mHasFace;
private boolean mHasFingerprint;
+ private boolean mIsFaceStrong;
+ private boolean mIsFingerprintStrong;
@Before
public void setup() {
@@ -74,6 +85,28 @@
final PackageManager pm = mContext.getPackageManager();
mHasFingerprint = pm.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT);
mHasFace = pm.hasSystemFeature(PackageManager.FEATURE_FACE);
+
+ if (mHasFace) {
+ final FaceManager faceManager = mContext.getSystemService(FaceManager.class);
+ final List<FaceSensorPropertiesInternal> faceProperties =
+ faceManager.getSensorPropertiesInternal();
+ if (!faceProperties.isEmpty()) {
+ final FaceSensorPropertiesInternal faceProp = faceProperties.get(0);
+ mIsFaceStrong = faceProp.sensorStrength == SensorProperties.STRENGTH_STRONG;
+ }
+ }
+
+ if (mHasFingerprint) {
+ final FingerprintManager fingerprintManager = mContext.getSystemService(
+ FingerprintManager.class);
+ final List<FingerprintSensorPropertiesInternal> fingerProperties =
+ fingerprintManager.getSensorPropertiesInternal();
+ if (!fingerProperties.isEmpty()) {
+ final FingerprintSensorPropertiesInternal fingerProp = fingerProperties.get(0);
+ mIsFingerprintStrong =
+ fingerProp.sensorStrength == SensorProperties.STRENGTH_STRONG;
+ }
+ }
}
@After
@@ -129,6 +162,27 @@
}
}
+ @Test
+ public void launchWithStrongBiometricAllowed_doNotEnrollWeak() throws Exception {
+ assumeTrue(mHasFace || mHasFingerprint);
+
+ // Allow only strong biometrics
+ Intent intent = getIntent();
+ intent.putExtra(Settings.EXTRA_BIOMETRIC_AUTHENTICATORS_ALLOWED, BIOMETRIC_STRONG);
+
+ try (ActivityScenario<BiometricEnrollActivity> scenario =
+ ActivityScenario.launch(intent)) {
+ intended(hasComponent(ChooseLockGeneric.class.getName()));
+ if (mIsFaceStrong && mIsFingerprintStrong) {
+ intended(hasExtra(EXTRA_KEY_FOR_BIOMETRICS, true));
+ } else if (mIsFaceStrong) {
+ intended(hasExtra(EXTRA_KEY_FOR_FACE, true));
+ } else if (mIsFingerprintStrong) {
+ intended(hasExtra(EXTRA_KEY_FOR_FINGERPRINT, true));
+ }
+ }
+ }
+
private Intent getIntent() {
return getIntent(false /* useInternal */);
}
diff --git a/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateDetailsFragmentTest.java
index c1268b6..e5940b6 100644
--- a/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateDetailsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateDetailsFragmentTest.java
@@ -16,6 +16,8 @@
package com.android.settings.display;
+import static android.provider.Settings.Secure.DEVICE_STATE_ROTATION_LOCK_LOCKED;
+
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
@@ -39,6 +41,10 @@
@RunWith(RobolectricTestRunner.class)
public class DeviceStateAutoRotateDetailsFragmentTest {
+ private static final int FOLDED_STATE = 0;
+ private static final int HALF_FOLDED_STATE = 1;
+ private static final int UNFOLDED_STATE = 2;
+ private static final int REAR_DISPLAY_STATE = 3;
private final DeviceStateAutoRotateDetailsFragment mFragment =
spy(new DeviceStateAutoRotateDetailsFragment());
@@ -51,6 +57,7 @@
when(mContext.getApplicationContext()).thenReturn(mContext);
when(mFragment.getContext()).thenReturn(mContext);
when(mFragment.getResources()).thenReturn(mResources);
+ setUpPostureMappings();
}
@Test
@@ -67,7 +74,9 @@
@Test
public void createPreferenceControllers_settableDeviceStates_returnsDeviceStateControllers() {
- enableDeviceStateSettableRotationStates(new String[]{"0:1", "1:1"},
+ enableDeviceStateSettableRotationStates(
+ new String[]{FOLDED_STATE + ":" + DEVICE_STATE_ROTATION_LOCK_LOCKED,
+ UNFOLDED_STATE + ":" + DEVICE_STATE_ROTATION_LOCK_LOCKED},
new String[]{"Folded", "Unfolded"});
List<AbstractPreferenceController> preferenceControllers =
@@ -102,4 +111,19 @@
DeviceStateRotationLockSettingsManager.getInstance(mContext)
.resetStateForTesting(mResources);
}
+
+ private void setUpPostureMappings() {
+ when(mResources.getIntArray(
+ com.android.internal.R.array.config_foldedDeviceStates)).thenReturn(
+ new int[]{FOLDED_STATE});
+ when(mResources.getIntArray(
+ com.android.internal.R.array.config_halfFoldedDeviceStates)).thenReturn(
+ new int[]{HALF_FOLDED_STATE});
+ when(mResources.getIntArray(
+ com.android.internal.R.array.config_openDeviceStates)).thenReturn(
+ new int[]{UNFOLDED_STATE});
+ when(mResources.getIntArray(
+ com.android.internal.R.array.config_rearDisplayDeviceStates)).thenReturn(
+ new int[]{REAR_DISPLAY_STATE});
+ }
}
diff --git a/tests/robotests/src/com/android/settings/display/SmartAutoRotateControllerTest.java b/tests/robotests/src/com/android/settings/display/SmartAutoRotateControllerTest.java
index 4fec38b..4596364 100644
--- a/tests/robotests/src/com/android/settings/display/SmartAutoRotateControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/SmartAutoRotateControllerTest.java
@@ -53,6 +53,7 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = ShadowSensorPrivacyManager.class)
@@ -171,16 +172,14 @@
}
private void lockDeviceStateRotation() {
- mDeviceStateAutoRotateSettingsManager.updateSetting(
- /* deviceState= */0, /* rotationLocked= */ true);
- mDeviceStateAutoRotateSettingsManager.updateSetting(
- /* deviceState= */1, /* rotationLocked= */ true);
+ ShadowDeviceStateRotationLockSettingsManager shadowManager =
+ Shadow.extract(mDeviceStateAutoRotateSettingsManager);
+ shadowManager.setRotationLockedForAllStates(true);
}
private void unlockDeviceStateRotation() {
- mDeviceStateAutoRotateSettingsManager.updateSetting(
- /* deviceState= */0, /* rotationLocked= */ false);
- mDeviceStateAutoRotateSettingsManager.updateSetting(
- /* deviceState= */1, /* rotationLocked= */ true);
+ ShadowDeviceStateRotationLockSettingsManager shadowManager =
+ Shadow.extract(mDeviceStateAutoRotateSettingsManager);
+ shadowManager.setRotationLockedForAllStates(false);
}
}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDeviceStateRotationLockSettingsManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDeviceStateRotationLockSettingsManager.java
index 72df3cc..ed266e3 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDeviceStateRotationLockSettingsManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDeviceStateRotationLockSettingsManager.java
@@ -27,6 +27,7 @@
public class ShadowDeviceStateRotationLockSettingsManager {
private static boolean sDeviceStateRotationLockEnabled;
+ private boolean mIsRotationLockedForAllStates;
@Implementation
public static boolean isDeviceStateRotationLockEnabled(Context context) {
@@ -36,4 +37,13 @@
public static void setDeviceStateRotationLockEnabled(boolean enabled) {
sDeviceStateRotationLockEnabled = enabled;
}
+
+ @Implementation
+ public boolean isRotationLockedForAllStates() {
+ return mIsRotationLockedForAllStates;
+ }
+
+ public void setRotationLockedForAllStates(boolean value) {
+ mIsRotationLockedForAllStates = value;
+ }
}