From b4c3591306dcab077fd2b408a20af3a296f0920c Mon Sep 17 00:00:00 2001 From: nkk71 Date: Wed, 11 Oct 2017 23:39:10 +0300 Subject: Auto detect possible use of legacy props * Revert: Make legacy props an option disabled by default (reverted from commit 75aa615767457f2b62dda65b16ded41b0e6df11f) * Instead check for ANDROID_PROPERTY_WORKSPACE in the updater- binary to determine whether legacy property service can be used Change-Id: If68d5cca9a2b56edcb1c73db0474668cf46d8c91 --- data.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'data.cpp') diff --git a/data.cpp b/data.cpp index 5a9055345..c0cb9b85b 100644 --- a/data.cpp +++ b/data.cpp @@ -833,20 +833,19 @@ void DataManager::SetDefaultValues() #else mConst.SetValue("tw_has_boot_slots", "0"); #endif + #ifdef TW_NO_LEGACY_PROPS LOGINFO("TW_NO_LEGACY_PROPS := true\n"); - mConst.SetValue("tw_enable_legacy_props", "0"); #endif + #ifdef TW_OEM_BUILD LOGINFO("TW_OEM_BUILD := true\n"); mConst.SetValue("tw_oem_build", "1"); - mConst.SetValue("tw_enable_legacy_props", "0"); #else mConst.SetValue("tw_oem_build", "0"); mPersist.SetValue("tw_app_prompt", "1"); mPersist.SetValue("tw_app_install_system", "1"); mData.SetValue("tw_app_install_status", "0"); // 0 = no status, 1 = not installed, 2 = already installed - mPersist.SetValue("tw_enable_legacy_props", "0"); #endif pthread_mutex_unlock(&m_valuesLock); -- cgit v1.2.3