Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
Bug: 111615259
Change-Id: I45ab414b0ca5da5901c2da9e1f44fa9f017aef49
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" />
diff --git a/sdk/images_armeabi-v7a_source.prop_template b/sdk/images_armeabi-v7a_source.prop_template
index c0fc670..f65eaed 100644
--- a/sdk/images_armeabi-v7a_source.prop_template
+++ b/sdk/images_armeabi-v7a_source.prop_template
@@ -1,6 +1,6 @@
Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
Pkg.UserSrc=false
-Pkg.Revision=4
+Pkg.Revision=5
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
SystemImage.Abi=armeabi-v7a
diff --git a/sdk/images_x86_source.prop_template b/sdk/images_x86_source.prop_template
index 5477fcd..636280d 100644
--- a/sdk/images_x86_source.prop_template
+++ b/sdk/images_x86_source.prop_template
@@ -1,6 +1,6 @@
Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
Pkg.UserSrc=false
-Pkg.Revision=4
+Pkg.Revision=5
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
SystemImage.Abi=x86
