Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 2c6a450fa2

Browse Source 
am: 3b91df7ccf

* commit '3b91df7ccf7ee4adf9914ffcdcbf220eb9f9fd08':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: Idb223f33d6c5b1d4054bd41f4b9b9672c507986c
This commit is contained in:
Felipe Leme
2016-05-17 18:47:41 +00:00
committed by android-build-merger
parent 3a5379285d 3b91df7ccf
commit 8b297e554d
5 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/net/INetworkPolicyListener.aidl
View File

@@ -23,5 +23,6 @@ oneway interface INetworkPolicyListener {
void onMeteredIfacesChanged(in String[] meteredIfaces);
void onRestrictBackgroundChanged(boolean restrictBackground);
void onRestrictBackgroundWhitelistChanged(int uid, boolean whitelisted);
void onRestrictBackgroundBlacklistChanged(int uid, boolean blacklisted);
}

3
packages/SystemUI/src/com/android/systemui/statusbar/policy/DataSaverController.java
View File

@@ -93,6 +93,9 @@ public class DataSaverController {
@Override
public void onRestrictBackgroundWhitelistChanged(int uid, boolean whitelisted) {
}
@Override
public void onRestrictBackgroundBlacklistChanged(int uid, boolean blacklisted) {
}
};
public interface Listener {

8
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -1445,6 +1445,14 @@ public class ConnectivityService extends IConnectivityManager.Stub
+ 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 + ")");
}
}
};
/**

5
services/core/java/com/android/server/job/controllers/ConnectivityController.java
View File

@@ -179,6 +179,11 @@ public class ConnectivityController extends StateController implements
public void onRestrictBackgroundWhitelistChanged(int uid, boolean whitelisted) {
updateTrackedJobs(uid);
}
@Override
public void onRestrictBackgroundBlacklistChanged(int uid, boolean blacklisted) {
updateTrackedJobs(uid);
}
};
@Override

36
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
View File

@@ -266,6 +266,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
private static final int MSG_RESTRICT_BACKGROUND_WHITELIST_CHANGED = 9;
private static final int MSG_UPDATE_INTERFACE_QUOTA = 10;
private static final int MSG_REMOVE_INTERFACE_QUOTA = 11;
private static final int MSG_RESTRICT_BACKGROUND_BLACKLIST_CHANGED = 12;
private final Context mContext;
private final IActivityManager mActivityManager;
@@ -1707,9 +1708,14 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
private void setUidPolicyUncheckedLocked(int uid, int oldPolicy, int policy, boolean persist) {
setUidPolicyUncheckedLocked(uid, policy, persist);
final boolean isBlacklisted = policy == POLICY_REJECT_METERED_BACKGROUND;
mHandler.obtainMessage(MSG_RESTRICT_BACKGROUND_BLACKLIST_CHANGED, uid,
isBlacklisted ? 1 : 0).sendToTarget();
final boolean wasBlacklisted = oldPolicy == POLICY_REJECT_METERED_BACKGROUND;
// Checks if app was added or removed to the blacklist.
if ((oldPolicy == POLICY_NONE && policy == POLICY_REJECT_METERED_BACKGROUND)
|| (oldPolicy == POLICY_REJECT_METERED_BACKGROUND && policy == POLICY_NONE)) {
if ((oldPolicy == POLICY_NONE && isBlacklisted)
|| (wasBlacklisted && policy == POLICY_NONE)) {
mHandler.obtainMessage(MSG_RESTRICT_BACKGROUND_WHITELIST_CHANGED, uid, 1, null)
.sendToTarget();
}
@@ -3096,6 +3102,16 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
}
}
private void dispatchRestrictBackgroundBlacklistChanged(INetworkPolicyListener listener,
int uid, boolean blacklisted) {
if (listener != null) {
try {
listener.onRestrictBackgroundBlacklistChanged(uid, blacklisted);
} catch (RemoteException ignored) {
}
}
}
private Handler.Callback mHandlerCallback = new Handler.Callback() {
@Override
public boolean handleMessage(Message msg) {
@@ -3186,7 +3202,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
}
mListeners.finishBroadcast();
}
final PackageManager pm = mContext.getPackageManager();
final String[] packages = pm.getPackagesForUid(uid);
if (changed && packages != null) {
@@ -3202,6 +3217,21 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
}
return true;
}
case MSG_RESTRICT_BACKGROUND_BLACKLIST_CHANGED: {
final int uid = msg.arg1;
final boolean blacklisted = msg.arg2 == 1;
dispatchRestrictBackgroundBlacklistChanged(mConnectivityListener, uid,
blacklisted);
final int length = mListeners.beginBroadcast();
for (int i = 0; i < length; i++) {
final INetworkPolicyListener listener = mListeners.getBroadcastItem(i);
dispatchRestrictBackgroundBlacklistChanged(listener, uid,
blacklisted);
}
mListeners.finishBroadcast();
return true;
}
case MSG_ADVISE_PERSIST_THRESHOLD: {
final long lowestRule = (Long) msg.obj;
try {