summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-06-27 19:16:18 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-06-27 19:16:18 -0700
commit14c18f2a53e783c488a3ec6e832b8f0baaf5585d (patch)
treea8ee1d7f5e3eb36c264fd4e9866fb17ccb848bf3 /src/com
parent80ecd85df84a9ec09b52abba3429b80c722cb89f (diff)
parent8198d64b94703eb4c7f762eb79079be028ad955e (diff)
downloadandroid_packages_apps_Snap-14c18f2a53e783c488a3ec6e832b8f0baaf5585d.tar.gz
android_packages_apps_Snap-14c18f2a53e783c488a3ec6e832b8f0baaf5585d.tar.bz2
android_packages_apps_Snap-14c18f2a53e783c488a3ec6e832b8f0baaf5585d.zip
Merge "SnapdragonCamera:Fix unbind error"
Diffstat (limited to 'src/com')
-rwxr-xr-xsrc/com/android/camera/CameraActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 34c40cbf8..9e1855ff3 100755
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1298,7 +1298,7 @@ public class CameraActivity extends Activity
}
private void unbindMediaSaveService() {
- if (mConnection != null) {
+ if (mConnection != null && mMediaSaveService != null) {
unbindService(mConnection);
}
}