commit 700a959aebe59eae4c601c55f59cce0f6f6993ad
author Philip P. Moltmann <moltmann@google.com> Thu Oct 03 11:53:50 2019 -0700
committer Philip P. Moltmann <moltmann@google.com> Thu Nov 14 13:31:10 2019 -0800
tree 163598201f20bff067fb4e33b6a6fc9f6f21ec62
parent f8a180fa7ec5d510df4d12bd9c864f3296094058

Pipe though componentId from caller to permission checks

Test: atest TeleServiceTests
Bug: 136595429
Change-Id: I3e6a3b0bd1c443660d0dcd27b6c8af0388330dec

src/com/android/phone/CallNotifier.java

diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index dab04f0..9e7bb39 100644
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -558,7 +558,8 @@
 
     public void updatePhoneStateListeners(boolean isRefresh, int updateType, int subIdToUpdate) {
         List<SubscriptionInfo> subInfos = SubscriptionController.getInstance()
-                .getActiveSubscriptionInfoList(mApplication.getOpPackageName());
+                .getActiveSubscriptionInfoList(mApplication.getOpPackageName(),
+                        mApplication.getFeatureId());
 
         // Sort sub id list based on slot id, so that CFI/MWI notifications will be updated for
         // slot 0 first then slot 1. This is needed to ensure that when CFI or MWI is enabled for