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

Merge "Do isAvailable() checks when accessing AirplaneEnabler." into udc-dev am: b232ba29e6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21725541

Change-Id: Ic9f27eb0e6eba63b719edcb31a0cc54909d4fd8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-04-06 00:37:40 +00:00
committed by Automerger Merge Worker
parent 95178742b3 b232ba29e6
commit e4c7e5b424
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,7 +79,7 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
@Override @Override
public boolean handlePreferenceTreeClick(Preference preference) { public boolean handlePreferenceTreeClick(Preference preference) {
if (KEY_AIRPLANE_MODE.equals(preference.getKey()) if (KEY_AIRPLANE_MODE.equals(preference.getKey()) && isAvailable()
&& mAirplaneModeEnabler.isInEcmMode()) { && mAirplaneModeEnabler.isInEcmMode()) {
// In ECM mode launch ECM app dialog // In ECM mode launch ECM app dialog
if (mFragment != null) { if (mFragment != null) {
@@ -141,12 +141,14 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
@Override @Override
public void onDestroy() { public void onDestroy() {
mAirplaneModeEnabler.close(); if (isAvailable()) {
mAirplaneModeEnabler.close();
}
} }
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == REQUEST_CODE_EXIT_ECM) { if (requestCode == REQUEST_CODE_EXIT_ECM && isAvailable()) {
final boolean isChoiceYes = (resultCode == Activity.RESULT_OK); final boolean isChoiceYes = (resultCode == Activity.RESULT_OK);
// Set Airplane mode based on the return value and checkbox state // Set Airplane mode based on the return value and checkbox state
mAirplaneModeEnabler.setAirplaneModeInECM(isChoiceYes, mAirplaneModeEnabler.setAirplaneModeInECM(isChoiceYes,
@@ -156,7 +158,7 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
@Override @Override
public boolean isChecked() { public boolean isChecked() {
return mAirplaneModeEnabler.isAirplaneModeOn(); return isAvailable() && mAirplaneModeEnabler.isAirplaneModeOn();
} }
@Override @Override
@@ -164,7 +166,9 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
if (isChecked() == isChecked) { if (isChecked() == isChecked) {
return false; return false;
} }
mAirplaneModeEnabler.setAirplaneMode(isChecked); if (isAvailable()) {
mAirplaneModeEnabler.setAirplaneMode(isChecked);
}
return true; return true;
} }