diff options
| author | Sascha Haeberling <haeberling@google.com> | 2014-08-13 11:43:57 -0700 |
|---|---|---|
| committer | Sascha Haeberling <haeberling@google.com> | 2014-08-13 12:08:11 -0700 |
| commit | c2e6813aadeb94f8ec7f093e56c986aac796e783 (patch) | |
| tree | fd578fbdada27a67a32f1fc4250ae656516be579 /src/com/android/camera/CameraActivity.java | |
| parent | 59c784bf588b9e0994e9769001f624200e9b1027 (diff) | |
| download | android_packages_apps_Camera2-c2e6813aadeb94f8ec7f093e56c986aac796e783.tar.gz android_packages_apps_Camera2-c2e6813aadeb94f8ec7f093e56c986aac796e783.tar.bz2 android_packages_apps_Camera2-c2e6813aadeb94f8ec7f093e56c986aac796e783.zip | |
Don't try to share null data
Bug: 16875556
Also add warning logs for null check cases.
Change-Id: Ic1e7e81b416d24a748b9572d63c145612b38d822
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 4a6fe8bf6..f14cf103e 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -305,10 +305,12 @@ public class CameraActivity extends Activity } final LocalData data = getCurrentLocalData(); if (data == null) { + Log.w(TAG, "Cannot open null data."); return; } final Uri contentUri = data.getUri(); if (contentUri == Uri.EMPTY) { + Log.w(TAG, "Cannot open empty URL."); return; } @@ -330,6 +332,7 @@ public class CameraActivity extends Activity public void onEdit() { LocalData data = getCurrentLocalData(); if (data == null) { + Log.w(TAG, "Cannot edit null data."); return; } final int currentDataId = getCurrentDataId(); @@ -344,6 +347,7 @@ public class CameraActivity extends Activity public void onTinyPlanet() { LocalData data = getCurrentLocalData(); if (data == null) { + Log.w(TAG, "Cannot edit tiny planet on null data."); return; } launchTinyPlanetEditor(data); @@ -362,6 +366,11 @@ public class CameraActivity extends Activity @Override public void onShare() { final LocalData data = getCurrentLocalData(); + if (data == null) { + Log.w(TAG, "Cannot share null data."); + return; + } + final int currentDataId = getCurrentDataId(); UsageStatistics.instance().mediaInteraction(fileNameFromDataID(currentDataId), MediaInteraction.InteractionType.SHARE, |