Snap for 7618979 from 23f97347a3 to sc-v2-release

Change-Id: Ie31153ac70d084b3f622b04249d51dc35b84cc44

src/com/android/settings/network/helper/SubscriptionAnnotation.java

@@ -90,16 +90,15 @@ public class SubscriptionAnnotation {
 
         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);

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 @@ import java.util.stream.Collectors;
  */
 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 @@ public class SubscriptionGrouping
         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);
     }
 }

src/com/android/settings/password/ChooseLockPattern.java

@@ -370,13 +370,13 @@ public class ChooseLockPattern extends SettingsActivity {
                     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(

tests/unit/src/com/android/settings/network/helper/SubscriptionGroupingTest.java

@@ -68,7 +68,7 @@ public class SubscriptionGroupingTest {
         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