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

Merge "Do not blame network scorer apps for permission access."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-30 05:23:59 +00:00
committed by Android (Google) Code Review
parent 04d47cdfde 04acad99bd
commit e12235039e
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/NetworkScorerAppManager.java
View File

@@ -18,10 +18,10 @@ package com.android.server;
import android.Manifest.permission;
import android.annotation.Nullable;
import android.app.AppOpsManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.PermissionChecker;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
@@ -210,14 +210,9 @@ public class NetworkScorerAppManager {
}
private boolean canAccessLocation(int uid, String packageName) {
final PackageManager pm = mContext.getPackageManager();
final AppOpsManager appOpsManager =
(AppOpsManager) mContext.getSystemService(Context.APP_OPS_SERVICE);
return isLocationModeEnabled()
&& pm.checkPermission(permission.ACCESS_COARSE_LOCATION, packageName)
== PackageManager.PERMISSION_GRANTED
&& appOpsManager.noteOp(AppOpsManager.OP_COARSE_LOCATION, uid, packageName)
== AppOpsManager.MODE_ALLOWED;
return isLocationModeEnabled() && PermissionChecker.checkPermissionForPreflight(mContext,
permission.ACCESS_COARSE_LOCATION, PermissionChecker.PID_UNKNOWN, uid, packageName)
== PermissionChecker.PERMISSION_GRANTED;
}
private boolean isLocationModeEnabled() {