am e5dd62e8: am 2fd73a45: Unhide camera metering mode API.

Merge commit 'e5dd62e873448fd8c1fd8e80739b58bda649a6e7'

* commit 'e5dd62e873448fd8c1fd8e80739b58bda649a6e7':
  Unhide camera metering mode API.

api/current.xml

@@ -78625,6 +78625,17 @@
  visibility="public"
 >
 </method>
+<method name="getMeteringMode"
+ return="java.lang.String"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getMinExposureCompensation"
  return="int"
  abstract="false"
@@ -78757,6 +78768,17 @@
  visibility="public"
 >
 </method>
+<method name="getSupportedMeteringModes"
+ return="java.util.List&lt;java.lang.String&gt;"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getSupportedPictureFormats"
  return="java.util.List&lt;java.lang.Integer&gt;"
  abstract="false"
@@ -79125,6 +79147,19 @@
 <parameter name="height" type="int">
 </parameter>
 </method>
+<method name="setMeteringMode"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="value" type="java.lang.String">
+</parameter>
+</method>
 <method name="setPictureFormat"
  return="void"
  abstract="false"
@@ -79556,6 +79591,39 @@
  visibility="public"
 >
 </field>
+<field name="METERING_MODE_CENTER_WEIGHTED"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;center-weighted&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="METERING_MODE_FRAME_AVERAGE"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;frame-average&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="METERING_MODE_SPOT"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;spot&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="SCENE_MODE_ACTION"
  type="java.lang.String"
  transient="false"
@@ -80841,7 +80909,7 @@
  type="float"
  transient="false"
  volatile="false"
- value="0.001f"
+ value="0.0010f"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -223060,7 +223128,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="t" type="T">
+<parameter name="arg0" type="T">
 </parameter>
 </method>
 </interface>

core/java/android/hardware/Camera.java

@@ -969,21 +969,18 @@ public class Camera {
         /**
          * The camera determines the exposure by giving more weight to the
          * central part of the scene.
-         * @hide
          */
         public static final String METERING_MODE_CENTER_WEIGHTED = "center-weighted";
 
         /**
          * The camera determines the exposure by averaging the entire scene,
          * giving no weighting to any particular area.
-         * @hide
          */
         public static final String METERING_MODE_FRAME_AVERAGE = "frame-average";
 
         /**
          * The camera determines the exposure by a very small area of the scene,
          * typically the center.
-         * @hide
          */
         public static final String METERING_MODE_SPOT = "spot";
 
@@ -1957,7 +1954,6 @@ public class Camera {
          * @return a list of supported metering modes. null if metering mode
          *         setting is not supported.
          * @see #getMeteringMode()
-         * @hide
          */
         public List<String> getSupportedMeteringModes() {
             String str = get(KEY_METERING_MODE + SUPPORTED_VALUES_SUFFIX);
@@ -1973,7 +1969,6 @@ public class Camera {
          * @see #METERING_MODE_CENTER_WEIGHTED
          * @see #METERING_MODE_FRAME_AVERAGE
          * @see #METERING_MODE_SPOT
-         * @hide
          */
         public String getMeteringMode() {
             return get(KEY_METERING_MODE);
@@ -1984,7 +1979,6 @@ public class Camera {
          *
          * @param value metering mode.
          * @see #getMeteringMode()
-         * @hide
          */
         public void setMeteringMode(String value) {
             set(KEY_METERING_MODE, value);