Suppress most deprecation warnings due to old camera API; remove call to old cookie manager

7 files changed, 6 insertions, 6 deletions

diff --git a/android/src/com/google/zxing/client/android/book/SearchBookContentsActivity.java b/android/src/com/google/zxing/client/android/book/SearchBookContentsActivity.java
index 76b4b2981..2de36effd 100644
--- a/android/src/com/google/zxing/client/android/book/SearchBookContentsActivity.java
+++ b/android/src/com/google/zxing/client/android/book/SearchBookContentsActivity.java
@@ -24,8 +24,6 @@ import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.webkit.CookieManager;
-import android.webkit.CookieSyncManager;
 import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -92,10 +90,6 @@ public final class SearchBookContentsActivity extends Activity {
   public void onCreate(Bundle icicle) {
     super.onCreate(icicle);
 
-    // Make sure that expired cookies are removed on launch.
-    CookieSyncManager.createInstance(this);
-    CookieManager.getInstance().removeExpiredCookie();
-
     Intent intent = getIntent();
     if (intent == null || !Intents.SearchBookContents.ACTION.equals(intent.getAction())) {
       finish();
diff --git a/android/src/com/google/zxing/client/android/camera/AutoFocusManager.java b/android/src/com/google/zxing/client/android/camera/AutoFocusManager.java
index 05aee0a92..d9857de9a 100644
--- a/android/src/com/google/zxing/client/android/camera/AutoFocusManager.java
+++ b/android/src/com/google/zxing/client/android/camera/AutoFocusManager.java
@@ -29,6 +29,7 @@ import java.util.concurrent.RejectedExecutionException;
 
 import com.google.zxing.client.android.PreferencesActivity;
 
+@SuppressWarnings("deprecation") // camera APIs
 final class AutoFocusManager implements Camera.AutoFocusCallback {
 
   private static final String TAG = AutoFocusManager.class.getSimpleName();
diff --git a/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java b/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
index 326957e1b..02a835ff6 100644
--- a/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
+++ b/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
@@ -34,6 +34,7 @@ import com.google.zxing.client.android.camera.open.OpenCamera;
  * A class which deals with reading, parsing, and setting the camera parameters which are used to
  * configure the camera hardware.
  */
+@SuppressWarnings("deprecation") // camera APIs
 final class CameraConfigurationManager {
 
   private static final String TAG = "CameraConfiguration";
diff --git a/android/src/com/google/zxing/client/android/camera/CameraManager.java b/android/src/com/google/zxing/client/android/camera/CameraManager.java
index 9e5478fef..09dd82282 100755
--- a/android/src/com/google/zxing/client/android/camera/CameraManager.java
+++ b/android/src/com/google/zxing/client/android/camera/CameraManager.java
@@ -36,6 +36,7 @@ import java.io.IOException;
  *
  * @author dswitkin@google.com (Daniel Switkin)
  */
+@SuppressWarnings("deprecation") // camera APIs
 public final class CameraManager {
 
   private static final String TAG = CameraManager.class.getSimpleName();
diff --git a/android/src/com/google/zxing/client/android/camera/PreviewCallback.java b/android/src/com/google/zxing/client/android/camera/PreviewCallback.java
index 7dc703574..5f82ea95c 100644
--- a/android/src/com/google/zxing/client/android/camera/PreviewCallback.java
+++ b/android/src/com/google/zxing/client/android/camera/PreviewCallback.java
@@ -22,6 +22,7 @@ import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
 
+@SuppressWarnings("deprecation") // camera APIs
 final class PreviewCallback implements Camera.PreviewCallback {
 
   private static final String TAG = PreviewCallback.class.getSimpleName();
diff --git a/android/src/com/google/zxing/client/android/camera/open/OpenCamera.java b/android/src/com/google/zxing/client/android/camera/open/OpenCamera.java
index 974c35254..1a00127aa 100755
--- a/android/src/com/google/zxing/client/android/camera/open/OpenCamera.java
+++ b/android/src/com/google/zxing/client/android/camera/open/OpenCamera.java
@@ -21,6 +21,7 @@ import android.hardware.Camera;
 /**
  * Represents an open {@link Camera} and its metadata, like facing direction and orientation.
  */
+@SuppressWarnings("deprecation") // camera APIs
 public final class OpenCamera {
   
   private final int index;
diff --git a/android/src/com/google/zxing/client/android/camera/open/OpenCameraInterface.java b/android/src/com/google/zxing/client/android/camera/open/OpenCameraInterface.java
index 7d13ddea1..a36883d34 100644
--- a/android/src/com/google/zxing/client/android/camera/open/OpenCameraInterface.java
+++ b/android/src/com/google/zxing/client/android/camera/open/OpenCameraInterface.java
@@ -22,6 +22,7 @@ import android.util.Log;
 /**
  * Abstraction over the {@link Camera} API that helps open them and return their metadata.
  */
+@SuppressWarnings("deprecation") // camera APIs
 public final class OpenCameraInterface {
 
   private static final String TAG = OpenCameraInterface.class.getName();