commit 295beeded357d0f68a47dcf5e79808b5023909d3
author Philip P. Moltmann <moltmann@google.com> Wed Mar 18 17:06:12 2020 -0700
committer Philip P. Moltmann <moltmann@google.com> Thu Mar 19 23:55:05 2020 +0000
tree 0feb9063fda32bda3f1a8f241e576084c0edef4a
parent 67be8c1973a96ed1a56e0baa6b7bcb8a682dc746

Pipe through attributeTag for one SMS permission check

Bug: 136595429
Test: TH
Change-Id: I4f8ed623e96d8f45234ecfe4020303ec09ed500c
Merged-In: Iedfa00973a92a7de7f9607df9f3f34f6682ec5b2

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 92b063a..319f308 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -8199,13 +8199,15 @@
     }
 
     @Override
-    public void enqueueSmsPickResult(String callingPackage, IIntegerConsumer pendingSubIdResult) {
+    public void enqueueSmsPickResult(String callingPackage, String callingAttributionTag,
+            IIntegerConsumer pendingSubIdResult) {
         if (callingPackage == null) {
             callingPackage = getCurrentPackageName();
         }
         SmsPermissions permissions = new SmsPermissions(getDefaultPhone(), mApp,
                 (AppOpsManager) mApp.getSystemService(Context.APP_OPS_SERVICE));
-        if (!permissions.checkCallingCanSendSms(callingPackage, "Sending message")) {
+        if (!permissions.checkCallingCanSendSms(callingPackage, callingAttributionTag,
+                "Sending message")) {
             throw new SecurityException("Requires SEND_SMS permission to perform this operation");
         }
         PickSmsSubscriptionActivity.addPendingResult(pendingSubIdResult);