summaryrefslogtreecommitdiffstats
path: root/core/java/android/net
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-04-29 21:02:36 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-29 21:02:36 +0000
commitc5cbdfcfe517b55cd4578e5e5b6a682fcfdffbc7 (patch)
tree9d246ae7f3371ef8ce3fa72c71b37c1f0e0f581a /core/java/android/net
parentec317987e06c9083a54bd32b5d10eee898345fe5 (diff)
parent8756f9b34dd04cabae7487bd1941008a6c98c4c6 (diff)
downloadframeworks_base-c5cbdfcfe517b55cd4578e5e5b6a682fcfdffbc7.zip
frameworks_base-c5cbdfcfe517b55cd4578e5e5b6a682fcfdffbc7.tar.gz
frameworks_base-c5cbdfcfe517b55cd4578e5e5b6a682fcfdffbc7.tar.bz2
am 8756f9b3: am 599a4e0e: am 9ac2718e: Merge "Implement user-settable power save whitelist." into mnc-dev
* commit '8756f9b34dd04cabae7487bd1941008a6c98c4c6': Implement user-settable power save whitelist.
Diffstat (limited to 'core/java/android/net')
-rw-r--r--core/java/android/net/INetworkPolicyManager.aidl2
-rw-r--r--core/java/android/net/NetworkPolicyManager.java8
2 files changed, 0 insertions, 10 deletions
diff --git a/core/java/android/net/INetworkPolicyManager.aidl b/core/java/android/net/INetworkPolicyManager.aidl
index c722fbc..7f5f377 100644
--- a/core/java/android/net/INetworkPolicyManager.aidl
+++ b/core/java/android/net/INetworkPolicyManager.aidl
@@ -38,8 +38,6 @@ interface INetworkPolicyManager {
boolean isUidForeground(int uid);
- int[] getPowerSaveAppIdWhitelist();
-
void registerListener(INetworkPolicyListener listener);
void unregisterListener(INetworkPolicyListener listener);
diff --git a/core/java/android/net/NetworkPolicyManager.java b/core/java/android/net/NetworkPolicyManager.java
index bc03637..b4c7b2b 100644
--- a/core/java/android/net/NetworkPolicyManager.java
+++ b/core/java/android/net/NetworkPolicyManager.java
@@ -129,14 +129,6 @@ public class NetworkPolicyManager {
}
}
- public int[] getPowerSaveAppIdWhitelist() {
- try {
- return mService.getPowerSaveAppIdWhitelist();
- } catch (RemoteException e) {
- return new int[0];
- }
- }
-
public void registerListener(INetworkPolicyListener listener) {
try {
mService.registerListener(listener);