From 95ad2ceac874cf45d2b73e1171e99add607d42af Mon Sep 17 00:00:00 2001
From: Chong Zhang <chz@google.com>
Date: Fri, 25 Sep 2020 11:53:03 -0700
Subject: [PATCH] Guard IResourceObserver::registerObserver with permission

bug: 154733526
bug: 168307955
test: mediatranscodingservice unit testing.
Change-Id: Ie210f704eb0982fcc50b8e7de7e84a7b96280e81
---
 core/res/AndroidManifest.xml | 7 +++++++
 data/etc/platform.xml        | 1 +
 2 files changed, 8 insertions(+)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 34543f13c1667..6f737eec28384 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -3546,6 +3546,13 @@
          android:protectionLevel="signature" />
     <uses-permission android:name="android.permission.MEDIA_RESOURCE_OVERRIDE_PID" />
 
+    <!-- This permission is required by Media Resource Observer Service when
+         accessing its registerObserver Api.
+         <p>Protection level: signature|privileged
+         <p>Not for use by third-party applications.
+         @hide -->
+    <permission android:name="android.permission.REGISTER_MEDIA_RESOURCE_OBSERVER"
+         android:protectionLevel="signature|privileged" />
 
     <!-- Must be required by a {@link android.media.routing.MediaRouteService}
          to ensure that only the system can interact with it.
diff --git a/data/etc/platform.xml b/data/etc/platform.xml
index 10c2b096ef985..42569195fcfe9 100644
--- a/data/etc/platform.xml
+++ b/data/etc/platform.xml
@@ -153,6 +153,7 @@
     <assign-permission name="android.permission.UPDATE_APP_OPS_STATS" uid="media" />
     <assign-permission name="android.permission.GET_PROCESS_STATE_AND_OOM_SCORE" uid="media" />
     <assign-permission name="android.permission.PACKAGE_USAGE_STATS" uid="media" />
+    <assign-permission name="android.permission.REGISTER_MEDIA_RESOURCE_OBSERVER" uid="media" />
 
     <assign-permission name="android.permission.INTERNET" uid="media" />