Fix permission check for deleting SMS on UICC.

When accessing SMS stored on UICC via TelephonyProvider, we need to
use the com.android.phone UID for the call to IccSmsInterfaceManager
to avoid a UID mismatch failure in the app ops check. Add code to
SmsProvider to save and restore the original caller identity.

Change-Id:I520ca6e456a20ad3bc5d5c2584be2560e16efd20
CRs-Fixed: 562711
(cherry picked from commit cc0aff6fa3de420b12c602fab9f139847bfc4b85)
(cherry picked from commit adbf372891093248f0ed5058eb0c701f655264f8)
(cherry picked from commit 43f8a3342021c4e86a85092c50275ead2cea93c9)

1 files changed, 3 insertions, 1 deletions

diff --git a/src/com/android/providers/telephony/SmsProvider.java b/src/com/android/providers/telephony/SmsProvider.java
index c36a0d2..28fb970 100644
--- a/src/com/android/providers/telephony/SmsProvider.java
+++ b/src/com/android/providers/telephony/SmsProvider.java
@@ -607,7 +607,8 @@ public class SmsProvider extends ContentProvider {
      */
     private int deleteMessageFromIcc(String messageIndexString) {
         SmsManager smsManager = SmsManager.getDefault();
-
+        // use phone app permissions to avoid UID mismatch in AppOpsManager.noteOp() call
+        long token = Binder.clearCallingIdentity();
         try {
             return smsManager.deleteMessageFromIcc(
                     Integer.parseInt(messageIndexString))
@@ -619,6 +620,7 @@ public class SmsProvider extends ContentProvider {
             ContentResolver cr = getContext().getContentResolver();
 
             cr.notifyChange(ICC_URI, null);
+            Binder.restoreCallingIdentity(token);
         }
     }