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

Commit 6f3ebef5 authored by Jooyung Han's avatar Jooyung Han Committed by Gerrit Code Review
Browse files

Merge "tuner: use typed Map<String, String>"

parents 332cd026 54a1fd2e

core/java/android/hardware/radio/ITuner.aidl

+5 −5
Original line number Original line Diff line number Diff line
@@ -80,14 +80,14 @@ interface ITuner { 
    void setConfigFlag(int flag, boolean value);

    void setConfigFlag(int flag, boolean value);





    /**

    /**

     * @param parameters Vendor-specific key-value pairs, must be Map<String, String>

     * @param parameters Vendor-specific key-value pairs

     * @return Vendor-specific key-value pairs, must be Map<String, String>

     * @return Vendor-specific key-value pairs

     */

     */

    Map setParameters(in Map parameters);

    Map<String, String> setParameters(in Map<String, String> parameters);





    /**

    /**

     * @param keys Parameter keys to fetch

     * @param keys Parameter keys to fetch

     * @return Vendor-specific key-value pairs, must be Map<String, String>

     * @return Vendor-specific key-value pairs

     */

     */

    Map getParameters(in List<String> keys);

    Map<String, String> getParameters(in List<String> keys);

}
 
}

core/java/android/hardware/radio/ITunerCallback.aidl

+2 −2
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ oneway interface ITunerCallback { 
    void onProgramListUpdated(in ProgramList.Chunk chunk);

    void onProgramListUpdated(in ProgramList.Chunk chunk);





    /**

    /**

     * @param parameters Vendor-specific key-value pairs, must be Map<String, String>

     * @param parameters Vendor-specific key-value pairs

     */

     */

    void onParametersUpdated(in Map parameters);

    void onParametersUpdated(in Map<String, String> parameters);

}
 
}

core/java/android/hardware/radio/TunerCallbackAdapter.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -220,7 +220,7 @@ class TunerCallbackAdapter extends ITunerCallback.Stub { 
    }

    }





    @Override

    @Override

    public void onParametersUpdated(Map parameters) {

    public void onParametersUpdated(Map<String, String> parameters) {

        mHandler.post(() -> mCallback.onParametersUpdated(parameters));

        mHandler.post(() -> mCallback.onParametersUpdated(parameters));

    }

    }

}
 
}

services/core/java/com/android/server/broadcastradio/hal1/Tuner.java

+2 −4
Original line number Original line Diff line number Diff line
@@ -28,10 +28,8 @@ import android.os.IBinder; 
import android.os.RemoteException;

import android.os.RemoteException;

import android.util.Slog;

import android.util.Slog;





import java.util.Collections;

import java.util.List;

import java.util.List;

import java.util.Map;

import java.util.Map;

import java.util.Objects;





class Tuner extends ITuner.Stub {

class Tuner extends ITuner.Stub {

    private static final String TAG = "BroadcastRadioService.Tuner";

    private static final String TAG = "BroadcastRadioService.Tuner";
@@ -292,12 +290,12 @@ class Tuner extends ITuner.Stub { 
    }

    }





    @Override

    @Override

    public Map setParameters(Map parameters) {

    public Map<String, String> setParameters(Map<String, String> parameters) {

        throw new UnsupportedOperationException("Not supported by HAL 1.x");

        throw new UnsupportedOperationException("Not supported by HAL 1.x");

    }

    }





    @Override

    @Override

    public Map getParameters(List<String> keys) {

    public Map<String, String> getParameters(List<String> keys) {

        throw new UnsupportedOperationException("Not supported by HAL 1.x");

        throw new UnsupportedOperationException("Not supported by HAL 1.x");

    }

    }

}
 
}

services/core/java/com/android/server/broadcastradio/hal1/TunerCallback.java

+1 −4
Original line number Original line Diff line number Diff line
@@ -18,12 +18,10 @@ package com.android.server.broadcastradio.hal1; 




import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.hardware.radio.ITuner;

import android.hardware.radio.ITunerCallback;

import android.hardware.radio.ITunerCallback;

import android.hardware.radio.ProgramList;

import android.hardware.radio.ProgramList;

import android.hardware.radio.ProgramSelector;

import android.hardware.radio.ProgramSelector;

import android.hardware.radio.RadioManager;

import android.hardware.radio.RadioManager;

import android.hardware.radio.RadioMetadata;

import android.hardware.radio.RadioTuner;

import android.hardware.radio.RadioTuner;

import android.os.IBinder;

import android.os.IBinder;

import android.os.RemoteException;

import android.os.RemoteException;
@@ -31,7 +29,6 @@ import android.util.Slog; 




import java.util.List;

import java.util.List;

import java.util.Map;

import java.util.Map;

import java.util.Objects;

import java.util.Set;

import java.util.Set;

import java.util.concurrent.atomic.AtomicReference;

import java.util.concurrent.atomic.AtomicReference;

import java.util.stream.Collectors;

import java.util.stream.Collectors;
@@ -176,7 +173,7 @@ class TunerCallback implements ITunerCallback { 
    }

    }





    @Override

    @Override

    public void onParametersUpdated(Map parameters) {

    public void onParametersUpdated(Map<String, String> parameters) {

        Slog.e(TAG, "Not applicable for HAL 1.x");

        Slog.e(TAG, "Not applicable for HAL 1.x");

    }

    }