Merge "Revert "Revert "Device do network scan after user rotates NetworkSelection page"""

2021-12-09 12:34:54 +00:00
parent 67b1ed67cf fa6a3613ab
commit 66db4b4641
8 changed files with 59 additions and 44 deletions
--- a/tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
@@ -122,10 +122,6 @@ public class NetworkSelectSettingsTest {

        public TargetClass(NetworkSelectSettingsTest env) {
            mTestEnv = env;
-
-            Bundle bundle = new Bundle();
-            bundle.putInt(Settings.EXTRA_SUB_ID, SUB_ID);
-            setArguments(bundle);
        }

        @Override
@@ -184,6 +180,11 @@ public class NetworkSelectSettingsTest {
        protected boolean enableAggregation(Context context) {
            return mTestEnv.mIsAggregationEnabled;
        }
+
+        @Override
+        protected int getSubId() {
+            return SUB_ID;
+        }
    }

    @Test