diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-12-06 04:57:23 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-12-06 04:57:23 -0800 |
| commit | f304deff7729e4199760f74687b96494232232de (patch) | |
| tree | 1a850c2ece127b65ebd77b2bb5c95f0cd9236949 /src | |
| parent | be01dc243365529c173e4e7ea17833d927974a8c (diff) | |
| parent | 1011037364354a9371a39e407b98fae211e104d9 (diff) | |
| download | android_packages_apps_Snap-f304deff7729e4199760f74687b96494232232de.tar.gz android_packages_apps_Snap-f304deff7729e4199760f74687b96494232232de.tar.bz2 android_packages_apps_Snap-f304deff7729e4199760f74687b96494232232de.zip | |
Merge "SnapdragonCamera: fix app crash when there is no map app"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/util/CameraUtil.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index a80db9f09..60d4f065c 100644 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -1035,8 +1035,14 @@ public class CameraUtil { // Use the "geo intent" if no GMM is installed Log.e(TAG, "GMM activity not found!", e); String url = String.format(Locale.ENGLISH, "geo:%f,%f", latLong[0], latLong[1]); - Intent mapsIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); - activity.startActivity(mapsIntent); + try { + Intent mapsIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); + activity.startActivity(mapsIntent); + } catch (ActivityNotFoundException ex) { + Log.e(TAG, "Map view activity not found!", ex); + Toast.makeText(activity, activity.getString(R.string.map_activity_not_found_err), + Toast.LENGTH_SHORT).show(); + } } } |