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

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

Merge "Initial implementation of Java-based broadcast radio service."

parents 77838724 347192e0

Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -216,6 +216,8 @@ LOCAL_SRC_FILES += \ 
	core/java/android/hardware/location/IGeofenceHardwareMonitorCallback.aidl \

	core/java/android/hardware/location/IContextHubCallback.aidl \

	core/java/android/hardware/location/IContextHubService.aidl \

	core/java/android/hardware/radio/IRadioService.aidl \

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

	core/java/android/hardware/soundtrigger/IRecognitionStatusCallback.aidl \

	core/java/android/hardware/usb/IUsbManager.aidl \

	core/java/android/net/ICaptivePortal.aidl \
@@ -673,6 +675,7 @@ aidl_files := \ 
	frameworks/base/core/java/android/print/PrinterInfo.aidl \

	frameworks/base/core/java/android/print/PrintJobId.aidl \

	frameworks/base/core/java/android/printservice/recommendation/RecommendationInfo.aidl \

	frameworks/base/core/java/android/hardware/radio/RadioManager.aidl \

	frameworks/base/core/java/android/hardware/usb/UsbDevice.aidl \

	frameworks/base/core/java/android/hardware/usb/UsbInterface.aidl \

	frameworks/base/core/java/android/hardware/usb/UsbEndpoint.aidl \

core/java/android/app/SystemServiceRegistry.java

+1 −1
Original line number Diff line number Diff line
@@ -784,7 +784,7 @@ final class SystemServiceRegistry { 
        registerService(Context.RADIO_SERVICE, RadioManager.class,

                new CachedServiceFetcher<RadioManager>() {

            @Override

            public RadioManager createService(ContextImpl ctx) {

            public RadioManager createService(ContextImpl ctx) throws ServiceNotFoundException {

                return new RadioManager(ctx);

            }});

core/java/android/content/pm/PackageManager.java

+8 −0
Original line number Diff line number Diff line
@@ -1828,6 +1828,14 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_VULKAN_HARDWARE_VERSION = "android.hardware.vulkan.version";



    /**

     * The device includes broadcast radio tuner.

     *

     * @hide FutureFeature

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_RADIO = "android.hardware.radio";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device includes an accelerometer.

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

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/**

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.hardware.radio;



import android.hardware.radio.ITuner;



/**

 * API to the broadcast radio service.

 *

 * {@hide}

 */

interface IRadioService {

    ITuner openTuner();

}

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

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/**

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.hardware.radio;



import android.hardware.radio.RadioManager;



/** {@hide} */

interface ITuner {

    int getProgramInformation(out RadioManager.ProgramInfo[] infoOut);

}