From c0254632e14f85c846d57cef0146f1534173b56c Mon Sep 17 00:00:00 2001 From: Christian Morlok Date: Sun, 8 Jan 2017 00:44:19 +0100 Subject: [PATCH] cmsdk: fix update path for version 7 * Do not break boot if clock position tunable is unset * Fixes I2412051289a922dfc72cdf266b47f32cf7aaa31a Change-Id: I8d841f324f5bf8499365ca48cdf6aa4710ccd957 --- .../src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java index 91c56018..9b468470 100644 --- a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java +++ b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java @@ -23,6 +23,7 @@ import android.content.res.AssetManager; import android.content.res.Configuration; import android.content.res.Resources; import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteDoneException; import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteStatement; import android.os.Build; @@ -249,6 +250,8 @@ public class CMDatabaseHelper extends SQLiteOpenHelper{ stmt.execute(); } db.setTransactionSuccessful(); + } catch (SQLiteDoneException ex) { + // CMSettings.System.STATUS_BAR_CLOCK is not set } finally { if (stmt != null) stmt.close(); db.endTransaction();