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

Commit 9f605941 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by android-build-merger
Browse files

Merge "Fix opening tuner session with HAL 2.0." into pi-dev 

am: 7072bbb1

Change-Id: Ie65b01455b80c404ae0886a5c5106c0d56d0fe8c
parents 86150fa2 7072bbb1

services/core/java/com/android/server/broadcastradio/hal2/BroadcastRadioService.java

+3 −1
Original line number Diff line number Diff line
@@ -101,7 +101,9 @@ public class BroadcastRadioService { 
        }



        TunerSession session = module.openSession(callback);

        if (legacyConfig != null) {

            session.setConfiguration(legacyConfig);

        }

        return session;

    }

services/core/java/com/android/server/broadcastradio/hal2/RadioModule.java

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ class RadioModule { 


    public static @Nullable RadioModule tryLoadingModule(int idx, @NonNull String fqName) {

        try {

            IBroadcastRadio service = IBroadcastRadio.getService();

            IBroadcastRadio service = IBroadcastRadio.getService(fqName);

            if (service == null) return null;



            Mutable<AmFmRegionConfig> amfmConfig = new Mutable<>();

services/core/java/com/android/server/broadcastradio/hal2/TunerSession.java

+2 −1
Original line number Diff line number Diff line
@@ -90,7 +90,8 @@ class TunerSession extends ITuner.Stub { 
        if (ret == AudioSystem.AUDIO_STATUS_OK) {

            mIsAudioConnected = connected;

        } else {

            Slog.e(TAG, "Failed to notify AudioService about new state: " + connected);

            Slog.e(TAG, "Failed to notify AudioService about new state: "

                    + connected + ", response was: " + ret);

        }

    }