diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-21 14:38:24 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-21 14:38:24 +0100 |
| commit | fa2e80883e60f4a5fc89d221465f36668671451a (patch) | |
| tree | d11da64f2b586d9d819afcaf063fbac103c1a049 /packages/SettingsProvider | |
| parent | 768d4bbe29f397bdff2021133a31ecc4c37ec6d4 (diff) | |
| parent | 093bdf9a3ed095763c0116dcd077b1061ede09e4 (diff) | |
| download | frameworks_base-fa2e80883e60f4a5fc89d221465f36668671451a.zip frameworks_base-fa2e80883e60f4a5fc89d221465f36668671451a.tar.gz frameworks_base-fa2e80883e60f4a5fc89d221465f36668671451a.tar.bz2 | |
Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index e9e310a..7b69b5f 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -1929,7 +1929,7 @@ class DatabaseHelper extends SQLiteOpenHelper { if (upgradeVersion < 116) { moveSettingsToNewTable(db, TABLE_SYSTEM, TABLE_SECURE, - new String[]{CMSettings.Secure.VOLUME_LINK_NOTIFICATION}, true); + new String[]{Settings.Secure.VOLUME_LINK_NOTIFICATION}, true); if (mUserHandle == UserHandle.USER_OWNER) { db.beginTransaction(); SQLiteStatement stmt = null; |