Snap for 5674462 from d64b6c8846 to qt-release

Change-Id: Ic4fbcd54ada1df8c98c43386873d67539c84a0f1

src/com/android/settings/network/telephony/DisabledSubscriptionController.java

@@ -72,7 +72,8 @@ public class DisabledSubscriptionController extends BasePreferenceController imp
         if (mCategory == null || mSubId ==  SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
             return;
         }
-        mCategory.setVisible(mSubscriptionManager.isSubscriptionEnabled(mSubId));
+        // TODO b/135222940: re-evaluate whether to use mSubscriptionManager#isSubscriptionEnabled
+        mCategory.setVisible(mSubscriptionManager.isActiveSubId(mSubId));
     }
 
     @Override

src/com/android/settings/network/telephony/MobileDataSlice.java

@@ -78,16 +78,14 @@ public class MobileDataSlice implements CustomSliceable {
         final String title = mContext.getText(R.string.mobile_data_settings_title).toString();
         @ColorInt final int color = Utils.getColorAccentDefaultColor(mContext);
 
-        // Return a Slice without the mobile data toggle when airplane mode is on.
+        // Return null until we can show a disabled-action Slice, blaming Airplane mode.
         if (isAirplaneModeEnabled()) {
-            return buildUnavailableMobileDataSlice(title,
+            return null;
-                    mContext.getText(R.string.mobile_data_ap_mode_disabled), icon, color);
         }
 
-        // Return a Slice without the mobile data toggle when mobile data disabled.
+        // Return null until we can show a disabled-action Slice.
         if (!isMobileDataAvailable()) {
-            return buildUnavailableMobileDataSlice(title,
+            return null;
-                    mContext.getText(R.string.sim_cellular_data_unavailable), icon, color);
         }
 
         final CharSequence summary = getSummary();
@@ -201,22 +199,6 @@ public class MobileDataSlice implements CustomSliceable {
         return mTelephonyManager.isDataEnabled();
     }
 
-    private Slice buildUnavailableMobileDataSlice(String title, CharSequence summary,
-            IconCompat icon, int color) {
-        final PendingIntent intent = PendingIntent.getActivity(mContext, 0 /* requestCode */,
-                new Intent(), 0 /* flags */);
-        final SliceAction deadAction =
-                SliceAction.create(intent, icon, ListBuilder.ICON_IMAGE, title);
-        final ListBuilder listBuilder = new ListBuilder(mContext, getUri(),
-                ListBuilder.INFINITY)
-                .setAccentColor(color)
-                .addRow(new ListBuilder.RowBuilder()
-                        .setTitle(title)
-                        .setSubtitle(summary)
-                        .setPrimaryAction(deadAction));
-        return listBuilder.build();
-    }
-
     /**
      * Listener for mobile data state changes.
      *

src/com/android/settings/network/telephony/MobileNetworkSwitchController.java

@@ -81,7 +81,9 @@ public class MobileNetworkSwitchController extends BasePreferenceController impl
                 R.string.mobile_network_use_sim_off);
 
         mSwitchBar.addOnSwitchChangeListener((switchView, isChecked) -> {
-            if (mSubscriptionManager.isSubscriptionEnabled(mSubId) != isChecked
+            // TODO b/135222940: re-evaluate whether to use
+            // mSubscriptionManager#isSubscriptionEnabled
+            if (mSubscriptionManager.isActiveSubId(mSubId) != isChecked
                     && (!mSubscriptionManager.setSubscriptionEnabled(mSubId, isChecked))) {
                 mSwitchBar.setChecked(!isChecked);
             }
@@ -108,7 +110,9 @@ public class MobileNetworkSwitchController extends BasePreferenceController impl
             mSwitchBar.hide();
         } else {
             mSwitchBar.show();
-            mSwitchBar.setChecked(mSubscriptionManager.isSubscriptionEnabled(mSubId));
+            // TODO b/135222940: re-evaluate whether to use
+            // mSubscriptionManager#isSubscriptionEnabled
+            mSwitchBar.setChecked(mSubscriptionManager.isActiveSubId(mSubId));
         }
     }
 

src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java

@@ -686,6 +686,10 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
             return;
         }
 
+        if (mCamera.isDecodeTaskAlive()) {
+            mCamera.stop();
+        }
+
         final SurfaceTexture surfaceTexture = mTextureView.getSurfaceTexture();
         if (surfaceTexture == null) {
             throw new IllegalStateException("SurfaceTexture is not ready for restarting camera");

src/com/android/settings/wifi/dpp/WifiDppUtils.java

@@ -205,6 +205,11 @@ public class WifiDppUtils {
         final WifiConfiguration wifiConfiguration = accessPoint.getConfig();
         setConfiguratorIntentExtra(intent, wifiManager, wifiConfiguration);
 
+        // For a transition mode Wi-Fi AP, creates a QR code that's compatible with more devices
+        if (accessPoint.getSecurity() == AccessPoint.SECURITY_PSK_SAE_TRANSITION) {
+            intent.putExtra(EXTRA_WIFI_SECURITY, WifiQrCode.SECURITY_WPA_PSK);
+        }
+
         return intent;
     }
 
@@ -400,6 +405,7 @@ public class WifiDppUtils {
                 }
                 break;
             case AccessPoint.SECURITY_PSK:
+            case AccessPoint.SECURITY_PSK_SAE_TRANSITION:
                 return true;
             default:
         }
@@ -412,6 +418,8 @@ public class WifiDppUtils {
             case AccessPoint.SECURITY_PSK:
             case AccessPoint.SECURITY_WEP:
             case AccessPoint.SECURITY_NONE:
+            case AccessPoint.SECURITY_PSK_SAE_TRANSITION:
+            case AccessPoint.SECURITY_OWE_TRANSITION:
                 return true;
             case AccessPoint.SECURITY_SAE:
                 if (wifiManager.isWpa3SaeSupported()) {

tests/robotests/src/com/android/settings/network/telephony/DisabledSubscriptionControllerTest.java

@@ -69,32 +69,32 @@ public class DisabledSubscriptionControllerTest {
 
     @Test
     public void displayPreference_subscriptionEnabled_categoryIsVisible() {
-        doReturn(true).when(mSubscriptionManager).isSubscriptionEnabled(SUB_ID);
+        doReturn(true).when(mSubscriptionManager).isActiveSubId(SUB_ID);
         mController.displayPreference(mScreen);
         assertThat(mCategory.isVisible()).isTrue();
     }
 
     @Test
     public void displayPreference_subscriptionDisabled_categoryIsNotVisible() {
-        doReturn(false).when(mSubscriptionManager).isSubscriptionEnabled(SUB_ID);
+        doReturn(false).when(mSubscriptionManager).isActiveSubId(SUB_ID);
         mController.displayPreference(mScreen);
         assertThat(mCategory.isVisible()).isFalse();
     }
 
     @Test
     public void onSubscriptionsChanged_subscriptionBecomesDisabled_categoryIsNotVisible() {
-        doReturn(true).when(mSubscriptionManager).isSubscriptionEnabled(SUB_ID);
+        doReturn(true).when(mSubscriptionManager).isActiveSubId(SUB_ID);
         mController.displayPreference(mScreen);
-        doReturn(false).when(mSubscriptionManager).isSubscriptionEnabled(SUB_ID);
+        doReturn(false).when(mSubscriptionManager).isActiveSubId(SUB_ID);
         mController.onSubscriptionsChanged();
         assertThat(mCategory.isVisible()).isFalse();
     }
 
     @Test
     public void onSubscriptionsChanged_subscriptionBecomesEnabled_categoryIsVisible() {
-        doReturn(false).when(mSubscriptionManager).isSubscriptionEnabled(SUB_ID);
+        doReturn(false).when(mSubscriptionManager).isActiveSubId(SUB_ID);
         mController.displayPreference(mScreen);
-        doReturn(true).when(mSubscriptionManager).isSubscriptionEnabled(SUB_ID);
+        doReturn(true).when(mSubscriptionManager).isActiveSubId(SUB_ID);
         mController.onSubscriptionsChanged();
         assertThat(mCategory.isVisible()).isTrue();
     }

tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java

@@ -174,21 +174,7 @@ public class MobileDataSliceTest {
         doReturn(new ArrayList<>()).when(mSubscriptionManager).getSelectableSubscriptionInfoList();
         final Slice mobileData = mMobileDataSlice.getSlice();
 
-        final SliceMetadata metadata = SliceMetadata.from(mContext, mobileData);
+        assertThat(mobileData).isNull();
-        assertThat(metadata.getTitle())
-                .isEqualTo(mContext.getString(R.string.mobile_data_settings_title));
-
-        assertThat(metadata.getSubtitle())
-                .isEqualTo(mContext.getString(R.string.sim_cellular_data_unavailable));
-
-        final List<SliceAction> toggles = metadata.getToggles();
-        assertThat(toggles).hasSize(0);
-
-        final SliceAction primaryAction = metadata.getPrimaryAction();
-        final PendingIntent pendingIntent = primaryAction.getAction();
-        final Intent actionIntent = pendingIntent.getIntent();
-
-        assertThat(actionIntent).isNull();
     }
 
     @Test
@@ -196,21 +182,7 @@ public class MobileDataSliceTest {
         doReturn(null).when(mSubscriptionManager).getSelectableSubscriptionInfoList();
         final Slice mobileData = mMobileDataSlice.getSlice();
 
-        final SliceMetadata metadata = SliceMetadata.from(mContext, mobileData);
+        assertThat(mobileData).isNull();
-        assertThat(metadata.getTitle())
-                .isEqualTo(mContext.getString(R.string.mobile_data_settings_title));
-
-        assertThat(metadata.getSubtitle())
-                .isEqualTo(mContext.getString(R.string.sim_cellular_data_unavailable));
-
-        final List<SliceAction> toggles = metadata.getToggles();
-        assertThat(toggles).hasSize(0);
-
-        final SliceAction primaryAction = metadata.getPrimaryAction();
-        final PendingIntent pendingIntent = primaryAction.getAction();
-        final Intent actionIntent = pendingIntent.getIntent();
-
-        assertThat(actionIntent).isNull();
     }
 
     @Test
@@ -219,20 +191,6 @@ public class MobileDataSliceTest {
         doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
         final Slice mobileData = mMobileDataSlice.getSlice();
 
-        final SliceMetadata metadata = SliceMetadata.from(mContext, mobileData);
+        assertThat(mobileData).isNull();
-        assertThat(metadata.getTitle())
-                .isEqualTo(mContext.getString(R.string.mobile_data_settings_title));
-
-        assertThat(metadata.getSubtitle())
-                .isEqualTo(mContext.getString(R.string.mobile_data_ap_mode_disabled));
-
-        final List<SliceAction> toggles = metadata.getToggles();
-        assertThat(toggles).hasSize(0);
-
-        final SliceAction primaryAction = metadata.getPrimaryAction();
-        final PendingIntent pendingIntent = primaryAction.getAction();
-        final Intent actionIntent = pendingIntent.getIntent();
-
-        assertThat(actionIntent).isNull();
     }
 }

tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSwitchControllerTest.java

@@ -109,7 +109,7 @@ public class MobileNetworkSwitchControllerTest {
 
     @Test
     public void displayPreference_oneEnabledSubscription_switchBarNotHidden() {
-        doReturn(true).when(mSubscriptionManager).isSubscriptionEnabled(mSubId);
+        doReturn(true).when(mSubscriptionManager).isActiveSubId(mSubId);
         SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubscription));
         mController.displayPreference(mScreen);
         assertThat(mSwitchBar.isShowing()).isTrue();
@@ -117,7 +117,7 @@ public class MobileNetworkSwitchControllerTest {
 
     @Test
     public void displayPreference_oneDisabledSubscription_switchBarNotHidden() {
-        doReturn(false).when(mSubscriptionManager).isSubscriptionEnabled(mSubId);
+        doReturn(false).when(mSubscriptionManager).isActiveSubId(mSubId);
         SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubscription));
         mController.displayPreference(mScreen);
         assertThat(mSwitchBar.isShowing()).isTrue();
@@ -125,7 +125,7 @@ public class MobileNetworkSwitchControllerTest {
 
     @Test
     public void displayPreference_subscriptionEnabled_switchIsOn() {
-        when(mSubscriptionManager.isSubscriptionEnabled(mSubId)).thenReturn(true);
+        when(mSubscriptionManager.isActiveSubId(mSubId)).thenReturn(true);
         mController.displayPreference(mScreen);
         assertThat(mSwitchBar.isShowing()).isTrue();
         assertThat(mSwitchBar.isChecked()).isTrue();
@@ -133,7 +133,7 @@ public class MobileNetworkSwitchControllerTest {
 
     @Test
     public void displayPreference_subscriptionDisabled_switchIsOff() {
-        when(mSubscriptionManager.isSubscriptionEnabled(mSubId)).thenReturn(false);
+        when(mSubscriptionManager.isActiveSubId(mSubId)).thenReturn(false);
         mController.displayPreference(mScreen);
         assertThat(mSwitchBar.isShowing()).isTrue();
         assertThat(mSwitchBar.isChecked()).isFalse();
@@ -141,7 +141,7 @@ public class MobileNetworkSwitchControllerTest {
 
     @Test
     public void switchChangeListener_fromEnabledToDisabled_setSubscriptionEnabledCalledCorrectly() {
-        when(mSubscriptionManager.isSubscriptionEnabled(mSubId)).thenReturn(true);
+        when(mSubscriptionManager.isActiveSubId(mSubId)).thenReturn(true);
         mController.displayPreference(mScreen);
         assertThat(mSwitchBar.isShowing()).isTrue();
         assertThat(mSwitchBar.isChecked()).isTrue();
@@ -153,7 +153,7 @@ public class MobileNetworkSwitchControllerTest {
     public void switchChangeListener_fromEnabledToDisabled_setSubscriptionEnabledFailed() {
         when(mSubscriptionManager.setSubscriptionEnabled(eq(mSubId), anyBoolean()))
                 .thenReturn(false);
-        when(mSubscriptionManager.isSubscriptionEnabled(mSubId)).thenReturn(true);
+        when(mSubscriptionManager.isActiveSubId(mSubId)).thenReturn(true);
         mController.displayPreference(mScreen);
         assertThat(mSwitchBar.isShowing()).isTrue();
         assertThat(mSwitchBar.isChecked()).isTrue();
@@ -164,7 +164,7 @@ public class MobileNetworkSwitchControllerTest {
 
     @Test
     public void switchChangeListener_fromDisabledToEnabled_setSubscriptionEnabledCalledCorrectly() {
-        when(mSubscriptionManager.isSubscriptionEnabled(mSubId)).thenReturn(false);
+        when(mSubscriptionManager.isActiveSubId(mSubId)).thenReturn(false);
         mController.displayPreference(mScreen);
         assertThat(mSwitchBar.isShowing()).isTrue();
         assertThat(mSwitchBar.isChecked()).isFalse();