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

Commit 14752375 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

Adjust log messages emitted by RadioService. 

Bug: b/36863239
Test: manual
Change-Id: I36ec04462e9db0fb8477a55e7ecec6f45c5a343e
parent 153a1bdd

core/java/android/hardware/radio/RadioManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1486,7 +1486,7 @@ public class RadioManager { 
            return nativeListModules(modules);

        }



        Log.v(TAG, "Listing available tuners...");

        Log.d(TAG, "Listing available tuners...");

        List<ModuleProperties> returnedList;

        try {

            returnedList = mService.listModules();
@@ -1527,7 +1527,7 @@ public class RadioManager { 
        }



        if (mService != null) {

            Log.d(TAG, "Opening tuner...");

            Log.d(TAG, "Opening tuner " + moduleId + "...");



            ITuner tuner;

            ITunerCallback halCallback = new TunerCallbackAdapter(callback, handler);

core/java/android/hardware/radio/RadioMetadata.java

+0 −6
Original line number Diff line number Diff line
@@ -15,21 +15,16 @@ 
 */

package android.hardware.radio;



import android.annotation.NonNull;

import android.annotation.SystemApi;

import android.content.ContentResolver;

import android.graphics.Bitmap;

import android.graphics.BitmapFactory;

import android.net.Uri;

import android.os.Bundle;

import android.os.Parcel;

import android.os.Parcelable;

import android.text.TextUtils;

import android.util.ArrayMap;

import android.util.Log;

import android.util.SparseArray;



import java.util.ArrayList;

import java.util.Set;



/**
@@ -540,7 +535,6 @@ public final class RadioMetadata implements Parcelable { 
    }



    int putClockFromNative(int nativeKey, long utcEpochSeconds, int timezoneOffsetInMinutes) {

        Log.d(TAG, "putClockFromNative()");

        String key = getKeyFromNativeKey(nativeKey);

        if (!METADATA_KEYS_TYPE.containsKey(key) ||

                METADATA_KEYS_TYPE.get(key) != METADATA_TYPE_CLOCK) {

core/java/android/hardware/radio/TunerAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ class TunerAdapter extends RadioTuner { 
    public void close() {

        synchronized (mTuner) {

            if (mIsClosed) {

                Log.d(TAG, "Tuner is already closed");

                Log.v(TAG, "Tuner is already closed");

                return;

            }

            mIsClosed = true;

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

+0 −5
Original line number Diff line number Diff line
@@ -24,16 +24,12 @@ import android.hardware.radio.ITuner; 
import android.hardware.radio.ITunerCallback;

import android.hardware.radio.RadioManager;

import android.os.ParcelableException;

import android.util.Slog;



import com.android.server.SystemService;



import java.util.List;



public class RadioService extends SystemService {

    // TODO(b/36863239): rename to RadioService when native service goes away

    private static final String TAG = "RadioServiceJava";



    private final RadioServiceImpl mServiceImpl = new RadioServiceImpl();



    /**
@@ -63,7 +59,6 @@ public class RadioService extends SystemService { 
    @Override

    public void onStart() {

        publishBinderService(Context.RADIO_SERVICE, mServiceImpl);

        Slog.v(TAG, "RadioService started");

    }



    private class RadioServiceImpl extends IRadioService.Stub {

services/core/jni/com_android_server_radio_RadioService.cpp

+3 −3
Original line number Diff line number Diff line
@@ -199,10 +199,10 @@ static jobject nativeOpenTuner(JNIEnv *env, jobject obj, long nativeContext, jin 


    HalRevision halRev;

    if (V1_1::IBroadcastRadio::castFrom(module).withDefault(nullptr) != nullptr) {

        ALOGI("Opening tuner with broadcast radio HAL 1.1");

        ALOGI("Opening tuner %d with broadcast radio HAL 1.1", moduleId);

        halRev = HalRevision::V1_1;

    } else {

        ALOGI("Opening tuner with broadcast radio HAL 1.0");

        ALOGI("Opening tuner %d with broadcast radio HAL 1.0", moduleId);

        halRev = HalRevision::V1_0;

    }
@@ -233,7 +233,7 @@ static jobject nativeOpenTuner(JNIEnv *env, jobject obj, long nativeContext, jin 
    }



    Tuner::setHalTuner(env, tuner, halTuner);

    ALOGI("Opened tuner %p", halTuner.get());

    ALOGD("Opened tuner %p", halTuner.get());

    return tuner.release();

}