From 173b6d86934f9f6cd7fa6e806994e9991c30551a Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Tue, 27 Jun 2023 21:14:36 +0530 Subject: [PATCH] Migrate side FPS settings * Really shouldn't have touched an existing migration before * Anywho, let's change it back to what it was but make it compile * Then, let's migrate that old setting to the new AOSP setting, but flip it since it works differently. Change-Id: I342d8c78aa8faeda5dcaafe9199deb51c570efd0 --- lineage/res/res/values/config.xml | 6 +++++ lineage/res/res/values/symbols.xml | 6 +++++ .../LineageDatabaseHelper.java | 23 +++++++++++++++---- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/lineage/res/res/values/config.xml b/lineage/res/res/values/config.xml index de59ce52..da1e5941 100644 --- a/lineage/res/res/values/config.xml +++ b/lineage/res/res/values/config.xml @@ -288,6 +288,12 @@ (needed for some older vendor fingerprint HAL implementations) --> false + + true + diff --git a/lineage/res/res/values/symbols.xml b/lineage/res/res/values/symbols.xml index 52904dee..04997105 100644 --- a/lineage/res/res/values/symbols.xml +++ b/lineage/res/res/values/symbols.xml @@ -173,6 +173,12 @@ (needed for some older vendor fingerprint HAL implementations) --> + + + diff --git a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java index 3e468f2d..ec931f21 100644 --- a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java +++ b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java @@ -60,7 +60,7 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{ private static final boolean LOCAL_LOGV = false; private static final String DATABASE_NAME = "lineagesettings.db"; - private static final int DATABASE_VERSION = 18; + private static final int DATABASE_VERSION = 19; private static final String DATABASE_NAME_OLD = "cmsettings.db"; @@ -447,18 +447,33 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{ } } catch (SQLiteDoneException ex) { // LineageSettings.System.FINGERPRINT_WAKE_UNLOCK was not set, - // default to config_performantAuthDefault value + // set default value based on config_fingerprintWakeAndUnlock oldSetting = mContext.getResources().getBoolean( - com.android.internal.R.bool.config_performantAuthDefault) ? 1 : 0; + org.lineageos.platform.internal.R.bool.config_fingerprintWakeAndUnlock) + ? 0 : 1; } finally { if (stmt != null) stmt.close(); db.endTransaction(); } + // Previously Settings.Secure.SFPS_REQUIRE_SCREEN_ON_TO_AUTH_ENABLED Settings.Secure.putInt(mContext.getContentResolver(), - Settings.Secure.SFPS_PERFORMANT_AUTH_ENABLED, + "sfps_require_screen_on_to_auth_enabled", oldSetting); upgradeVersion = 18; } + + if (upgradeVersion < 19) { + // Set default value based on config_fingerprintWakeAndUnlock + boolean fingerprintWakeAndUnlock = mContext.getResources().getBoolean( + org.lineageos.platform.internal.R.bool.config_fingerprintWakeAndUnlock); + // Previously Settings.Secure.SFPS_REQUIRE_SCREEN_ON_TO_AUTH_ENABLED + Integer oldSetting = Settings.Secure.getInt(mContext.getContentResolver(), + "sfps_require_screen_on_to_auth_enabled", fingerprintWakeAndUnlock ? 0 : 1); + // Flip value + Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Secure.SFPS_PERFORMANT_AUTH_ENABLED, oldSetting.equals(1) ? 0 : 1); + upgradeVersion = 19; + } // *** Remember to update DATABASE_VERSION above! if (upgradeVersion != newVersion) { Log.wtf(TAG, "warning: upgrading settings database to version "