commit 9a1473406f634ea541bd1643dc70d9aae8c10e77
author Amith Yamasani <yamasani@google.com> Wed Dec 12 11:38:38 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 12 11:39:18 2012 -0800
tree 43c4a67268a94bfff75d3e8f0405297a868e12dc
parent 90e41469fe99e52de2144ed24d005a1b30e5f917
parent 2d43fabaf7c15ded1dcb463725754edfe41b42a1

Merge "Don't update global table when upgrading secondary users' database." into jb-mr1.1-dev

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index ba19307..2454fb0 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 @@
 
         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;
         }