commit d02b7377516bd8d01d92324063a83560264c2be2
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 16:54:45 2020 -0700
tree 189510ae393c88ca393cb8061f2f900b7f8bd5a2
parent c5e887a40c8a4039ac22a575e16464963e446260

Pipe through attributeTag for one SMS permission check

Bug: 136595429
Test: TH
Change-Id: Iedfa00973a92a7de7f9607df9f3f34f6682ec5b2

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index a00e6cc..b71b5b1 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -8265,13 +8265,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);