Merge changes from topic "misc" into q10
* changes:
bliss: Fix dopush
bliss: Deprecate AddonSU
diff --git a/config/bliss_packages.mk b/config/bliss_packages.mk
index b0c170d..1dcabe5 100644
--- a/config/bliss_packages.mk
+++ b/config/bliss_packages.mk
@@ -64,6 +64,7 @@
BlissPapers \
SettingsIntelligenceGooglePrebuilt \
Lawnchair \
+ Longshot \
NexusWallpapersStubPrebuilt2019Static \
GalleryGoPrebuilt \
PixelThemesStub2019 \
@@ -101,6 +102,10 @@
PRODUCT_COPY_FILES += \
vendor/bliss/config/permissions/privapp-permissions-bliss-product.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-bliss.xml
+# Hidden api whitelisted apps
+PRODUCT_COPY_FILES += \
+ vendor/bliss/prebuilt/common/etc/sysconfig/bliss-hiddenapi-package-whitelist.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/bliss-hiddenapi-package-whitelist.xml
+
# Lawnchair
PRODUCT_COPY_FILES += \
vendor/bliss/prebuilt/common/etc/permissions/privapp-permissions-lawnchair.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-lawnchair.xml \
diff --git a/config/permissions/privapp-permissions-bliss-system.xml b/config/permissions/privapp-permissions-bliss-system.xml
index 0ce53ce..b20b3e1 100644
--- a/config/permissions/privapp-permissions-bliss-system.xml
+++ b/config/permissions/privapp-permissions-bliss-system.xml
@@ -15,6 +15,10 @@
<privapp-permissions package="com.custom.ambient.display">
<permission name="android.permission.INTERACT_ACROSS_USERS"/>
</privapp-permissions>
+
+ <privapp-permissions package="com.android.screenshot">
+ <permission name="android.permission.READ_FRAME_BUFFER"/>
+ </privapp-permissions>
</permissions>
diff --git a/prebuilt/common/Android.mk b/prebuilt/common/Android.mk
index d0e649b..e6646ff 100644
--- a/prebuilt/common/Android.mk
+++ b/prebuilt/common/Android.mk
@@ -155,3 +155,14 @@
LOCAL_DEX_PREOPT := false
LOCAL_REPLACE_PREBUILT_APK_INSTALLED := $(LOCAL_PATH)/$(LOCAL_SRC_FILES)
include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := Longshot
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := app/$(LOCAL_MODULE).apk
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_CLASS := APPS
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_DEX_PREOPT := false
+LOCAL_PRODUCT_MODULE := true
+include $(BUILD_PREBUILT)
diff --git a/prebuilt/common/app/Longshot.apk b/prebuilt/common/app/Longshot.apk
new file mode 100644
index 0000000..47f97f0
--- /dev/null
+++ b/prebuilt/common/app/Longshot.apk
Binary files differ
diff --git a/prebuilt/common/etc/sysconfig/bliss-hiddenapi-package-whitelist.xml b/prebuilt/common/etc/sysconfig/bliss-hiddenapi-package-whitelist.xml
new file mode 100644
index 0000000..47c4618
--- /dev/null
+++ b/prebuilt/common/etc/sysconfig/bliss-hiddenapi-package-whitelist.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This XML file declares which platform apps that need to access internal APIs.
+-->
+<config>
+ <hidden-api-whitelisted-app package="com.android.screenshot" />
+</config>