OSDN Git Service
(root)
/
android-x86
/
packages-apps-Camera2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e3974bb
)
Fix NPE in Camera
author
Michael Kolb
<kolby@google.com>
Fri, 22 Mar 2013 21:11:57 +0000
(14:11 -0700)
committer
Michael Kolb
<kolby@google.com>
Fri, 22 Mar 2013 21:11:57 +0000
(14:11 -0700)
Bug:
8409508
Change-Id: I962a7eccec9ca2e1c190eb1c2c252020cd0926e0
src/com/android/camera/CameraActivity.java
patch
|
blob
|
history
diff --git
a/src/com/android/camera/CameraActivity.java
b/src/com/android/camera/CameraActivity.java
index
24c49ba
..
3813cce
100644
(file)
--- a/
src/com/android/camera/CameraActivity.java
+++ b/
src/com/android/camera/CameraActivity.java
@@
-370,8
+370,12
@@
public class CameraActivity extends ActivityBase
}
private void unbindMediaSaveService() {
- mMediaSaveService.setListener(null);
- unbindService(mConnection);
+ if (mMediaSaveService != null) {
+ mMediaSaveService.setListener(null);
+ }
+ if (mConnection != null) {
+ unbindService(mConnection);
+ }
}
@Override