commit bca933d9516c6085396e7bcd86ea9613e0d3525a
author Felipe Leme <felipeal@google.com> Tue May 17 18:50:22 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 17 18:50:22 2016 +0000
tree 285c5c2e2696563fd9ea8acabd994a545824c455
parent 1cd027befe8206fe4c33b1efff2bebb0584c138c
parent b6b7b81ae0b5e619f1add42a66f98c187e25da9a

Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 54bc88cdbc
am: b6b7b81ae0

* commit 'b6b7b81ae0b5e619f1add42a66f98c187e25da9a':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: I64af44f5b12248facbeeef66d0ff5372ec5e69ed

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 53b2942..b5c2b89 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -1445,6 +1445,14 @@
                         + 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 + ")");
+            }
+        }
     };
 
     /**