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

Commit 1c47f309 authored by Zoey Chen's avatar Zoey Chen Committed by Android (Google) Code Review
Browse files

Merge changes I26c7d64e,I7ec6d824 into udc-dev 

* changes:
  [Settings] update the db list when back to UI
  [Settings] Fix the inconsistent data/entity when switch the app/fragment
parents 2494fd01 db02f10b

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

+5 −3
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ public class InternetPreferenceController extends AbstractPreferenceController i 
        mInternetUpdater = new InternetUpdater(context, lifecycle, this);

        mInternetType = mInternetUpdater.getInternetType();

        mLifecycleOwner = lifecycleOwner;

        mMobileNetworkRepository = MobileNetworkRepository.create(context, this);

        mMobileNetworkRepository = MobileNetworkRepository.getInstance(context);

        lifecycle.addObserver(this);

    }
@@ -156,14 +156,16 @@ public class InternetPreferenceController extends AbstractPreferenceController i 
    /** @OnLifecycleEvent(ON_RESUME) */

    @OnLifecycleEvent(ON_RESUME)

    public void onResume() {

        mMobileNetworkRepository.addRegister(mLifecycleOwner);

        mMobileNetworkRepository.addRegister(mLifecycleOwner, this,

                SubscriptionManager.INVALID_SUBSCRIPTION_ID);

        mMobileNetworkRepository.updateEntity();

        mSummaryHelper.register(true);

    }



    /** @OnLifecycleEvent(ON_PAUSE) */

    @OnLifecycleEvent(ON_PAUSE)

    public void onPause() {

        mMobileNetworkRepository.removeRegister();

        mMobileNetworkRepository.removeRegister(this);

        mSummaryHelper.register(false);

    }

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

+253 −157

File changed.

Preview size limit exceeded, changes collapsed.

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

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

import android.content.Intent;

import android.os.UserManager;

import android.telephony.SubscriptionManager;

import android.telephony.euicc.EuiccManager;

import android.util.Log;
@@ -87,7 +88,7 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController 
        mMetricsFeatureProvider = FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();

        mUserManager = context.getSystemService(UserManager.class);

        mLifecycleOwner = lifecycleOwner;

        mMobileNetworkRepository = MobileNetworkRepository.create(context, this);

        mMobileNetworkRepository = MobileNetworkRepository.getInstance(context);

        mIsAirplaneModeOn = mMobileNetworkRepository.isAirplaneModeOn();

        if (lifecycle != null) {

            lifecycle.addObserver(this);
@@ -96,13 +97,14 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController 


    @OnLifecycleEvent(ON_RESUME)

    public void onResume() {

        mMobileNetworkRepository.addRegister(mLifecycleOwner);

        update();

        mMobileNetworkRepository.addRegister(mLifecycleOwner, this,

                SubscriptionManager.INVALID_SUBSCRIPTION_ID);

        mMobileNetworkRepository.updateEntity();

    }



    @OnLifecycleEvent(ON_PAUSE)

    public void onPause() {

        mMobileNetworkRepository.removeRegister();

        mMobileNetworkRepository.removeRegister(this);

    }



    @Override

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

+6 −4
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static androidx.lifecycle.Lifecycle.Event; 
import android.content.Context;

import android.os.UserManager;

import android.telephony.ServiceState;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.util.Log;

import android.view.View;
@@ -71,7 +72,7 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl 
        mIsRtlMode = context.getResources().getConfiguration().getLayoutDirection()

                == View.LAYOUT_DIRECTION_RTL;

        mLifecycleOwner = lifecycleOwner;

        mMobileNetworkRepository = MobileNetworkRepository.create(context, this);

        mMobileNetworkRepository = MobileNetworkRepository.getInstance(context);

        if (lifecycle != null) {

            lifecycle.addObserver(this);

        }
@@ -79,13 +80,14 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl 


    @OnLifecycleEvent(Event.ON_RESUME)

    public void onResume() {

        mMobileNetworkRepository.addRegister(mLifecycleOwner);

        update();

        mMobileNetworkRepository.addRegister(mLifecycleOwner, this,

                SubscriptionManager.INVALID_SUBSCRIPTION_ID);

        mMobileNetworkRepository.updateEntity();

    }



    @OnLifecycleEvent(Event.ON_PAUSE)

    public void onPause() {

        mMobileNetworkRepository.removeRegister();

        mMobileNetworkRepository.removeRegister(this);

    }



    @Override

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

+5 −4
Original line number Diff line number Diff line
@@ -65,19 +65,20 @@ public class NetworkProviderSimListController extends AbstractPreferenceControll 
        mSubscriptionManager = context.getSystemService(SubscriptionManager.class);

        mPreferences = new ArrayMap<>();

        mLifecycleOwner = lifecycleOwner;

        mMobileNetworkRepository = MobileNetworkRepository.create(context, this);

        mMobileNetworkRepository = MobileNetworkRepository.getInstance(context);

        lifecycle.addObserver(this);

    }



    @OnLifecycleEvent(ON_RESUME)

    public void onResume() {

        mMobileNetworkRepository.addRegister(mLifecycleOwner);

        update();

        mMobileNetworkRepository.addRegister(mLifecycleOwner, this,

                SubscriptionManager.INVALID_SUBSCRIPTION_ID);

        mMobileNetworkRepository.updateEntity();

    }



    @OnLifecycleEvent(ON_PAUSE)

    public void onPause() {

        mMobileNetworkRepository.removeRegister();

        mMobileNetworkRepository.removeRegister(this);

    }



    @Override