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

Merge "use @SystemAPI in AppOpsManager"

Browse Source
This commit is contained in:
Chen Xu
2019-09-26 03:43:44 +00:00
committed by Gerrit Code Review
parent e958bbd8ae 4927f6d7da
commit 83fe845c8c
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
telephony/java/com/android/internal/telephony/TelephonyPermissions.java
View File

@@ -178,7 +178,7 @@ public final class TelephonyPermissions {
// We have READ_PHONE_STATE permission, so return true as long as the AppOps bit hasn't been // We have READ_PHONE_STATE permission, so return true as long as the AppOps bit hasn't been
// revoked. // revoked.
AppOpsManager appOps = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE); AppOpsManager appOps = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
return appOps.noteOp(AppOpsManager.OP_READ_PHONE_STATE, uid, callingPackage) return appOps.noteOp(AppOpsManager.OPSTR_READ_PHONE_STATE, uid, callingPackage)
== AppOpsManager.MODE_ALLOWED; == AppOpsManager.MODE_ALLOWED;
} }
@@ -226,7 +226,7 @@ public final class TelephonyPermissions {
// We have READ_PHONE_STATE permission, so return true as long as the AppOps bit hasn't been // We have READ_PHONE_STATE permission, so return true as long as the AppOps bit hasn't been
// revoked. // revoked.
AppOpsManager appOps = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE); AppOpsManager appOps = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
return appOps.noteOp(AppOpsManager.OP_READ_PHONE_STATE, uid, callingPackage) == return appOps.noteOp(AppOpsManager.OPSTR_READ_PHONE_STATE, uid, callingPackage) ==
AppOpsManager.MODE_ALLOWED; AppOpsManager.MODE_ALLOWED;
} }
@@ -448,7 +448,7 @@ public final class TelephonyPermissions {
// We have READ_CALL_LOG permission, so return true as long as the AppOps bit hasn't been // We have READ_CALL_LOG permission, so return true as long as the AppOps bit hasn't been
// revoked. // revoked.
AppOpsManager appOps = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE); AppOpsManager appOps = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
return appOps.noteOp(AppOpsManager.OP_READ_CALL_LOG, uid, callingPackage) == return appOps.noteOp(AppOpsManager.OPSTR_READ_CALL_LOG, uid, callingPackage) ==
AppOpsManager.MODE_ALLOWED; AppOpsManager.MODE_ALLOWED;
} }
@@ -471,7 +471,7 @@ public final class TelephonyPermissions {
String callingPackage, String message) { String callingPackage, String message) {
// Default SMS app can always read it. // Default SMS app can always read it.
AppOpsManager appOps = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE); AppOpsManager appOps = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
if (appOps.noteOp(AppOpsManager.OP_WRITE_SMS, uid, callingPackage) == if (appOps.noteOp(AppOpsManager.OPSTR_WRITE_SMS, uid, callingPackage) ==
AppOpsManager.MODE_ALLOWED) { AppOpsManager.MODE_ALLOWED) {
return true; return true;
} }
@@ -488,25 +488,18 @@ public final class TelephonyPermissions {
// Can be read with READ_SMS too. // Can be read with READ_SMS too.
try { try {
context.enforcePermission(android.Manifest.permission.READ_SMS, pid, uid, message); context.enforcePermission(android.Manifest.permission.READ_SMS, pid, uid, message);
int opCode = AppOpsManager.permissionToOpCode(android.Manifest.permission.READ_SMS); return appOps.noteOp(AppOpsManager.OPSTR_READ_SMS, uid, callingPackage)
if (opCode != AppOpsManager.OP_NONE) { == AppOpsManager.MODE_ALLOWED;
return appOps.noteOp(opCode, uid, callingPackage) == AppOpsManager.MODE_ALLOWED;
} else {
return true;
}
} catch (SecurityException readSmsSecurityException) { } catch (SecurityException readSmsSecurityException) {
} }
// Can be read with READ_PHONE_NUMBERS too. // Can be read with READ_PHONE_NUMBERS too.
try { try {
context.enforcePermission(android.Manifest.permission.READ_PHONE_NUMBERS, pid, uid, context.enforcePermission(android.Manifest.permission.READ_PHONE_NUMBERS, pid, uid,
message); message);
int opCode = AppOpsManager.permissionToOpCode( return appOps.noteOp(AppOpsManager.OPSTR_READ_PHONE_NUMBERS, uid, callingPackage)
android.Manifest.permission.READ_PHONE_NUMBERS); == AppOpsManager.MODE_ALLOWED;
if (opCode != AppOpsManager.OP_NONE) {
return appOps.noteOp(opCode, uid, callingPackage) == AppOpsManager.MODE_ALLOWED;
} else {
return true;
}
} catch (SecurityException readPhoneNumberSecurityException) { } catch (SecurityException readPhoneNumberSecurityException) {
} }