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

Commit 1e410610 authored by Chaohui Wang's avatar Chaohui Wang Committed by Automerger Merge Worker
Browse files

Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f81359 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472



Change-Id: I6a8942f58c25a773719f4db05a6d44b50a491ccb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 395c6757 87f81359

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() {