diff options
| author | Camera Software Integration <camswint@localhost> | 2016-11-15 07:04:04 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-15 07:04:04 -0800 |
| commit | 835e1ab0df28156ade9d168ce5ce8b706765c44b (patch) | |
| tree | 953f534105ea97071275ba6f80ce8c40d9585430 /src/com/android/camera/SettingsActivity.java | |
| parent | 7c31b1e54e8fb6cd28e24eaee1e1d700d2061435 (diff) | |
| parent | c886ddbaf89d0563251b4dd75e051923465bc5b4 (diff) | |
| download | android_packages_apps_Snap-835e1ab0df28156ade9d168ce5ce8b706765c44b.tar.gz android_packages_apps_Snap-835e1ab0df28156ade9d168ce5ce8b706765c44b.tar.bz2 android_packages_apps_Snap-835e1ab0df28156ade9d168ce5ce8b706765c44b.zip | |
Merge "SnapdragonCamera:Fix crash when settingsManager is null" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/SettingsActivity.java')
| -rw-r--r-- | src/com/android/camera/SettingsActivity.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java index 86d74b079..a019f179c 100644 --- a/src/com/android/camera/SettingsActivity.java +++ b/src/com/android/camera/SettingsActivity.java @@ -90,6 +90,10 @@ public class SettingsActivity extends PreferenceActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); mSettingsManager = SettingsManager.getInstance(); + if (mSettingsManager == null) { + finish(); + return; + } addPreferencesFromResource(R.xml.setting_menu_preferences); mSharedPreferences = getPreferenceManager().getSharedPreferences(); |