Merge "use @SystemAPI in AppOpsManager" am: 83fe845c8c am: 7ca0425127 (b92ef484) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/TelephonyPermissions.java

+10 −17

Original line number	Diff line number	Diff line
		@@ -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
		// revoked.
		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;
		}

		@@ -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
		// revoked.
		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;
		}

		@@ -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
		// revoked.
		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;
		}

		@@ -471,7 +471,7 @@ public final class TelephonyPermissions {
		String callingPackage, String message) {
		// Default SMS app can always read it.
		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) {
		return true;
		}
		@@ -488,25 +488,18 @@ public final class TelephonyPermissions {
		// Can be read with READ_SMS too.
		try {
		context.enforcePermission(android.Manifest.permission.READ_SMS, pid, uid, message);
		int opCode = AppOpsManager.permissionToOpCode(android.Manifest.permission.READ_SMS);
		if (opCode != AppOpsManager.OP_NONE) {
		return appOps.noteOp(opCode, uid, callingPackage) == AppOpsManager.MODE_ALLOWED;
		} else {
		return true;
		}
		return appOps.noteOp(AppOpsManager.OPSTR_READ_SMS, uid, callingPackage)
		== AppOpsManager.MODE_ALLOWED;

		} catch (SecurityException readSmsSecurityException) {
		}
		// Can be read with READ_PHONE_NUMBERS too.
		try {
		context.enforcePermission(android.Manifest.permission.READ_PHONE_NUMBERS, pid, uid,
		message);
		int opCode = AppOpsManager.permissionToOpCode(
		android.Manifest.permission.READ_PHONE_NUMBERS);
		if (opCode != AppOpsManager.OP_NONE) {
		return appOps.noteOp(opCode, uid, callingPackage) == AppOpsManager.MODE_ALLOWED;
		} else {
		return true;
		}
		return appOps.noteOp(AppOpsManager.OPSTR_READ_PHONE_NUMBERS, uid, callingPackage)
		== AppOpsManager.MODE_ALLOWED;

		} catch (SecurityException readPhoneNumberSecurityException) {
		}