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

Merge "Modified the AirplaneModePreferenceController for slice" into pi-dev am: 62cd5f7f0f

Browse Source 
am: 169d6a9cd6

Change-Id: Ie5aada5dc0993e097ad5215895bda86cebab2f87
This commit is contained in:
Fan Zhang
2018-04-26 16:49:32 -07:00
committed by android-build-merger
parent cd26201845 169d6a9cd6
commit 5f492647c8
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,9 +27,9 @@ import androidx.preference.PreferenceScreen;
import com.android.internal.telephony.TelephonyIntents; import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.telephony.TelephonyProperties; import com.android.internal.telephony.TelephonyProperties;
import com.android.settings.AirplaneModeEnabler; import com.android.settings.AirplaneModeEnabler;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController; import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settings.R;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -96,15 +96,16 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
return isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED; return isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
} }
@Override
public void onResume() { public void onResume() {
if (mAirplaneModeEnabler != null) { if (isAvailable()) {
mAirplaneModeEnabler.resume(); mAirplaneModeEnabler.resume();
} }
} }
@Override @Override
public void onPause() { public void onPause() {
if (mAirplaneModeEnabler != null) { if (isAvailable()) {
mAirplaneModeEnabler.pause(); mAirplaneModeEnabler.pause();
} }
} }
@@ -134,6 +135,8 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
@Override @Override
public void onAirplaneModeChanged(boolean isAirplaneModeOn) { public void onAirplaneModeChanged(boolean isAirplaneModeOn) {
mAirplaneModePreference.setChecked(isAirplaneModeOn); if (mAirplaneModePreference != null) {
mAirplaneModePreference.setChecked(isAirplaneModeOn);
}
} }
} }