PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Settings] Remove PhoneStateIntentReceiver

Browse Source 
1. Replace PhoneStateIntentReceiver by adopting PhoneStateListener
2. Replace TelephonyProperties.in_ecm_mode() by
TelephonyManager.getEmergencyCallbackMode()

Bug: 144331663
Change-Id: Ib127cb165c65f50851c4390b05a16dfb8024fab1
Bug: 145830780
Test: Manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=AirplaneModeEnabler
Merged-In: Ib39ab1881484f65bc5a3834b2828c6ba98198cca
This commit is contained in:
Bonian Chen
2019-12-26 18:41:32 +08:00
parent 047dd2dff9
commit e520ec60aa
3 changed files with 157 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/network/AirplaneModePreferenceController.java
View File

@@ -20,7 +20,6 @@ import static android.provider.SettingsSlicesContract.KEY_AIRPLANE_MODE;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.SystemProperties;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
@@ -28,12 +27,9 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.telephony.TelephonyProperties;
import com.android.settings.AirplaneModeEnabler;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
@@ -47,14 +43,15 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
private static final String EXIT_ECM_RESULT = "exit_ecm_result";
private Fragment mFragment;
private final MetricsFeatureProvider mMetricsFeatureProvider;
private AirplaneModeEnabler mAirplaneModeEnabler;
private SwitchPreference mAirplaneModePreference;
public AirplaneModePreferenceController(Context context, String key) {
super(context, key);
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
mAirplaneModeEnabler = new AirplaneModeEnabler(mContext, mMetricsFeatureProvider, this);
if (isAvailable(mContext)) {
mAirplaneModeEnabler = new AirplaneModeEnabler(mContext, this);
}
}
public void setFragment(Fragment hostFragment) {
@@ -63,8 +60,8 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
if (KEY_AIRPLANE_MODE.equals(preference.getKey()) && Boolean.parseBoolean(
SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE))) {
if (KEY_AIRPLANE_MODE.equals(preference.getKey())
&& mAirplaneModeEnabler.isInEcmMode()) {
// In ECM mode launch ECM app dialog
if (mFragment != null) {
mFragment.startActivityForResult(
@@ -80,9 +77,7 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
if (isAvailable()) {
mAirplaneModePreference = screen.findPreference(getPreferenceKey());
}
mAirplaneModePreference = screen.findPreference(getPreferenceKey());
}
public static boolean isAvailable(Context context) {
@@ -117,7 +112,7 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == REQUEST_CODE_EXIT_ECM) {
Boolean isChoiceYes = data.getBooleanExtra(EXIT_ECM_RESULT, false);
final boolean isChoiceYes = data.getBooleanExtra(EXIT_ECM_RESULT, false);
// Set Airplane mode based on the return value and checkbox state
mAirplaneModeEnabler.setAirplaneModeInECM(isChoiceYes,
mAirplaneModePreference.isChecked());