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

Merge "Remove appops debug logic" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-13 06:06:40 +00:00
committed by Android (Google) Code Review
parent d406d41bd1 4f10da3f75
commit 62c6f21dac
1 changed files with 0 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
core/java/android/app/AppOpsManager.java
View File

@@ -38,7 +38,6 @@ import android.os.Parcelable;
import android.os.Process;
import android.os.RemoteCallback;
import android.os.RemoteException;
import android.os.SystemProperties;
import android.os.UserManager;
import android.util.ArrayMap;
import android.util.LongSparseArray;
@@ -5209,7 +5208,6 @@ public class AppOpsManager {
* @hide
*/
public int noteProxyOpNoThrow(int op, String proxiedPackageName, int proxiedUid) {
logOperationIfNeeded(op, mContext.getOpPackageName(), proxiedPackageName);
try {
return mService.noteProxyOperation(op, Process.myUid(), mContext.getOpPackageName(),
proxiedUid, proxiedPackageName);
@@ -5238,7 +5236,6 @@ public class AppOpsManager {
*/
@UnsupportedAppUsage
public int noteOpNoThrow(int op, int uid, String packageName) {
logOperationIfNeeded(op, packageName, null);
try {
return mService.noteOperation(op, uid, packageName);
} catch (RemoteException e) {
@@ -5346,7 +5343,6 @@ public class AppOpsManager {
* @hide
*/
public int startOpNoThrow(int op, int uid, String packageName, boolean startIfModeDefault) {
logOperationIfNeeded(op, packageName, null);
try {
return mService.startOperation(getToken(mService), op, uid, packageName,
startIfModeDefault);
@@ -5363,7 +5359,6 @@ public class AppOpsManager {
* @hide
*/
public void finishOp(int op, int uid, String packageName) {
logOperationIfNeeded(op, packageName, null);
try {
mService.finishOperation(getToken(mService), op, uid, packageName);
} catch (RemoteException e) {
@@ -5703,45 +5698,4 @@ public class AppOpsManager {
return AppOpsManager.MODE_DEFAULT;
}
private static void logOperationIfNeeded(int op, String callingPackage, String proxiedPackage) {
// Check if debug logging propety is enabled.
if (!SystemProperties.getBoolean(DEBUG_LOGGING_ENABLE_PROP, false)) {
return;
}
// Check if this package should be logged.
String packages = SystemProperties.get(DEBUG_LOGGING_PACKAGES_PROP, "");
if (!"".equals(packages) && callingPackage != null) {
boolean found = false;
for (String pkg : packages.split(",")) {
if (callingPackage.equals(pkg)) {
found = true;
break;
}
}
if (!found) {
return;
}
}
String opStr = opToName(op);
// Check if this app op should be logged
String logOps = SystemProperties.get(DEBUG_LOGGING_OPS_PROP, "");
if (!"".equals(logOps)) {
boolean found = false;
for (String logOp : logOps.split(",")) {
if (opStr.equals(logOp)) {
found = true;
break;
}
}
if (!found) {
return;
}
}
// Log a stack trace
Exception here = new Exception("HERE!");
android.util.Log.i(DEBUG_LOGGING_TAG, "Note operation package= " + callingPackage
+ " proxied= " + proxiedPackage + " op= " + opStr, here);
}
}