diff options
author | Dianne Hackborn <hackbod@google.com> | 2015-04-29 20:51:04 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-29 20:51:04 +0000 |
commit | 8756f9b34dd04cabae7487bd1941008a6c98c4c6 (patch) | |
tree | addf56c050d2963c16496111cd2b8905be629372 /core/java/android/net | |
parent | 94582c5fb632b17b751729a929ff94ef8aa216a1 (diff) | |
parent | 599a4e0ea864769e6cd1d04bd766c472b16be4c7 (diff) | |
download | frameworks_base-8756f9b34dd04cabae7487bd1941008a6c98c4c6.zip frameworks_base-8756f9b34dd04cabae7487bd1941008a6c98c4c6.tar.gz frameworks_base-8756f9b34dd04cabae7487bd1941008a6c98c4c6.tar.bz2 |
am 599a4e0e: am 9ac2718e: Merge "Implement user-settable power save whitelist." into mnc-dev
* commit '599a4e0ea864769e6cd1d04bd766c472b16be4c7':
Implement user-settable power save whitelist.
Diffstat (limited to 'core/java/android/net')
-rw-r--r-- | core/java/android/net/INetworkPolicyManager.aidl | 2 | ||||
-rw-r--r-- | core/java/android/net/NetworkPolicyManager.java | 8 |
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); |