Merge "Make face education handle timeout result correctly" into sc-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cf43731..9b2cf24 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2862,9 +2862,7 @@
<activity android:name=".notification.app.ChannelPanelActivity"
android:label="@string/notification_channel_title"
android:theme="@style/Theme.Panel"
- android:launchMode="singleInstance"
android:excludeFromRecents="true"
- android:noHistory="true"
android:configChanges="orientation|keyboardHidden|screenSize"
android:exported="true">
<intent-filter android:priority="1">
diff --git a/res/values/themes_suw.xml b/res/values/themes_suw.xml
index 067ddfb..a0585fd 100644
--- a/res/values/themes_suw.xml
+++ b/res/values/themes_suw.xml
@@ -208,6 +208,8 @@
<!-- copied from Theme.DeviceDefault.Dialog.Alert -->
<item name="colorAccent">@*android:color/accent_device_default_dark</item>
<item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
</style>
<style name="SuwAlertDialogThemeCompat.Light" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
@@ -218,6 +220,8 @@
<!-- copied from Theme.DeviceDefault.Light.Dialog.Alert -->
<item name="colorAccent">@*android:color/accent_device_default_light</item>
<item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
</style>
<!-- This theme was applied to Settings pages which are running under SUW. -->
diff --git a/src/com/android/settings/biometrics/BiometricEnrollActivity.java b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
index b3a9505..44a874b 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollActivity.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
@@ -284,7 +284,7 @@
launchCredentialOnlyEnroll();
finish();
} else if (canUseFace && canUseFingerprint) {
- if (mParentalOptionsRequired && mGkPwHandle != null) {
+ if (mGkPwHandle != null) {
launchFaceAndFingerprintEnroll();
} else {
setOrConfirmCredentialsNow();
diff --git a/src/com/android/settings/network/helper/SubscriptionAnnotation.java b/src/com/android/settings/network/helper/SubscriptionAnnotation.java
index 29d4fb5..79fbf68 100644
--- a/src/com/android/settings/network/helper/SubscriptionAnnotation.java
+++ b/src/com/android/settings/network/helper/SubscriptionAnnotation.java
@@ -90,16 +90,15 @@
mOrderWithinList = subInfoIndex;
mType = mSubInfo.isEmbedded() ? TYPE_ESIM : TYPE_PSIM;
+ mIsExisted = true;
if (mType == TYPE_ESIM) {
int cardId = mSubInfo.getCardId();
- mIsExisted = eSimCardId.contains(cardId);
mIsActive = activeSimSlotIndexList.contains(mSubInfo.getSimSlotIndex());
mIsAllowToDisplay = (cardId < 0) // always allow when eSIM not in slot
|| isDisplayAllowed(context);
return;
}
- mIsExisted = true;
mIsActive = (mSubInfo.getSimSlotIndex() > SubscriptionManager.INVALID_SIM_SLOT_INDEX)
&& activeSimSlotIndexList.contains(mSubInfo.getSimSlotIndex());
mIsAllowToDisplay = isDisplayAllowed(context);
diff --git a/src/com/android/settings/network/helper/SubscriptionGrouping.java b/src/com/android/settings/network/helper/SubscriptionGrouping.java
index cfb5ea9..c4e0fd7 100644
--- a/src/com/android/settings/network/helper/SubscriptionGrouping.java
+++ b/src/com/android/settings/network/helper/SubscriptionGrouping.java
@@ -16,6 +16,7 @@
package com.android.settings.network.helper;
import android.os.ParcelUuid;
+import android.util.Log;
import androidx.annotation.Keep;
import androidx.annotation.VisibleForTesting;
@@ -44,9 +45,12 @@
*/
public class SubscriptionGrouping
implements UnaryOperator<List<SubscriptionAnnotation>> {
+ private static final String LOG_TAG = "SubscriptionGrouping";
// implementation of UnaryOperator
public List<SubscriptionAnnotation> apply(List<SubscriptionAnnotation> listOfSubscriptions) {
+ Log.d(LOG_TAG, "Grouping " + listOfSubscriptions);
+
// group by GUID
Map<ParcelUuid, List<SubscriptionAnnotation>> groupedSubInfoList =
listOfSubscriptions.stream()
@@ -89,8 +93,8 @@
annoSelector = annoSelector
// eSIM in front of pSIM
.thenComparingInt(anno -> -anno.getType())
- // subscription ID in reverse order
- .thenComparingInt(anno -> -anno.getSubscriptionId());
+ // maintain the ordering given within constructor
+ .thenComparingInt(anno -> annoList.indexOf(anno));
return annoList.stream().sorted(annoSelector).findFirst().orElse(null);
}
}
diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index 3c43fc3..e85ce60 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -370,13 +370,13 @@
LeftButtonMode.Gone, RightButtonMode.Ok, ID_EMPTY_MESSAGE, false),
ChoiceTooShort(
R.string.lock_settings_picker_biometrics_added_security_message,
- ID_EMPTY_MESSAGE,
+ R.string.lockpattern_choose_pattern_description,
R.string.lockpattern_recording_incorrect_too_short,
LeftButtonMode.Retry, RightButtonMode.ContinueDisabled,
ID_EMPTY_MESSAGE, true),
FirstChoiceValid(
R.string.lock_settings_picker_biometrics_added_security_message,
- ID_EMPTY_MESSAGE,
+ R.string.lockpattern_choose_pattern_description,
R.string.lockpattern_pattern_entered_header,
LeftButtonMode.Retry, RightButtonMode.Continue, ID_EMPTY_MESSAGE, false),
NeedToConfirm(
diff --git a/tests/componenttests/Android.bp b/tests/componenttests/Android.bp
index 7d9c4b2..77ee164 100644
--- a/tests/componenttests/Android.bp
+++ b/tests/componenttests/Android.bp
@@ -21,6 +21,8 @@
static_libs: [
"truth-prebuilt",
"androidx.test.core",
+ "androidx.test.espresso.core",
+ "androidx.test.espresso.intents-nodeps",
"androidx.test.runner",
"androidx.test.rules",
"androidx.test.ext.junit",
diff --git a/tests/componenttests/src/com/android/settings/biometrics/BiometricEnrollActivityTest.java b/tests/componenttests/src/com/android/settings/biometrics/BiometricEnrollActivityTest.java
new file mode 100644
index 0000000..0ef57a0
--- /dev/null
+++ b/tests/componenttests/src/com/android/settings/biometrics/BiometricEnrollActivityTest.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.biometrics;
+
+import static android.provider.Settings.ACTION_BIOMETRIC_ENROLL;
+
+import static androidx.test.espresso.intent.Intents.intended;
+import static androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assume.assumeTrue;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.UserHandle;
+
+import androidx.test.core.app.ActivityScenario;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.espresso.intent.Intents;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.MediumTest;
+
+import com.android.internal.widget.LockPatternChecker;
+import com.android.internal.widget.LockPatternUtils;
+import com.android.internal.widget.LockscreenCredential;
+import com.android.settings.biometrics.face.FaceEnrollIntroduction;
+import com.android.settings.biometrics.fingerprint.FingerprintEnrollIntroduction;
+import com.android.settings.password.ChooseLockGeneric;
+import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.password.ConfirmLockPassword;
+import com.android.settings.testutils.AdbUtils;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@MediumTest
+public class BiometricEnrollActivityTest {
+
+ private static final String TAG = "BiometricEnrollActivityTest";
+ private static final int ADB_TIMEOUT_MS = 5000;
+ private static final String TEST_PIN = "1234";
+
+ private final Context mContext = ApplicationProvider.getApplicationContext();
+ private boolean mHasFace;
+ private boolean mHasFingerprint;
+
+ @Before
+ public void setup() {
+ Intents.init();
+ final PackageManager pm = mContext.getPackageManager();
+ mHasFingerprint = pm.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT);
+ mHasFace = pm.hasSystemFeature(PackageManager.FEATURE_FACE);
+ }
+
+ @After
+ public void teardown() throws Exception {
+ Intents.release();
+ AdbUtils.checkStringInAdbCommandOutput(TAG, "locksettings clear --old " + TEST_PIN,
+ "", "", ADB_TIMEOUT_MS);
+ }
+
+ @Test
+ public void launchWithoutPin_setsPin() {
+ try (ActivityScenario<BiometricEnrollActivity> scenario =
+ ActivityScenario.launch(getIntent())) {
+ intended(hasComponent(ChooseLockGeneric.class.getName()));
+ }
+ }
+
+ @Test
+ public void launchWithPin_confirmsPin() throws Exception {
+ setPin();
+ try (ActivityScenario<BiometricEnrollActivity> scenario =
+ ActivityScenario.launch(getIntent())) {
+ intended(hasComponent(ConfirmLockPassword.InternalActivity.class.getName()));
+ }
+ }
+
+ @Test
+ public void launchWithPinAndPwHandle_confirmsPin() throws Exception {
+ assumeTrue(mHasFace || mHasFingerprint);
+
+ setPin();
+ final Intent intent = getIntent(true /* useInternal */);
+ LockPatternChecker.verifyCredential(new LockPatternUtils(mContext),
+ LockscreenCredential.createPin(TEST_PIN), UserHandle.myUserId(),
+ LockPatternUtils.VERIFY_FLAG_REQUEST_GK_PW_HANDLE, (response, timeoutMs) -> {
+ assertThat(response.containsGatekeeperPasswordHandle()).isTrue();
+ intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE,
+ response.getGatekeeperPasswordHandle());
+ }).get();
+
+
+
+ try (ActivityScenario<BiometricEnrollActivity> scenario =
+ ActivityScenario.launch(intent)) {
+ intended(hasComponent(mHasFace
+ ? FaceEnrollIntroduction.class.getName()
+ : FingerprintEnrollIntroduction.class.getName()));
+ }
+ }
+
+ private Intent getIntent() {
+ return getIntent(false /* useInternal */);
+ }
+
+ private Intent getIntent(boolean useInternal) {
+ final Intent intent = new Intent(mContext, useInternal
+ ? BiometricEnrollActivity.InternalActivity.class : BiometricEnrollActivity.class);
+ intent.setAction(ACTION_BIOMETRIC_ENROLL);
+ return intent;
+ }
+
+ private static void setPin() throws Exception {
+ assertThat(AdbUtils.checkStringInAdbCommandOutput(TAG, "locksettings set-pin " + TEST_PIN,
+ "Pin set to ", "'" + TEST_PIN + "'", ADB_TIMEOUT_MS)).isTrue();
+ }
+}
diff --git a/tests/unit/src/com/android/settings/network/helper/SubscriptionGroupingTest.java b/tests/unit/src/com/android/settings/network/helper/SubscriptionGroupingTest.java
index 97bdb74..bea7209 100644
--- a/tests/unit/src/com/android/settings/network/helper/SubscriptionGroupingTest.java
+++ b/tests/unit/src/com/android/settings/network/helper/SubscriptionGroupingTest.java
@@ -68,7 +68,7 @@
List<SubscriptionAnnotation> result = mTarget
.apply(Arrays.asList(subAnno2, subAnno1, subAnno3));
assertThat(result.size()).isEqualTo(1);
- assertThat(result.get(0)).isEqualTo(subAnno3);
+ assertThat(result.get(0)).isEqualTo(subAnno1);
}
@Test