commit 327e3486e13c47479525deec36e5d03e4b554cf7
author sakal <sakal@webrtc.org> Tue Jun 28 15:36:35 2016
committer Commit bot <commit-bot@chromium.org> Tue Jun 28 15:36:43 2016
tree 78a9d2722371f1188293973c515b432225e4e3ac
parent 6bf7b9820207a0b626a2aac44d1057d39ed3c245

Add override annotation to appropriate methods in Camera1Enumerator.

Also move getDeviceNames to a more appropriate location in the file.

NOTRY=True

Review-Url: https://codereview.webrtc.org/2105813002
Cr-Original-Commit-Position: refs/heads/master@{#13312}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 70fae2ccc6e65967affdce1ebe324c95c207b650

api/java/android/org/webrtc/Camera1Enumerator.java

diff --git a/api/java/android/org/webrtc/Camera1Enumerator.java b/api/java/android/org/webrtc/Camera1Enumerator.java
index a021da2..8523bba 100644
--- a/api/java/android/org/webrtc/Camera1Enumerator.java
+++ b/api/java/android/org/webrtc/Camera1Enumerator.java
@@ -35,16 +35,29 @@
     this.captureToTexture = captureToTexture;
   }
 
+  // Returns device names that can be used to create a new VideoCapturerAndroid.
+  @Override
+  public String[] getDeviceNames() {
+    String[] names = new String[android.hardware.Camera.getNumberOfCameras()];
+    for (int i = 0; i < android.hardware.Camera.getNumberOfCameras(); ++i) {
+      names[i] = getDeviceName(i);
+    }
+    return names;
+  }
+
+  @Override
   public boolean isFrontFacing(String deviceName) {
     android.hardware.Camera.CameraInfo info = getCameraInfo(getCameraIndex(deviceName));
     return info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT;
   }
 
+  @Override
   public boolean isBackFacing(String deviceName) {
     android.hardware.Camera.CameraInfo info = getCameraInfo(getCameraIndex(deviceName));
     return info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_BACK;
   }
 
+  @Override
   public CameraVideoCapturer createCapturer(String deviceName,
       CameraVideoCapturer.CameraEventsHandler eventsHandler) {
     return new VideoCapturerAndroid(deviceName, eventsHandler, captureToTexture);
@@ -134,15 +147,6 @@
     return ranges;
   }
 
-  // Returns device names that can be used to create a new VideoCapturerAndroid.
-  public String[] getDeviceNames() {
-    String[] names = new String[android.hardware.Camera.getNumberOfCameras()];
-    for (int i = 0; i < android.hardware.Camera.getNumberOfCameras(); ++i) {
-      names[i] = getDeviceName(i);
-    }
-    return names;
-  }
-
   // Returns the camera index for camera with name |deviceName|, or throws IllegalArgumentException
   // if no such camera can be found.
   static int getCameraIndex(String deviceName) {