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

Commit b92238ba authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[log] user enable per sub" into main

parents 881a4e39 bc424ccb

src/java/com/android/internal/telephony/data/DataSettingsManager.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -467,8 +467,8 @@ public class DataSettingsManager extends Handler { 
        if (isStandAloneOpportunistic(mSubId) && !enabled) return;

        if (isStandAloneOpportunistic(mSubId) && !enabled) return;

        boolean changed = GlobalSettingsHelper.setInt(mPhone.getContext(),

        boolean changed = GlobalSettingsHelper.setInt(mPhone.getContext(),

                Settings.Global.MOBILE_DATA, mSubId, (enabled ? 1 : 0));

                Settings.Global.MOBILE_DATA, mSubId, (enabled ? 1 : 0));

        log("Set user data enabled to " + enabled + ", changed=" + changed + ", callingPackage="

        logl("Set user data enabled to " + enabled + " on sub " + mSubId + ", changed="

                + callingPackage);

                + changed + ", callingPackage=" + callingPackage);

        if (changed) {

        if (changed) {

            logl("UserDataEnabled changed to " + enabled);

            logl("UserDataEnabled changed to " + enabled);

            mPhone.notifyUserMobileDataStateChanged(enabled);

            mPhone.notifyUserMobileDataStateChanged(enabled);
@@ -555,8 +555,9 @@ public class DataSettingsManager extends Handler { 
        // Will trigger handleDataOnRoamingChange() through observer

        // Will trigger handleDataOnRoamingChange() through observer

        boolean changed = GlobalSettingsHelper.setBoolean(mPhone.getContext(),

        boolean changed = GlobalSettingsHelper.setBoolean(mPhone.getContext(),

                Settings.Global.DATA_ROAMING, mSubId, enabled);

                Settings.Global.DATA_ROAMING, mSubId, enabled);

        logl("DataRoamingEnabled set to " + enabled + " on sub " + mSubId

                + ", changed=" + changed);

        if (changed) {

        if (changed) {

            logl("DataRoamingEnabled changed to " + enabled);

            mDataSettingsManagerCallbacks.forEach(callback -> callback.invokeFromExecutor(

            mDataSettingsManagerCallbacks.forEach(callback -> callback.invokeFromExecutor(

                    () -> callback.onDataRoamingEnabledChanged(enabled)));

                    () -> callback.onDataRoamingEnabledChanged(enabled)));

        }

        }