Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b8ef174 authored by Eiichi Ohnishi's avatar Eiichi Ohnishi Committed by Takeshi Aimi
Browse files

Fix can't change airplane mode from GlobalActions. 

A PhoneStateListener is registered in the constructor of
GlobalActions which, on rare occasions, leads to a callback being
received immediately. In these cases because mHasTelephony has not
been initialized, airplane mode is not refreshed in the callback
which disables the option to set airplane mode from GlobalActions.

To fix this issue mHasTelephony has to be set before registering
the listener.

Change-Id: If117a879d3244414b369a1711bf46526b7a5ae24
parent 449273e2

policy/src/com/android/internal/policy/impl/GlobalActions.java

+4 −3
Original line number Diff line number Diff line
@@ -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);