diff options
author | Adam Cohen <adamcohen@google.com> | 2014-12-04 18:43:49 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 18:43:49 +0000 |
commit | 396628876da3df23ecc545ca474da8fe8e3a2cb8 (patch) | |
tree | 9ae008fc66cca5ee77bedffe93f7d6cd03f88308 /src/com/android/launcher3/WidgetPreviewLoader.java | |
parent | 6948580a1ce2f76879ff428c2563dccfcce3d86f (diff) | |
parent | 0250945759f7ac58aab912448d62dc108b1770c5 (diff) | |
download | android_packages_apps_Trebuchet-396628876da3df23ecc545ca474da8fe8e3a2cb8.tar.gz android_packages_apps_Trebuchet-396628876da3df23ecc545ca474da8fe8e3a2cb8.tar.bz2 android_packages_apps_Trebuchet-396628876da3df23ecc545ca474da8fe8e3a2cb8.zip |
am 02509457: Avoid db exception on L and above
* commit '0250945759f7ac58aab912448d62dc108b1770c5':
Avoid db exception on L and above
Diffstat (limited to 'src/com/android/launcher3/WidgetPreviewLoader.java')
-rw-r--r-- | src/com/android/launcher3/WidgetPreviewLoader.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java index c3c0649f0..4e6fe1f88 100644 --- a/src/com/android/launcher3/WidgetPreviewLoader.java +++ b/src/com/android/launcher3/WidgetPreviewLoader.java @@ -166,21 +166,19 @@ public class WidgetPreviewLoader { LauncherAppState.getSharedPreferencesKey(), Context.MODE_PRIVATE); final String lastVersionName = sp.getString(ANDROID_INCREMENTAL_VERSION_NAME_KEY, null); final String versionName = android.os.Build.VERSION.INCREMENTAL; - final boolean isLollipop = Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP; + final boolean isLollipopOrGreater = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP; if (!versionName.equals(lastVersionName)) { try { // clear all the previews whenever the system version changes, to ensure that // previews are up-to-date for any apps that might have been updated with the system clearDb(); } catch (SQLiteReadOnlyDatabaseException e) { - if (isLollipop) { + if (isLollipopOrGreater) { // Workaround for Bug. 18554839, if we fail to clear the db due to the read-only // issue, then ignore this error and leave the old previews } else { throw e; } - } catch (Exception e) { - throw e; } finally { SharedPreferences.Editor editor = sp.edit(); editor.putString(ANDROID_INCREMENTAL_VERSION_NAME_KEY, versionName); |