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

Merge "allow CBR to write SMS database" into rvc-dev am: b44d6d6d48

Browse Source 
Change-Id: Idc24a3c6b63ed4dea663f371a24073596e91abd1
This commit is contained in:
Chen Xu
2020-05-19 05:01:01 +00:00
committed by Automerger Merge Worker
parent 5e2b89d6b1 b44d6d6d48
commit a97cbb8bd6
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
telephony/common/com/android/internal/telephony/SmsApplication.java
View File

@@ -536,13 +536,16 @@ public final class SmsApplication {
// Assign permission to special system apps // Assign permission to special system apps
assignExclusiveSmsPermissionsToSystemApp(context, packageManager, appOps, assignExclusiveSmsPermissionsToSystemApp(context, packageManager, appOps,
PHONE_PACKAGE_NAME); PHONE_PACKAGE_NAME, true);
assignExclusiveSmsPermissionsToSystemApp(context, packageManager, appOps, assignExclusiveSmsPermissionsToSystemApp(context, packageManager, appOps,
BLUETOOTH_PACKAGE_NAME); BLUETOOTH_PACKAGE_NAME, true);
assignExclusiveSmsPermissionsToSystemApp(context, packageManager, appOps, assignExclusiveSmsPermissionsToSystemApp(context, packageManager, appOps,
MMS_SERVICE_PACKAGE_NAME); MMS_SERVICE_PACKAGE_NAME, true);
assignExclusiveSmsPermissionsToSystemApp(context, packageManager, appOps, assignExclusiveSmsPermissionsToSystemApp(context, packageManager, appOps,
TELEPHONY_PROVIDER_PACKAGE_NAME); TELEPHONY_PROVIDER_PACKAGE_NAME, true);
// CellbroadcastReceiver is a mainline module thus skip signature match.
assignExclusiveSmsPermissionsToSystemApp(context, packageManager, appOps,
CellBroadcastUtils.getDefaultCellBroadcastReceiverPackageName(context), false);
// Give AppOps permission to UID 1001 which contains multiple // Give AppOps permission to UID 1001 which contains multiple
// apps, all of them should be able to write to telephony provider. // apps, all of them should be able to write to telephony provider.
@@ -744,17 +747,23 @@ public final class SmsApplication {
* @param packageManager The package manager instance * @param packageManager The package manager instance
* @param appOps The AppOps manager instance * @param appOps The AppOps manager instance
* @param packageName The package name of the system app * @param packageName The package name of the system app
* @param sigatureMatch whether to check signature match
*/ */
private static void assignExclusiveSmsPermissionsToSystemApp(Context context, private static void assignExclusiveSmsPermissionsToSystemApp(Context context,
PackageManager packageManager, AppOpsManager appOps, String packageName) { PackageManager packageManager, AppOpsManager appOps, String packageName,
boolean sigatureMatch) {
// First check package signature matches the caller's package signature. // First check package signature matches the caller's package signature.
// Since this class is only used internally by the system, this check makes sure // Since this class is only used internally by the system, this check makes sure
// the package signature matches system signature. // the package signature matches system signature.
final int result = packageManager.checkSignatures(context.getPackageName(), packageName); if (sigatureMatch) {
if (result != PackageManager.SIGNATURE_MATCH) { final int result = packageManager.checkSignatures(context.getPackageName(),
Log.e(LOG_TAG, packageName + " does not have system signature"); packageName);
return; if (result != PackageManager.SIGNATURE_MATCH) {
Log.e(LOG_TAG, packageName + " does not have system signature");
return;
}
} }
try { try {
PackageInfo info = packageManager.getPackageInfo(packageName, 0); PackageInfo info = packageManager.getPackageInfo(packageName, 0);
int mode = appOps.unsafeCheckOp(AppOpsManager.OPSTR_WRITE_SMS, info.applicationInfo.uid, int mode = appOps.unsafeCheckOp(AppOpsManager.OPSTR_WRITE_SMS, info.applicationInfo.uid,