LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes from topics "ms34-tm", "ms40-clock"

Browse Source 
* changes:
  [MS09] Expose NetworkTemplate APIs which are needed by NetworkPolicy
  [MS34.1] Replace TelephonyManager#getSubscriberId(subId) with public API
  [MS40.1] Remove Clock dependencies from NetworkStatsService
  [MS27] Expose noteUntaggedSocket SystemApi
This commit is contained in:
Junyu Lai
2022-01-06 13:56:39 +00:00
committed by Gerrit Code Review
parent b01254f350 6ba0487c91
commit 230a6388a8
4 changed files with 17 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
service-t/src/com/android/server/net/NetworkStatsService.java
View File

@@ -113,7 +113,6 @@ import android.net.Uri;
import android.net.netstats.provider.INetworkStatsProvider;
import android.net.netstats.provider.INetworkStatsProviderCallback;
import android.net.netstats.provider.NetworkStatsProvider;
import android.os.BestClock;
import android.os.Binder;
import android.os.DropBoxManager;
import android.os.Environment;
@@ -149,6 +148,7 @@ import android.util.proto.ProtoOutputStream;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.FileRotator;
import com.android.net.module.util.BestClock;
import com.android.net.module.util.BinderUtils;
import com.android.net.module.util.CollectionUtils;
import com.android.net.module.util.NetworkStatsUtils;

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

@@ -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<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));
}