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

Commit 1766b3c0 authored by Jason Chiu's avatar Jason Chiu
Browse files

Fix indexing error of mobile related controllers 

There were several errors in indexing mobile related sliceable
controllers, which led them not able to display on Panel and as inline
controls in search result.

It's because indexing mechanism is running in a worker thread and trying
to construct each controller instance, but the failed controllers'
constructors need to initilize something in the main thread.

- Give the main looper to the classes which only can be initialized in
  the main thread to fix the indexing.
- Guard null pointer exception in SlicesIndexer after fixing the
  indexing.
- Use onStart/onStop in AirplaneModePreferenceController to start/stop
  listener.

Fixes: 149720345
Test: robotest
Change-Id: Ibe5a8d6cc713eeddf26eceaabc05e6d1faa45507
parent 4edb83b2

src/com/android/settings/AirplaneModeEnabler.java

+11 −5
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings; 
import android.app.settings.SettingsEnums;

import android.content.Context;

import android.content.Intent;

import android.os.Looper;

import android.os.UserHandle;

import android.provider.Settings;

import android.telephony.PhoneStateListener;
@@ -62,8 +63,6 @@ public class AirplaneModeEnabler extends GlobalSettingsChangeListener { 
    @VisibleForTesting

    PhoneStateListener mPhoneStateListener;



    private GlobalSettingsChangeListener mAirplaneModeObserver;



    public AirplaneModeEnabler(Context context, OnAirplaneModeChangedListener listener) {

        super(context, Settings.Global.AIRPLANE_MODE_ON);
@@ -73,7 +72,7 @@ public class AirplaneModeEnabler extends GlobalSettingsChangeListener { 


        mTelephonyManager = context.getSystemService(TelephonyManager.class);



        mPhoneStateListener = new PhoneStateListener() {

        mPhoneStateListener = new PhoneStateListener(Looper.getMainLooper()) {

            @Override

            public void onRadioPowerStateChanged(int state) {

                if (DEBUG) {
@@ -87,6 +86,7 @@ public class AirplaneModeEnabler extends GlobalSettingsChangeListener { 
    /**

     * Implementation of GlobalSettingsChangeListener.onChanged

     */

    @Override

    public void onChanged(String field) {

        if (DEBUG) {

            Log.d(LOG_TAG, "Airplane mode configuration update");
@@ -94,12 +94,18 @@ public class AirplaneModeEnabler extends GlobalSettingsChangeListener { 
        onAirplaneModeChanged();

    }



    public void resume() {

    /**

     * Start listening to the phone state change

     */

    public void start() {

        mTelephonyManager.listen(mPhoneStateListener,

                PhoneStateListener.LISTEN_RADIO_POWER_STATE_CHANGED);

    }



    public void pause() {

    /**

     * Stop listening to the phone state change

     */

    public void stop() {

        mTelephonyManager.listen(mPhoneStateListener,

                PhoneStateListener.LISTEN_NONE);

    }

src/com/android/settings/network/AirplaneModePreferenceController.java

+7 −7
Original line number Diff line number Diff line
@@ -35,11 +35,11 @@ import com.android.settings.AirplaneModeEnabler; 
import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnPause;

import com.android.settingslib.core.lifecycle.events.OnResume;

import com.android.settingslib.core.lifecycle.events.OnStart;

import com.android.settingslib.core.lifecycle.events.OnStop;



public class AirplaneModePreferenceController extends TogglePreferenceController

        implements LifecycleObserver, OnResume, OnPause,

        implements LifecycleObserver, OnStart, OnStop,

        AirplaneModeEnabler.OnAirplaneModeChangedListener {



    public static final int REQUEST_CODE_EXIT_ECM = 1;
@@ -120,16 +120,16 @@ public class AirplaneModePreferenceController extends TogglePreferenceController 
    }



    @Override

    public void onResume() {

    public void onStart() {

        if (isAvailable()) {

            mAirplaneModeEnabler.resume();

            mAirplaneModeEnabler.start();

        }

    }



    @Override

    public void onPause() {

    public void onStop() {

        if (isAvailable()) {

            mAirplaneModeEnabler.pause();

            mAirplaneModeEnabler.stop();

        }

    }

src/com/android/settings/network/SubscriptionsChangeListener.java

+3 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.IntentFilter; 
import android.database.ContentObserver;

import android.net.Uri;

import android.os.Handler;

import android.os.Looper;

import android.provider.Settings;

import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
@@ -45,11 +46,11 @@ public class SubscriptionsChangeListener extends ContentObserver { 
    private BroadcastReceiver mBroadcastReceiver;



    public SubscriptionsChangeListener(Context context, SubscriptionsChangeListenerClient client) {

        super(new Handler());

        super(new Handler(Looper.getMainLooper()));

        mContext = context;

        mClient = client;

        mSubscriptionManager = mContext.getSystemService(SubscriptionManager.class);

        mSubscriptionsChangedListener = new OnSubscriptionsChangedListener() {

        mSubscriptionsChangedListener = new OnSubscriptionsChangedListener(Looper.getMainLooper()) {

            @Override

            public void onSubscriptionsChanged() {

                subscriptionsChangedCallback();

src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.network.telephony;



import android.content.Context;

import android.os.Looper;

import android.os.PersistableBundle;

import android.telephony.CarrierConfigManager;

import android.telephony.PhoneStateListener;
@@ -187,7 +188,7 @@ public class Enhanced4gBasePreferenceController extends TelephonyTogglePreferenc 
    private class PhoneCallStateListener extends PhoneStateListener {



        PhoneCallStateListener() {

            super();

            super(Looper.getMainLooper());

        }



        private TelephonyManager mTelephonyManager;

src/com/android/settings/network/telephony/VideoCallingPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.network.telephony;



import android.content.Context;

import android.os.Looper;

import android.os.PersistableBundle;

import android.telephony.CarrierConfigManager;

import android.telephony.PhoneStateListener;
@@ -164,7 +165,7 @@ public class VideoCallingPreferenceController extends TelephonyTogglePreferenceC 
    private class PhoneCallStateListener extends PhoneStateListener {



        PhoneCallStateListener() {

            super();

            super(Looper.getMainLooper());

        }



        private TelephonyManager mTelephonyManager;