Override phone settings from CarSettings.
Bug: 73470808
Test: build and deploy, verify phone settings is not present.
Change-Id: I2a2ce0d1e4a3210d44d6ebff15f59d5430aa6ea9
diff --git a/Android.mk b/Android.mk
index 39b7790..a9c6acf 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,6 +22,7 @@
# (for example, projected). See b/30064991
ifeq (,$(TARGET_BUILD_APPS))
LOCAL_PACKAGE_NAME := CarSettings
+ LOCAL_OVERRIDES_PACKAGES := Settings
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_SRC_FILES := $(call all-java-files-under, src)
@@ -63,12 +64,6 @@
LOCAL_DX_FLAGS := --multi-dex
- ifdef DISABLE_AOSP_PHONE_SETTING
- ifeq ($(DISABLE_AOSP_PHONE_SETTING),true)
- # This will hide AOSP phone setting.
- LOCAL_OVERRIDES_PACKAGES := Settings
- endif
- endif
include $(BUILD_PACKAGE)
endif
@@ -81,6 +76,7 @@
# (for example, projected). See b/30064991
ifeq (,$(TARGET_BUILD_APPS))
LOCAL_PACKAGE_NAME := CarSettingsForTesting
+ LOCAL_OVERRIDES_PACKAGES := Settings
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_SRC_FILES := $(call all-java-files-under, src)
@@ -123,12 +119,6 @@
LOCAL_DX_FLAGS := --multi-dex
- ifdef DISABLE_AOSP_PHONE_SETTING
- ifeq ($(DISABLE_AOSP_PHONE_SETTING),true)
- # This will hide AOSP phone setting.
- LOCAL_OVERRIDES_PACKAGES := Settings
- endif
- endif
include $(BUILD_PACKAGE)
endif
###################################################################################