From 3d417283a987c10170c3c8d6547a29dd8bb64d53 Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Tue, 6 Sep 2016 12:49:48 -0700 Subject: [PATCH] Refactored INetworkPolicyListener callbacks. Methods onRestrictBackgroundWhitelistChanged() and onRestrictBackgroundBlacklistChanged() were replaced by a more generic onUidPoliciesChanged(). Test: m javac-check RUN_ERROR_PRONE=true Test: m -j32 FrameworksServicesTests && adb install -r -g ${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk && adb shell am instrument -e class "com.android.server.NetworkPolicyManagerServiceTest" -w "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner" BUG: 28791717 Change-Id: I18b2ee4af06802e0d23822b153d1be9b429d5811 --- .../com/android/server/ConnectivityService.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index a739be7f3f..b08549f7d3 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -1538,19 +1538,10 @@ public class ConnectivityService extends IConnectivityManager.Stub } @Override - public void onRestrictBackgroundWhitelistChanged(int uid, boolean whitelisted) { + public void onUidPoliciesChanged(int uid, int uidPolicies) { + // caller is NPMS, since we only register with them if (LOGD_RULES) { - // caller is NPMS, since we only register with them - log("onRestrictBackgroundWhitelistChanged(uid=" + uid + ", whitelisted=" - + whitelisted + ")"); - } - } - @Override - public void onRestrictBackgroundBlacklistChanged(int uid, boolean blacklisted) { - if (LOGD_RULES) { - // caller is NPMS, since we only register with them - log("onRestrictBackgroundBlacklistChanged(uid=" + uid + ", blacklisted=" - + blacklisted + ")"); + log("onUidRulesChanged(uid=" + uid + ", uidPolicies=" + uidPolicies + ")"); } } };