From 4cddbf8ddbd5b329b89e21229919f3a0173f0f86 Mon Sep 17 00:00:00 2001
From: Amit Mahajan <amitmahajan@google.com>
Date: Tue, 17 Mar 2020 20:39:06 +0000
Subject: [PATCH] Revert "Fix permission check for get/setSmscAddress."

This reverts commit 06b248fa6c9b71a5cd945d00556dc6a72e7647a9.

Reason for revert: b/150666039

Change-Id: Ida963267b4ffd054b58471731347b523b3fcd456
Merged-in: I67a4ffe94e3caabd04a5b9305de3e476867bfbd1
---
 .../internal/telephony/SmsApplication.java      | 17 +----------------
 .../java/android/telephony/SmsManager.java      |  7 +++----
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/telephony/common/com/android/internal/telephony/SmsApplication.java b/telephony/common/com/android/internal/telephony/SmsApplication.java
index 98a649fb0fc32..1a049e6c517e7 100644
--- a/telephony/common/com/android/internal/telephony/SmsApplication.java
+++ b/telephony/common/com/android/internal/telephony/SmsApplication.java
@@ -1051,8 +1051,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
@@ -1061,22 +1060,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)) {
diff --git a/telephony/java/android/telephony/SmsManager.java b/telephony/java/android/telephony/SmsManager.java
index 437ee2cd67cc0..f86eeb2bf3dfc 100644
--- a/telephony/java/android/telephony/SmsManager.java
+++ b/telephony/java/android/telephony/SmsManager.java
@@ -2743,7 +2743,7 @@ public final class SmsManager {
                         getSubscriptionId(), null);
             }
         } catch (RemoteException ex) {
-            throw new RuntimeException(ex);
+            // ignore it
         }
         return smsc;
     }
@@ -2765,8 +2765,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)
@@ -2778,7 +2777,7 @@ public final class SmsManager {
                         smsc, getSubscriptionId(), null);
             }
         } catch (RemoteException ex) {
-            throw new RuntimeException(ex);
+            // ignore it
         }
         return false;
     }