aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2021-03-24 01:07:53 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2021-03-24 01:07:53 +0000
commit5866f75f5601629e9ef1a78eea83870626b1eba2 (patch)
tree281ecf9d2d40e2d284c6e8ba44279d04f80d09f9
parent2920bab95e2d3c4f6fa838ec22c3c8a2d436bd3d (diff)
parent96d125af115e720868973965dfb836b36ab1cd26 (diff)
downloadTV-5866f75f5601629e9ef1a78eea83870626b1eba2.tar.gz
Snap for 7230642 from 96d125af115e720868973965dfb836b36ab1cd26 to sc-release
Change-Id: I525c06bb1ab0ae409ca2336a2b61ceb932f8baa3
-rw-r--r--AndroidManifest.xml2
-rw-r--r--com.android.tv.xml1
2 files changed, 3 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 38d24747..2cff92d3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -34,6 +34,7 @@
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_TV_LISTINGS"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+ <uses-permission android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="com.android.providers.tv.permission.READ_EPG_DATA"/>
<uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA"/>
@@ -115,6 +116,7 @@
<category android:name="android.intent.category.LAUNCHER"/>
<category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
+ <category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name="com.android.tv.MainActivity"
diff --git a/com.android.tv.xml b/com.android.tv.xml
index 1379a010..5ac6c0c3 100644
--- a/com.android.tv.xml
+++ b/com.android.tv.xml
@@ -9,6 +9,7 @@
<permission name="android.permission.HDMI_CEC"/>
<permission name="android.permission.MODIFY_PARENTAL_CONTROLS"/>
<permission name="android.permission.READ_CONTENT_RATING_SYSTEMS"/>
+ <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
<permission name="com.android.providers.tv.permission.ACCESS_ALL_EPG_DATA"/>
<permission name="com.android.providers.tv.permission.ACCESS_WATCHED_PROGRAMS"/>
</privapp-permissions>