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

Merge "Use hasInternetPermission method" into nyc-dev

Browse Source 
am: 6b6b9c6425

* commit '6b6b9c6425074b1010804694dcba08073dc78946':
  Use hasInternetPermission method
This commit is contained in:
Amith Yamasani
2016-02-12 21:35:11 +00:00
committed by android-build-merger
parent 051c1675b0 6b6b9c6425
commit dff704d50f
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -339,6 +339,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
private final AppOpsManager mAppOps; private final AppOpsManager mAppOps;
private final MyPackageMonitor mPackageMonitor; private final MyPackageMonitor mPackageMonitor;
private final IPackageManager mIPm;
// TODO: keep whitelist of system-critical services that should never have // TODO: keep whitelist of system-critical services that should never have
// rules enforced, such as system, phone, and radio UIDs. // rules enforced, such as system, phone, and radio UIDs.
@@ -369,6 +371,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
Context.DEVICE_IDLE_CONTROLLER)); Context.DEVICE_IDLE_CONTROLLER));
mTime = checkNotNull(time, "missing TrustedTime"); mTime = checkNotNull(time, "missing TrustedTime");
mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE); mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
mIPm = AppGlobals.getPackageManager();
HandlerThread thread = new HandlerThread(TAG); HandlerThread thread = new HandlerThread(TAG);
thread.start(); thread.start();
@@ -2335,14 +2338,9 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
// quick check: if this uid doesn't have INTERNET permission, it // quick check: if this uid doesn't have INTERNET permission, it
// doesn't have network access anyway, so it is a waste to mess // doesn't have network access anyway, so it is a waste to mess
// with it here. // with it here.
try { if (hasInternetPermissions(uid)) {
if (ipm.checkUidPermission(Manifest.permission.INTERNET, uid) uidRules.put(uid, FIREWALL_RULE_DENY);
!= PackageManager.PERMISSION_GRANTED) {
continue;
}
} catch (RemoteException e) {
} }
uidRules.put(uid, FIREWALL_RULE_DENY);
} }
} }
} }
@@ -2451,9 +2449,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
* Useful for the cases where the lack of network access can simplify the rules. * Useful for the cases where the lack of network access can simplify the rules.
*/ */
private boolean hasInternetPermissions(int uid) { private boolean hasInternetPermissions(int uid) {
final IPackageManager ipm = AppGlobals.getPackageManager();
try { try {
if (ipm.checkUidPermission(Manifest.permission.INTERNET, uid) if (mIPm.checkUidPermission(Manifest.permission.INTERNET, uid)
!= PackageManager.PERMISSION_GRANTED) { != PackageManager.PERMISSION_GRANTED) {
return false; return false;
} }