Merge branch 'tm-qpr2' into 'tm-qpr2'

gms: Import missing QR Code scanner components in PrebuiltGmsCore

See merge request statixos/google-mobile-services!7

common/Android.bp

@@ -582,6 +582,30 @@ android_app_import {
 	product_specific: true,
 }
 
+android_app_import {
+	name: "MlkitBarcodeUIPrebuilt",
+	owner: "gms",
+	apk: "proprietary/product/priv-app/PrebuiltGmsCore/m/optional/MlkitBarcodeUIPrebuilt.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
+android_app_import {
+	name: "VisionBarcodePrebuilt",
+	owner: "gms",
+	apk: "proprietary/product/priv-app/PrebuiltGmsCore/m/optional/VisionBarcodePrebuilt.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
 android_app_import {
 	name: "RecorderPrebuilt",
 	owner: "gms",

common/common-vendor.mk

@@ -205,6 +205,8 @@ PRODUCT_PACKAGES += \
     PrebuiltGmsCoreSc_MapsDynamite \
     PrebuiltGmsCoreSc_MeasurementDynamite \
     AndroidPlatformServices \
+    MlkitBarcodeUIPrebuilt \
+    VisionBarcodePrebuilt \
     RecorderPrebuilt \
     SafetyHubPrebuilt \
     ScribePrebuilt \

proprietary-files.txt

@@ -133,6 +133,8 @@ product/app/WebViewGoogle/WebViewGoogle.apk.gz
 -product/priv-app/PrebuiltGmsCore/app_chimera/m/PrebuiltGmsCoreSc_MapsDynamite.apk;PRESIGNED
 -product/priv-app/PrebuiltGmsCore/app_chimera/m/PrebuiltGmsCoreSc_MeasurementDynamite.apk;PRESIGNED
 -product/priv-app/PrebuiltGmsCore/m/independent/AndroidPlatformServices.apk;PRESIGNED
+-product/priv-app/PrebuiltGmsCore/m/optional/MlkitBarcodeUIPrebuilt.apk;PRESIGNED
+-product/priv-app/PrebuiltGmsCore/m/optional/VisionBarcodePrebuilt.apk;PRESIGNED
 -system/app/GoogleExtShared/GoogleExtShared.apk;OVERRIDES=ExtShared;PRESIGNED
 -system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk;PRESIGNED
 -system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk;PRESIGNED