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

Commit 81868e70 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Android (Google) Code Review
Browse files

Merge "Close minor RadioService TODO's."

parents 9a92accc 7143f5c4

services/core/java/com/android/server/radio/Tuner.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ class Tuner extends ITuner.Stub { 
    private final Object mLock = new Object();

    private boolean mIsClosed = false;

    private boolean mIsMuted = false;

    private int mRegion;  // TODO(b/36863239): find better solution to manage regions

    private int mRegion;  // TODO(b/62710330): find better solution to handle regions

    private final boolean mWithAudio;



    Tuner(@NonNull ITunerCallback clientCallback, int halRev, int region, boolean withAudio) {

services/core/jni/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ LOCAL_SRC_FILES += \ 
    $(LOCAL_REL_DIR)/com_android_server_power_PowerManagerService.cpp \

    $(LOCAL_REL_DIR)/com_android_server_radio_RadioService.cpp \

    $(LOCAL_REL_DIR)/com_android_server_radio_Tuner.cpp \

    $(LOCAL_REL_DIR)/com_android_server_radio_Tuner_TunerCallback.cpp \

    $(LOCAL_REL_DIR)/com_android_server_radio_TunerCallback.cpp \

    $(LOCAL_REL_DIR)/com_android_server_radio_convert.cpp \

    $(LOCAL_REL_DIR)/com_android_server_SerialService.cpp \

    $(LOCAL_REL_DIR)/com_android_server_storage_AppFuseBridge.cpp \

services/core/jni/com_android_server_radio_Tuner.cpp

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include "com_android_server_radio_Tuner.h"



#include "com_android_server_radio_convert.h"

#include "com_android_server_radio_Tuner_TunerCallback.h"

#include "com_android_server_radio_TunerCallback.h"



#include <android/hardware/broadcastradio/1.1/IBroadcastRadioFactory.h>

#include <core_jni_helpers.h>

services/core/jni/com_android_server_radio_Tuner_TunerCallback.cpp→services/core/jni/com_android_server_radio_TunerCallback.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define LOG_TAG "radio.TunerCallback.jni"

#define LOG_NDEBUG 0



#include "com_android_server_radio_Tuner_TunerCallback.h"

#include "com_android_server_radio_TunerCallback.h"



#include "com_android_server_radio_convert.h"

#include "com_android_server_radio_Tuner.h"

services/core/jni/com_android_server_radio_Tuner_TunerCallback.h→services/core/jni/com_android_server_radio_TunerCallback.h

+0 −2
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
 * limitations under the License.

 */



// TODO(b/36863239): rename s/_Tuner_TunerCallback/_TunerCallback/, as this

// module is no longer a part of Tuner - it's an independent java class.

#ifndef _ANDROID_SERVER_RADIO_TUNERCALLBACK_H

#define _ANDROID_SERVER_RADIO_TUNERCALLBACK_H