Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c78f4a3 authored by Rambo Wang's avatar Rambo Wang
Browse files

Support CarrierMessagingService binding for HSUM 

This change supports CMS binding from telephony for HSUM by the create
new context for current user (instead of always system user).

The change doesn't change behavior for non-HSUM device but support the
case when CMS was provided by carrier app installed only on non-system
user (e.g. Main User on HSUM).

Bug: 345532465
Test: atest CarrierServicesSmsFilterTest GsmInboundSmsHandlerTest CarrierMessagingServiceWrapperTest GsmSmsDispatcherTest
Flag: com.android.internal.telephony.flags.support_carrier_services_for_hsum
Change-Id: I2a783c0a5982cfe0fe0fe1bf59ee59886a04700a
parent 53aebb03

core/java/android/service/carrier/CarrierMessagingServiceWrapper.java

+9 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.annotation.CallbackExecutor; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.app.ActivityManager;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;
@@ -28,8 +29,10 @@ import android.net.Uri; 
import android.os.Binder;

import android.os.IBinder;

import android.os.RemoteException;

import android.os.UserHandle;

import android.telephony.SmsMessage;



import com.android.internal.telephony.flags.Flags;

import com.android.internal.util.Preconditions;



import java.util.List;
@@ -91,7 +94,11 @@ public final class CarrierMessagingServiceWrapper implements AutoCloseable { 
        mOnServiceReadyCallback = onServiceReadyCallback;

        mServiceReadyCallbackExecutor = executor;

        mContext = context;

        return context.bindService(intent, mCarrierMessagingServiceConnection,

        return Flags.supportCarrierServicesForHsum()

                ? context.bindServiceAsUser(intent, mCarrierMessagingServiceConnection,

                Context.BIND_AUTO_CREATE,

                UserHandle.of(ActivityManager.getCurrentUser()))

                : context.bindService(intent, mCarrierMessagingServiceConnection,

                        Context.BIND_AUTO_CREATE);

    }