commit 98813474d11582bf62ddd6a1df9c8a4425308f8d
author Rambo Wang <rambowang@google.com> Fri Sep 20 18:18:56 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 20 18:18:56 2024 +0000
tree 13a917f46c90a53cc3b644f8c9eeedb5ab03f5f5
parent 0e39b43f3aad9e671cd1398786e29e0a16bb92d8
parent 1b948370dfcd002ae4e49a90efcbb8c79e660659

Merge "CarrierServiceBindHelper: incorrect user unlocked event received in HSUM" into main

src/java/com/android/internal/telephony/CarrierServiceBindHelper.java

diff --git a/src/java/com/android/internal/telephony/CarrierServiceBindHelper.java b/src/java/com/android/internal/telephony/CarrierServiceBindHelper.java
index 960d794..55baecc 100644
--- a/src/java/com/android/internal/telephony/CarrierServiceBindHelper.java
+++ b/src/java/com/android/internal/telephony/CarrierServiceBindHelper.java
@@ -45,6 +45,7 @@
 import android.util.SparseArray;
 
 import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.telephony.flags.Flags;
 import com.android.internal.telephony.util.TelephonyUtils;
 
 import java.io.FileDescriptor;
@@ -171,7 +172,7 @@
                 context, mHandler.getLooper(), UserHandle.ALL);
         try {
             Context contextAsUser = mContext.createPackageContextAsUser(mContext.getPackageName(),
-                0, UserHandle.SYSTEM);
+                0, Flags.supportCarrierServicesForHsum() ? UserHandle.CURRENT : UserHandle.SYSTEM);
             contextAsUser.registerReceiver(mUserUnlockedReceiver,
                 new IntentFilter(Intent.ACTION_USER_UNLOCKED), null /* broadcastPermission */,
                 mHandler);