am cef1300e: am f3882914: Merge "Make policy data enabled flag static." into ics-mr1

* commit 'cef1300ebd6bc88e93ee1420e5fec359531533d2':
  Make policy data enabled flag static.
This commit is contained in:
Jeff Sharkey
2011-11-09 21:51:35 +00:00
committed by Android Git Automerger
3 changed files with 12 additions and 20 deletions

View File

@@ -225,8 +225,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
/** Set of currently active {@link Notification} tags. */
private HashSet<String> mActiveNotifs = Sets.newHashSet();
/** Current values from {@link #setPolicyDataEnable(int, boolean)}. */
private SparseBooleanArray mActiveNetworkEnabled = new SparseBooleanArray();
/** Foreground at both UID and PID granularity. */
private SparseBooleanArray mUidForeground = new SparseBooleanArray();
@@ -1519,21 +1517,13 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
}
/**
* Control {@link IConnectivityManager#setPolicyDataEnable(int, boolean)},
* dispatching only when actually changed.
* Control {@link IConnectivityManager#setPolicyDataEnable(int, boolean)}.
*/
private void setPolicyDataEnable(int networkType, boolean enabled) {
synchronized (mActiveNetworkEnabled) {
final boolean prevEnabled = mActiveNetworkEnabled.get(networkType, true);
if (prevEnabled == enabled) return;
try {
mConnManager.setPolicyDataEnable(networkType, enabled);
} catch (RemoteException e) {
// ignored; service lives in system_server
}
mActiveNetworkEnabled.put(networkType, enabled);
try {
mConnManager.setPolicyDataEnable(networkType, enabled);
} catch (RemoteException e) {
// ignored; service lives in system_server
}
}