summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Altensen <info@stricted.net>2020-01-31 00:24:47 +0100
committerPaul Keith <javelinanddart@gmail.com>2020-02-03 22:23:19 +0100
commitea2dcc833be54e6d12ef2d15b5980884e729bbc2 (patch)
tree42b35a774ba12e3b1cab2b4bd6d44b54723d88b6 /src
parent2bd38f540405233daba3d63545bdc368f96973a3 (diff)
downloadandroid_packages_apps_Snap-ea2dcc833be54e6d12ef2d15b5980884e729bbc2.tar.gz
android_packages_apps_Snap-ea2dcc833be54e6d12ef2d15b5980884e729bbc2.tar.bz2
android_packages_apps_Snap-ea2dcc833be54e6d12ef2d15b5980884e729bbc2.zip
Snap: catch NumberFormatException in getDeviceSocId
* non qcom devices might return a non numeric value Change-Id: I6dcdab18965778053bf10291c9fa86e21d048c4f
Diffstat (limited to 'src')
-rwxr-xr-xsrc/com/android/camera/SettingsManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index 96283ebfd..febba2bf1 100755
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -90,6 +90,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.lang.NumberFormatException;
import java.lang.StringBuilder;
public class SettingsManager implements ListMenu.SettingsListener {
@@ -716,7 +717,7 @@ public class SettingsManager implements ListMenu.SettingsListener {
}
} catch (FileNotFoundException e) {
Log.d(TAG, filePath + " doesn't found!");
- } catch (IOException e) {
+ } catch (IOException | NumberFormatException e) {
Log.d(TAG, filePath + " read exception, " + e.getMessage());
}
}