commit 901e95ac968d961ddbbf47bd2e0ec71ccda1711b
author android-build-team Robot <android-build-team-robot@google.com> Tue Jun 12 01:49:30 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jun 12 01:49:30 2018 +0000
tree e1880e9921bf9beb6ceb72ab7071fdd76aa295f8
parent 1a01a10e8755212b3ab2d417cf78f3598ce98273
parent 514aef98c6926539cad77bd4110faa3707641185

Merge cherrypicks of [4315359, 4315389, 4315390, 4315519, 4315520, 4315360, 4317665, 4317701, 4315391, 4316085] into pi-release

Change-Id: I3c21029a771b77f89e3501aa570aab71160ca016

permissions/tv_core_hardware.xml

diff --git a/permissions/tv_core_hardware.xml b/permissions/tv_core_hardware.xml
index 74403e2..d9d4eb1 100644
--- a/permissions/tv_core_hardware.xml
+++ b/permissions/tv_core_hardware.xml
@@ -30,8 +30,8 @@
     <feature name="android.software.leanback" />
     <feature name="android.software.leanback_only" />
     <feature name="android.software.live_tv" />
-    <feature name="android.software.picture_in_picture" />
-    <feature name="android.software.activities_on_secondary_displays" />
+    <feature name="android.software.picture_in_picture" notLowRam="true" />
+    <feature name="android.software.activities_on_secondary_displays" notLowRam="true" />
     <feature name="android.software.voice_recognizers" />
     <feature name="android.software.input_methods" />
     <feature name="android.software.autofill" />