Bug 1047971: Delete even more redundant field initialisers r=rnewman

media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java

@@ -42,7 +42,7 @@ public class VideoCaptureAndroid implements PreviewCallback, Callback, AppStateL
   private final static String TAG = "WEBRTC-JC";
 
   private Camera camera;  // Only non-null while capturing.
-  private Camera.CameraInfo info = null;
+  private Camera.CameraInfo info;
   private final int id;
   private final long native_capturer;  // |VideoCaptureAndroid*| in C++.
   private SurfaceHolder localPreview;
@@ -55,8 +55,8 @@ public class VideoCaptureAndroid implements PreviewCallback, Callback, AppStateL
   private volatile int mCaptureRotation;
   private int mCaptureWidth;
   private int mCaptureHeight;
-  private int mCaptureMinFPS = 0;
-  private int mCaptureMaxFPS = 0;
+  private int mCaptureMinFPS;
+  private int mCaptureMaxFPS;
   // Are we being told to start/stop the camera, or just suspending/resuming
   // due to the application being backgrounded.
   private boolean mResumeCapture;

mobile/android/base/AndroidGamepadManager.java

@@ -38,7 +38,7 @@ public class AndroidGamepadManager {
         private Axis(int axis) {
             this.axis = axis;
         }
-    };
+    }
 
     // A list of gamepad button mappings. Axes are determined at
     // runtime, as they vary by Android version.
@@ -51,7 +51,7 @@ public class AndroidGamepadManager {
         private Trigger(int button) {
             this.button = button;
         }
-    };
+    }
 
     private static final int FIRST_DPAD_BUTTON = 12;
     // A list of axis number, gamepad button mappings for negative, positive.
@@ -69,7 +69,7 @@ public class AndroidGamepadManager {
             this.negativeButton = negativeButton;
             this.positiveButton = positiveButton;
         }
-    };
+    }
 
     private static enum Button {
         A(KeyEvent.KEYCODE_BUTTON_A),
@@ -94,7 +94,7 @@ public class AndroidGamepadManager {
         private Button(int button) {
             this.button = button;
         }
-    };
+    }
 
     private static class Gamepad {
         // ID from GamepadService
@@ -129,9 +129,9 @@ public class AndroidGamepadManager {
     }
 
     private static boolean sStarted;
-    private static HashMap<Integer, Gamepad> sGamepads = null;
-    private static HashMap<Integer, List<KeyEvent>> sPendingGamepads = null;
-    private static InputManager.InputDeviceListener sListener = null;
+    private static HashMap<Integer, Gamepad> sGamepads;
+    private static HashMap<Integer, List<KeyEvent>> sPendingGamepads;
+    private static InputManager.InputDeviceListener sListener;
     private static Timer sPollTimer;
 
     private AndroidGamepadManager() {

mobile/android/base/BrowserApp.java

@@ -155,7 +155,7 @@ public class BrowserApp extends GeckoApp
     private HomePager mHomePager;
     private TabsPanel mTabsPanel;
     private ViewGroup mHomePagerContainer;
-    protected Telemetry.Timer mAboutHomeStartupTimer = null;
+    protected Telemetry.Timer mAboutHomeStartupTimer;
     private ActionModeCompat mActionMode;
     private boolean mShowActionModeEndAnimation;
 

mobile/android/base/GeckoAppShell.java

@@ -1577,7 +1577,7 @@ public class GeckoAppShell
     public static boolean checkForGeckoProcs() {
 
         class GeckoPidCallback implements GeckoProcessesVisitor {
-            public boolean otherPidExist = false;
+            public boolean otherPidExist;
             @Override
             public boolean callback(int pid) {
                 if (pid != android.os.Process.myPid()) {
@@ -2099,12 +2099,12 @@ public class GeckoAppShell
         sGeckoInterface = aGeckoInterface;
     }
 
-    public static android.hardware.Camera sCamera = null;
+    public static android.hardware.Camera sCamera;
 
     static native void cameraCallbackBridge(byte[] data);
 
     static int kPreferedFps = 25;
-    static byte[] sCameraBuffer = null;
+    static byte[] sCameraBuffer;
 
 
     @WrapElementForJNI(stubName = "InitCameraWrapper")

mobile/android/base/gfx/LayerView.java

@@ -157,7 +157,7 @@ public class LayerView extends FrameLayout implements Tabs.OnTabsChangedListener
 
         mLayerClient.notifyGeckoReady();
         addTouchInterceptor(new TouchEventInterceptor() {
-            private PointF mInitialTouchPoint = null;
+            private PointF mInitialTouchPoint;
 
             @Override
             public boolean onInterceptTouchEvent(View view, MotionEvent event) {

mobile/android/base/menu/GeckoMenuItem.java

@@ -48,7 +48,7 @@ public class GeckoMenuItem implements MenuItem {
     private GeckoActionProvider mActionProvider;
     private final GeckoMenu mMenu;
     private GeckoSubMenu mSubMenu;
-    private MenuItem.OnMenuItemClickListener mMenuItemClickListener = null;
+    private MenuItem.OnMenuItemClickListener mMenuItemClickListener;
     private OnShowAsActionChangedListener mShowAsActionChangedListener;
 
     public GeckoMenuItem(GeckoMenu menu, int id, int order, int titleRes) {

mobile/android/base/util/INIParser.java

@@ -19,7 +19,7 @@ public final class INIParser extends INISection {
     private File mFile;
 
     // List of sections in the current iniFile. null if the file has not been parsed yet
-    private Hashtable<String, INISection> mSections = null;
+    private Hashtable<String, INISection> mSections;
 
     // create a parser. The file will not be read until you attempt to
     // access sections or properties inside it. At that point its read synchronously

mobile/android/base/util/INISection.java

@@ -24,7 +24,7 @@ public class INISection {
     private  boolean mDebug;
 
     // Global properties that aren't inside a section in the file
-    protected Hashtable<String, Object> mProperties = null;
+    protected Hashtable<String, Object> mProperties;
 
     // create a parser. The file will not be read until you attempt to
     // access sections or properties inside it. At that point its read synchronously