From c3b7e6fd44593c3974e989d8ccf2097b4471b2b7 Mon Sep 17 00:00:00 2001 From: nagarw Date: Thu, 20 Feb 2014 17:10:46 +0530 Subject: GlobalActions: Fix Airplane Mode on/off issue Issue: Unable to turn off Airplane mode from power button after phone reboot Fix: Initialize mHasTelephony before the PhoneStateListener is registered to the TelephonyManager so that correct value of mHasTelephony is reflected when onServiceStateChanged callback is called. Bug: 13697360 Change-Id: Ide8afd9c16ea90b98b5912dbff440c5fd67b178d --- policy/src/com/android/internal/policy/impl/GlobalActions.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'policy/src/com/android') diff --git a/policy/src/com/android/internal/policy/impl/GlobalActions.java b/policy/src/com/android/internal/policy/impl/GlobalActions.java index 7c0735b..4db7d4d 100644 --- a/policy/src/com/android/internal/policy/impl/GlobalActions.java +++ b/policy/src/com/android/internal/policy/impl/GlobalActions.java @@ -121,13 +121,14 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac filter.addAction(TelephonyIntents.ACTION_EMERGENCY_CALLBACK_MODE_CHANGED); context.registerReceiver(mBroadcastReceiver, filter); + ConnectivityManager cm = (ConnectivityManager) + context.getSystemService(Context.CONNECTIVITY_SERVICE); + mHasTelephony = cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE); + // get notified of phone state changes TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); telephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_SERVICE_STATE); - ConnectivityManager cm = (ConnectivityManager) - context.getSystemService(Context.CONNECTIVITY_SERVICE); - mHasTelephony = cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE); mContext.getContentResolver().registerContentObserver( Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON), true, mAirplaneModeObserver); -- cgit v1.1