From 62ab05149695753ee4a5ef32d5bd4ad2af93f924 Mon Sep 17 00:00:00 2001 From: Gabriele M Date: Mon, 26 Jun 2017 23:26:43 +0200 Subject: [PATCH] Make CMParts a protected component manager This allows to start protected application from the "Protected apps" activity without re-inserting the secret code. Change-Id: Iaf727d741ef8e302b76a566ae9cd6a5031c85079 --- .../res/values/defaults.xml | 2 +- .../cmsettings/CMDatabaseHelper.java | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/packages/CMSettingsProvider/res/values/defaults.xml b/packages/CMSettingsProvider/res/values/defaults.xml index 1ea76a6a..8e558b4b 100644 --- a/packages/CMSettingsProvider/res/values/defaults.xml +++ b/packages/CMSettingsProvider/res/values/defaults.xml @@ -111,7 +111,7 @@ false - com.android.settings|com.android.launcher3|com.cyanogenmod.trebuchet + com.android.settings|com.android.launcher3|com.cyanogenmod.trebuchet|org.cyanogenmod.cmparts 2 diff --git a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java index 9b468470..c7076b07 100644 --- a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java +++ b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java @@ -47,7 +47,7 @@ public class CMDatabaseHelper extends SQLiteOpenHelper{ private static final boolean LOCAL_LOGV = false; private static final String DATABASE_NAME = "cmsettings.db"; - private static final int DATABASE_VERSION = 7; + private static final int DATABASE_VERSION = 8; public static class CMTableNames { public static final String TABLE_SYSTEM = "system"; @@ -259,6 +259,23 @@ public class CMDatabaseHelper extends SQLiteOpenHelper{ } upgradeVersion = 7; } + + if (upgradeVersion < 8) { + db.beginTransaction(); + SQLiteStatement stmt = null; + try { + stmt = db.compileStatement("UPDATE secure SET value=? WHERE name=?"); + stmt.bindString(1, mContext.getResources() + .getString(R.string.def_protected_component_managers)); + stmt.bindString(2, CMSettings.Secure.PROTECTED_COMPONENT_MANAGERS); + stmt.execute(); + db.setTransactionSuccessful(); + } finally { + if (stmt != null) stmt.close(); + db.endTransaction(); + } + upgradeVersion = 8; + } // *** Remember to update DATABASE_VERSION above! if (upgradeVersion < newVersion) {