Revert "Fix permission check for get/setSmscAddress."

This reverts commit 05e9720552.

Reason for revert: b/150666039
Bug: 150666039
Change-Id: I67a4ffe94e3caabd04a5b9305de3e476867bfbd1
This commit is contained in:
Amit Mahajan
2020-03-03 19:18:23 +00:00
parent 05e9720552
commit dec964ceb6
2 changed files with 4 additions and 20 deletions

View File

@@ -1057,8 +1057,7 @@ public final class SmsApplication {
}
/**
* Check if a package is default sms app (or equivalent, like bluetooth), and verify that
* packageName belongs to the caller.
* Check if a package is default sms app (or equivalent, like bluetooth)
*
* @param context context from the calling app
* @param packageName the name of the package to be checked
@@ -1067,22 +1066,8 @@ public final class SmsApplication {
@UnsupportedAppUsage
public static boolean isDefaultSmsApplication(Context context, String packageName) {
if (packageName == null) {
Log.e(LOG_TAG, "isDefaultSmsApplication: packageName is null");
return false;
}
try {
if (Binder.getCallingUid()
== context.getPackageManager().getPackageUid(packageName, 0)) {
Log.e(LOG_TAG, "isDefaultSmsApplication: " + packageName + " calling uid "
+ context.getPackageManager().getPackageUid(packageName, 0)
+ " does not match calling uid " + Binder.getCallingUid());
return false;
}
} catch (NameNotFoundException ex) {
Log.e(LOG_TAG, "isDefaultSmsApplication: packageName " + packageName + " not found");
return false;
}
final String defaultSmsPackage = getDefaultSmsApplicationPackageName(context);
if ((defaultSmsPackage != null && defaultSmsPackage.equals(packageName))
|| BLUETOOTH_PACKAGE_NAME.equals(packageName)) {

View File

@@ -2898,7 +2898,7 @@ public final class SmsManager {
getSubscriptionId(), null);
}
} catch (RemoteException ex) {
throw new RuntimeException(ex);
// ignore it
}
return smsc;
}
@@ -2920,8 +2920,7 @@ public final class SmsManager {
* </p>
*
* @param smsc the SMSC address string.
* @return true for success, false otherwise. Failure can be due to caller not having the
* appropriate permission, or modem returning an error.
* @return true for success, false otherwise.
*/
@SuppressAutoDoc // for carrier privileges and default SMS application.
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
@@ -2933,7 +2932,7 @@ public final class SmsManager {
smsc, getSubscriptionId(), null);
}
} catch (RemoteException ex) {
throw new RuntimeException(ex);
// ignore it
}
return false;
}