Rename (FM) Radio to Broadcast Radio to avoid confusion with (GSM) Radio.
Bug: b/63405337
Test: instrumentation
Change-Id: I33c3e450602e521b77b6167f9866278980f17743
diff --git a/services/core/java/com/android/server/radio/RadioService.java b/services/core/java/com/android/server/broadcastradio/BroadcastRadioService.java
similarity index 91%
rename from services/core/java/com/android/server/radio/RadioService.java
rename to services/core/java/com/android/server/broadcastradio/BroadcastRadioService.java
index 8b0d3aa..914f034 100644
--- a/services/core/java/com/android/server/radio/RadioService.java
+++ b/services/core/java/com/android/server/broadcastradio/BroadcastRadioService.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.server.radio;
+package com.android.server.broadcastradio;
import android.Manifest;
import android.content.Context;
@@ -29,8 +29,8 @@
import java.util.List;
-public class RadioService extends SystemService {
- private final RadioServiceImpl mServiceImpl = new RadioServiceImpl();
+public class BroadcastRadioService extends SystemService {
+ private final ServiceImpl mServiceImpl = new ServiceImpl();
/**
* This field is used by native code, do not access or modify.
@@ -40,7 +40,7 @@
private final Object mLock = new Object();
private List<RadioManager.ModuleProperties> mModules = null;
- public RadioService(Context context) {
+ public BroadcastRadioService(Context context) {
super(context);
}
@@ -61,7 +61,7 @@
publishBinderService(Context.RADIO_SERVICE, mServiceImpl);
}
- private class RadioServiceImpl extends IRadioService.Stub {
+ private class ServiceImpl extends IRadioService.Stub {
private void enforcePolicyAccess() {
if (PackageManager.PERMISSION_GRANTED != getContext().checkCallingPermission(
Manifest.permission.ACCESS_FM_RADIO)) {
diff --git a/services/core/java/com/android/server/radio/Tuner.java b/services/core/java/com/android/server/broadcastradio/Tuner.java
similarity index 98%
rename from services/core/java/com/android/server/radio/Tuner.java
rename to services/core/java/com/android/server/broadcastradio/Tuner.java
index 4d13adb..b9a1e81 100644
--- a/services/core/java/com/android/server/radio/Tuner.java
+++ b/services/core/java/com/android/server/broadcastradio/Tuner.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.server.radio;
+package com.android.server.broadcastradio;
import android.annotation.NonNull;
import android.graphics.Bitmap;
@@ -30,7 +30,7 @@
import java.util.List;
class Tuner extends ITuner.Stub {
- private static final String TAG = "RadioService.Tuner";
+ private static final String TAG = "BroadcastRadioService.Tuner";
/**
* This field is used by native code, do not access or modify.
diff --git a/services/core/java/com/android/server/radio/TunerCallback.java b/services/core/java/com/android/server/broadcastradio/TunerCallback.java
similarity index 96%
rename from services/core/java/com/android/server/radio/TunerCallback.java
rename to services/core/java/com/android/server/broadcastradio/TunerCallback.java
index 62110cf..25f3775 100644
--- a/services/core/java/com/android/server/radio/TunerCallback.java
+++ b/services/core/java/com/android/server/broadcastradio/TunerCallback.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.server.radio;
+package com.android.server.broadcastradio;
import android.annotation.NonNull;
import android.hardware.radio.ITuner;
@@ -27,7 +27,7 @@
import android.util.Slog;
class TunerCallback implements ITunerCallback {
- private static final String TAG = "RadioService.TunerCallback";
+ private static final String TAG = "BroadcastRadioService.TunerCallback";
/**
* This field is used by native code, do not access or modify.
diff --git a/services/core/jni/Android.mk b/services/core/jni/Android.mk
index a6065025..651cc7d 100644
--- a/services/core/jni/Android.mk
+++ b/services/core/jni/Android.mk
@@ -5,8 +5,12 @@
LOCAL_CFLAGS += -Wall -Werror -Wno-unused-parameter
LOCAL_SRC_FILES += \
- $(LOCAL_REL_DIR)/JavaRef.cpp \
- $(LOCAL_REL_DIR)/NativeCallbackThread.cpp \
+ $(LOCAL_REL_DIR)/BroadcastRadio/JavaRef.cpp \
+ $(LOCAL_REL_DIR)/BroadcastRadio/NativeCallbackThread.cpp \
+ $(LOCAL_REL_DIR)/BroadcastRadio/BroadcastRadioService.cpp \
+ $(LOCAL_REL_DIR)/BroadcastRadio/Tuner.cpp \
+ $(LOCAL_REL_DIR)/BroadcastRadio/TunerCallback.cpp \
+ $(LOCAL_REL_DIR)/BroadcastRadio/convert.cpp \
$(LOCAL_REL_DIR)/com_android_server_AlarmManagerService.cpp \
$(LOCAL_REL_DIR)/com_android_server_am_BatteryStatsService.cpp \
$(LOCAL_REL_DIR)/com_android_server_connectivity_Vpn.cpp \
@@ -22,10 +26,6 @@
$(LOCAL_REL_DIR)/com_android_server_location_GnssLocationProvider.cpp \
$(LOCAL_REL_DIR)/com_android_server_locksettings_SyntheticPasswordManager.cpp \
$(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_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 \
$(LOCAL_REL_DIR)/com_android_server_SystemServer.cpp \
diff --git a/services/core/jni/com_android_server_radio_RadioService.cpp b/services/core/jni/BroadcastRadio/BroadcastRadioService.cpp
similarity index 92%
rename from services/core/jni/com_android_server_radio_RadioService.cpp
rename to services/core/jni/BroadcastRadio/BroadcastRadioService.cpp
index b06243d..492be17 100644
--- a/services/core/jni/com_android_server_radio_RadioService.cpp
+++ b/services/core/jni/BroadcastRadio/BroadcastRadioService.cpp
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-#define LOG_TAG "radio.RadioService.jni"
+#define LOG_TAG "BroadcastRadioService.jni"
#define LOG_NDEBUG 0
-#include "com_android_server_radio_RadioService.h"
+#include "BroadcastRadioService.h"
-#include "com_android_server_radio_Tuner.h"
-#include "com_android_server_radio_convert.h"
+#include "Tuner.h"
+#include "convert.h"
#include <android/hardware/broadcastradio/1.1/IBroadcastRadio.h>
#include <android/hardware/broadcastradio/1.1/IBroadcastRadioFactory.h>
@@ -32,8 +32,8 @@
namespace android {
namespace server {
-namespace radio {
-namespace RadioService {
+namespace BroadcastRadio {
+namespace BroadcastRadioService {
using hardware::Return;
using hardware::hidl_string;
@@ -242,20 +242,20 @@
{ "nativeFinalize", "(J)V", (void*)nativeFinalize },
{ "nativeLoadModules", "(J)Ljava/util/List;", (void*)nativeLoadModules },
{ "nativeOpenTuner", "(JILandroid/hardware/radio/RadioManager$BandConfig;Z"
- "Landroid/hardware/radio/ITunerCallback;)Lcom/android/server/radio/Tuner;",
+ "Landroid/hardware/radio/ITunerCallback;)Lcom/android/server/broadcastradio/Tuner;",
(void*)nativeOpenTuner },
};
-} // namespace RadioService
-} // namespace radio
+} // namespace BroadcastRadioService
+} // namespace BroadcastRadio
} // namespace server
-void register_android_server_radio_RadioService(JNIEnv *env) {
- using namespace server::radio::RadioService;
+void register_android_server_broadcastradio_BroadcastRadioService(JNIEnv *env) {
+ using namespace server::BroadcastRadio::BroadcastRadioService;
- register_android_server_radio_convert(env);
+ register_android_server_broadcastradio_convert(env);
- auto tunerClass = FindClassOrDie(env, "com/android/server/radio/Tuner");
+ auto tunerClass = FindClassOrDie(env, "com/android/server/broadcastradio/Tuner");
gjni.Tuner.clazz = MakeGlobalRefOrDie(env, tunerClass);
gjni.Tuner.cstor = GetMethodIDOrDie(env, tunerClass, "<init>",
"(Landroid/hardware/radio/ITunerCallback;IIZI)V");
@@ -265,7 +265,8 @@
gjni.ArrayList.cstor = GetMethodIDOrDie(env, arrayListClass, "<init>", "()V");
gjni.ArrayList.add = GetMethodIDOrDie(env, arrayListClass, "add", "(Ljava/lang/Object;)Z");
- auto res = jniRegisterNativeMethods(env, "com/android/server/radio/RadioService",
+ auto res = jniRegisterNativeMethods(env,
+ "com/android/server/broadcastradio/BroadcastRadioService",
gRadioServiceMethods, NELEM(gRadioServiceMethods));
LOG_ALWAYS_FATAL_IF(res < 0, "Unable to register native methods.");
}
diff --git a/services/core/jni/com_android_server_radio_RadioService.h b/services/core/jni/BroadcastRadio/BroadcastRadioService.h
similarity index 71%
rename from services/core/jni/com_android_server_radio_RadioService.h
rename to services/core/jni/BroadcastRadio/BroadcastRadioService.h
index 91e119c..df7af89 100644
--- a/services/core/jni/com_android_server_radio_RadioService.h
+++ b/services/core/jni/BroadcastRadio/BroadcastRadioService.h
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-#ifndef _ANDROID_SERVER_RADIO_RADIOSERVICE_H
-#define _ANDROID_SERVER_RADIO_RADIOSERVICE_H
+#ifndef _ANDROID_SERVER_BROADCASTRADIO_BROADCASTRADIOSERVICE_H
+#define _ANDROID_SERVER_BROADCASTRADIO_BROADCASTRADIOSERVICE_H
#include <jni.h>
namespace android {
-void register_android_server_radio_RadioService(JNIEnv *env);
+void register_android_server_broadcastradio_BroadcastRadioService(JNIEnv *env);
} // namespace android
-#endif // _ANDROID_SERVER_RADIO_RADIOSERVICE_H
+#endif // _ANDROID_SERVER_BROADCASTRADIO_BROADCASTRADIOSERVICE_H
diff --git a/services/core/jni/JavaRef.cpp b/services/core/jni/BroadcastRadio/JavaRef.cpp
similarity index 100%
rename from services/core/jni/JavaRef.cpp
rename to services/core/jni/BroadcastRadio/JavaRef.cpp
diff --git a/services/core/jni/JavaRef.h b/services/core/jni/BroadcastRadio/JavaRef.h
similarity index 100%
rename from services/core/jni/JavaRef.h
rename to services/core/jni/BroadcastRadio/JavaRef.h
diff --git a/services/core/jni/NativeCallbackThread.cpp b/services/core/jni/BroadcastRadio/NativeCallbackThread.cpp
similarity index 100%
rename from services/core/jni/NativeCallbackThread.cpp
rename to services/core/jni/BroadcastRadio/NativeCallbackThread.cpp
diff --git a/services/core/jni/NativeCallbackThread.h b/services/core/jni/BroadcastRadio/NativeCallbackThread.h
similarity index 100%
rename from services/core/jni/NativeCallbackThread.h
rename to services/core/jni/BroadcastRadio/NativeCallbackThread.h
diff --git a/services/core/jni/com_android_server_radio_Tuner.cpp b/services/core/jni/BroadcastRadio/Tuner.cpp
similarity index 96%
rename from services/core/jni/com_android_server_radio_Tuner.cpp
rename to services/core/jni/BroadcastRadio/Tuner.cpp
index 96da038..2e8798b 100644
--- a/services/core/jni/com_android_server_radio_Tuner.cpp
+++ b/services/core/jni/BroadcastRadio/Tuner.cpp
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-#define LOG_TAG "radio.Tuner.jni"
+#define LOG_TAG "BroadcastRadioService.Tuner.jni"
#define LOG_NDEBUG 0
-#include "com_android_server_radio_Tuner.h"
+#include "Tuner.h"
-#include "com_android_server_radio_convert.h"
-#include "com_android_server_radio_TunerCallback.h"
+#include "convert.h"
+#include "TunerCallback.h"
#include <JNIHelp.h>
#include <Utils.h>
@@ -32,7 +32,7 @@
namespace android {
namespace server {
-namespace radio {
+namespace BroadcastRadio {
namespace Tuner {
using hardware::Return;
@@ -508,26 +508,26 @@
};
} // namespace Tuner
-} // namespace radio
+} // namespace BroadcastRadio
} // namespace server
-void register_android_server_radio_Tuner(JavaVM *vm, JNIEnv *env) {
- using namespace server::radio::Tuner;
+void register_android_server_broadcastradio_Tuner(JavaVM *vm, JNIEnv *env) {
+ using namespace server::BroadcastRadio::Tuner;
- register_android_server_radio_TunerCallback(vm, env);
+ register_android_server_broadcastradio_TunerCallback(vm, env);
- auto tunerClass = FindClassOrDie(env, "com/android/server/radio/Tuner");
+ auto tunerClass = FindClassOrDie(env, "com/android/server/broadcastradio/Tuner");
gjni.Tuner.nativeContext = GetFieldIDOrDie(env, tunerClass, "mNativeContext", "J");
gjni.Tuner.region = GetFieldIDOrDie(env, tunerClass, "mRegion", "I");
gjni.Tuner.tunerCallback = GetFieldIDOrDie(env, tunerClass, "mTunerCallback",
- "Lcom/android/server/radio/TunerCallback;");
+ "Lcom/android/server/broadcastradio/TunerCallback;");
auto arrayListClass = FindClassOrDie(env, "java/util/ArrayList");
gjni.ArrayList.clazz = MakeGlobalRefOrDie(env, arrayListClass);
gjni.ArrayList.cstor = GetMethodIDOrDie(env, arrayListClass, "<init>", "()V");
gjni.ArrayList.add = GetMethodIDOrDie(env, arrayListClass, "add", "(Ljava/lang/Object;)Z");
- auto res = jniRegisterNativeMethods(env, "com/android/server/radio/Tuner",
+ auto res = jniRegisterNativeMethods(env, "com/android/server/broadcastradio/Tuner",
gTunerMethods, NELEM(gTunerMethods));
LOG_ALWAYS_FATAL_IF(res < 0, "Unable to register native methods.");
}
diff --git a/services/core/jni/com_android_server_radio_Tuner.h b/services/core/jni/BroadcastRadio/Tuner.h
similarity index 81%
rename from services/core/jni/com_android_server_radio_Tuner.h
rename to services/core/jni/BroadcastRadio/Tuner.h
index 7c100e8..818597b 100644
--- a/services/core/jni/com_android_server_radio_Tuner.h
+++ b/services/core/jni/BroadcastRadio/Tuner.h
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-#ifndef _ANDROID_SERVER_RADIO_TUNER_H
-#define _ANDROID_SERVER_RADIO_TUNER_H
+#ifndef _ANDROID_SERVER_BROADCASTRADIORADIO_TUNER_H
+#define _ANDROID_SERVER_BROADCASTRADIORADIO_TUNER_H
-#include "com_android_server_radio_types.h"
+#include "types.h"
#include "JavaRef.h"
@@ -29,10 +29,10 @@
namespace android {
-void register_android_server_radio_Tuner(JavaVM *vm, JNIEnv *env);
+void register_android_server_broadcastradio_Tuner(JavaVM *vm, JNIEnv *env);
namespace server {
-namespace radio {
+namespace BroadcastRadio {
namespace Tuner {
void assignHalInterfaces(JNIEnv *env, JavaRef<jobject> const &jTuner,
@@ -45,8 +45,8 @@
Region getRegion(JNIEnv *env, jobject obj);
} // namespace Tuner
-} // namespace radio
+} // namespace BroadcastRadio
} // namespace server
} // namespace android
-#endif // _ANDROID_SERVER_RADIO_TUNER_H
+#endif // _ANDROID_SERVER_BROADCASTRADIORADIO_TUNER_H
diff --git a/services/core/jni/com_android_server_radio_TunerCallback.cpp b/services/core/jni/BroadcastRadio/TunerCallback.cpp
similarity index 95%
rename from services/core/jni/com_android_server_radio_TunerCallback.cpp
rename to services/core/jni/BroadcastRadio/TunerCallback.cpp
index 815a212..d22ee82 100644
--- a/services/core/jni/com_android_server_radio_TunerCallback.cpp
+++ b/services/core/jni/BroadcastRadio/TunerCallback.cpp
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-#define LOG_TAG "radio.TunerCallback.jni"
+#define LOG_TAG "BroadcastRadioService.TunerCallback.jni"
#define LOG_NDEBUG 0
-#include "com_android_server_radio_TunerCallback.h"
+#include "TunerCallback.h"
-#include "com_android_server_radio_convert.h"
-#include "com_android_server_radio_Tuner.h"
+#include "Tuner.h"
+#include "convert.h"
#include <JNIHelp.h>
#include <Utils.h>
@@ -29,7 +29,7 @@
namespace android {
namespace server {
-namespace radio {
+namespace BroadcastRadio {
namespace TunerCallback {
using hardware::Return;
@@ -355,21 +355,21 @@
}
static const JNINativeMethod gTunerCallbackMethods[] = {
- { "nativeInit", "(Lcom/android/server/radio/Tuner;I)J", (void*)nativeInit },
+ { "nativeInit", "(Lcom/android/server/broadcastradio/Tuner;I)J", (void*)nativeInit },
{ "nativeFinalize", "(J)V", (void*)nativeFinalize },
{ "nativeDetach", "(J)V", (void*)nativeDetach },
};
} // namespace TunerCallback
-} // namespace radio
+} // namespace BroadcastRadio
} // namespace server
-void register_android_server_radio_TunerCallback(JavaVM *vm, JNIEnv *env) {
- using namespace server::radio::TunerCallback;
+void register_android_server_broadcastradio_TunerCallback(JavaVM *vm, JNIEnv *env) {
+ using namespace server::BroadcastRadio::TunerCallback;
gvm = vm;
- auto tunerCbClass = FindClassOrDie(env, "com/android/server/radio/TunerCallback");
+ auto tunerCbClass = FindClassOrDie(env, "com/android/server/broadcastradio/TunerCallback");
gjni.TunerCallback.clazz = MakeGlobalRefOrDie(env, tunerCbClass);
gjni.TunerCallback.nativeContext = GetFieldIDOrDie(env, tunerCbClass, "mNativeContext", "J");
gjni.TunerCallback.handleHwFailure = GetMethodIDOrDie(env, tunerCbClass, "handleHwFailure", "()V");
@@ -391,7 +391,7 @@
gjni.TunerCallback.onProgramListChanged = GetMethodIDOrDie(env, tunerCbClass,
"onProgramListChanged", "()V");
- auto res = jniRegisterNativeMethods(env, "com/android/server/radio/TunerCallback",
+ auto res = jniRegisterNativeMethods(env, "com/android/server/broadcastradio/TunerCallback",
gTunerCallbackMethods, NELEM(gTunerCallbackMethods));
LOG_ALWAYS_FATAL_IF(res < 0, "Unable to register native methods.");
}
diff --git a/services/core/jni/com_android_server_radio_TunerCallback.h b/services/core/jni/BroadcastRadio/TunerCallback.h
similarity index 75%
rename from services/core/jni/com_android_server_radio_TunerCallback.h
rename to services/core/jni/BroadcastRadio/TunerCallback.h
index 7d37b87..af12d21 100644
--- a/services/core/jni/com_android_server_radio_TunerCallback.h
+++ b/services/core/jni/BroadcastRadio/TunerCallback.h
@@ -14,30 +14,30 @@
* limitations under the License.
*/
-#ifndef _ANDROID_SERVER_RADIO_TUNERCALLBACK_H
-#define _ANDROID_SERVER_RADIO_TUNERCALLBACK_H
+#ifndef _ANDROID_SERVER_BROADCASTRADIO_TUNERCALLBACK_H
+#define _ANDROID_SERVER_BROADCASTRADIO_TUNERCALLBACK_H
#include "JavaRef.h"
#include "NativeCallbackThread.h"
-#include "com_android_server_radio_types.h"
+#include "types.h"
#include <android/hardware/broadcastradio/1.1/ITunerCallback.h>
#include <jni.h>
namespace android {
-void register_android_server_radio_TunerCallback(JavaVM *vm, JNIEnv *env);
+void register_android_server_broadcastradio_TunerCallback(JavaVM *vm, JNIEnv *env);
namespace server {
-namespace radio {
+namespace BroadcastRadio {
namespace TunerCallback {
sp<hardware::broadcastradio::V1_1::ITunerCallback>
getNativeCallback(JNIEnv *env, jobject jTunerCallback);
} // namespace TunerCallback
-} // namespace radio
+} // namespace BroadcastRadio
} // namespace server
} // namespace android
-#endif // _ANDROID_SERVER_RADIO_TUNERCALLBACK_H
+#endif // _ANDROID_SERVER_BROADCASTRADIO_TUNERCALLBACK_H
diff --git a/services/core/jni/com_android_server_radio_convert.cpp b/services/core/jni/BroadcastRadio/convert.cpp
similarity index 98%
rename from services/core/jni/com_android_server_radio_convert.cpp
rename to services/core/jni/BroadcastRadio/convert.cpp
index 767c04a..2bc12e9 100644
--- a/services/core/jni/com_android_server_radio_convert.cpp
+++ b/services/core/jni/BroadcastRadio/convert.cpp
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-#define LOG_TAG "radio.convert.jni"
+#define LOG_TAG "BroadcastRadioService.convert.jni"
#define LOG_NDEBUG 0
-#include "com_android_server_radio_convert.h"
+#include "convert.h"
#include <JNIHelp.h>
#include <Utils.h>
@@ -26,7 +26,7 @@
namespace android {
namespace server {
-namespace radio {
+namespace BroadcastRadio {
namespace convert {
using hardware::Return;
@@ -530,11 +530,11 @@
}
} // namespace convert
-} // namespace radio
+} // namespace BroadcastRadio
} // namespace server
-void register_android_server_radio_convert(JNIEnv *env) {
- using namespace server::radio::convert;
+void register_android_server_broadcastradio_convert(JNIEnv *env) {
+ using namespace server::BroadcastRadio::convert;
auto bandConfigClass = FindClassOrDie(env, "android/hardware/radio/RadioManager$BandConfig");
gjni.BandConfig.descriptor = GetFieldIDOrDie(env, bandConfigClass,
diff --git a/services/core/jni/com_android_server_radio_convert.h b/services/core/jni/BroadcastRadio/convert.h
similarity index 89%
rename from services/core/jni/com_android_server_radio_convert.h
rename to services/core/jni/BroadcastRadio/convert.h
index 3d1b8c5..198e594 100644
--- a/services/core/jni/com_android_server_radio_convert.h
+++ b/services/core/jni/BroadcastRadio/convert.h
@@ -14,21 +14,22 @@
* limitations under the License.
*/
-#ifndef _ANDROID_SERVER_RADIO_CONVERT_H
-#define _ANDROID_SERVER_RADIO_CONVERT_H
+#ifndef _ANDROID_SERVER_BROADCASTRADIO_CONVERT_H
+#define _ANDROID_SERVER_BROADCASTRADIO_CONVERT_H
+
+#include "types.h"
#include "JavaRef.h"
-#include "com_android_server_radio_types.h"
#include <android/hardware/broadcastradio/1.1/types.h>
#include <jni.h>
namespace android {
-void register_android_server_radio_convert(JNIEnv *env);
+void register_android_server_broadcastradio_convert(JNIEnv *env);
namespace server {
-namespace radio {
+namespace BroadcastRadio {
namespace convert {
namespace V1_0 = hardware::broadcastradio::V1_0;
@@ -72,8 +73,8 @@
bool ThrowIfFailed(JNIEnv *env, const hardware::Return<void> &hidlResult);
} // namespace convert
-} // namespace radio
+} // namespace BroadcastRadio
} // namespace server
} // namespace android
-#endif // _ANDROID_SERVER_RADIO_CONVERT_H
+#endif // _ANDROID_SERVER_BROADCASTRADIO_CONVERT_H
diff --git a/services/core/jni/com_android_server_radio_types.h b/services/core/jni/BroadcastRadio/types.h
similarity index 90%
rename from services/core/jni/com_android_server_radio_types.h
rename to services/core/jni/BroadcastRadio/types.h
index 36f7643..f726af3 100644
--- a/services/core/jni/com_android_server_radio_types.h
+++ b/services/core/jni/BroadcastRadio/types.h
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-#ifndef _ANDROID_SERVER_RADIO_TYPES_H
-#define _ANDROID_SERVER_RADIO_TYPES_H
+#ifndef _ANDROID_SERVER_BROADCASTRADIO_TYPES_H
+#define _ANDROID_SERVER_BROADCASTRADIO_TYPES_H
#include <jni.h>
namespace android {
namespace server {
-namespace radio {
+namespace BroadcastRadio {
/* Most of these enums are dereived from Java code, based at
* frameworks/base/core/java/android/hardware/radio/RadioManager.java.
@@ -53,7 +53,7 @@
KOREA = 4,
};
-} // namespace radio
+} // namespace BroadcastRadio
} // namespace server
} // namespace android
diff --git a/services/core/jni/onload.cpp b/services/core/jni/onload.cpp
index c3617e0..fea4468 100644
--- a/services/core/jni/onload.cpp
+++ b/services/core/jni/onload.cpp
@@ -19,8 +19,8 @@
#include "utils/Log.h"
#include "utils/misc.h"
-#include "com_android_server_radio_RadioService.h"
-#include "com_android_server_radio_Tuner.h"
+#include "BroadcastRadio/BroadcastRadioService.h"
+#include "BroadcastRadio/Tuner.h"
namespace android {
int register_android_server_AlarmManagerService(JNIEnv* env);
@@ -67,8 +67,8 @@
}
ALOG_ASSERT(env, "Could not retrieve the env!");
- register_android_server_radio_RadioService(env);
- register_android_server_radio_Tuner(vm, env);
+ register_android_server_broadcastradio_BroadcastRadioService(env);
+ register_android_server_broadcastradio_Tuner(vm, env);
register_android_server_PowerManagerService(env);
register_android_server_SerialService(env);
register_android_server_InputApplicationHandle(env);
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index d10cc02..8574728 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -97,7 +97,7 @@
import com.android.server.policy.PhoneWindowManager;
import com.android.server.power.PowerManagerService;
import com.android.server.power.ShutdownThread;
-import com.android.server.radio.RadioService;
+import com.android.server.broadcastradio.BroadcastRadioService;
import com.android.server.restrictions.RestrictionsManagerService;
import com.android.server.retaildemo.RetailDemoModeService;
import com.android.server.security.KeyAttestationApplicationIdProviderService;
@@ -1208,7 +1208,7 @@
if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_BROADCAST_RADIO)) {
traceBeginAndSlog("StartBroadcastRadioService");
- mSystemServiceManager.startService(RadioService.class);
+ mSystemServiceManager.startService(BroadcastRadioService.class);
traceEnd();
}