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

Merge "Avoid data usage notifications in airplane mode."

Browse Source
This commit is contained in:
Jeff Sharkey
2012-03-20 17:49:52 -07:00
committed by Android (Google) Code Review
parent 848763daea 3a66cf3e86
commit 4259fc65da
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/java/com/android/server/net/NetworkPolicyManagerService.java
View File

@@ -524,6 +524,11 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
case MATCH_MOBILE_3G_LOWER:
case MATCH_MOBILE_4G:
case MATCH_MOBILE_ALL:
// mobile templates aren't relevant in airplane mode
if (isAirplaneModeOn(mContext)) {
return false;
}
// mobile templates are relevant when subscriberid is active
return Objects.equal(getActiveSubscriberId(), template.getSubscriberId());
}
@@ -1723,6 +1728,11 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
mHandler.getLooper().getQueue().addIdleHandler(handler);
}
public static boolean isAirplaneModeOn(Context context) {
return Settings.System.getInt(
context.getContentResolver(), Settings.System.AIRPLANE_MODE_ON, 0) != 0;
}
private static void collectKeys(SparseIntArray source, SparseBooleanArray target) {
final int size = source.size();
for (int i = 0; i < size; i++) {