commit 5bef63756c51e6232ceee81f2b40a200ef16aa69
author Junyu Lai <junyulai@google.com> Mon Jan 03 14:05:45 2022 +0000
committer Junyu Lai <junyulai@google.com> Thu Jan 06 09:22:52 2022 +0000
tree ee8f1b46f553fc4d70485f8fe37c8edfc04b7bd4
parent 0dbd0c8d26252c44b5a30c3d8c76620b6326e96e

[MS34.1] Replace TelephonyManager#getSubscriberId(subId) with public API

Test: atest com.android.server.net.NetworkStatsSubscriptionsMonitorTest
Bug: 204830222
Change-Id: I57aa4470aea1715217fa7d74f2c9067b096d1bae

service-t/src/com/android/server/net/NetworkStatsSubscriptionsMonitor.java

diff --git a/service-t/src/com/android/server/net/NetworkStatsSubscriptionsMonitor.java b/service-t/src/com/android/server/net/NetworkStatsSubscriptionsMonitor.java
index 93d0ae7..9bb7bb8 100644
--- a/service-t/src/com/android/server/net/NetworkStatsSubscriptionsMonitor.java
+++ b/service-t/src/com/android/server/net/NetworkStatsSubscriptionsMonitor.java
@@ -101,7 +101,8 @@
         // with empty IMSI. So filter the subs w/o a valid IMSI to prevent such registration.
         final List<Pair<Integer, String>> filteredNewSubs = new ArrayList<>();
         for (final int subId : newSubs) {
-            final String subscriberId = mTeleManager.getSubscriberId(subId);
+            final String subscriberId =
+                    mTeleManager.createForSubscriptionId(subId).getSubscriberId();
             if (!TextUtils.isEmpty(subscriberId)) {
                 filteredNewSubs.add(new Pair(subId, subscriberId));
             }