diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-09 04:21:40 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-09 04:21:40 +0000 |
| commit | 1cc3e69a6d8bdf4f84c6bd8a157be25252644a90 (patch) | |
| tree | af5988624ed93389b325bfef5f5b027ceef7e811 | |
| parent | 3e91a3297f8820255b77178aa6ff96bf71ab14b3 (diff) | |
| parent | a625fb2c83cee267a0bcfb58547d0e6febc9428b (diff) | |
| download | AlternativeNetworkAccess-android14-qpr2-s3-release.tar.gz | |
Snap for 11200327 from a625fb2c83cee267a0bcfb58547d0e6febc9428b to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release
Change-Id: Ief6dd76341e1d68efda3429664ae5c09bc38237c
| -rw-r--r-- | src/com/android/ons/ONSProfileActivator.java | 7 | ||||
| -rw-r--r-- | src/com/android/ons/OpportunisticNetworkService.java | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/com/android/ons/ONSProfileActivator.java b/src/com/android/ons/ONSProfileActivator.java index 05228b8..d869975 100644 --- a/src/com/android/ons/ONSProfileActivator.java +++ b/src/com/android/ons/ONSProfileActivator.java @@ -35,6 +35,7 @@ import android.telephony.euicc.EuiccManager; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.telephony.flags.Flags; import com.android.ons.ONSProfileDownloader.DownloadRetryResultCode; import java.util.ArrayList; @@ -67,7 +68,11 @@ public class ONSProfileActivator implements ONSProfileConfigurator.ONSProfConfig public ONSProfileActivator(Context context, ONSStats onsStats) { mContext = context; - mSubManager = mContext.getSystemService(SubscriptionManager.class); + SubscriptionManager sm = mContext.getSystemService(SubscriptionManager.class); + if (Flags.workProfileApiSplit()) { + sm = sm.createForAllUserProfiles(); + } + mSubManager = sm; mTelephonyManager = mContext.getSystemService(TelephonyManager.class); mCarrierConfigMgr = mContext.getSystemService(CarrierConfigManager.class); mEuiccManager = mContext.getSystemService(EuiccManager.class); diff --git a/src/com/android/ons/OpportunisticNetworkService.java b/src/com/android/ons/OpportunisticNetworkService.java index 3080943..a77c18e 100644 --- a/src/com/android/ons/OpportunisticNetworkService.java +++ b/src/com/android/ons/OpportunisticNetworkService.java @@ -48,6 +48,7 @@ import com.android.internal.telephony.ISetOpportunisticDataCallback; import com.android.internal.telephony.IUpdateAvailableNetworksCallback; import com.android.internal.telephony.TelephonyIntents; import com.android.internal.telephony.TelephonyPermissions; +import com.android.internal.telephony.flags.Flags; import com.android.telephony.Rlog; import java.util.ArrayList; @@ -469,6 +470,9 @@ public class OpportunisticNetworkService extends Service { PREF_NAME, Context.MODE_PRIVATE); mSubscriptionManager = (SubscriptionManager) mContext.getSystemService( Context.TELEPHONY_SUBSCRIPTION_SERVICE); + if (Flags.workProfileApiSplit()) { + mSubscriptionManager = mSubscriptionManager.createForAllUserProfiles(); + } mONSConfigInputHashMap = new HashMap<String, ONSConfigInput>(); mONSStats = new ONSStats(mContext, mSubscriptionManager); mContext.registerReceiver(mBroadcastReceiver, |