Revert "Import and build SafetyHub"
This reverts commit 9c283e9bc3eb179549fab0104ae8ad1510a14bd4.
Change-Id: Ia8e79f2b122e2dd4fb44bff67d2e26a51e6b8d65
diff --git a/config/bliss_packages.mk b/config/bliss_packages.mk
index ffbea44..62bda13 100644
--- a/config/bliss_packages.mk
+++ b/config/bliss_packages.mk
@@ -70,7 +70,6 @@
AboutBliss \
BlissStatistics \
Contacts \
- SafetyHubPrebuilt \
Dialer \
OmniJaws \
OmniStyle
diff --git a/overlay/common/packages/apps/Settings/res/values/config.xml b/overlay/common/packages/apps/Settings/res/values/config.xml
index cedd7c1..ab74b9e 100644
--- a/overlay/common/packages/apps/Settings/res/values/config.xml
+++ b/overlay/common/packages/apps/Settings/res/values/config.xml
@@ -48,9 +48,6 @@
-->
<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>
-
<!--Whether help links are defined. -->
<bool name="config_has_help">true</bool>
diff --git a/prebuilt/common/Android.mk b/prebuilt/common/Android.mk
index 599d332..38de312 100644
--- a/prebuilt/common/Android.mk
+++ b/prebuilt/common/Android.mk
@@ -120,20 +120,6 @@
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/priv-app/SafetyHubPrebuilt.apk b/prebuilt/common/priv-app/SafetyHubPrebuilt.apk
deleted file mode 100644
index a127867..0000000
--- a/prebuilt/common/priv-app/SafetyHubPrebuilt.apk
+++ /dev/null
Binary files differ