summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBonian Chen <bonianchen@google.com>2020-01-02 12:01:10 +0800
committerBonian Chen <bonianchen@google.com>2020-01-02 12:06:00 +0800
commit717e0765a532ad3c68798648147f11e6213682aa (patch)
treee2bc23d462aaa6e09500b74183654d3322e476da /src
parent3e9fd2490e0494209e5dce99b3098a12ec0688fd (diff)
downloadpackages_apps_Settings-717e0765a532ad3c68798648147f11e6213682aa.tar.gz
packages_apps_Settings-717e0765a532ad3c68798648147f11e6213682aa.tar.bz2
packages_apps_Settings-717e0765a532ad3c68798648147f11e6213682aa.zip
[Settings] Refactor AirplaneModeEnabler with test
Support auto testing Bug: 147029746 Test: manual Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=AirplaneModeEnablerTest Change-Id: Ib39ab1881484f65bc5a3834b2828c6ba98198cca
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/AirplaneModeEnabler.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java
index f1d36f2654..a843a046c9 100644
--- a/src/com/android/settings/AirplaneModeEnabler.java
+++ b/src/com/android/settings/AirplaneModeEnabler.java
@@ -26,6 +26,8 @@ import android.telephony.SubscriptionInfo;
import android.telephony.TelephonyManager;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.network.GlobalSettingsChangeListener;
import com.android.settings.network.ProxySubscriptionManager;
import com.android.settings.overlay.FeatureFactory;
@@ -57,8 +59,8 @@ public class AirplaneModeEnabler extends GlobalSettingsChangeListener {
}
private TelephonyManager mTelephonyManager;
- private ProxySubscriptionManager mProxySubscriptionMgr;
- private PhoneStateListener mPhoneStateListener;
+ @VisibleForTesting
+ PhoneStateListener mPhoneStateListener;
private GlobalSettingsChangeListener mAirplaneModeObserver;
@@ -70,7 +72,6 @@ public class AirplaneModeEnabler extends GlobalSettingsChangeListener {
mOnAirplaneModeChangedListener = listener;
mTelephonyManager = context.getSystemService(TelephonyManager.class);
- mProxySubscriptionMgr = ProxySubscriptionManager.getInstance(context);
mPhoneStateListener = new PhoneStateListener() {
@Override
@@ -143,7 +144,7 @@ public class AirplaneModeEnabler extends GlobalSettingsChangeListener {
return true;
}
final List<SubscriptionInfo> subInfoList =
- mProxySubscriptionMgr.getActiveSubscriptionsInfo();
+ ProxySubscriptionManager.getInstance(mContext).getActiveSubscriptionsInfo();
if (subInfoList == null) {
return false;
}