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

Commit 7981e8ff authored by Sujith Ramakrishnan's avatar Sujith Ramakrishnan Committed by Android (Google) Code Review
Browse files

Merge "Unbundle RemoteService on TV - part 3" into nyc-dev

parents b7ba7663 b5b86c11

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -401,6 +401,8 @@ LOCAL_SRC_FILES += \ 
	media/java/android/media/tv/ITvInputServiceCallback.aidl \

	media/java/android/media/tv/ITvInputSession.aidl \

	media/java/android/media/tv/ITvInputSessionCallback.aidl \

	media/java/android/media/tv/ITvRemoteProvider.aidl \

	media/java/android/media/tv/ITvRemoteServiceInput.aidl \

	media/java/android/service/media/IMediaBrowserService.aidl \

	media/java/android/service/media/IMediaBrowserServiceCallbacks.aidl \

	telecomm/java/com/android/internal/telecom/ICallScreeningAdapter.aidl \

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ package android { 
    field public static final java.lang.String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE";

    field public static final java.lang.String BIND_TRUST_AGENT = "android.permission.BIND_TRUST_AGENT";

    field public static final java.lang.String BIND_TV_INPUT = "android.permission.BIND_TV_INPUT";

    field public static final java.lang.String BIND_TV_REMOTE_SERVICE = "android.permission.BIND_TV_REMOTE_SERVICE";

    field public static final java.lang.String BIND_VOICE_INTERACTION = "android.permission.BIND_VOICE_INTERACTION";

    field public static final java.lang.String BIND_VPN_SERVICE = "android.permission.BIND_VPN_SERVICE";

    field public static final java.lang.String BIND_VR_LISTENER_SERVICE = "android.permission.BIND_VR_LISTENER_SERVICE";
@@ -222,6 +223,7 @@ package android { 
    field public static final java.lang.String TETHER_PRIVILEGED = "android.permission.TETHER_PRIVILEGED";

    field public static final java.lang.String TRANSMIT_IR = "android.permission.TRANSMIT_IR";

    field public static final java.lang.String TV_INPUT_HARDWARE = "android.permission.TV_INPUT_HARDWARE";

    field public static final java.lang.String TV_VIRTUAL_REMOTE_CONTROLLER = "android.permission.TV_VIRTUAL_REMOTE_CONTROLLER";

    field public static final java.lang.String UNINSTALL_SHORTCUT = "com.android.launcher.permission.UNINSTALL_SHORTCUT";

    field public static final java.lang.String UPDATE_APP_OPS_STATS = "android.permission.UPDATE_APP_OPS_STATS";

    field public static final java.lang.String UPDATE_DEVICE_STATS = "android.permission.UPDATE_DEVICE_STATS";

core/res/AndroidManifest.xml

+17 −0
Original line number Diff line number Diff line
@@ -2279,6 +2279,23 @@ 
    <permission android:name="android.permission.BIND_TV_INPUT"

        android:protectionLevel="signature|privileged" />



    <!-- @SystemApi

         Must be required by a {@link com.android.media.tv.remoteprovider.TvRemoteProvider}

         to ensure that only the system can bind to it.

         <p>Protection level: signature|privileged

         <p>Not for use by third-party applications. </p>

         @hide  -->

    <permission android:name="android.permission.BIND_TV_REMOTE_SERVICE"

        android:protectionLevel="signature|privileged" />



    <!-- @SystemApi

         Must be required for a virtual remote controller for TV.

         <p>Protection level: signature|privileged

         <p>Not for use by third-party applications. </p>

         @hide  -->

    <permission android:name="android.permission.TV_VIRTUAL_REMOTE_CONTROLLER"

        android:protectionLevel="signature|privileged" />



    <!-- @SystemApi Allows an application to modify parental controls

         <p>Not for use by third-party applications.

         @hide -->

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -2474,4 +2474,8 @@ 
    -->

    <integer name="config_externalHardKeyboardBehavior">0</integer>



    <!-- Package of the unbundled tv remote service which can connect to tv

         remote provider -->

    <string name="config_tvRemoteServicePackage" translatable="false"></string>



</resources>

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -2574,4 +2574,7 @@ 


  <java-symbol type="dimen" name="input_extract_action_button_width" />

  <java-symbol type="dimen" name="input_extract_action_button_height" />



  <!-- TV Remote Service package -->

  <java-symbol type="string" name="config_tvRemoteServicePackage" />

</resources>