From 27c9adb058e14e2bea63acebc619464084da276e Mon Sep 17 00:00:00 2001 From: Junyu Lai Date: Mon, 3 Jan 2022 14:05:45 +0000 Subject: [MS34.1] Replace TelephonyManager#getSubscriberId(subId) with public API Test: atest com.android.server.net.NetworkStatsSubscriptionsMonitorTest Bug: 204830222 Change-Id: I57aa4470aea1715217fa7d74f2c9067b096d1bae --- .../src/com/android/server/net/NetworkStatsSubscriptionsMonitor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsSubscriptionsMonitor.java b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsSubscriptionsMonitor.java index 93d0ae7da098..9bb7bb80782b 100644 --- a/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsSubscriptionsMonitor.java +++ b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsSubscriptionsMonitor.java @@ -101,7 +101,8 @@ public class NetworkStatsSubscriptionsMonitor extends // with empty IMSI. So filter the subs w/o a valid IMSI to prevent such registration. final List> 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)); } -- cgit v1.2.3-59-g8ed1b