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

Commit 4e13a4e0 authored by Rambo Wang's avatar Rambo Wang Committed by Android (Google) Code Review
Browse files

Merge "Clean up 25Q2 aconfig flag support_carrier_services_for_hsum" into main

parents ff7d2637 f9d3a299

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

+2 −7
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 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;
@@ -94,12 +93,8 @@ public final class CarrierMessagingServiceWrapper implements AutoCloseable { 
        mOnServiceReadyCallback = onServiceReadyCallback;

        mServiceReadyCallbackExecutor = executor;

        mContext = context;

        return Flags.supportCarrierServicesForHsum()

                ? context.bindServiceAsUser(intent, mCarrierMessagingServiceConnection,

                Context.BIND_AUTO_CREATE,

                UserHandle.of(ActivityManager.getCurrentUser()))

                : context.bindService(intent, mCarrierMessagingServiceConnection,

                        Context.BIND_AUTO_CREATE);

        return context.bindServiceAsUser(intent, mCarrierMessagingServiceConnection,

                Context.BIND_AUTO_CREATE, UserHandle.of(ActivityManager.getCurrentUser()));

    }



    /**