Partial revert of r9936.

talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java

 /*
  * libjingle
  * Copyright 2015 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 11 matching lines @@
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 package org.webrtc;
 
 import static java.lang.Math.abs;
 import static java.lang.Math.ceil;
-
 import android.hardware.Camera;
+import android.util.Log;
 import android.graphics.ImageFormat;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import org.webrtc.Logging;
-
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
 @SuppressWarnings("deprecation")
 public class CameraEnumerationAndroid {
   private final static String TAG = "CameraEnumerationAndroid";
   // Synchronized on |CameraEnumerationAndroid.this|.
   private static Enumerator enumerator = new CameraEnumerator();
 
@@ skipping 88 matching lines @@
     return Camera.getNumberOfCameras();
   }
 
   // Returns the name of the camera with camera index. Returns null if the
   // camera can not be used.
   public static String getDeviceName(int index) {
     Camera.CameraInfo info = new Camera.CameraInfo();
     try {
       Camera.getCameraInfo(index, info);
     } catch (Exception e) {
-      Logging.e(TAG, "getCameraInfo failed on index " + index,e);
+      Log.e(TAG, "getCameraInfo failed on index " + index,e);
       return null;
     }
 
     String facing =
         (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) ? "front" : "back";
     return "Camera " + index + ", Facing " + facing
         + ", Orientation " + info.orientation;
   }
 
   // Returns the name of the front facing camera. Returns null if the
@@ skipping 11 matching lines @@
   public static String getSupportedFormatsAsJson(int id) throws JSONException {
     List<CaptureFormat> formats = getSupportedFormats(id);
     JSONArray json_formats = new JSONArray();
     for (CaptureFormat format : formats) {
       JSONObject json_format = new JSONObject();
       json_format.put("width", format.width);
       json_format.put("height", format.height);
       json_format.put("framerate", (format.maxFramerate + 999) / 1000);
       json_formats.put(json_format);
     }
-    Logging.d(TAG, "Supported formats for camera " + id + ": "
+    Log.d(TAG, "Supported formats for camera " + id + ": "
         +  json_formats.toString(2));
     return json_formats.toString();
   }
 
   // Helper class for finding the closest supported format for the two functions below.
   private static abstract class ClosestComparator<T> implements Comparator<T> {
     // Difference between supported and requested parameter.
     abstract int diff(T supportedParameter);
 
     @Override
     public int compare(T t1, T t2) {
       return diff(t1) - diff(t2);
     }
   }
 
   public static int[] getFramerateRange(Camera.Parameters parameters, final int framerate) {
     List<int[]> listFpsRange = parameters.getSupportedPreviewFpsRange();
     if (listFpsRange.isEmpty()) {
-      Logging.w(TAG, "No supported preview fps range");
+      Log.w(TAG, "No supported preview fps range");
       return new int[]{0, 0};
     }
     return Collections.min(listFpsRange,
         new ClosestComparator<int[]>() {
           @Override int diff(int[] range) {
             return abs(framerate - range[Camera.Parameters.PREVIEW_FPS_MIN_INDEX])
                 + abs(framerate - range[Camera.Parameters.PREVIEW_FPS_MAX_INDEX]);
           }
      });
   }
@@ skipping 10 matching lines @@
 
   private static String getNameOfDevice(int facing) {
     final Camera.CameraInfo info = new Camera.CameraInfo();
     for (int i = 0; i < Camera.getNumberOfCameras(); ++i) {
       try {
         Camera.getCameraInfo(i, info);
         if (info.facing == facing) {
           return getDeviceName(i);
         }
       } catch (Exception e) {
-        Logging.e(TAG, "getCameraInfo() failed on index " + i, e);
+        Log.e(TAG, "getCameraInfo() failed on index " + i, e);
       }
     }
     return null;
   }
 }