Import and build SafetyHub
Change-Id: I1ca470d03f9664cce5bdefe00ea3945c192c4562
diff --git a/config/bliss_packages.mk b/config/bliss_packages.mk
index b2e69f5..bdf8b72 100644
--- a/config/bliss_packages.mk
+++ b/config/bliss_packages.mk
@@ -68,6 +68,7 @@
AboutBliss \
BlissStatistics \
Contacts \
+ SafetyHubPrebuilt \
Dialer
# Accents
diff --git a/overlay/common/packages/apps/Settings/res/values/config.xml b/overlay/common/packages/apps/Settings/res/values/config.xml
index 2972efb..0518a5b 100644
--- a/overlay/common/packages/apps/Settings/res/values/config.xml
+++ b/overlay/common/packages/apps/Settings/res/values/config.xml
@@ -44,4 +44,7 @@
Default to true as not all devices support contextual cards.
-->
<bool name="config_use_legacy_suggestion">false</bool>
+
+ <string name="config_emergency_intent_action">com.google.android.safetyhub.SAFETY_HUB</string>
+ <string name="config_emergency_package_name">com.google.android.apps.safetyhub</string>
</resources>
diff --git a/prebuilt/common/Android.mk b/prebuilt/common/Android.mk
index 0a66664..b7715ce 100644
--- a/prebuilt/common/Android.mk
+++ b/prebuilt/common/Android.mk
@@ -49,6 +49,17 @@
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
+LOCAL_MODULE := EmergencyInfoGoogleNoUi
+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)
+
+include $(CLEAR_VARS)
LOCAL_MODULE := AboutBliss
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := app/$(LOCAL_MODULE).apk
@@ -109,6 +120,20 @@
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
+LOCAL_MODULE := SafetyHubPrebuilt
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := priv-app/$(LOCAL_MODULE).apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_CLASS := APPS
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_OVERRIDES_PACKAGES := EmergencyInfo
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_DEX_PREOPT := false
+LOCAL_PRODUCT_MODULE := true
+LOCAL_REQUIRED_MODULES := EmergencyInfoGoogleNoUi
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
LOCAL_MODULE := BlissStatistics
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := app/$(LOCAL_MODULE).apk
diff --git a/prebuilt/common/app/EmergencyInfoGoogleNoUi.apk b/prebuilt/common/app/EmergencyInfoGoogleNoUi.apk
new file mode 100644
index 0000000..f03280b
--- /dev/null
+++ b/prebuilt/common/app/EmergencyInfoGoogleNoUi.apk
Binary files differ
diff --git a/prebuilt/common/priv-app/SafetyHubPrebuilt.apk b/prebuilt/common/priv-app/SafetyHubPrebuilt.apk
new file mode 100644
index 0000000..a127867
--- /dev/null
+++ b/prebuilt/common/priv-app/SafetyHubPrebuilt.apk
Binary files differ