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

Commit 866b79c2 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Clean up lifecycle in MobileNetworkSettings 

To avoid double registering, which prevent potential issues and could
improve latency.

Since DashboardFragment already supported register lifecycle
automatically for the controllers bound by XML which implements
androidx.lifecycle.Lifecycle, so doing a cleanup to prevent register
lifecycle event manually (doubling).

Bug: 149338098
Test: temporarily add logging to make sure the lifecycle method is
      called and only called once
Change-Id: I4dbc36414991ef6b599be61aa77ff0dc8c52468c
parent fa878f2f

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

+1 −4
Original line number Diff line number Diff line
@@ -61,12 +61,9 @@ public class ContactDiscoveryPreferenceController extends TelephonyTogglePrefere 
        mCarrierConfigCache = CarrierConfigCache.getInstance(context);

    }



    public ContactDiscoveryPreferenceController init(FragmentManager fragmentManager, int subId,

            Lifecycle lifecycle) {

    void init(FragmentManager fragmentManager, int subId) {

        mFragmentManager = fragmentManager;

        mSubId = subId;

        lifecycle.addObserver(this);

        return this;

    }



    @Override

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

+1 −3
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.os.Looper; 
import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;



import androidx.lifecycle.Lifecycle;

import androidx.lifecycle.LifecycleObserver;

import androidx.lifecycle.OnLifecycleEvent;

import androidx.preference.Preference;
@@ -52,10 +51,9 @@ public class DataDuringCallsPreferenceController extends TelephonyTogglePreferen 
        super(context, preferenceKey);

    }



    public void init(Lifecycle lifecycle, int subId) {

    void init(int subId) {

        this.mSubId = subId;

        mManager = mContext.getSystemService(TelephonyManager.class).createForSubscriptionId(subId);

        lifecycle.addObserver(this);

    }



    @OnLifecycleEvent(ON_RESUME)

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

+0 −5
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.telephony.SubscriptionInfo; 
import android.telephony.SubscriptionManager;

import android.view.View;



import androidx.lifecycle.Lifecycle;

import androidx.lifecycle.LifecycleObserver;

import androidx.lifecycle.OnLifecycleEvent;

import androidx.preference.ListPreference;
@@ -72,10 +71,6 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere 
                == View.LAYOUT_DIRECTION_RTL;

    }



    public void init(Lifecycle lifecycle) {

        lifecycle.addObserver(this);

    }



    /** @return SubscriptionInfo for the default subscription for the service, or null if there

     * isn't one. */

    protected abstract SubscriptionInfo getDefaultSubscriptionInfo();

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

+1 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; 
import android.content.Context;

import android.telephony.SubscriptionManager;



import androidx.lifecycle.Lifecycle;

import androidx.lifecycle.LifecycleObserver;

import androidx.lifecycle.OnLifecycleEvent;

import androidx.preference.PreferenceCategory;
@@ -53,8 +52,7 @@ public class DisabledSubscriptionController extends TelephonyBasePreferenceContr 
    /**

     * Re-initialize the configuration based on subscription id provided

     */

    public void init(Lifecycle lifecycle, int subId) {

        lifecycle.addObserver(this);

    public void init(int subId) {

        mSubId = subId;

    }

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

+1 −3
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.telephony.TelephonyManager; 
import android.util.Log;



import androidx.annotation.VisibleForTesting;

import androidx.lifecycle.Lifecycle;

import androidx.lifecycle.LifecycleObserver;

import androidx.lifecycle.OnLifecycleEvent;

import androidx.preference.ListPreference;
@@ -163,7 +162,7 @@ public class EnabledNetworkModePreferenceController extends 
        return false;

    }



    public void init(Lifecycle lifecycle, int subId) {

    void init(int subId) {

        mSubId = subId;

        mTelephonyManager = mContext.getSystemService(TelephonyManager.class)

                .createForSubscriptionId(mSubId);
@@ -178,7 +177,6 @@ public class EnabledNetworkModePreferenceController extends 
                        updatePreference();

                    });

        }

        lifecycle.addObserver(this);

    }



    private void updatePreference() {