diff options
author | LuK1337 <priv.luk@gmail.com> | 2016-01-11 17:40:58 +0100 |
---|---|---|
committer | LuK1337 <priv.luk@gmail.com> | 2016-01-11 18:02:29 +0100 |
commit | a1b0f7ad512c87b7d2287975cf6ada231b8373ae (patch) | |
tree | 77b083d69fda14fd368c0231257d5c656420df08 | |
parent | 42a806a3c4ec7d76ca4f4292c9d106eb2e1fdc17 (diff) | |
download | android_packages_apps_Snap-a1b0f7ad512c87b7d2287975cf6ada231b8373ae.tar.gz android_packages_apps_Snap-a1b0f7ad512c87b7d2287975cf6ada231b8373ae.tar.bz2 android_packages_apps_Snap-a1b0f7ad512c87b7d2287975cf6ada231b8373ae.zip |
Move mApplicationContext to init()
Fixes following NPE:
01-11 17:36:42.607 4329 4391 E AndroidRuntime: FATAL EXCEPTION: Thread-235
01-11 17:36:42.607 4329 4391 E AndroidRuntime: Process: org.cyanogenmod.snap, PID: 4329
01-11 17:36:42.607 4329 4391 E AndroidRuntime: java.lang.NullPointerException: Attempt to invoke virtual method 'android.content.res.Resources android.content.Context.getResources()' on a null object reference
01-11 17:36:42.607 4329 4391 E AndroidRuntime: at com.android.camera.PhotoModule.updateCameraParametersPreference(PhotoModule.java:3492)
01-11 17:36:42.607 4329 4391 E AndroidRuntime: at com.android.camera.PhotoModule.setCameraParameters(PhotoModule.java:3714)
01-11 17:36:42.607 4329 4391 E AndroidRuntime: at com.android.camera.PhotoModule.startPreview(PhotoModule.java:2715)
01-11 17:36:42.607 4329 4391 E AndroidRuntime: at com.android.camera.PhotoModule.-wrap14(PhotoModule.java)
01-11 17:36:42.607 4329 4391 E AndroidRuntime: at com.android.camera.PhotoModule$OpenCameraThread.run(PhotoModule.java:265)
Change-Id: I6ca0dfe402cab46dd7b6f102921062f3c7ec8d43
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index be187f416..bb0f1968e 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -493,6 +493,7 @@ public class PhotoModule mCameraId = getPreferredCameraId(mPreferences); mContentResolver = mActivity.getContentResolver(); + mApplicationContext = CameraApp.getContext(); // Surface texture is from camera screen nail and startPreview needs it. // This must be done before startPreview. @@ -821,8 +822,6 @@ public class PhotoModule return; } - mApplicationContext = CameraApp.getContext(); - // Initialize location service. boolean recordLocation = RecordLocationPreference.get( mPreferences, mContentResolver); |