diff --git a/Android.bp b/Android.bp index 2d4c42c4f40..7ac1a5dbcf0 100644 --- a/Android.bp +++ b/Android.bp @@ -1,20 +1,3 @@ -package { - default_applicable_licenses: ["packages_apps_Settings_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "packages_apps_Settings_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - java_library { name: "settings-logtags", srcs: ["src/**/*.logtags"], diff --git a/protos/Android.bp b/protos/Android.bp index e09b941924d..5184218df63 100644 --- a/protos/Android.bp +++ b/protos/Android.bp @@ -1,12 +1,3 @@ -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "packages_apps_Settings_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["packages_apps_Settings_license"], -} - java_library_static { name: "settings-contextual-card-protos-lite", host_supported: true, @@ -23,4 +14,4 @@ java_library_static { type: "lite", }, srcs: ["settings_log_bridge.proto"], -} +} \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 9dd44efaf36..48350d6e101 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -12106,7 +12106,7 @@ Carrier - Settings version + Carrier settings version Calling diff --git a/res/xml/network_provider_calls_sms.xml b/res/xml/network_provider_calls_sms.xml index 0b390b5e1c6..2281f4883f0 100644 --- a/res/xml/network_provider_calls_sms.xml +++ b/res/xml/network_provider_calls_sms.xml @@ -51,12 +51,4 @@ settings:controller="com.android.settings.network.telephony.NetworkProviderBackupCallingPreferenceController" settings:allowDividerAbove="true" /> - - diff --git a/src/com/android/settings/AllInOneTetherSettings.java b/src/com/android/settings/AllInOneTetherSettings.java index 34d723f324e..d41c07bb6a3 100644 --- a/src/com/android/settings/AllInOneTetherSettings.java +++ b/src/com/android/settings/AllInOneTetherSettings.java @@ -16,8 +16,8 @@ package com.android.settings; -import static android.net.ConnectivityManager.ACTION_TETHER_STATE_CHANGED; import static android.net.ConnectivityManager.TETHERING_WIFI; +import static android.net.TetheringManager.ACTION_TETHER_STATE_CHANGED; import static android.net.wifi.WifiManager.WIFI_AP_STATE_CHANGED_ACTION; import android.app.settings.SettingsEnums; diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java index 48dd218bafc..6d98f360459 100644 --- a/src/com/android/settings/TetherSettings.java +++ b/src/com/android/settings/TetherSettings.java @@ -167,8 +167,8 @@ public class TetherSettings extends RestrictedSettingsFragment mEm = (EthernetManager) getSystemService(Context.ETHERNET_SERVICE); mTm = (TetheringManager) getSystemService(Context.TETHERING_SERVICE); - mUsbRegexs = mCm.getTetherableUsbRegexs(); - mBluetoothRegexs = mCm.getTetherableBluetoothRegexs(); + mUsbRegexs = mTm.getTetherableUsbRegexs(); + mBluetoothRegexs = mTm.getTetherableBluetoothRegexs(); mEthernetRegex = getContext().getResources().getString( com.android.internal.R.string.config_ethernet_iface_regex); @@ -251,14 +251,14 @@ public class TetherSettings extends RestrictedSettingsFragment public void onReceive(Context content, Intent intent) { String action = intent.getAction(); // TODO: stop using ACTION_TETHER_STATE_CHANGED and use mTetheringEventCallback instead. - if (action.equals(ConnectivityManager.ACTION_TETHER_STATE_CHANGED)) { + if (action.equals(TetheringManager.ACTION_TETHER_STATE_CHANGED)) { // TODO - this should understand the interface types ArrayList available = intent.getStringArrayListExtra( - ConnectivityManager.EXTRA_AVAILABLE_TETHER); + TetheringManager.EXTRA_AVAILABLE_TETHER); ArrayList active = intent.getStringArrayListExtra( - ConnectivityManager.EXTRA_ACTIVE_TETHER); + TetheringManager.EXTRA_ACTIVE_TETHER); ArrayList errored = intent.getStringArrayListExtra( - ConnectivityManager.EXTRA_ERRORED_TETHER); + TetheringManager.EXTRA_ERRORED_TETHER); updateState(available.toArray(new String[available.size()]), active.toArray(new String[active.size()]), errored.toArray(new String[errored.size()])); @@ -345,7 +345,7 @@ public class TetherSettings extends RestrictedSettingsFragment final Activity activity = getActivity(); mTetherChangeReceiver = new TetherChangeReceiver(); - IntentFilter filter = new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED); + IntentFilter filter = new IntentFilter(TetheringManager.ACTION_TETHER_STATE_CHANGED); final Intent intent = activity.registerReceiver(mTetherChangeReceiver, filter); filter = new IntentFilter(); @@ -367,11 +367,10 @@ public class TetherSettings extends RestrictedSettingsFragment } private void updateState() { - final ConnectivityManager cm = - (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); - final String[] available = cm.getTetherableIfaces(); - final String[] tethered = cm.getTetheredIfaces(); - final String[] errored = cm.getTetheringErroredIfaces(); + final TetheringManager tm = getContext().getSystemService(TetheringManager.class); + final String[] available = tm.getTetherableIfaces(); + final String[] tethered = tm.getTetheredIfaces(); + final String[] errored = tm.getTetheringErroredIfaces(); updateState(available, tethered, errored); } @@ -391,7 +390,7 @@ public class TetherSettings extends RestrictedSettingsFragment for (String regex : mUsbRegexs) { if (s.matches(regex)) { if (usbError == ConnectivityManager.TETHER_ERROR_NO_ERROR) { - usbError = mCm.getLastTetherError(s); + usbError = mTm.getLastTetherError(s); } } } @@ -558,8 +557,8 @@ public class TetherSettings extends RestrictedSettingsFragment @Override public List getNonIndexableKeys(Context context) { final List keys = super.getNonIndexableKeys(context); - final ConnectivityManager cm = - context.getSystemService(ConnectivityManager.class); + final TetheringManager tm = + context.getSystemService(TetheringManager.class); if (!TetherUtil.isTetherAvailable(context)) { keys.add(KEY_TETHER_PREFS_SCREEN); @@ -567,13 +566,13 @@ public class TetherSettings extends RestrictedSettingsFragment } final boolean usbAvailable = - cm.getTetherableUsbRegexs().length != 0; + tm.getTetherableUsbRegexs().length != 0; if (!usbAvailable || Utils.isMonkeyRunning()) { keys.add(KEY_USB_TETHER_SETTINGS); } final boolean bluetoothAvailable = - cm.getTetherableBluetoothRegexs().length != 0; + tm.getTetherableBluetoothRegexs().length != 0; if (!bluetoothAvailable) { keys.add(KEY_ENABLE_BLUETOOTH_TETHERING); } diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java index dcaeffe07d8..aacf41fbbc9 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java @@ -297,6 +297,7 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll preference.setEnabled(false); preference.setKey(KEY_BOTTOM_PREFERENCE); preference.setOrder(ORDINAL); + preference.setSelectable(false); mProfilesContainer.addPreference(preference); } } diff --git a/src/com/android/settings/datausage/OWNERS b/src/com/android/settings/datausage/OWNERS index 49449ec2ee0..1ec66b3e4dc 100644 --- a/src/com/android/settings/datausage/OWNERS +++ b/src/com/android/settings/datausage/OWNERS @@ -1,5 +1,6 @@ # Default reviewers for this and subdirectories. andychou@google.com -goldmanj@google.com bonianchen@google.com +goldmanj@google.com +songferngwang@google.com wengsu@google.com diff --git a/src/com/android/settings/deviceinfo/OWNERS b/src/com/android/settings/deviceinfo/OWNERS index e6569f4ddbf..68cee361fe7 100644 --- a/src/com/android/settings/deviceinfo/OWNERS +++ b/src/com/android/settings/deviceinfo/OWNERS @@ -1,7 +1,8 @@ # Default reviewers for this and subdirectories. +allenwtsu@google.com andychou@google.com bonianchen@google.com goldmanj@google.com -allenwtsu@google.com +songferngwang@google.com # Emergency approvers in case the above are not available diff --git a/src/com/android/settings/network/BluetoothTetherPreferenceController.java b/src/com/android/settings/network/BluetoothTetherPreferenceController.java index ab507da2f9e..96d39e37c33 100644 --- a/src/com/android/settings/network/BluetoothTetherPreferenceController.java +++ b/src/com/android/settings/network/BluetoothTetherPreferenceController.java @@ -70,7 +70,7 @@ public final class BluetoothTetherPreferenceController extends TetherBasePrefere @Override public boolean shouldShow() { - final String[] bluetoothRegexs = mCm.getTetherableBluetoothRegexs(); + final String[] bluetoothRegexs = mTm.getTetherableBluetoothRegexs(); return bluetoothRegexs != null && bluetoothRegexs.length != 0; } diff --git a/src/com/android/settings/network/EthernetTetherPreferenceController.java b/src/com/android/settings/network/EthernetTetherPreferenceController.java index 19c410d8672..06cd6a7feed 100644 --- a/src/com/android/settings/network/EthernetTetherPreferenceController.java +++ b/src/com/android/settings/network/EthernetTetherPreferenceController.java @@ -65,7 +65,7 @@ public final class EthernetTetherPreferenceController extends TetherBasePreferen @Override public boolean shouldEnable() { - String[] available = mCm.getTetherableIfaces(); + String[] available = mTm.getTetherableIfaces(); for (String s : available) { if (s.matches(mEthernetRegex)) { return true; diff --git a/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java b/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java index a811978a94f..fcb8345e7c1 100644 --- a/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java +++ b/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java @@ -27,7 +27,6 @@ import com.android.settings.Utils; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.network.telephony.CallsDefaultSubscriptionController; import com.android.settings.network.telephony.NetworkProviderBackupCallingPreferenceController; -import com.android.settings.network.telephony.NetworkProviderWfcFooterPreferenceController; import com.android.settings.network.telephony.NetworkProviderWifiCallingPreferenceController; import com.android.settings.network.telephony.SmsDefaultSubscriptionController; import com.android.settings.search.BaseSearchIndexProvider; @@ -46,8 +45,6 @@ public class NetworkProviderCallsSmsFragment extends DashboardFragment { @VisibleForTesting static final String KEY_PREFERENCE_CATEGORY_BACKUP_CALLING = "provider_model_backup_calling_category"; - static final String KEY_PREFERENCE_CATEGORY_WFC_FOOTER = - "provider_model_calls_sms_footer"; @VisibleForTesting static final String KEY_PREFERENCE_CALLS= "provider_model_calls_preference"; @@ -74,12 +71,6 @@ public class NetworkProviderCallsSmsFragment extends DashboardFragment { backupCallingPrefCtrl.init(getSettingsLifecycle()); controllers.add(backupCallingPrefCtrl); - NetworkProviderWfcFooterPreferenceController wfcFooterPreferenceController = - new NetworkProviderWfcFooterPreferenceController(context, - KEY_PREFERENCE_CATEGORY_WFC_FOOTER); - wfcFooterPreferenceController.init(getSettingsLifecycle()); - controllers.add(wfcFooterPreferenceController); - return controllers; } diff --git a/src/com/android/settings/network/TetherBasePreferenceController.java b/src/com/android/settings/network/TetherBasePreferenceController.java index 1919770d57d..822aa726fee 100644 --- a/src/com/android/settings/network/TetherBasePreferenceController.java +++ b/src/com/android/settings/network/TetherBasePreferenceController.java @@ -17,7 +17,7 @@ package com.android.settings.network; import android.content.Context; -import android.net.ConnectivityManager; +import android.net.TetheringManager; import androidx.lifecycle.Lifecycle; import androidx.lifecycle.LifecycleObserver; @@ -33,7 +33,7 @@ public abstract class TetherBasePreferenceController extends TogglePreferenceCon TetherEnabler.OnTetherStateUpdateListener { private static final String TAG = "TetherBasePreferenceController"; - final ConnectivityManager mCm; + final TetheringManager mTm; private final DataSaverBackend mDataSaverBackend; private TetherEnabler mTetherEnabler; @@ -43,7 +43,7 @@ public abstract class TetherBasePreferenceController extends TogglePreferenceCon TetherBasePreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); - mCm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); + mTm = context.getSystemService(TetheringManager.class); mDataSaverBackend = new DataSaverBackend(context); mDataSaverEnabled = mDataSaverBackend.isDataSaverEnabled(); } diff --git a/src/com/android/settings/network/TetherEnabler.java b/src/com/android/settings/network/TetherEnabler.java index 6ab4cb22f7c..ef031f69639 100644 --- a/src/com/android/settings/network/TetherEnabler.java +++ b/src/com/android/settings/network/TetherEnabler.java @@ -147,7 +147,7 @@ public class TetherEnabler implements SwitchWidgetController.OnSwitchChangeListe mSwitchWidgetController.setListener(this); mSwitchWidgetController.startListening(); final IntentFilter filter = new IntentFilter( - ConnectivityManager.ACTION_TETHER_STATE_CHANGED); + TetheringManager.ACTION_TETHER_STATE_CHANGED); filter.addAction(WifiManager.WIFI_AP_STATE_CHANGED_ACTION); filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED); mContext.registerReceiver(mTetherChangeReceiver, filter); @@ -222,7 +222,7 @@ public class TetherEnabler implements SwitchWidgetController.OnSwitchChangeListe int getTetheringState(@Nullable String[] tethered) { int tetherState = TETHERING_OFF; if (tethered == null) { - tethered = mConnectivityManager.getTetheredIfaces(); + tethered = mTetheringManager.getTetheredIfaces(); } if (mWifiManager.isWifiApEnabled()) { @@ -239,7 +239,7 @@ public class TetherEnabler implements SwitchWidgetController.OnSwitchChangeListe } } - String[] usbRegexs = mConnectivityManager.getTetherableUsbRegexs(); + String[] usbRegexs = mTetheringManager.getTetherableUsbRegexs(); for (String s : tethered) { for (String regex : usbRegexs) { if (s.matches(regex)) { diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java index 24095442161..8df0ac1f7fd 100644 --- a/src/com/android/settings/network/TetherPreferenceController.java +++ b/src/com/android/settings/network/TetherPreferenceController.java @@ -28,6 +28,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.database.ContentObserver; import android.net.ConnectivityManager; +import android.net.TetheringManager; import android.net.Uri; import android.os.Bundle; import android.os.Handler; @@ -62,6 +63,7 @@ public class TetherPreferenceController extends AbstractPreferenceController imp private final AtomicReference mBluetoothPan; private final ConnectivityManager mConnectivityManager; private final BluetoothAdapter mBluetoothAdapter; + private final TetheringManager mTetheringManager; @VisibleForTesting final BluetoothProfile.ServiceListener mBtProfileServiceListener = new android.bluetooth.BluetoothProfile.ServiceListener() { @@ -86,6 +88,7 @@ public class TetherPreferenceController extends AbstractPreferenceController imp mBluetoothPan = new AtomicReference<>(); mConnectivityManager = null; mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); + mTetheringManager = null; } public TetherPreferenceController(Context context, Lifecycle lifecycle) { @@ -95,6 +98,7 @@ public class TetherPreferenceController extends AbstractPreferenceController imp mConnectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); + mTetheringManager = context.getSystemService(TetheringManager.class); if (lifecycle != null) { lifecycle.addObserver(this); } @@ -144,7 +148,7 @@ public class TetherPreferenceController extends AbstractPreferenceController imp mTetherReceiver = new TetherBroadcastReceiver(); } mContext.registerReceiver( - mTetherReceiver, new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED)); + mTetherReceiver, new IntentFilter(TetheringManager.ACTION_TETHER_STATE_CHANGED)); mContext.getContentResolver() .registerContentObserver(mAirplaneModeObserver.uri, false, mAirplaneModeObserver); } @@ -178,9 +182,9 @@ public class TetherPreferenceController extends AbstractPreferenceController imp // Preference is not ready yet. return; } - String[] allTethered = mConnectivityManager.getTetheredIfaces(); - String[] wifiTetherRegex = mConnectivityManager.getTetherableWifiRegexs(); - String[] bluetoothRegex = mConnectivityManager.getTetherableBluetoothRegexs(); + String[] allTethered = mTetheringManager.getTetheredIfaces(); + String[] wifiTetherRegex = mTetheringManager.getTetherableWifiRegexs(); + String[] bluetoothRegex = mTetheringManager.getTetherableBluetoothRegexs(); boolean hotSpotOn = false; boolean tetherOn = false; @@ -211,7 +215,7 @@ public class TetherPreferenceController extends AbstractPreferenceController imp && bluetoothRegex != null && bluetoothRegex.length > 0 && mBluetoothAdapter != null && mBluetoothAdapter.getState() == BluetoothAdapter.STATE_ON) { - // Check bluetooth state. It's not included in mConnectivityManager.getTetheredIfaces. + // Check bluetooth state. It's not included in mTetheringManager.getTetheredIfaces. final BluetoothPan pan = mBluetoothPan.get(); tetherOn = pan != null && pan.isTetheringOn(); } diff --git a/src/com/android/settings/network/UsbTetherPreferenceController.java b/src/com/android/settings/network/UsbTetherPreferenceController.java index 7cf1ddfcf98..7a5cc21f0a3 100644 --- a/src/com/android/settings/network/UsbTetherPreferenceController.java +++ b/src/com/android/settings/network/UsbTetherPreferenceController.java @@ -68,7 +68,7 @@ public final class UsbTetherPreferenceController extends TetherBasePreferenceCon @Override public boolean shouldShow() { - String[] usbRegexs = mCm.getTetherableUsbRegexs(); + String[] usbRegexs = mTm.getTetherableUsbRegexs(); return usbRegexs != null && usbRegexs.length != 0 && !Utils.isMonkeyRunning(); } diff --git a/src/com/android/settings/network/WifiTetherDisablePreferenceController.java b/src/com/android/settings/network/WifiTetherDisablePreferenceController.java index 38e831bd38d..783f78fb9d1 100644 --- a/src/com/android/settings/network/WifiTetherDisablePreferenceController.java +++ b/src/com/android/settings/network/WifiTetherDisablePreferenceController.java @@ -68,7 +68,7 @@ public final class WifiTetherDisablePreferenceController extends TetherBasePrefe @Override public boolean shouldShow() { - final String[] wifiRegexs = mCm.getTetherableWifiRegexs(); + final String[] wifiRegexs = mTm.getTetherableWifiRegexs(); return wifiRegexs != null && wifiRegexs.length != 0 && !Utils.isMonkeyRunning() && getTetheringStateOfOtherInterfaces() != TetherEnabler.TETHERING_OFF; } diff --git a/src/com/android/settings/network/telephony/NetworkProviderWfcFooterPreferenceController.java b/src/com/android/settings/network/telephony/NetworkProviderWfcFooterPreferenceController.java deleted file mode 100644 index 166094d267f..00000000000 --- a/src/com/android/settings/network/telephony/NetworkProviderWfcFooterPreferenceController.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.android.settings.network.telephony; - -import android.content.Context; -import android.content.Intent; -import android.telephony.SubscriptionInfo; -import android.telephony.SubscriptionManager; - -import androidx.preference.Preference; - -import com.android.settings.R; -import com.android.settings.core.BasePreferenceController; -import com.android.settings.network.SubscriptionUtil; -import com.android.settings.utils.AnnotationSpan; -import com.android.settingslib.HelpUtils; -import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.core.lifecycle.LifecycleObserver; - -import java.util.List; - -public class NetworkProviderWfcFooterPreferenceController extends BasePreferenceController - implements LifecycleObserver { - - /** - * Constructor. - */ - public NetworkProviderWfcFooterPreferenceController(Context context, String preferenceKey) { - super(context, preferenceKey); - } - - /** - * Initialize the binding with Lifecycle - * - * @param lifecycle Lifecycle of UI which owns this Preference - */ - public void init(Lifecycle lifecycle) { - lifecycle.addObserver(this); - } - - @Override - public void updateState(Preference preference) { - super.updateState(preference); - - if (preference != null) { - // This is necessary to ensure that setting the title to the spannable string returned - // by getFooterText will be accepted. Internally, setTitle does an equality check on - // the spannable string being set to the text already set on the preference. That - // equality check apparently only takes into account the raw text and not and spannables - // that are part of the text. So we clear the title before applying the spannable - // footer to ensure it is accepted. - preference.setTitle(""); - preference.setTitle(getFooterText()); - } - } - - private CharSequence getFooterText() { - final Intent helpIntent = HelpUtils.getHelpIntent(mContext, - mContext.getString(R.string.help_uri_wifi_calling), - mContext.getClass().getName()); - final AnnotationSpan.LinkInfo linkInfo = new AnnotationSpan.LinkInfo(mContext, - "url", helpIntent); - - return AnnotationSpan.linkify(mContext.getText(R.string.calls_sms_footnote), linkInfo); - } - - @Override - public int getAvailabilityStatus() { - final SubscriptionManager subscriptionManager = - mContext.getSystemService(SubscriptionManager.class); - final List subscriptions = SubscriptionUtil.getActiveSubscriptions( - subscriptionManager); - if (subscriptions.size() >= 1) { - return AVAILABLE; - } else { - return CONDITIONALLY_UNAVAILABLE; - } - } -} diff --git a/src/com/android/settings/sim/OWNERS b/src/com/android/settings/sim/OWNERS index e6569f4ddbf..68cee361fe7 100644 --- a/src/com/android/settings/sim/OWNERS +++ b/src/com/android/settings/sim/OWNERS @@ -1,7 +1,8 @@ # Default reviewers for this and subdirectories. +allenwtsu@google.com andychou@google.com bonianchen@google.com goldmanj@google.com -allenwtsu@google.com +songferngwang@google.com # Emergency approvers in case the above are not available diff --git a/src/com/android/settings/wifi/OWNERS b/src/com/android/settings/wifi/OWNERS index 5e20fd5a1d4..d15cd78e493 100644 --- a/src/com/android/settings/wifi/OWNERS +++ b/src/com/android/settings/wifi/OWNERS @@ -2,4 +2,5 @@ andychou@google.com arcwang@google.com goldmanj@google.com +songferngwang@google.com wengsu@google.com diff --git a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java index 7ba02168c70..46da097959c 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java @@ -17,7 +17,7 @@ package com.android.settings.wifi.tether; import android.content.Context; -import android.net.ConnectivityManager; +import android.net.TetheringManager; import android.net.wifi.WifiManager; import androidx.preference.Preference; @@ -36,7 +36,7 @@ public abstract class WifiTetherBasePreferenceController extends AbstractPrefere protected final WifiManager mWifiManager; protected final String[] mWifiRegexs; - protected final ConnectivityManager mCm; + protected final TetheringManager mTm; protected final OnTetherConfigUpdateListener mListener; protected Preference mPreference; @@ -46,8 +46,8 @@ public abstract class WifiTetherBasePreferenceController extends AbstractPrefere super(context); mListener = listener; mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); - mCm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); - mWifiRegexs = mCm.getTetherableWifiRegexs(); + mTm = (TetheringManager) context.getSystemService(Context.TETHERING_SERVICE); + mWifiRegexs = mTm.getTetherableWifiRegexs(); } @Override diff --git a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java index 5049002d7ed..70b6a45eb52 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java @@ -18,7 +18,7 @@ package com.android.settings.wifi.tether; import android.annotation.NonNull; import android.content.Context; -import android.net.ConnectivityManager; +import android.net.TetheringManager; import android.net.wifi.SoftApConfiguration; import android.net.wifi.WifiClient; import android.net.wifi.WifiManager; @@ -44,7 +44,7 @@ public class WifiTetherPreferenceController extends AbstractPreferenceController private static final String WIFI_TETHER_SETTINGS = "wifi_tether"; - private final ConnectivityManager mConnectivityManager; + private final TetheringManager mTetheringManager; private final String[] mWifiRegexs; private final WifiManager mWifiManager; private final Lifecycle mLifecycle; @@ -62,10 +62,9 @@ public class WifiTetherPreferenceController extends AbstractPreferenceController WifiTetherPreferenceController(Context context, Lifecycle lifecycle, boolean initSoftApManager) { super(context); - mConnectivityManager = - (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); + mTetheringManager = context.getSystemService(TetheringManager.class); mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); - mWifiRegexs = mConnectivityManager.getTetherableWifiRegexs(); + mWifiRegexs = mTetheringManager.getTetherableWifiRegexs(); mLifecycle = lifecycle; if (lifecycle != null) { lifecycle.addObserver(this); diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java index 0529b7a5182..939f0778943 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java @@ -16,7 +16,7 @@ package com.android.settings.wifi.tether; -import static android.net.ConnectivityManager.ACTION_TETHER_STATE_CHANGED; +import static android.net.TetheringManager.ACTION_TETHER_STATE_CHANGED; import static android.net.wifi.WifiManager.WIFI_AP_STATE_CHANGED_ACTION; import android.app.settings.SettingsEnums; diff --git a/tests/anomaly-tester/Android.bp b/tests/anomaly-tester/Android.bp index c897d75fe37..29181af61ed 100644 --- a/tests/anomaly-tester/Android.bp +++ b/tests/anomaly-tester/Android.bp @@ -1,12 +1,3 @@ -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "packages_apps_Settings_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["packages_apps_Settings_license"], -} - android_test { name: "AnomalyTester", diff --git a/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp b/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp index 1ec108a53bc..dacd32aa163 100644 --- a/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp +++ b/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp @@ -12,15 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "packages_apps_Settings_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["packages_apps_Settings_license"], -} - android_test { name: "InstrumentedEntitlementApp", srcs: ["src/**/*.java"], diff --git a/tests/perftests/Android.bp b/tests/perftests/Android.bp index c03c57f3742..1ba5d9c432a 100644 --- a/tests/perftests/Android.bp +++ b/tests/perftests/Android.bp @@ -1,12 +1,3 @@ -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "packages_apps_Settings_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["packages_apps_Settings_license"], -} - android_test { name: "SettingsPerfTests", diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp index 337bad73057..af4f0d62947 100644 --- a/tests/robotests/Android.bp +++ b/tests/robotests/Android.bp @@ -2,15 +2,6 @@ // Build SettingsRoboTestStub.apk which includes test-only resources.# //############################################################ -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "packages_apps_Settings_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["packages_apps_Settings_license"], -} - android_app { name: "SettingsRoboTestStub", defaults: [ diff --git a/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java b/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java index c9a8c449d14..cd336633e73 100644 --- a/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java +++ b/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java @@ -33,6 +33,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.net.ConnectivityManager; +import android.net.TetheringManager; import android.net.wifi.SoftApConfiguration; import android.os.UserHandle; import android.os.UserManager; @@ -74,6 +75,8 @@ public class AllInOneTetherSettingsTest { @Mock private ConnectivityManager mConnectivityManager; @Mock + private TetheringManager mTetheringManager; + @Mock private UserManager mUserManager; @Mock private WifiTetherSecurityPreferenceController mSecurityPreferenceController; @@ -89,10 +92,12 @@ public class AllInOneTetherSettingsTest { MockitoAnnotations.initMocks(this); doReturn(mConnectivityManager) .when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE); - doReturn(WIFI_REGEXS).when(mConnectivityManager).getTetherableWifiRegexs(); - doReturn(USB_REGEXS).when(mConnectivityManager).getTetherableUsbRegexs(); - doReturn(BT_REGEXS).when(mConnectivityManager).getTetherableBluetoothRegexs(); - doReturn(ETHERNET_REGEXS).when(mConnectivityManager).getTetherableIfaces(); + doReturn(mTetheringManager) + .when(mContext).getSystemService(Context.TETHERING_SERVICE); + doReturn(WIFI_REGEXS).when(mTetheringManager).getTetherableWifiRegexs(); + doReturn(USB_REGEXS).when(mTetheringManager).getTetherableUsbRegexs(); + doReturn(BT_REGEXS).when(mTetheringManager).getTetherableBluetoothRegexs(); + doReturn(ETHERNET_REGEXS).when(mTetheringManager).getTetherableIfaces(); doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE); // Assume the feature is enabled for most test cases. FeatureFlagUtils.setEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE, true); diff --git a/tests/robotests/src/com/android/settings/TetherSettingsTest.java b/tests/robotests/src/com/android/settings/TetherSettingsTest.java index f217e21da99..0948cfad24e 100644 --- a/tests/robotests/src/com/android/settings/TetherSettingsTest.java +++ b/tests/robotests/src/com/android/settings/TetherSettingsTest.java @@ -34,6 +34,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.net.ConnectivityManager; +import android.net.TetheringManager; import android.net.wifi.WifiManager; import android.os.UserHandle; import android.os.UserManager; @@ -66,6 +67,8 @@ public class TetherSettingsTest { private ConnectivityManager mConnectivityManager; @Mock private UserManager mUserManager; + @Mock + private TetheringManager mTetheringManager; @Before public void setUp() { @@ -76,11 +79,13 @@ public class TetherSettingsTest { .when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE); doReturn(mUserManager) .when(mContext).getSystemService(Context.USER_SERVICE); + doReturn(mTetheringManager) + .when(mContext).getSystemService(Context.TETHERING_SERVICE); setupIsTetherAvailable(true); - when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[0]); - when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]); + when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(new String[0]); + when(mTetheringManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]); } @Test @@ -110,7 +115,7 @@ public class TetherSettingsTest { @Test public void testTetherNonIndexableKeys_usbNotAvailable_usbKeyReturned() { - when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[0]); + when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(new String[0]); final List niks = TetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext); @@ -123,7 +128,7 @@ public class TetherSettingsTest { FeatureFlagUtils.setEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE, false); // We can ignore the condition of Utils.isMonkeyRunning() // In normal case, monkey and robotest should not execute at the same time - when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[]{"fakeRegex"}); + when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(new String[]{"fakeRegex"}); final List niks = TetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext); @@ -133,7 +138,7 @@ public class TetherSettingsTest { @Test public void testTetherNonIndexableKeys_bluetoothNotAvailable_bluetoothKeyReturned() { - when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]); + when(mTetheringManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]); final List niks = TetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext); @@ -144,7 +149,7 @@ public class TetherSettingsTest { @Test public void testTetherNonIndexableKeys_bluetoothAvailable_bluetoothKeyNotReturned() { FeatureFlagUtils.setEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE, false); - when(mConnectivityManager.getTetherableBluetoothRegexs()) + when(mTetheringManager.getTetherableBluetoothRegexs()) .thenReturn(new String[]{"fakeRegex"}); final List niks = @@ -235,11 +240,11 @@ public class TetherSettingsTest { } private void updateOnlyBluetoothState(TetherSettings tetherSettings) { - doReturn(mConnectivityManager).when(tetherSettings) - .getSystemService(Context.CONNECTIVITY_SERVICE); - when(mConnectivityManager.getTetherableIfaces()).thenReturn(new String[0]); - when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[0]); - when(mConnectivityManager.getTetheringErroredIfaces()).thenReturn(new String[0]); + doReturn(mTetheringManager).when(tetherSettings) + .getSystemService(Context.TETHERING_SERVICE); + when(mTetheringManager.getTetherableIfaces()).thenReturn(new String[0]); + when(mTetheringManager.getTetheredIfaces()).thenReturn(new String[0]); + when(mTetheringManager.getTetheringErroredIfaces()).thenReturn(new String[0]); doNothing().when(tetherSettings).updateUsbState(any(String[].class), any(String[].class), any(String[].class)); doNothing().when(tetherSettings).updateEthernetState(any(String[].class), diff --git a/tests/robotests/src/com/android/settings/network/BluetoothTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/BluetoothTetherPreferenceControllerTest.java index 3b1f00818ec..d3a3129f4a2 100644 --- a/tests/robotests/src/com/android/settings/network/BluetoothTetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/BluetoothTetherPreferenceControllerTest.java @@ -26,7 +26,6 @@ import static org.mockito.Mockito.when; import android.bluetooth.BluetoothAdapter; import android.content.Context; -import android.net.ConnectivityManager; import android.net.TetheringManager; import androidx.preference.SwitchPreference; @@ -44,7 +43,7 @@ import org.robolectric.util.ReflectionHelpers; public class BluetoothTetherPreferenceControllerTest { @Mock - private ConnectivityManager mConnectivityManager; + private TetheringManager mTetheringManager; @Mock private TetherEnabler mTetherEnabler; @@ -58,9 +57,8 @@ public class BluetoothTetherPreferenceControllerTest { mContext = spy(ApplicationProvider.getApplicationContext()); mSwitchPreference = spy(SwitchPreference.class); - when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn( - mConnectivityManager); - when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[] {""}); + when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager); + when(mTetheringManager.getTetherableBluetoothRegexs()).thenReturn(new String[] {""}); mController = new BluetoothTetherPreferenceController(mContext, "BLUETOOTH"); mController.setTetherEnabler(mTetherEnabler); ReflectionHelpers.setField(mController, "mPreference", mSwitchPreference); @@ -98,7 +96,7 @@ public class BluetoothTetherPreferenceControllerTest { @Test public void shouldShow_noBluetoothTetherable() { - when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]); + when(mTetheringManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]); assertThat(mController.isAvailable()).isFalse(); } diff --git a/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java index d2e53b85ace..b269b05b82b 100644 --- a/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.net.ConnectivityManager; import android.net.EthernetManager; import android.net.TetheringManager; @@ -49,7 +48,7 @@ public class EthernetTetherPreferenceControllerTest { public MockitoRule mocks = MockitoJUnit.rule(); @Mock - private ConnectivityManager mConnectivityManager; + private TetheringManager mTetheringManager; @Mock private EthernetManager mEthernetManager; @Mock @@ -64,9 +63,8 @@ public class EthernetTetherPreferenceControllerTest { public void setUp() { mContext = spy(ApplicationProvider.getApplicationContext()); mPreference = spy(SwitchPreference.class); - when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)) - .thenReturn(mConnectivityManager); - when(mConnectivityManager.getTetherableIfaces()).thenReturn(new String[]{ETHERNET_REGEX}); + when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager); + when(mTetheringManager.getTetherableIfaces()).thenReturn(new String[]{ETHERNET_REGEX}); when(mContext.getSystemService(Context.ETHERNET_SERVICE)).thenReturn(mEthernetManager); mController = new EthernetTetherPreferenceController(mContext, "ethernet"); mController.setTetherEnabler(mTetherEnabler); @@ -105,7 +103,7 @@ public class EthernetTetherPreferenceControllerTest { @Test public void shouldEnable_noTetherable() { - when(mConnectivityManager.getTetherableIfaces()).thenReturn(new String[0]); + when(mTetheringManager.getTetherableIfaces()).thenReturn(new String[0]); assertThat(mController.shouldEnable()).isFalse(); } diff --git a/tests/robotests/src/com/android/settings/network/TetherEnablerTest.java b/tests/robotests/src/com/android/settings/network/TetherEnablerTest.java index 87806bed640..bb4b0c41492 100644 --- a/tests/robotests/src/com/android/settings/network/TetherEnablerTest.java +++ b/tests/robotests/src/com/android/settings/network/TetherEnablerTest.java @@ -101,9 +101,9 @@ public class TetherEnablerTest { when(context.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager); when(context.getSystemService(Context.NETWORK_POLICY_SERVICE)).thenReturn( mNetworkPolicyManager); - when(mConnectivityManager.getTetherableIfaces()).thenReturn(new String[0]); - when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[0]); - when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[0]); + when(mTetheringManager.getTetherableIfaces()).thenReturn(new String[0]); + when(mTetheringManager.getTetheredIfaces()).thenReturn(new String[0]); + when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(new String[0]); panReference.set(mBluetoothPan); mEnabler = spy(new TetherEnabler(context, mSwitchWidgetController, panReference)); ReflectionHelpers.setField(mEnabler, "mBluetoothAdapter", mBluetoothAdapter); @@ -111,8 +111,8 @@ public class TetherEnablerTest { @Test public void lifecycle_onStart_setCheckedCorrectly() { - when(mConnectivityManager.getTetheredIfaces()).thenReturn(USB_TETHERED); - when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(USB_TETHERED); + when(mTetheringManager.getTetheredIfaces()).thenReturn(USB_TETHERED); + when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(USB_TETHERED); mEnabler.onStart(); assertThat(mSwitchBar.isChecked()).isTrue(); @@ -150,7 +150,7 @@ public class TetherEnablerTest { mEnabler.onStart(); mEnabler.startTethering(TetheringManager.TETHERING_WIFI); - when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[0]); + when(mTetheringManager.getTetheredIfaces()).thenReturn(new String[0]); mEnabler.mOnStartTetheringCallback.onTetheringFailed(); assertThat(mSwitchBar.isChecked()).isFalse(); @@ -255,8 +255,8 @@ public class TetherEnablerTest { @Test public void updateState_shouldEnableSwitchBarTethering() { - when(mConnectivityManager.getTetheredIfaces()).thenReturn(USB_TETHERED); - when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(USB_TETHERED); + when(mTetheringManager.getTetheredIfaces()).thenReturn(USB_TETHERED); + when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(USB_TETHERED); mSwitchWidgetController.setListener(mEnabler); mSwitchWidgetController.startListening(); diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java index 3958589972b..4824eb2d189 100644 --- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java @@ -33,6 +33,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.database.ContentObserver; import android.net.ConnectivityManager; +import android.net.TetheringManager; import android.provider.Settings; import androidx.preference.Preference; @@ -56,7 +57,7 @@ public class TetherPreferenceControllerTest { @Mock private Context mContext; @Mock - private ConnectivityManager mConnectivityManager; + private TetheringManager mTetheringManager; @Mock private BluetoothAdapter mBluetoothAdapter; @Mock @@ -69,7 +70,7 @@ public class TetherPreferenceControllerTest { MockitoAnnotations.initMocks(this); mController = spy(TetherPreferenceController.class); ReflectionHelpers.setField(mController, "mContext", mContext); - ReflectionHelpers.setField(mController, "mConnectivityManager", mConnectivityManager); + ReflectionHelpers.setField(mController, "mTetheringManager", mTetheringManager); ReflectionHelpers.setField(mController, "mBluetoothAdapter", mBluetoothAdapter); ReflectionHelpers.setField(mController, "mPreference", mPreference); } @@ -106,16 +107,16 @@ public class TetherPreferenceControllerTest { } @Test - public void updateSummary_noPreference_noInteractionWithConnectivityManager() { + public void updateSummary_noPreference_noInteractionWithTetheringManager() { ReflectionHelpers.setField(mController, "mPreference", null); mController.updateSummary(); - verifyNoMoreInteractions(mConnectivityManager); + verifyNoMoreInteractions(mTetheringManager); } @Test public void updateSummary_wifiTethered_shouldShowHotspotMessage() { - when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[]{"123"}); - when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"123"}); + when(mTetheringManager.getTetheredIfaces()).thenReturn(new String[]{"123"}); + when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"123"}); mController.updateSummary(); verify(mPreference).setSummary(R.string.tether_settings_summary_hotspot_on_tether_off); @@ -123,8 +124,8 @@ public class TetherPreferenceControllerTest { @Test public void updateSummary_btThetherOn_shouldShowTetherMessage() { - when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[]{"123"}); - when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"123"}); + when(mTetheringManager.getTetheredIfaces()).thenReturn(new String[]{"123"}); + when(mTetheringManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"123"}); mController.updateSummary(); verify(mPreference).setSummary(R.string.tether_settings_summary_hotspot_off_tether_on); @@ -132,8 +133,8 @@ public class TetherPreferenceControllerTest { @Test public void updateSummary_tetherOff_shouldShowTetherOffMessage() { - when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"123"}); - when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"456"}); + when(mTetheringManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"123"}); + when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"456"}); mController.updateSummary(); verify(mPreference).setSummary(R.string.switch_off_text); @@ -141,9 +142,9 @@ public class TetherPreferenceControllerTest { @Test public void updateSummary_wifiBtTetherOn_shouldShowHotspotAndTetherMessage() { - when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[]{"123", "456"}); - when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"456"}); - when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"23"}); + when(mTetheringManager.getTetheredIfaces()).thenReturn(new String[]{"123", "456"}); + when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"456"}); + when(mTetheringManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"23"}); mController.updateSummary(); verify(mPreference).setSummary(R.string.tether_settings_summary_hotspot_on_tether_on); diff --git a/tests/robotests/src/com/android/settings/network/UsbTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/UsbTetherPreferenceControllerTest.java index 066084edd85..e02da9002a9 100644 --- a/tests/robotests/src/com/android/settings/network/UsbTetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/UsbTetherPreferenceControllerTest.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.net.ConnectivityManager; import android.net.TetheringManager; import androidx.preference.SwitchPreference; @@ -43,7 +42,7 @@ import org.robolectric.util.ReflectionHelpers; public class UsbTetherPreferenceControllerTest { @Mock - private ConnectivityManager mConnectivityManager; + private TetheringManager mTetheringManager; @Mock private TetherEnabler mTetherEnabler; @@ -56,9 +55,8 @@ public class UsbTetherPreferenceControllerTest { MockitoAnnotations.initMocks(this); mContext = spy(ApplicationProvider.getApplicationContext()); - when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn( - mConnectivityManager); - when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[]{""}); + when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager); + when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(new String[]{""}); mController = new UsbTetherPreferenceController(mContext, "USB"); mController.setTetherEnabler(mTetherEnabler); mSwitchPreference = spy(SwitchPreference.class); @@ -94,7 +92,7 @@ public class UsbTetherPreferenceControllerTest { @Test public void shouldShow_noTetherableUsb() { - when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[0]); + when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(new String[0]); assertThat(mController.shouldShow()).isFalse(); } diff --git a/tests/robotests/src/com/android/settings/network/WifiTetherDisablePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/WifiTetherDisablePreferenceControllerTest.java index 1d2042c4ae0..a82a71f18f5 100644 --- a/tests/robotests/src/com/android/settings/network/WifiTetherDisablePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/WifiTetherDisablePreferenceControllerTest.java @@ -28,7 +28,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.content.Context; -import android.net.ConnectivityManager; +import android.net.TetheringManager; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; @@ -77,7 +77,7 @@ public class WifiTetherDisablePreferenceControllerTest { } @Mock - private ConnectivityManager mConnectivityManager; + private TetheringManager mTetheringManager; @Mock private PreferenceScreen mPreferenceScreen; @Mock @@ -100,9 +100,8 @@ public class WifiTetherDisablePreferenceControllerTest { mContext = spy(ApplicationProvider.getApplicationContext()); mPreference = spy(SwitchPreference.class); - when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn( - mConnectivityManager); - when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{""}); + when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager); + when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{""}); mController = new WifiTetherDisablePreferenceController(mContext, WIFI_TETHER_DISABLE_KEY); mController.setTetherEnabler(mTetherEnabler); ReflectionHelpers.setField(mController, "mScreen", mPreferenceScreen); @@ -112,7 +111,7 @@ public class WifiTetherDisablePreferenceControllerTest { @Test public void shouldShow_noTetherableWifi() { - when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[0]); + when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[0]); assertThat(mController.shouldShow()).isFalse(); } diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java index e639b679787..d777a597936 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java @@ -25,7 +25,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.net.ConnectivityManager; +import android.net.TetheringManager; import android.net.wifi.SoftApConfiguration; import android.net.wifi.WifiManager; @@ -57,7 +57,7 @@ public class WifiTetherApBandPreferenceControllerTest { private Context mContext; @Mock - private ConnectivityManager mConnectivityManager; + private TetheringManager mTetheringManager; @Mock private WifiManager mWifiManager; @Mock @@ -74,9 +74,8 @@ public class WifiTetherApBandPreferenceControllerTest { mContext = spy(RuntimeEnvironment.application); mPreference = new ListPreference(RuntimeEnvironment.application); when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager); - when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)) - .thenReturn(mConnectivityManager); - when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"}); + when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager); + when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"}); when(mContext.getResources()).thenReturn(RuntimeEnvironment.application.getResources()); when(mScreen.findPreference(anyString())).thenReturn(mPreference); when(mWifiManager.getSoftApConfiguration()).thenReturn( diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java index b0ed8622e98..25ad7308bfa 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.net.ConnectivityManager; +import android.net.TetheringManager; import android.net.wifi.WifiManager; import androidx.preference.PreferenceScreen; @@ -43,7 +43,7 @@ public class WifiTetherFooterPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) private Context mContext; @Mock - private ConnectivityManager mConnectivityManager; + private TetheringManager mTetheringManager; @Mock private WifiManager mWifiManager; @Mock @@ -58,9 +58,8 @@ public class WifiTetherFooterPreferenceControllerTest { MockitoAnnotations.initMocks(this); when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager); - when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)) - .thenReturn(mConnectivityManager); - when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"}); + when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager); + when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"}); mController = new WifiTetherFooterPreferenceController(mContext); when(mScreen.findPreference(anyString())).thenReturn(mPreference); } diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java index 7835f7eba16..8f8477fcff7 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java @@ -26,7 +26,7 @@ import static org.mockito.Mockito.when; import android.app.settings.SettingsEnums; import android.content.Context; -import android.net.ConnectivityManager; +import android.net.TetheringManager; import android.net.wifi.SoftApConfiguration; import android.net.wifi.WifiManager; @@ -53,7 +53,7 @@ public class WifiTetherPasswordPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) private Context mContext; @Mock - private ConnectivityManager mConnectivityManager; + private TetheringManager mTetheringManager; @Mock private WifiManager mWifiManager; @Mock @@ -77,9 +77,8 @@ public class WifiTetherPasswordPreferenceControllerTest { when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager); when(mWifiManager.getSoftApConfiguration()).thenReturn(mConfig); - when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)) - .thenReturn(mConnectivityManager); - when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"}); + when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager); + when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"}); when(mContext.getResources()).thenReturn(RuntimeEnvironment.application.getResources()); when(mScreen.findPreference(anyString())).thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java index 920582f0754..23bb0db3896 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.content.Context; -import android.net.ConnectivityManager; +import android.net.TetheringManager; import android.net.wifi.SoftApConfiguration; import android.net.wifi.WifiManager; @@ -56,7 +56,7 @@ public class WifiTetherPreferenceControllerTest { private Context mContext; @Mock - private ConnectivityManager mConnectivityManager; + private TetheringManager mTetheringManager; @Mock private WifiManager mWifiManager; @Mock @@ -77,14 +77,13 @@ public class WifiTetherPreferenceControllerTest { mLifecycle = new Lifecycle(mLifecycleOwner); FakeFeatureFactory.setupForTest(); mPreference = new PrimarySwitchPreference(RuntimeEnvironment.application); - when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)) - .thenReturn(mConnectivityManager); + when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager); when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager); when(mScreen.findPreference(anyString())).thenReturn(mPreference); mSoftApConfiguration = new SoftApConfiguration.Builder().setSsid(SSID).build(); when(mWifiManager.getSoftApConfiguration()).thenReturn(mSoftApConfiguration); - when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"}); + when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"}); mController = new WifiTetherPreferenceController(mContext, mLifecycle, false /* initSoftApManager */); mController.displayPreference(mScreen); @@ -92,7 +91,7 @@ public class WifiTetherPreferenceControllerTest { @Test public void isAvailable_noTetherRegex_shouldReturnFalse() { - when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{}); + when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{}); mController = new WifiTetherPreferenceController(mContext, mLifecycle, false /* initSoftApManager */); diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java index a6a9ddaa968..147cd64b437 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java @@ -26,7 +26,7 @@ import static org.mockito.Mockito.when; import android.app.settings.SettingsEnums; import android.content.Context; -import android.net.ConnectivityManager; +import android.net.TetheringManager; import android.net.wifi.SoftApConfiguration; import android.net.wifi.WifiManager; @@ -49,7 +49,7 @@ public class WifiTetherSSIDPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) private Context mContext; @Mock - private ConnectivityManager mConnectivityManager; + private TetheringManager mTetheringManager; @Mock private WifiManager mWifiManager; @Mock @@ -68,9 +68,8 @@ public class WifiTetherSSIDPreferenceControllerTest { mPreference = new WifiTetherSsidPreference(RuntimeEnvironment.application); when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager); - when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)) - .thenReturn(mConnectivityManager); - when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"}); + when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager); + when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"}); when(mContext.getResources()).thenReturn(RuntimeEnvironment.application.getResources()); when(mScreen.findPreference(anyString())).thenReturn(mPreference); mController = new WifiTetherSSIDPreferenceController(mContext, mListener, diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java index b41616b76f5..a2412961919 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java @@ -30,6 +30,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.net.ConnectivityManager; +import android.net.TetheringManager; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; @@ -70,6 +71,8 @@ public class WifiTetherSettingsTest { private ConnectivityManager mConnectivityManager; @Mock private UserManager mUserManager; + @Mock + private TetheringManager mTetheringManager; @Before public void setUp() { @@ -78,7 +81,8 @@ public class WifiTetherSettingsTest { MockitoAnnotations.initMocks(this); doReturn(mConnectivityManager) .when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE); - doReturn(WIFI_REGEXS).when(mConnectivityManager).getTetherableWifiRegexs(); + doReturn(mTetheringManager).when(mContext).getSystemService(Context.TETHERING_SERVICE); + doReturn(WIFI_REGEXS).when(mTetheringManager).getTetherableWifiRegexs(); doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE); mWifiTetherSettings = new WifiTetherSettings(); diff --git a/tests/uitests/Android.bp b/tests/uitests/Android.bp index 8636c813282..8a3e374ff43 100644 --- a/tests/uitests/Android.bp +++ b/tests/uitests/Android.bp @@ -12,15 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "packages_apps_Settings_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["packages_apps_Settings_license"], -} - android_test { name: "SettingsUITests", platform_apis: true, diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp index b55a788988f..b857a0a92e2 100644 --- a/tests/unit/Android.bp +++ b/tests/unit/Android.bp @@ -1,12 +1,3 @@ -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "packages_apps_Settings_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["packages_apps_Settings_license"], -} - android_test { name: "SettingsUnitTests",