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

Commit 7f615da8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Rename callback variable name" am: 9dd132f3 am: 9174bb02 am: c10177fa am: 8e51d1a7 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2138473



Change-Id: Idc6b3828cf998e0a5901cdd774c519211d4098b3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8497f140 8e51d1a7

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

+6 −6
Original line number Diff line number Diff line
@@ -1115,8 +1115,8 @@ public class DataNetworkController extends Handler { 
                log("Subscription plans changed: " + Arrays.toString(plans));

                mSubscriptionPlans.clear();

                mSubscriptionPlans.addAll(Arrays.asList(plans));

                mDataNetworkControllerCallbacks.forEach(callback -> callback.invokeFromExecutor(

                        () -> callback.onSubscriptionPlanOverride()));

                mDataNetworkControllerCallbacks.forEach(cb -> cb.invokeFromExecutor(

                        () -> cb.onSubscriptionPlanOverride()));

                break;

            case EVENT_SUBSCRIPTION_OVERRIDE:

                int overrideMask = msg.arg1;
@@ -1135,8 +1135,8 @@ public class DataNetworkController extends Handler { 
                            mUnmeteredOverrideNetworkTypes.remove(networkType);

                        }

                    }

                    mDataNetworkControllerCallbacks.forEach(callback -> callback.invokeFromExecutor(

                            () -> callback.onSubscriptionPlanOverride()));

                    mDataNetworkControllerCallbacks.forEach(cb -> cb.invokeFromExecutor(

                            () -> cb.onSubscriptionPlanOverride()));

                } else if (overrideMask == NetworkPolicyManager.SUBSCRIPTION_OVERRIDE_CONGESTED) {

                    log("Congested subscription override: override=" + override

                            + ", networkTypes=" + Arrays.stream(networkTypes)
@@ -1149,8 +1149,8 @@ public class DataNetworkController extends Handler { 
                            mCongestedOverrideNetworkTypes.remove(networkType);

                        }

                    }

                    mDataNetworkControllerCallbacks.forEach(callback -> callback.invokeFromExecutor(

                            () -> callback.onSubscriptionPlanOverride()));

                    mDataNetworkControllerCallbacks.forEach(cb -> cb.invokeFromExecutor(

                            () -> cb.onSubscriptionPlanOverride()));

                } else {

                    loge("Unknown override mask: " + overrideMask);

                }