Fixed GbaServiceTest on HSUM devices
Fixed by always binding to the overridden Gba package for
the current user.
Fix: 369560559
Test: atest GbaServiceTest
Flag: EXEMPT test fix
Change-Id: Ic2990599688fd95e7b62fe0983f8562e2173beb9
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index d3d53b1..c24f6f7 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -11699,10 +11699,10 @@
@Override
public boolean setBoundGbaServiceOverride(int subId, String packageName) {
enforceModifyPermission();
-
+ int userId = ActivityManager.getCurrentUser();
final long identity = Binder.clearCallingIdentity();
try {
- return getGbaManager(subId).overrideServicePackage(packageName);
+ return getGbaManager(subId).overrideServicePackage(packageName, userId);
} finally {
Binder.restoreCallingIdentity(identity);
}