Merge "Rename callback variable name" (9dd132f3) · Commits · e / os / android_frameworks_opt_telephony

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -1105,8 +1105,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;
		@@ -1125,8 +1125,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)
		@@ -1139,8 +1139,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);
		}