commit d91d78d8a43a2d7b75deef0adf05fabcf094bc99
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Jan 24 17:33:49 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 24 17:33:49 2024 +0000
tree 57ea7485878f3aef5d91905f8505b1ad0f28bef7
parent 650a82659dd30856456b44b2f00421db9382f331
parent 7b0adf2eec6de98e67baab9d8370e248d1d2f9a0

Merge "Use createForAllProfiles SubscriptionManager" into main

services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java

diff --git a/services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java b/services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java
index 403b421..71a9f54 100644
--- a/services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java
+++ b/services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java
@@ -248,6 +248,7 @@
             SubscriptionManager subManager = mContext.getSystemService(SubscriptionManager.class);
             TelephonyManager telManager = mContext.getSystemService(TelephonyManager.class);
             if (subManager != null && telManager != null) {
+                subManager = subManager.createForAllUserProfiles();
                 List<SubscriptionInfo> subscriptionInfoList =
                         subManager.getActiveSubscriptionInfoList();
                 HashSet<Integer> activeSubIds = new HashSet<Integer>();