(SHIFT) CameraActivity: rip out auto test
Change-Id: I28da716339774c850201da207710f8d9f76996f6
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 9da9e84..474ec90 100755
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -96,7 +96,6 @@
import com.android.camera.util.CameraUtil;
import com.android.camera.util.FeatureHelper;
import com.android.camera.util.IntentHelper;
-import com.android.camera.util.PersistUtil;
import com.android.camera.util.UsageStatistics;
import org.codeaurora.snapcam.R;
@@ -138,8 +137,6 @@
// This string is used for judge start activity from screenoff or not
public static final String GESTURE_CAMERA_NAME = "com.android.camera.CameraGestureActivity";
- private static final String AUTO_TEST_INTENT ="com.android.camera.autotest";
-
/**
* Request code from an activity we started that indicated that we do not
* want to reset the view to the preview in onResume.
@@ -246,8 +243,6 @@
private boolean mDataRequested;
private Cursor mCursor;
- private boolean mAutoTestEnabled = false;
-
private WakeLock mWakeLock;
private static final int REFOCUS_ACTIVITY_CODE = 1;
@@ -1304,24 +1299,6 @@
}
}
- private BroadcastReceiver mAutoTestReceiver = new BroadcastReceiver() {
- @Override
- public void onReceive(Context context, Intent intent) {
- if (intent.hasExtra("KEY") && intent.hasExtra("VALUE")) {
- String key = intent.getExtras().getString("KEY");
- String value = intent.getExtras().getString("VALUE");
- if (mCurrentModule != null) {
- mCurrentModule.setPreferenceForTest(key,value);
- }
- }
- }
- };
-
- private void registerAutoTestReceiver() {
- IntentFilter filter = new IntentFilter(AUTO_TEST_INTENT);
- registerReceiver(mAutoTestReceiver, filter);
- }
-
@Override
public void onCreate(Bundle state) {
super.onCreate(state);
@@ -1498,12 +1475,6 @@
SETTING_LIST_WIDTH_1 = lower / 2 + offset;
SETTING_LIST_WIDTH_2 = lower / 2 - offset;
registerSDcardMountedReceiver();
-
- mAutoTestEnabled = PersistUtil.isAutoTestEnabled();
-
- if (mAutoTestEnabled) {
- registerAutoTestReceiver();
- }
}
private void setRotationAnimation() {
@@ -1728,9 +1699,6 @@
if (mDataAdapter != null) {
mDataAdapter.stopLoading();
}
- if (mAutoTestEnabled) {
- unregisterReceiver(mAutoTestReceiver);
- }
if(mCurrentModule != null){
mCurrentModule.onDestroy();
}