Merge "Fix crash for AirplaneModePreferenceController when not available."

This commit is contained in:
TreeHugger Robot
2017-12-02 01:30:28 +00:00
committed by Android (Google) Code Review
2 changed files with 93 additions and 2 deletions

View File

@@ -100,12 +100,16 @@ public class AirplaneModePreferenceController extends AbstractPreferenceControll
}
public void onResume() {
mAirplaneModeEnabler.resume();
if (mAirplaneModeEnabler != null) {
mAirplaneModeEnabler.resume();
}
}
@Override
public void onPause() {
mAirplaneModeEnabler.pause();
if (mAirplaneModeEnabler != null) {
mAirplaneModeEnabler.pause();
}
}
public void onActivityResult(int requestCode, int resultCode, Intent data) {