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

Commit 00c8a878 authored by Weilin Xu's avatar Weilin Xu Committed by Android (Google) Code Review
Browse files

Merge "Rename variable of bcradio service instances" into main

parents 5f6600c4 a7a54280

services/core/java/com/android/server/broadcastradio/IRadioServiceAidlImpl.java

+7 −7
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ final class IRadioServiceAidlImpl extends IRadioService.Stub { 
    private static final List<String> SERVICE_NAMES = Arrays.asList(

            IBroadcastRadio.DESCRIPTOR + "/amfm", IBroadcastRadio.DESCRIPTOR + "/dab");



    private final BroadcastRadioServiceImpl mHalAidl;

    private final BroadcastRadioServiceImpl mAidlHalClient;

    private final BroadcastRadioService mService;



    /**
@@ -77,14 +77,14 @@ final class IRadioServiceAidlImpl extends IRadioService.Stub { 
    @VisibleForTesting

    IRadioServiceAidlImpl(BroadcastRadioService service, BroadcastRadioServiceImpl halAidl) {

        mService = Objects.requireNonNull(service, "Broadcast radio service cannot be null");

        mHalAidl = Objects.requireNonNull(halAidl,

        mAidlHalClient = Objects.requireNonNull(halAidl,

                "Broadcast radio service implementation for AIDL HAL cannot be null");

    }



    @Override

    public List<RadioManager.ModuleProperties> listModules() {

        mService.enforcePolicyAccess();

        return mHalAidl.listModules();

        return mAidlHalClient.listModules();

    }



    @Override
@@ -97,7 +97,7 @@ final class IRadioServiceAidlImpl extends IRadioService.Stub { 
        if (callback == null) {

            throw new IllegalArgumentException("Callback must not be null");

        }

        return mHalAidl.openSession(moduleId, bandConfig, withAudio, callback);

        return mAidlHalClient.openSession(moduleId, bandConfig, withAudio, callback);

    }



    @Override
@@ -110,7 +110,7 @@ final class IRadioServiceAidlImpl extends IRadioService.Stub { 
        Objects.requireNonNull(listener, "Announcement listener cannot be null");

        mService.enforcePolicyAccess();



        return mHalAidl.addAnnouncementListener(enabledTypes, listener);

        return mAidlHalClient.addAnnouncementListener(enabledTypes, listener);

    }



    @Override
@@ -126,10 +126,10 @@ final class IRadioServiceAidlImpl extends IRadioService.Stub { 
        radioPrintWriter.printf("BroadcastRadioService\n");



        radioPrintWriter.increaseIndent();

        radioPrintWriter.printf("AIDL HAL:\n");

        radioPrintWriter.printf("AIDL HAL client:\n");



        radioPrintWriter.increaseIndent();

        mHalAidl.dumpInfo(radioPrintWriter);

        mAidlHalClient.dumpInfo(radioPrintWriter);

        radioPrintWriter.decreaseIndent();



        radioPrintWriter.decreaseIndent();

services/core/java/com/android/server/broadcastradio/IRadioServiceHidlImpl.java

+18 −18
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ import java.util.OptionalInt; 
final class IRadioServiceHidlImpl extends IRadioService.Stub {

    private static final String TAG = "BcRadioSrvHidl";



    private final com.android.server.broadcastradio.hal1.BroadcastRadioService mHal1;

    private final com.android.server.broadcastradio.hal2.BroadcastRadioService mHal2;

    private final com.android.server.broadcastradio.hal1.BroadcastRadioService mHal1Client;

    private final com.android.server.broadcastradio.hal2.BroadcastRadioService mHal2Client;



    private final Object mLock = new Object();
@@ -61,10 +61,10 @@ final class IRadioServiceHidlImpl extends IRadioService.Stub { 


    IRadioServiceHidlImpl(BroadcastRadioService service) {

        mService = Objects.requireNonNull(service, "broadcast radio service cannot be null");

        mHal1 = new com.android.server.broadcastradio.hal1.BroadcastRadioService();

        mV1Modules = mHal1.loadModules();

        mHal1Client = new com.android.server.broadcastradio.hal1.BroadcastRadioService();

        mV1Modules = mHal1Client.loadModules();

        OptionalInt max = mV1Modules.stream().mapToInt(RadioManager.ModuleProperties::getId).max();

        mHal2 = new com.android.server.broadcastradio.hal2.BroadcastRadioService(

        mHal2Client = new com.android.server.broadcastradio.hal2.BroadcastRadioService(

                max.isPresent() ? max.getAsInt() + 1 : 0);

    }
@@ -73,17 +73,17 @@ final class IRadioServiceHidlImpl extends IRadioService.Stub { 
            com.android.server.broadcastradio.hal1.BroadcastRadioService hal1,

            com.android.server.broadcastradio.hal2.BroadcastRadioService hal2) {

        mService = Objects.requireNonNull(service, "Broadcast radio service cannot be null");

        mHal1 = Objects.requireNonNull(hal1,

        mHal1Client = Objects.requireNonNull(hal1,

                "Broadcast radio service implementation for HIDL 1 HAL cannot be null");

        mV1Modules = mHal1.loadModules();

        mHal2 = Objects.requireNonNull(hal2,

        mV1Modules = mHal1Client.loadModules();

        mHal2Client = Objects.requireNonNull(hal2,

                "Broadcast radio service implementation for HIDL 2 HAL cannot be null");

    }



    @Override

    public List<RadioManager.ModuleProperties> listModules() {

        mService.enforcePolicyAccess();

        Collection<RadioManager.ModuleProperties> v2Modules = mHal2.listModules();

        Collection<RadioManager.ModuleProperties> v2Modules = mHal2Client.listModules();

        List<RadioManager.ModuleProperties> modules;

        synchronized (mLock) {

            modules = new ArrayList<>(mV1Modules.size() + v2Modules.size());
@@ -102,10 +102,10 @@ final class IRadioServiceHidlImpl extends IRadioService.Stub { 
        mService.enforcePolicyAccess();

        Objects.requireNonNull(callback, "Callback must not be null");

        synchronized (mLock) {

            if (mHal2.hasModule(moduleId)) {

                return mHal2.openSession(moduleId, bandConfig, withAudio, callback);

            if (mHal2Client.hasModule(moduleId)) {

                return mHal2Client.openSession(moduleId, bandConfig, withAudio, callback);

            } else {

                return mHal1.openTuner(moduleId, bandConfig, withAudio, callback);

                return mHal1Client.openTuner(moduleId, bandConfig, withAudio, callback);

            }

        }

    }
@@ -121,12 +121,12 @@ final class IRadioServiceHidlImpl extends IRadioService.Stub { 
        mService.enforcePolicyAccess();



        synchronized (mLock) {

            if (!mHal2.hasAnyModules()) {

            if (!mHal2Client.hasAnyModules()) {

                Slog.w(TAG, "There are no HAL 2.0 modules registered");

                return new AnnouncementAggregator(listener, mLock);

            }



            return mHal2.addAnnouncementListener(enabledTypes, listener);

            return mHal2Client.addAnnouncementListener(enabledTypes, listener);

        }

    }
@@ -143,18 +143,18 @@ final class IRadioServiceHidlImpl extends IRadioService.Stub { 
        radioPw.printf("BroadcastRadioService\n");



        radioPw.increaseIndent();

        radioPw.printf("HAL1: %s\n", mHal1);

        radioPw.printf("HAL1 client: %s\n", mHal1Client);



        radioPw.increaseIndent();

        synchronized (mLock) {

            radioPw.printf("Modules of HAL1: %s\n", mV1Modules);

            radioPw.printf("Modules of HAL1 client: %s\n", mV1Modules);

        }

        radioPw.decreaseIndent();



        radioPw.printf("HAL2:\n");

        radioPw.printf("HAL2 client:\n");



        radioPw.increaseIndent();

        mHal2.dumpInfo(radioPw);

        mHal2Client.dumpInfo(radioPw);

        radioPw.decreaseIndent();



        radioPw.decreaseIndent();