Merge "Add setting flag for enabling voice activation apps in Special app access." into main
diff --git a/aconfig/settings_connecteddevice_flag_declarations.aconfig b/aconfig/settings_connecteddevice_flag_declarations.aconfig
index eda2de6..450fc0d 100644
--- a/aconfig/settings_connecteddevice_flag_declarations.aconfig
+++ b/aconfig/settings_connecteddevice_flag_declarations.aconfig
@@ -6,3 +6,10 @@
description: "Gates whether to enable subsequent pair Settings integration."
bug: "299405720"
}
+
+flag {
+ name: "enable_le_audio_sharing"
+ namespace: "pixel_cross_device_control"
+ description: "Gates whether to enable LE audio sharing"
+ bug: "305620450"
+}
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1ba0d37..a2bb40e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -259,6 +259,8 @@
<string name="connected_device_saved_title">Saved devices</string>
<!-- Title for fast pair device group [CHAR LIMIT=none]-->
<string name="connected_device_fast_pair_device_title">Associated with account</string>
+ <!-- Title for previously associated fast pair device group [CHAR LIMIT=none]-->
+ <string name="connected_device_previously_associated_fast_pair_device_title">Previously used with account</string>
<!-- Summary for preference to add a device [CHAR LIMIT=none]-->
<string name="connected_device_add_device_summary">Bluetooth will turn on to pair</string>
<!-- Title for other connection preferences [CHAR LIMIT=none]-->
diff --git a/res/xml/connected_devices.xml b/res/xml/connected_devices.xml
index 830ed87..0043a2d 100644
--- a/res/xml/connected_devices.xml
+++ b/res/xml/connected_devices.xml
@@ -63,7 +63,7 @@
<PreferenceCategory
android:key="fast_pair_devices"
- android:title="@string/connected_device_fast_pair_device_title"
+ android:title="@string/connected_device_previously_associated_fast_pair_device_title"
settings:controller=
"com.android.settings.connecteddevice.fastpair.FastPairDevicePreferenceController">
diff --git a/res/xml/fast_pair_devices.xml b/res/xml/fast_pair_devices.xml
index 7e72cd7..bb8381f 100644
--- a/res/xml/fast_pair_devices.xml
+++ b/res/xml/fast_pair_devices.xml
@@ -18,7 +18,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:title="@string/connected_device_fast_pair_device_title">
+ android:title="@string/connected_device_previously_associated_fast_pair_device_title">
<PreferenceCategory
android:key="fast_pair_device_list"
diff --git a/res/xml/network_provider_sims_list.xml b/res/xml/network_provider_sims_list.xml
index b21341e..cc7589c 100644
--- a/res/xml/network_provider_sims_list.xml
+++ b/res/xml/network_provider_sims_list.xml
@@ -24,7 +24,7 @@
android:title="@string/summary_placeholder"
android:layout="@layout/preference_category_no_label"
android:order="20"
- settings:controller="com.android.settings.network.NetworkProviderSimsCategoryController"/>
+ settings:controller="com.android.settings.network.NetworkProviderSimListController"/>
<com.android.settingslib.RestrictedPreference
android:key="add_sim"
diff --git a/res/xml/reset_dashboard_fragment.xml b/res/xml/reset_dashboard_fragment.xml
index cd1c671..ab253ac 100644
--- a/res/xml/reset_dashboard_fragment.xml
+++ b/res/xml/reset_dashboard_fragment.xml
@@ -32,6 +32,7 @@
<!-- Bluetooth and WiFi reset -->
<com.android.settings.spa.preference.ComposePreference
android:key="network_reset_bluetooth_wifi_pref"
+ android:title="@string/reset_bluetooth_wifi_title"
settings:controller="com.android.settings.network.BluetoothWiFiResetPreferenceController" />
<!-- Reset app preferences -->
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
index ce17418..a6dd732 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
@@ -30,6 +30,7 @@
import android.view.View;
import android.widget.Toast;
+import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ChooseLockSettingsHelper;
@@ -97,10 +98,19 @@
@Override
public void onNavigateNext(View view) {
// Ensure that all users are unlocked so that we can move their data
+ final LockPatternUtils lpu = new LockPatternUtils(this);
if (StorageManager.isFileEncrypted()) {
for (UserInfo user : getSystemService(UserManager.class).getUsers()) {
- if (!StorageManager.isUserKeyUnlocked(user.id)) {
- Log.d(TAG, "User " + user.id + " is currently locked; requesting unlock");
+ if (StorageManager.isUserKeyUnlocked(user.id)) {
+ continue;
+ }
+ if (!lpu.isSecure(user.id)) {
+ Log.d(TAG, "Unsecured user " + user.id + " is currently locked; attempting "
+ + "automatic unlock");
+ lpu.unlockUserKeyIfUnsecured(user.id);
+ } else {
+ Log.d(TAG, "Secured user " + user.id + " is currently locked; requesting "
+ + "manual unlock");
final CharSequence description = TextUtils.expandTemplate(
getText(R.string.storage_wizard_move_unlock), user.name);
final ChooseLockSettingsHelper.Builder builder =
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
index da96104..bf16ab0 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
@@ -33,6 +33,7 @@
import android.view.View;
import com.android.internal.util.Preconditions;
+import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.password.ChooseLockSettingsHelper;
@@ -79,10 +80,19 @@
@Override
public void onNavigateNext(View view) {
// Ensure that all users are unlocked so that we can move their data
+ final LockPatternUtils lpu = new LockPatternUtils(this);
if (StorageManager.isFileEncrypted()) {
for (UserInfo user : getSystemService(UserManager.class).getUsers()) {
- if (!StorageManager.isUserKeyUnlocked(user.id)) {
- Log.d(TAG, "User " + user.id + " is currently locked; requesting unlock");
+ if (StorageManager.isUserKeyUnlocked(user.id)) {
+ continue;
+ }
+ if (!lpu.isSecure(user.id)) {
+ Log.d(TAG, "Unsecured user " + user.id + " is currently locked; attempting "
+ + "automatic unlock");
+ lpu.unlockUserKeyIfUnsecured(user.id);
+ } else {
+ Log.d(TAG, "Secured user " + user.id + " is currently locked; requesting "
+ + "manual unlock");
final CharSequence description = TextUtils.expandTemplate(
getText(R.string.storage_wizard_move_unlock), user.name);
final ChooseLockSettingsHelper.Builder builder =
diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java
index b6a0ca3..ac1a1cb 100644
--- a/src/com/android/settings/display/BrightnessLevelPreferenceController.java
+++ b/src/com/android/settings/display/BrightnessLevelPreferenceController.java
@@ -14,6 +14,7 @@
package com.android.settings.display;
import static android.content.Intent.ACTION_SHOW_BRIGHTNESS_DIALOG;
+import static android.content.Intent.EXTRA_BRIGHTNESS_DIALOG_IS_FULL_WIDTH;
import static com.android.settingslib.display.BrightnessUtils.GAMMA_SPACE_MAX;
import static com.android.settingslib.display.BrightnessUtils.GAMMA_SPACE_MIN;
@@ -53,7 +54,6 @@
private static final String TAG = "BrightnessPrefCtrl";
private static final String KEY_BRIGHTNESS = "brightness";
private static final Uri BRIGHTNESS_ADJ_URI;
-
private final ContentResolver mContentResolver;
private final Handler mHandler = new Handler(Looper.getMainLooper());
private final DisplayManager mDisplayManager;
@@ -141,6 +141,7 @@
final Intent intent = new Intent(ACTION_SHOW_BRIGHTNESS_DIALOG);
intent.putExtra(SettingsBaseActivity.EXTRA_PAGE_TRANSITION_TYPE,
SettingsTransitionHelper.TransitionType.TRANSITION_NONE);
+ intent.putExtra(EXTRA_BRIGHTNESS_DIALOG_IS_FULL_WIDTH, true);
// Start activity in the same task and pass fade animations
final ActivityOptions options = ActivityOptions.makeCustomAnimation(mContext,
diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java
index 171c76b..3b958ae 100644
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -74,6 +74,7 @@
* Utils for battery operation
*/
public class BatteryUtils {
+ public static final int UID_ZERO = 0;
public static final int UID_NULL = -1;
public static final int SDK_NULL = -1;
/** Special UID value for data usage by removed apps. */
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java
index 971ada9..9d7b629 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java
@@ -283,7 +283,9 @@
/** Whether the current BatteryDiffEntry is uninstalled app or not. */
public boolean isUninstalledEntry() {
final String packageName = getPackageName();
- if (TextUtils.isEmpty(packageName) || isSystemEntry()) {
+ if (TextUtils.isEmpty(packageName) || isSystemEntry()
+ // Some special package UIDs could be 0. Those packages are not installed by users.
+ || mUid == BatteryUtils.UID_ZERO) {
return false;
}
diff --git a/src/com/android/settings/network/EraseEuiccDataController.java b/src/com/android/settings/network/EraseEuiccDataController.java
index 3dc3ab5..9892f0d 100644
--- a/src/com/android/settings/network/EraseEuiccDataController.java
+++ b/src/com/android/settings/network/EraseEuiccDataController.java
@@ -18,10 +18,12 @@
import android.content.Context;
import android.content.pm.PackageManager;
+import android.os.UserManager;
import android.text.TextUtils;
import androidx.preference.Preference;
+import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.network.telephony.MobileNetworkUtils;
@@ -33,8 +35,11 @@
public class EraseEuiccDataController extends BasePreferenceController {
private ResetDashboardFragment mHostFragment;
+ private final UserManager mUm;
+
public EraseEuiccDataController(Context context, String preferenceKey) {
super(context, preferenceKey);
+ mUm = context.getSystemService(UserManager.class);
}
public void setFragment(ResetDashboardFragment hostFragment) {
@@ -52,10 +57,12 @@
@Override
public int getAvailabilityStatus() {
- return SubscriptionUtil.isSimHardwareVisible(mContext) &&
- (!MobileNetworkUtils.isMobileNetworkUserRestricted(mContext)) &&
- mContext.getPackageManager().hasSystemFeature(
- PackageManager.FEATURE_TELEPHONY_EUICC) ? AVAILABLE_UNSEARCHABLE
- : UNSUPPORTED_ON_DEVICE;
+ boolean isAllowedUser = (mUm.isAdminUser() || Utils.isDemoUser(mContext))
+ && !MobileNetworkUtils.isMobileNetworkUserRestricted(mContext);
+ boolean hasEuiccFeature = mContext.getPackageManager().hasSystemFeature(
+ PackageManager.FEATURE_TELEPHONY_EUICC);
+ return SubscriptionUtil.isSimHardwareVisible(mContext)
+ && isAllowedUser
+ && hasEuiccFeature ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
}
}
diff --git a/src/com/android/settings/network/MobileNetworkListFragment.java b/src/com/android/settings/network/MobileNetworkListFragment.java
index d7d241a..3de05af 100644
--- a/src/com/android/settings/network/MobileNetworkListFragment.java
+++ b/src/com/android/settings/network/MobileNetworkListFragment.java
@@ -19,26 +19,19 @@
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.UserManager;
-import android.provider.SearchIndexableResource;
-import androidx.annotation.VisibleForTesting;
import androidx.recyclerview.widget.RecyclerView;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.search.SearchIndexable;
-import java.util.ArrayList;
-import java.util.List;
-
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
public class MobileNetworkListFragment extends DashboardFragment {
private static final String LOG_TAG = "NetworkListFragment";
- static final String KEY_PREFERENCE_CATEGORY_SIM = "provider_model_sim_category";
private static final String KEY_ADD_SIM = "add_sim";
@Override
@@ -68,34 +61,8 @@
return SettingsEnums.MOBILE_NETWORK_LIST;
}
- @Override
- protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
- final List<AbstractPreferenceController> controllers = new ArrayList<>();
- if (!SubscriptionUtil.isSimHardwareVisible(getContext())) {
- finish();
- return controllers;
- }
-
- NetworkProviderSimsCategoryController simCategoryPrefCtrl =
- new NetworkProviderSimsCategoryController(context, KEY_PREFERENCE_CATEGORY_SIM,
- getSettingsLifecycle(), this);
- controllers.add(simCategoryPrefCtrl);
-
- return controllers;
- }
-
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider() {
-
- @Override
- public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
- boolean enabled) {
- final ArrayList<SearchIndexableResource> result = new ArrayList<>();
- final SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.network_provider_sims_list;
- result.add(sir);
- return result;
- }
+ new BaseSearchIndexProvider(R.xml.network_provider_sims_list) {
@Override
protected boolean isPageSearchEnabled(Context context) {
diff --git a/src/com/android/settings/network/NetworkProviderSimListController.java b/src/com/android/settings/network/NetworkProviderSimListController.java
index 89cb73c..02b1980 100644
--- a/src/com/android/settings/network/NetworkProviderSimListController.java
+++ b/src/com/android/settings/network/NetworkProviderSimListController.java
@@ -16,69 +16,60 @@
package com.android.settings.network;
-import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
-import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
-
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.telephony.SubscriptionManager;
import android.util.ArrayMap;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.DefaultLifecycleObserver;
import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settingslib.RestrictedPreference;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-public class NetworkProviderSimListController extends AbstractPreferenceController implements
- LifecycleObserver, MobileNetworkRepository.MobileNetworkCallback,
+public class NetworkProviderSimListController extends BasePreferenceController implements
+ DefaultLifecycleObserver, MobileNetworkRepository.MobileNetworkCallback,
DefaultSubscriptionReceiver.DefaultSubscriptionListener {
- private static final String TAG = "NetworkProviderSimListCtrl";
- private static final String KEY_PREFERENCE_CATEGORY_SIM = "provider_model_sim_category";
- private static final String KEY_PREFERENCE_SIM = "provider_model_sim_list";
- private SubscriptionManager mSubscriptionManager;
+ private final SubscriptionManager mSubscriptionManager;
+ @Nullable
private PreferenceCategory mPreferenceCategory;
private Map<Integer, RestrictedPreference> mPreferences;
- private LifecycleOwner mLifecycleOwner;
- private MobileNetworkRepository mMobileNetworkRepository;
+ private final MobileNetworkRepository mMobileNetworkRepository;
private List<SubscriptionInfoEntity> mSubInfoEntityList = new ArrayList<>();
- private DefaultSubscriptionReceiver mDataSubscriptionChangedReceiver;
+ private final DefaultSubscriptionReceiver mDataSubscriptionChangedReceiver;
- public NetworkProviderSimListController(Context context, Lifecycle lifecycle,
- LifecycleOwner lifecycleOwner) {
- super(context);
+ public NetworkProviderSimListController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
mPreferences = new ArrayMap<>();
- mLifecycleOwner = lifecycleOwner;
mMobileNetworkRepository = MobileNetworkRepository.getInstance(context);
mDataSubscriptionChangedReceiver = new DefaultSubscriptionReceiver(context, this);
- lifecycle.addObserver(this);
}
- @OnLifecycleEvent(ON_RESUME)
- public void onResume() {
- mMobileNetworkRepository.addRegister(mLifecycleOwner, this,
+ @Override
+ public void onResume(@NonNull LifecycleOwner owner) {
+ mMobileNetworkRepository.addRegister(owner, this,
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
mMobileNetworkRepository.updateEntity();
mDataSubscriptionChangedReceiver.registerReceiver();
}
- @OnLifecycleEvent(ON_PAUSE)
- public void onPause() {
+ @Override
+ public void onPause(@NonNull LifecycleOwner owner) {
mMobileNetworkRepository.removeRegister(this);
mDataSubscriptionChangedReceiver.unRegisterReceiver();
}
@@ -86,7 +77,7 @@
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
- mPreferenceCategory = screen.findPreference(KEY_PREFERENCE_CATEGORY_SIM);
+ mPreferenceCategory = screen.findPreference(getPreferenceKey());
update();
}
@@ -154,31 +145,22 @@
}
@Override
- public boolean isAvailable() {
- if (!getAvailablePhysicalSubscriptions().isEmpty()) {
- return true;
- }
- return false;
+ public int getAvailabilityStatus() {
+ return getAvailablePhysicalSubscriptions().isEmpty()
+ ? CONDITIONALLY_UNAVAILABLE : AVAILABLE;
}
@VisibleForTesting
protected List<SubscriptionInfoEntity> getAvailablePhysicalSubscriptions() {
- List<SubscriptionInfoEntity> subList = new ArrayList<>();
- for (SubscriptionInfoEntity info : mSubInfoEntityList) {
- subList.add(info);
- }
- return subList;
- }
-
- @Override
- public String getPreferenceKey() {
- return KEY_PREFERENCE_SIM;
+ return new ArrayList<>(mSubInfoEntityList);
}
@Override
public void onAvailableSubInfoChanged(List<SubscriptionInfoEntity> subInfoEntityList) {
mSubInfoEntityList = subInfoEntityList;
- mPreferenceCategory.setVisible(isAvailable());
+ if (mPreferenceCategory != null) {
+ mPreferenceCategory.setVisible(isAvailable());
+ }
update();
}
diff --git a/src/com/android/settings/network/NetworkProviderSimsCategoryController.java b/src/com/android/settings/network/NetworkProviderSimsCategoryController.java
deleted file mode 100644
index f983e62..0000000
--- a/src/com/android/settings/network/NetworkProviderSimsCategoryController.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.network;
-
-import android.content.Context;
-import android.util.Log;
-
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.widget.PreferenceCategoryController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-
-public class NetworkProviderSimsCategoryController extends PreferenceCategoryController implements
- LifecycleObserver {
- private static final String LOG_TAG = "NetworkProviderSimsCategoryController";
- private static final String KEY_PREFERENCE_CATEGORY_SIM = "provider_model_sim_category";
- private NetworkProviderSimListController mNetworkProviderSimListController;
- private PreferenceCategory mPreferenceCategory;
-
- public NetworkProviderSimsCategoryController(Context context, String key, Lifecycle lifecycle,
- LifecycleOwner lifecycleOwner) {
- super(context, key);
- mNetworkProviderSimListController =
- new NetworkProviderSimListController(mContext, lifecycle, lifecycleOwner);
- }
-
- @Override
- public int getAvailabilityStatus() {
- if (mNetworkProviderSimListController == null
- || !mNetworkProviderSimListController.isAvailable()) {
- return CONDITIONALLY_UNAVAILABLE;
- } else {
- return AVAILABLE;
- }
- }
-
- @Override
- public void displayPreference(PreferenceScreen screen) {
- super.displayPreference(screen);
- mNetworkProviderSimListController.displayPreference(screen);
- mPreferenceCategory = screen.findPreference(KEY_PREFERENCE_CATEGORY_SIM);
- if (mPreferenceCategory == null) {
- Log.d(LOG_TAG, "displayPreference(), Can not find the category.");
- return;
- }
- mPreferenceCategory.setVisible(isAvailable());
- }
-}
diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
index 9fb80a5..2a355ad 100644
--- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
@@ -29,9 +29,12 @@
import android.util.Log;
import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.ListPreference;
+import androidx.preference.ListPreferenceDialogFragmentCompat;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -67,6 +70,7 @@
private SubscriptionsChangeListener mSubscriptionsListener;
private int mCallState = TelephonyManager.CALL_STATE_IDLE;
private PhoneCallStateTelephonyCallback mTelephonyCallback;
+ private FragmentManager mFragmentManager;
public EnabledNetworkModePreferenceController(Context context, String key) {
super(context, key);
@@ -151,7 +155,16 @@
listPreference.setEntryValues(mBuilder.getEntryValues());
listPreference.setValue(Integer.toString(mBuilder.getSelectedEntryValue()));
listPreference.setSummary(mBuilder.getSummary());
- listPreference.setEnabled(isCallStateIdle());
+ boolean listPreferenceEnabled = isCallStateIdle();
+ listPreference.setEnabled(listPreferenceEnabled);
+ if (!listPreferenceEnabled) {
+ // If dialog is already opened when ListPreference disabled, dismiss them.
+ for (Fragment fragment : mFragmentManager.getFragments()) {
+ if (fragment instanceof ListPreferenceDialogFragmentCompat) {
+ ((ListPreferenceDialogFragmentCompat) fragment).dismiss();
+ }
+ }
+ }
}
@Override
@@ -169,8 +182,9 @@
return false;
}
- void init(int subId) {
+ void init(int subId, FragmentManager fragmentManager) {
mSubId = subId;
+ mFragmentManager = fragmentManager;
mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
.createForSubscriptionId(mSubId);
mBuilder = new PreferenceEntriesBuilder(mContext, mSubId);
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
index 452ce49..afc1b7e 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
@@ -260,7 +260,7 @@
use(CarrierPreferenceController.class).init(mSubId);
use(DataUsagePreferenceController.class).init(mSubId);
use(PreferredNetworkModePreferenceController.class).init(mSubId);
- use(EnabledNetworkModePreferenceController.class).init(mSubId);
+ use(EnabledNetworkModePreferenceController.class).init(mSubId, getParentFragmentManager());
use(DataServiceSetupPreferenceController.class).init(mSubId);
use(Enable2gPreferenceController.class).init(mSubId);
use(CarrierWifiTogglePreferenceController.class).init(getLifecycle(), mSubId);
diff --git a/src/com/android/settings/notification/history/NotificationSbnViewHolder.java b/src/com/android/settings/notification/history/NotificationSbnViewHolder.java
index 1a703eb..df8aec4 100644
--- a/src/com/android/settings/notification/history/NotificationSbnViewHolder.java
+++ b/src/com/android/settings/notification/history/NotificationSbnViewHolder.java
@@ -16,6 +16,9 @@
package com.android.settings.notification.history;
+import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED;
+
+import android.app.ActivityOptions;
import android.app.PendingIntent;
import android.content.ActivityNotFoundException;
import android.content.Intent;
@@ -110,7 +113,10 @@
uid, pkg, instanceId, position);
if (pi != null && isPendingIntentValid) {
try {
- pi.send();
+ ActivityOptions options = ActivityOptions.makeBasic();
+ options.setPendingIntentBackgroundActivityStartMode(
+ MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
+ pi.send(options.toBundle());
} catch (PendingIntent.CanceledException e) {
Slog.e(TAG, "Could not launch", e);
}
diff --git a/src/com/android/settings/password/SetNewPasswordActivity.java b/src/com/android/settings/password/SetNewPasswordActivity.java
index c02e23b..bb3c6df 100644
--- a/src/com/android/settings/password/SetNewPasswordActivity.java
+++ b/src/com/android/settings/password/SetNewPasswordActivity.java
@@ -121,7 +121,9 @@
@Override
public void launchChooseLock(Bundle chooseLockFingerprintExtras) {
- Intent intent = new Intent(this, SetupChooseLockGeneric.class);
+ final boolean isInSetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());
+ Intent intent = isInSetupWizard ? new Intent(this, SetupChooseLockGeneric.class)
+ : new Intent(this, ChooseLockGeneric.class);
intent.setAction(mNewPasswordAction);
intent.putExtras(chooseLockFingerprintExtras);
if (mCallerAppName != null) {
diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java
index eade7cf..7c0769e 100644
--- a/src/com/android/settings/password/SetupChooseLockGeneric.java
+++ b/src/com/android/settings/password/SetupChooseLockGeneric.java
@@ -256,12 +256,6 @@
return InternalSetupChooseLockGenericFragment.class;
}
- @Override
- protected boolean isToolbarEnabled() {
- // Hide the action bar from this page.
- return false;
- }
-
public static class InternalSetupChooseLockGenericFragment
extends ChooseLockGenericFragment {
@Override
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncControllerTest.java
index 799f7fc..5d6fe31 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncControllerTest.java
@@ -92,6 +92,14 @@
}
@Test
+ public void refresh_noAssociations_checkPreferenceInvisible() {
+ mController.mAssociationId = DUMMY_ASSOCIATION_ID;
+ mController.refresh();
+
+ assertThat(mPermSyncPreference.isVisible()).isFalse();
+ }
+
+ @Test
public void refresh_permSyncNull_checkPreferenceInvisible() {
mPermissionSyncRequest = null;
when(mCompanionDeviceManager.getPermissionSyncRequest(ASSOCIATION_ID)).thenReturn(
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java
index 2cafadb..ae726b7 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java
@@ -62,6 +62,8 @@
private static final int UNINSTALLED_UID = 101;
private static final String PACKAGE_NAME = "com.android.testing";
private static final String UNINSTALLED_PACKAGE_NAME = "com.android.testing.uninstalled";
+ private static final String UID_ZERO_PACKAGE_NAME = "com.android.testing.uid.zero";
+
private Context mContext;
@@ -89,6 +91,9 @@
doReturn(BatteryUtils.UID_NULL)
.when(mMockPackageManager)
.getPackageUid(UNINSTALLED_PACKAGE_NAME, PackageManager.GET_META_DATA);
+ doReturn(BatteryUtils.UID_ZERO)
+ .when(mMockPackageManager)
+ .getPackageUid(UID_ZERO_PACKAGE_NAME, PackageManager.GET_META_DATA);
BatteryDiffEntry.clearCache();
}
@@ -443,6 +448,18 @@
}
@Test
+ public void testIsUninstalledEntry_uidZero_returnFalse() throws Exception {
+ final ContentValues values =
+ getContentValuesWithType(ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
+ values.put(BatteryHistEntry.KEY_UID, BatteryUtils.UID_ZERO);
+ values.put(BatteryHistEntry.KEY_PACKAGE_NAME, PACKAGE_NAME);
+ final BatteryDiffEntry entry = createBatteryDiffEntry(10, new BatteryHistEntry(values));
+
+ assertThat(entry.isSystemEntry()).isFalse();
+ assertThat(entry.isUninstalledEntry()).isFalse();
+ }
+
+ @Test
public void testIsUninstalledEntry_uninstalledApp_returnTrue() throws Exception {
doReturn(BatteryUtils.UID_NULL)
.when(mMockPackageManager)
diff --git a/tests/spa_unit/src/com/android/settings/spa/app/appinfo/InteractAcrossProfilesDetailsPreferenceTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/appinfo/InteractAcrossProfilesDetailsPreferenceTest.kt
index f4489c6..e123389 100644
--- a/tests/spa_unit/src/com/android/settings/spa/app/appinfo/InteractAcrossProfilesDetailsPreferenceTest.kt
+++ b/tests/spa_unit/src/com/android/settings/spa/app/appinfo/InteractAcrossProfilesDetailsPreferenceTest.kt
@@ -40,6 +40,7 @@
import com.android.settingslib.spaprivileged.framework.common.crossProfileApps
import org.junit.After
import org.junit.Before
+import org.junit.Ignore
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
@@ -116,6 +117,7 @@
composeTestRule.waitUntilExists(hasText(SUMMARY))
}
+ @Ignore
@Test
fun whenClick_startActivity() {
mockCanConfig(true)
diff --git a/tests/unit/src/com/android/settings/network/NetworkProviderSimListControllerTest.java b/tests/unit/src/com/android/settings/network/NetworkProviderSimListControllerTest.java
index c4e0f64..a98f83b 100644
--- a/tests/unit/src/com/android/settings/network/NetworkProviderSimListControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/NetworkProviderSimListControllerTest.java
@@ -16,19 +16,16 @@
package com.android.settings.network;
-import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-import static com.google.common.truth.Truth.assertThat;
-
import static androidx.lifecycle.Lifecycle.Event;
+import static com.google.common.truth.Truth.assertThat;
+
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.Context;
-import android.graphics.drawable.Drawable;
import android.os.Looper;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
@@ -36,18 +33,15 @@
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.LifecycleRegistry;
-import androidx.preference.PreferenceManager;
-import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.annotation.UiThreadTest;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.android.settings.R;
import com.android.settings.testutils.ResourcesUtils;
import com.android.settingslib.RestrictedPreference;
-import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity;
import org.junit.Before;
@@ -83,8 +77,6 @@
@Mock
private SubscriptionManager mSubscriptionManager;
@Mock
- private Lifecycle mLifecycle;
- @Mock
private LifecycleOwner mLifecycleOwner;
private LifecycleRegistry mLifecycleRegistry;
@@ -100,12 +92,10 @@
* Mock the NetworkProviderSimListController that allows one to set a default voice,
* SMS and mobile data subscription ID.
*/
- @SuppressWarnings("ClassCanBeStatic")
- private class MockNetworkProviderSimListController extends
- com.android.settings.network.NetworkProviderSimListController {
- public MockNetworkProviderSimListController(Context context, Lifecycle lifecycle,
- LifecycleOwner lifecycleOwner) {
- super(context, lifecycle, lifecycleOwner);
+ private static class MockNetworkProviderSimListController
+ extends NetworkProviderSimListController {
+ MockNetworkProviderSimListController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
}
private List<SubscriptionInfoEntity> mSubscriptionInfoEntity;
@@ -136,8 +126,7 @@
mPreference.setKey(KEY_PREFERENCE_SIM_LIST);
mPreferenceCategory = new PreferenceCategory(mContext);
mPreferenceCategory.setKey(KEY_PREFERENCE_CATEGORY_SIM);
- mController = new MockNetworkProviderSimListController(mContext, mLifecycle,
- mLifecycleOwner);
+ mController = new MockNetworkProviderSimListController(mContext, "test_key");
mLifecycleRegistry = new LifecycleRegistry(mLifecycleOwner);
when(mLifecycleOwner.getLifecycle()).thenReturn(mLifecycleRegistry);
}
diff --git a/tests/unit/src/com/android/settings/network/NetworkProviderSimsCategoryControllerTest.java b/tests/unit/src/com/android/settings/network/NetworkProviderSimsCategoryControllerTest.java
deleted file mode 100644
index dc17e91..0000000
--- a/tests/unit/src/com/android/settings/network/NetworkProviderSimsCategoryControllerTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (C) 2020 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.network;
-
-import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.os.Looper;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-
-import com.android.settings.testutils.ResourcesUtils;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-//TODO: Remove NetworkProviderSimsCategoryControllerTest once it is removed in the b/244769887.
-@RunWith(AndroidJUnit4.class)
-public class NetworkProviderSimsCategoryControllerTest {
-
- private static final String KEY_PREFERENCE_CATEGORY_SIM = "provider_model_sim_category";
- private static final String SUB_1 = "SUB_1";
- private static final String SUB_2 = "SUB_2";
- private static final int SUB_ID_1 = 1;
- private static final int SUB_ID_2 = 2;
-
- @Mock
- private Lifecycle mLifecycle;
- @Mock
- private SubscriptionInfo mSubscriptionInfo1;
- @Mock
- private SubscriptionInfo mSubscriptionInfo2;
-
- private Context mContext;
- private NetworkProviderSimsCategoryController mCategoryController;
- private PreferenceManager mPreferenceManager;
- private PreferenceScreen mPreferenceScreen;
- private PreferenceCategory mPreferenceCategory;
- private LifecycleOwner mLifecycleOwner;
-
- @Before
- public void setUp() throws Exception {
- MockitoAnnotations.initMocks(this);
- mContext = spy(ApplicationProvider.getApplicationContext());
-
- if (Looper.myLooper() == null) {
- Looper.prepare();
- }
-
- mLifecycleOwner = () -> mLifecycle;
- mPreferenceManager = new PreferenceManager(mContext);
- mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
- mPreferenceCategory = new PreferenceCategory(mContext);
- mPreferenceCategory.setKey(KEY_PREFERENCE_CATEGORY_SIM);
- mPreferenceScreen.addPreference(mPreferenceCategory);
-
- mCategoryController = new NetworkProviderSimsCategoryController(
- mContext, KEY_PREFERENCE_CATEGORY_SIM, mLifecycle, mLifecycleOwner);
- }
-
- @Ignore
- @Test
- public void getAvailabilityStatus_returnUnavailable() {
- SubscriptionUtil.setAvailableSubscriptionsForTesting(new ArrayList<>());
-
- assertThat(mCategoryController.getAvailabilityStatus()).isEqualTo(
- CONDITIONALLY_UNAVAILABLE);
- }
-
- @Ignore
- @Test
- public void displayPreference_isVisible() {
- setUpSubscriptionInfoForPhysicalSim(SUB_ID_1, SUB_1, mSubscriptionInfo1);
- SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubscriptionInfo1));
- mCategoryController.displayPreference(mPreferenceScreen);
-
- assertEquals(mPreferenceCategory.isVisible(), true);
- }
-
- @Ignore
- @Test
- public void updateState_setTitle_withTwoPhysicalSims_returnSims() {
- setUpSubscriptionInfoForPhysicalSim(SUB_ID_1, SUB_1, mSubscriptionInfo1);
- setUpSubscriptionInfoForPhysicalSim(SUB_ID_2, SUB_2, mSubscriptionInfo2);
- SubscriptionUtil.setAvailableSubscriptionsForTesting(
- Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
-
- mCategoryController.displayPreference(mPreferenceScreen);
- mCategoryController.updateState(mPreferenceCategory);
-
- assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(2);
- assertThat(mPreferenceCategory.getTitle()).isEqualTo(
- ResourcesUtils.getResourcesString(mContext, "provider_network_settings_title"));
- }
-
- @Ignore
- @Test
- public void updateState_setTitle_withOnePhysicalSim_returnSim() {
- setUpSubscriptionInfoForPhysicalSim(SUB_ID_1, SUB_1, mSubscriptionInfo1);
- SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubscriptionInfo1));
-
- mCategoryController.displayPreference(mPreferenceScreen);
- mCategoryController.updateState(mPreferenceCategory);
-
- assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1);
- assertThat(mPreferenceCategory.getTitle()).isEqualTo(
- ResourcesUtils.getResourcesString(mContext, "sim_category_title"));
- }
-
- private void setUpSubscriptionInfoForPhysicalSim(int subId, String displayName,
- SubscriptionInfo subscriptionInfo) {
- when(subscriptionInfo.isEmbedded()).thenReturn(false);
- when(subscriptionInfo.getSubscriptionId()).thenReturn(subId);
- when(subscriptionInfo.getDisplayName()).thenReturn(displayName);
- }
-
-}
diff --git a/tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
similarity index 96%
rename from tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java
rename to tests/unit/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
index 7f170b5..1b337ca 100644
--- a/tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2021 The Android Open Source Project
+ * Copyright (C) 2023 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.
@@ -46,6 +46,7 @@
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
+import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.ListPreference;
import androidx.preference.PreferenceManager;
@@ -64,6 +65,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import java.util.Collections;
+
@RunWith(AndroidJUnit4.class)
public class EnabledNetworkModePreferenceControllerTest {
private static final int SUB_ID = 2;
@@ -80,6 +83,8 @@
private CarrierConfigCache mCarrierConfigCache;
@Mock
private ServiceState mServiceState;
+ @Mock
+ private FragmentManager mFragmentManager;
private PersistableBundle mPersistableBundle;
private EnabledNetworkModePreferenceController mController;
@@ -111,7 +116,8 @@
mController = new EnabledNetworkModePreferenceController(mContext, KEY);
mockAllowedNetworkTypes(ALLOWED_ALL_NETWORK_TYPE);
mockAccessFamily(TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA);
- mController.init(SUB_ID);
+ when(mFragmentManager.getFragments()).thenReturn(Collections.emptyList());
+ mController.init(SUB_ID, mFragmentManager);
mPreference.setKey(mController.getPreferenceKey());
}
@@ -205,7 +211,7 @@
public void updateState_5gWorldPhone_GlobalHasNr() {
mockAllowedNetworkTypes(ALLOWED_ALL_NETWORK_TYPE);
mockAccessFamily(TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA);
- mController.init(SUB_ID);
+ mController.init(SUB_ID, mFragmentManager);
mPersistableBundle.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
mController.updateState(mPreference);
@@ -221,7 +227,7 @@
mockAllowedNetworkTypes(ALLOWED_ALL_NETWORK_TYPE);
mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA);
mockAccessFamily(TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA);
- mController.init(SUB_ID);
+ mController.init(SUB_ID, mFragmentManager);
// NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA = NR | LTE | RAF_TD_SCDMA | GSM | WCDMA
when(mTelephonyManager.getAllowedNetworkTypesForReason(
@@ -241,7 +247,7 @@
mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA);
mockAccessFamily(TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA);
mockAllowedNetworkTypes(DISABLED_5G_NETWORK_TYPE);
- mController.init(SUB_ID);
+ mController.init(SUB_ID, mFragmentManager);
// NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA = NR | LTE | RAF_TD_SCDMA | GSM | WCDMA
when(mTelephonyManager.getAllowedNetworkTypesForReason(
@@ -261,7 +267,7 @@
mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA);
mockAccessFamily(TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA);
mockAllowedNetworkTypes(DISABLED_5G_NETWORK_TYPE);
- mController.init(SUB_ID);
+ mController.init(SUB_ID, mFragmentManager);
// NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA = NR | LTE | RAF_TD_SCDMA | GSM | WCDMA
when(mTelephonyManager.getAllowedNetworkTypesForReason(
@@ -281,7 +287,7 @@
mockAccessFamily(TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA);
mockAllowedNetworkTypes(DISABLED_5G_NETWORK_TYPE);
- mController.init(SUB_ID);
+ mController.init(SUB_ID, mFragmentManager);
// NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA = LTE | CDMA | EVDO | GSM | WCDMA
when(mTelephonyManager.getAllowedNetworkTypesForReason(
@@ -304,7 +310,7 @@
public void updateState_GlobalDisAllowed5g_GlobalWithoutNR() {
mockAccessFamily(TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA);
mockAllowedNetworkTypes(DISABLED_5G_NETWORK_TYPE);
- mController.init(SUB_ID);
+ mController.init(SUB_ID, mFragmentManager);
mPersistableBundle.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
// NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA = NR | LTE | CDMA | EVDO | GSM | WCDMA
@@ -324,7 +330,7 @@
public void updateState_GlobalDisAllowed5g_SelectOnGlobal() {
mockAccessFamily(TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA);
mockAllowedNetworkTypes(DISABLED_5G_NETWORK_TYPE);
- mController.init(SUB_ID);
+ mController.init(SUB_ID, mFragmentManager);
mPersistableBundle.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
// NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA = NR | LTE | CDMA | EVDO | GSM | WCDMA
@@ -497,7 +503,7 @@
mPersistableBundle.putBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL, true);
mPersistableBundle.putBoolean(CarrierConfigManager.KEY_LTE_ENABLED_BOOL, true);
}
- mController.init(SUB_ID);
+ mController.init(SUB_ID, mFragmentManager);
}
private void mockAllowedNetworkTypes(long allowedNetworkType) {