From c624663312cdb112fe85588c4c95ffe802d7414b Mon Sep 17 00:00:00 2001
From: sunnyshao <sunnyshao@android.com>
Date: Tue, 24 Apr 2018 15:57:25 +0800
Subject: [PATCH] Modified the AirplaneModePreferenceController for slice

- Updated the AirplaneModePreferenceController for slice feature
- Updated the AirplaneModeEnabler for slice feature

Fixes: 78645242
Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.network
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.dashboard
      atest UniquePreferenceTest SettingsGatewayTest

Change-Id: I4afbc666f916570d648ad2b33ebb25924024e9f1
---
 .../network/AirplaneModePreferenceController.java     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java
index 7d32ece3012..56c305d1d0e 100644
--- a/src/com/android/settings/network/AirplaneModePreferenceController.java
+++ b/src/com/android/settings/network/AirplaneModePreferenceController.java
@@ -27,9 +27,9 @@ import android.support.v7.preference.PreferenceScreen;
 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.settings.R;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -96,15 +96,16 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
         return isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
     }
 
+    @Override
     public void onResume() {
-        if (mAirplaneModeEnabler != null) {
+        if (isAvailable()) {
             mAirplaneModeEnabler.resume();
         }
     }
 
     @Override
     public void onPause() {
-        if (mAirplaneModeEnabler != null) {
+        if (isAvailable()) {
             mAirplaneModeEnabler.pause();
         }
     }
@@ -134,6 +135,8 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
 
     @Override
     public void onAirplaneModeChanged(boolean isAirplaneModeOn) {
-        mAirplaneModePreference.setChecked(isAirplaneModeOn);
+        if (mAirplaneModePreference != null) {
+            mAirplaneModePreference.setChecked(isAirplaneModeOn);
+        }
     }
 }