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

Commit 546c635a authored by Jae Seo's avatar Jae Seo
Browse files

TIF: Change CEC specific names to more general ones 

Now MHL device information is also a part of HdmiDeviceInfo (previously
HdmiCecDeviceInfo). This change adjusts method/variable names across our code
base to reflect that.

Bug: 16215362
Change-Id: I7a6692329f39842a4aec9a4ff036eca5474cfd33
parent c8f2d5e6

media/java/android/media/tv/ITvInputService.aidl

+2 −2
Original line number Diff line number Diff line
@@ -35,6 +35,6 @@ oneway interface ITvInputService { 
    // For hardware TvInputService

    void notifyHardwareAdded(in TvInputHardwareInfo hardwareInfo);

    void notifyHardwareRemoved(in TvInputHardwareInfo hardwareInfo);

    void notifyHdmiCecDeviceAdded(in HdmiDeviceInfo deviceInfo);

    void notifyHdmiCecDeviceRemoved(in HdmiDeviceInfo deviceInfo);

    void notifyHdmiDeviceAdded(in HdmiDeviceInfo deviceInfo);

    void notifyHdmiDeviceRemoved(in HdmiDeviceInfo deviceInfo);

}

media/java/android/media/tv/ITvInputServiceCallback.aidl

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import android.media.tv.TvInputInfo; 
 * @hide

 */

oneway interface ITvInputServiceCallback {

    void addHardwareTvInput(in int deviceID, in TvInputInfo inputInfo);

    void addHdmiCecTvInput(in int logicalAddress, in TvInputInfo inputInfo);

    void addHardwareTvInput(in int deviceId, in TvInputInfo inputInfo);

    void addHdmiTvInput(in int logicalAddress, in TvInputInfo inputInfo);

    void removeTvInput(in String inputId);

}

media/java/android/media/tv/TvContentRating.java

+0 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.media.tv; 
import android.annotation.SystemApi;

import android.net.Uri;

import android.text.TextUtils;

import android.util.Log;



import java.util.Arrays;

import java.util.Collections;
@@ -963,8 +962,6 @@ import java.util.List; 
 * </table>

 */

public final class TvContentRating {

    private static final String TAG = "TvContentRating";



    /** @hide */

    public static final Uri SYSTEM_CONTENT_RATING_SYSTEM_XML = Uri.parse(

            "android.resource://system/" + com.android.internal.R.xml.tv_content_rating_systems);

media/java/android/media/tv/TvContract.java

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.annotation.SystemApi; 
import android.content.ComponentName;

import android.content.ContentResolver;

import android.content.ContentUris;

import android.media.tv.TvContract.Programs;

import android.net.Uri;

import android.provider.BaseColumns;

import android.util.ArraySet;

media/java/android/media/tv/TvInputInfo.java

+17 −17
Original line number Diff line number Diff line
@@ -103,10 +103,10 @@ public final class TvInputInfo implements Parcelable { 


    private static final String XML_START_TAG_NAME = "tv-input";

    private static final String DELIMITER_INFO_IN_ID = "/";

    private static final String PREFIX_CEC_DEVICE = "CEC";

    private static final String PREFIX_HDMI_DEVICE = "HDMI";

    private static final String PREFIX_HARDWARE_DEVICE = "HW";

    private static final int LENGTH_CEC_PHYSICAL_ADDRESS = 4;

    private static final int LENGTH_CEC_LOGICAL_ADDRESS = 2;

    private static final int LENGTH_HDMI_PHYSICAL_ADDRESS = 4;

    private static final int LENGTH_HDMI_LOGICAL_ADDRESS = 2;



    private final ResolveInfo mService;

    private final String mId;
@@ -155,7 +155,7 @@ public final class TvInputInfo implements Parcelable { 
     * instantiating it from the given Context, ResolveInfo, and HdmiDeviceInfo.

     *

     * @param service The ResolveInfo returned from the package manager about this TV input service.

     * @param cecInfo The HdmiDeviceInfo for a HDMI CEC logical device.

     * @param deviceInfo The HdmiDeviceInfo for a HDMI CEC logical device.

     * @param parentId The ID of this TV input's parent input. {@code null} if none exists.

     * @param iconUri The {@link android.net.Uri} to load the icon image.

     *        {@see android.content.ContentResolver#openInputStream}. If it is null, the application
@@ -166,12 +166,12 @@ public final class TvInputInfo implements Parcelable { 
     */

    @SystemApi

    public static TvInputInfo createTvInputInfo(Context context, ResolveInfo service,

            HdmiDeviceInfo cecInfo, String parentId, String label, Uri iconUri)

            HdmiDeviceInfo deviceInfo, String parentId, String label, Uri iconUri)

                    throws XmlPullParserException, IOException {

        boolean isConnectedToHdmiSwitch = (cecInfo.getPhysicalAddress() & 0x0FFF) != 0;

        return createTvInputInfo(context, service, generateInputIdForHdmiCec(

        boolean isConnectedToHdmiSwitch = (deviceInfo.getPhysicalAddress() & 0x0FFF) != 0;

        return createTvInputInfo(context, service, generateInputIdForHdmiDevice(

                new ComponentName(service.serviceInfo.packageName, service.serviceInfo.name),

                cecInfo), parentId, TYPE_HDMI, label, iconUri, isConnectedToHdmiSwitch);

                deviceInfo), parentId, TYPE_HDMI, label, iconUri, isConnectedToHdmiSwitch);

    }



    /**
@@ -497,16 +497,16 @@ public final class TvInputInfo implements Parcelable { 
     * Used to generate an input id from a ComponentName and HdmiDeviceInfo.

     *

     * @param name the component name for generating an input id.

     * @param cecInfo HdmiDeviceInfo describing this TV input.

     * @return the generated input id for the given {@code name} and {@code cecInfo}.

     */

    private static final String generateInputIdForHdmiCec(

            ComponentName name, HdmiDeviceInfo cecInfo) {

        // Example of the format : "/CEC%04X%02X"

        String format = String.format("%s%s%%0%sX%%0%sX", DELIMITER_INFO_IN_ID, PREFIX_CEC_DEVICE,

                LENGTH_CEC_PHYSICAL_ADDRESS, LENGTH_CEC_LOGICAL_ADDRESS);

     * @param deviceInfo HdmiDeviceInfo describing this TV input.

     * @return the generated input id for the given {@code name} and {@code deviceInfo}.

     */

    private static final String generateInputIdForHdmiDevice(

            ComponentName name, HdmiDeviceInfo deviceInfo) {

        // Example of the format : "/HDMI%04X%02X"

        String format = String.format("%s%s%%0%sX%%0%sX", DELIMITER_INFO_IN_ID, PREFIX_HDMI_DEVICE,

                LENGTH_HDMI_PHYSICAL_ADDRESS, LENGTH_HDMI_LOGICAL_ADDRESS);

        return name.flattenToShortString() + String.format(format,

                cecInfo.getPhysicalAddress(), cecInfo.getLogicalAddress());

                deviceInfo.getPhysicalAddress(), deviceInfo.getLogicalAddress());

    }



    /**