From 2d43fabaf7c15ded1dcb463725754edfe41b42a1 Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Wed, 12 Dec 2012 09:52:26 -0800 Subject: [PATCH] Don't update global table when upgrading secondary users' database. Bug: 7722149 Change-Id: I0c1373cba316b924701136579083274eb6c9b1da --- .../providers/settings/DatabaseHelper.java | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index ba19307493896..2454fb0ceafab 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -1507,17 +1507,19 @@ public class DatabaseHelper extends SQLiteOpenHelper { if (upgradeVersion == 94) { // Add wireless charging started sound setting - db.beginTransaction(); - SQLiteStatement stmt = null; - try { - stmt = db.compileStatement("INSERT OR REPLACE INTO global(name,value)" - + " VALUES(?,?);"); - loadStringSetting(stmt, Settings.Global.WIRELESS_CHARGING_STARTED_SOUND, - R.string.def_wireless_charging_started_sound); - db.setTransactionSuccessful(); - } finally { - db.endTransaction(); - if (stmt != null) stmt.close(); + if (mUserHandle == UserHandle.USER_OWNER) { + db.beginTransaction(); + SQLiteStatement stmt = null; + try { + stmt = db.compileStatement("INSERT OR REPLACE INTO global(name,value)" + + " VALUES(?,?);"); + loadStringSetting(stmt, Settings.Global.WIRELESS_CHARGING_STARTED_SOUND, + R.string.def_wireless_charging_started_sound); + db.setTransactionSuccessful(); + } finally { + db.endTransaction(); + if (stmt != null) stmt.close(); + } } upgradeVersion = 95; }