Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cddbf8d authored by Amit Mahajan's avatar Amit Mahajan
Browse files

Revert "Fix permission check for get/setSmscAddress." 

This reverts commit 06b248fa.

Reason for revert: b/150666039

Change-Id: Ida963267b4ffd054b58471731347b523b3fcd456
Merged-in: I67a4ffe94e3caabd04a5b9305de3e476867bfbd1
parent 06b248fa

telephony/common/com/android/internal/telephony/SmsApplication.java

+1 −16
Original line number Diff line number Diff line
@@ -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)) {

telephony/java/android/telephony/SmsManager.java

+3 −4
Original line number Diff line number Diff line
@@ -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;

    }