From: Sascha Haeberling <haeberling@google.com>
Date: Mon, 7 Oct 2013 01:07:07 +0000 (-0700)
Subject: Revert CL that added broadcast receivers for shutter control.
X-Git-Tag: android-x86-6.0-r3~1684^2~99
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4de788063b51cc2d3f65122bdcc7f862170ba761;p=android-x86%2Fpackages-apps-Camera2.git

Revert CL that added broadcast receivers for shutter control.

 Bug: 11006189

This was added for Gem support but causes us trouble. As it's not
essential, we'll remove it now.
Original CL was http://ag/342589

Change-Id: I9e137411cf5beb0fbdad611ee85803960feef14a
---

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index c0693deea..88fb72a43 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -342,18 +342,6 @@ public class PhotoModule
         }
     }
 
-    private BroadcastReceiver mReceiver = null;
-
-    private class ShutterBroadcastReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            if (action.equals(CameraUtil.ACTION_CAMERA_SHUTTER_CLICK)) {
-                onShutterButtonFocus(true);
-                onShutterButtonClick();
-            }
-        }
-    }
 
     @Override
     public void init(CameraActivity activity, View parent) {
@@ -1132,11 +1120,7 @@ public class PhotoModule
 
     @Override
     public void installIntentFilter() {
-        // Install an intent filter to receive remote shutter events.
-        IntentFilter intentFilter =
-                new IntentFilter(CameraUtil.ACTION_CAMERA_SHUTTER_CLICK);
-        mReceiver = new ShutterBroadcastReceiver();
-        mActivity.registerReceiver(mReceiver, intentFilter);
+        // Do nothing.
     }
 
     @Override
@@ -1211,23 +1195,10 @@ public class PhotoModule
         if (msensor != null) {
             mSensorManager.registerListener(this, msensor, SensorManager.SENSOR_DELAY_NORMAL);
         }
-
-        installIntentFilter();
-        Intent intent = new Intent(CameraUtil.ACTION_CAMERA_STARTED);
-        mActivity.sendBroadcast(intent);
     }
 
     @Override
     public void onPauseBeforeSuper() {
-
-        Intent intent = new Intent(CameraUtil.ACTION_CAMERA_STOPPED);
-        mActivity.sendBroadcast(intent);
-
-        if (mReceiver != null) {
-            mActivity.unregisterReceiver(mReceiver);
-            mReceiver = null;
-        }
-
         mPaused = true;
         Sensor gsensor = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
         if (gsensor != null) {