diff options
author | Steve Kondik <steve@cyngn.com> | 2016-11-11 04:42:43 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-11-11 05:48:29 -0800 |
commit | 0b4b53688f8486537d9d58dc6448ca2db8c67c7d (patch) | |
tree | 378028d4ddbe18b028f837e6859eab2f4369d535 /src/com/android/camera | |
parent | 07bf07444dda71b7e6c6b7e8e36c460ff17a15fa (diff) | |
download | android_packages_apps_Snap-0b4b53688f8486537d9d58dc6448ca2db8c67c7d.tar.gz android_packages_apps_Snap-0b4b53688f8486537d9d58dc6448ca2db8c67c7d.tar.bz2 android_packages_apps_Snap-0b4b53688f8486537d9d58dc6448ca2db8c67c7d.zip |
snap: Get rid of static Context member
* These are never a good thing. Instead pass the activity
thru CameraUtil.
Change-Id: I30d73fa329e174b20e0075a49e6d1e059e30aa3e
Diffstat (limited to 'src/com/android/camera')
-rw-r--r-- | src/com/android/camera/CameraButtonIntentReceiver.java | 2 | ||||
-rw-r--r-- | src/com/android/camera/CameraHolder.java | 6 | ||||
-rwxr-xr-x | src/com/android/camera/PhotoModule.java | 27 | ||||
-rw-r--r-- | src/com/android/camera/app/CameraApp.java | 9 | ||||
-rw-r--r-- | src/com/android/camera/util/CameraUtil.java | 2 |
5 files changed, 14 insertions, 32 deletions
diff --git a/src/com/android/camera/CameraButtonIntentReceiver.java b/src/com/android/camera/CameraButtonIntentReceiver.java index 253105aca..3f0be1d76 100644 --- a/src/com/android/camera/CameraButtonIntentReceiver.java +++ b/src/com/android/camera/CameraButtonIntentReceiver.java @@ -38,7 +38,7 @@ public class CameraButtonIntentReceiver extends BroadcastReceiver { CameraHolder holder = CameraHolder.instance(); ComboPreferences pref = new ComboPreferences(context); int cameraId = CameraSettings.readPreferredCameraId(pref); - if (holder.tryOpen(null, cameraId, null) == null) { + if (holder.tryOpen(context, null, cameraId, null) == null) { return; } diff --git a/src/com/android/camera/CameraHolder.java b/src/com/android/camera/CameraHolder.java index ee62eb2f6..9e0e32271 100644 --- a/src/com/android/camera/CameraHolder.java +++ b/src/com/android/camera/CameraHolder.java @@ -193,11 +193,10 @@ public class CameraHolder { } public synchronized CameraProxy open( + Context context, Handler handler, int cameraId, CameraManager.CameraOpenErrorCallback cb) { - Context context = CameraApp.getContext(); - if (DEBUG_OPEN_RELEASE) { collectState(cameraId, mCameraDevice); if (mCameraOpened) { @@ -263,8 +262,9 @@ public class CameraHolder { * unavailable then return {@code null}. */ public synchronized CameraProxy tryOpen( + Context context, Handler handler, int cameraId, CameraManager.CameraOpenErrorCallback cb) { - return (!mCameraOpened ? open(handler, cameraId, cb) : null); + return (!mCameraOpened ? open(context, handler, cameraId, cb) : null); } public synchronized void release() { diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 5eff069ab..55dfbaadc 100755 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -57,6 +57,7 @@ import android.view.KeyEvent; import android.view.OrientationEventListener; import android.view.SurfaceHolder; import android.view.View; +import android.view.ViewGroup; import android.view.WindowManager; import android.widget.Toast; import android.widget.SeekBar; @@ -253,8 +254,6 @@ public class PhotoModule private byte[] mLastJpegData; private int mLastJpegOrientation = 0; - private static Context mApplicationContext = null; - private Runnable mDoSnapRunnable = new Runnable() { @Override public void run() { @@ -571,7 +570,6 @@ public class PhotoModule CameraSettings.upgradeGlobalPreferences(mPreferences.getGlobal(), activity); 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. @@ -601,9 +599,7 @@ public class PhotoModule mPreferences.getString(CameraSettings.KEY_CAMERA_SAVEPATH, "0").equals("1")); // LGE HDR mode - if (mApplicationContext != null) { - mLgeHdrMode = mApplicationContext.getResources().getBoolean(R.bool.lge_hdr_mode); - } + mLgeHdrMode = mActivity.getResources().getBoolean(R.bool.lge_hdr_mode); } private void initializeControlByIntent() { @@ -1322,11 +1318,8 @@ public class PhotoModule ExifInterface exif = Exif.getExif(jpegData); boolean overrideMakerAndModelTag = false; - if (mApplicationContext != null) { - overrideMakerAndModelTag = - mApplicationContext.getResources() - .getBoolean(R.bool.override_maker_and_model_tag); - } + overrideMakerAndModelTag = mActivity.getResources() + .getBoolean(R.bool.override_maker_and_model_tag); if (overrideMakerAndModelTag) { ExifTag maker = exif.buildTag(ExifInterface.TAG_MAKE, Build.MANUFACTURER); @@ -1376,12 +1369,10 @@ public class PhotoModule boolean backCameraRestartPreviewOnPictureTaken = false; boolean frontCameraRestartPreviewOnPictureTaken = false; - if (mApplicationContext != null) { - backCameraRestartPreviewOnPictureTaken = - mApplicationContext.getResources().getBoolean(R.bool.back_camera_restart_preview_onPictureTaken); - frontCameraRestartPreviewOnPictureTaken = - mApplicationContext.getResources().getBoolean(R.bool.front_camera_restart_preview_onPictureTaken); - } + backCameraRestartPreviewOnPictureTaken = + mActivity.getResources().getBoolean(R.bool.back_camera_restart_preview_onPictureTaken); + frontCameraRestartPreviewOnPictureTaken = + mActivity.getResources().getBoolean(R.bool.front_camera_restart_preview_onPictureTaken); CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId]; if ((info.facing == CameraInfo.CAMERA_FACING_BACK @@ -3861,7 +3852,7 @@ public class PhotoModule // Get default preview resolution from overlay String previewSizeForPhoto = - mApplicationContext.getResources().getString(R.string.preview_size_for_photo); + mActivity.getResources().getString(R.string.preview_size_for_photo); try { android.util.Size previewSize = android.util.Size.parseSize(previewSizeForPhoto); diff --git a/src/com/android/camera/app/CameraApp.java b/src/com/android/camera/app/CameraApp.java index b5a5f4db8..6261159ec 100644 --- a/src/com/android/camera/app/CameraApp.java +++ b/src/com/android/camera/app/CameraApp.java @@ -19,7 +19,6 @@ package com.android.camera.app; import android.app.ActivityManager; import android.app.Application; -import android.content.Context; import com.android.camera.SDCard; import com.android.camera.util.CameraUtil; @@ -29,7 +28,6 @@ public class CameraApp extends Application { private static long mMaxSystemMemory; public static boolean mIsLowMemoryDevice = false; private static final long LOW_MEMORY_DEVICE_THRESHOLD = 2L*1024*1024*1024; - private static Application mApp = null; @Override public void onCreate() { @@ -42,15 +40,8 @@ public class CameraApp extends Application { mIsLowMemoryDevice = true; } - mApp = this; - UsageStatistics.initialize(this); CameraUtil.initialize(this); SDCard.initialize(this); } - - public static Context getContext() - { - return mApp.getApplicationContext(); - } } diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index a5bd123b2..ba6768eb7 100644 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -381,7 +381,7 @@ public class CameraUtil { Handler handler, final CameraManager.CameraOpenErrorCallback cb) { try { throwIfCameraDisabled(activity); - return CameraHolder.instance().open(handler, cameraId, cb); + return CameraHolder.instance().open(activity, handler, cameraId, cb); } catch (CameraDisabledException ex) { handler.post(new Runnable() { @Override |