Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 055c986a authored by Ray Chen's avatar Ray Chen
Browse files

Add location provider name to gps-processing-method in EXIF header.

parent 3f5144b8

api/current.xml

+13 −0
Original line number Diff line number Diff line
@@ -72368,6 +72368,19 @@ 
<parameter name="longitude" type="double">

</parameter>

</method>

<method name="setGpsProcessingMethod"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="processing_method" type="java.lang.String">

</parameter>

</method>

<method name="setGpsTimestamp"

 return="void"

 abstract="false"

core/java/android/hardware/Camera.java

+12 −0
Original line number Diff line number Diff line
@@ -717,6 +717,7 @@ public class Camera { 
        private static final String KEY_GPS_LONGITUDE = "gps-longitude";

        private static final String KEY_GPS_ALTITUDE = "gps-altitude";

        private static final String KEY_GPS_TIMESTAMP = "gps-timestamp";

        private static final String KEY_GPS_PROCESSING_METHOD = "gps-processing-method";

        private static final String KEY_WHITE_BALANCE = "whitebalance";

        private static final String KEY_EFFECT = "effect";

        private static final String KEY_ANTIBANDING = "antibanding";
@@ -1326,6 +1327,16 @@ public class Camera { 
            set(KEY_GPS_TIMESTAMP, Long.toString(timestamp));

        }



        /**

         * Sets GPS processing method. It will store up to 100 characters

         * in JPEG EXIF header.

         *

         * @param processing_method The processing method to get this location.

         */

        public void setGpsProcessingMethod(String processing_method) {

            set(KEY_GPS_PROCESSING_METHOD, processing_method);

        }



        /**

         * Removes GPS latitude, longitude, altitude, and timestamp from the

         * parameters.
@@ -1335,6 +1346,7 @@ public class Camera { 
            remove(KEY_GPS_LONGITUDE);

            remove(KEY_GPS_ALTITUDE);

            remove(KEY_GPS_TIMESTAMP);

            remove(KEY_GPS_PROCESSING_METHOD);

        }



        /**

include/camera/CameraParameters.h

+3 −0
Original line number Diff line number Diff line
@@ -139,6 +139,9 @@ public: 
    // stored in JPEG EXIF header.

    // Example value: "1251192757". Write only.

    static const char KEY_GPS_TIMESTAMP[];

    // GPS Processing Method

    // Example value: "GPS" or "NETWORK". Write only.

    static const char KEY_GPS_PROCESSING_METHOD[];

    // Current white balance setting.

    // Example value: "auto" or WHITE_BALANCE_XXX constants. Read/write.

    static const char KEY_WHITE_BALANCE[];

libs/camera/CameraParameters.cpp

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ const char CameraParameters::KEY_GPS_LATITUDE[] = "gps-latitude"; 
const char CameraParameters::KEY_GPS_LONGITUDE[] = "gps-longitude";

const char CameraParameters::KEY_GPS_ALTITUDE[] = "gps-altitude";

const char CameraParameters::KEY_GPS_TIMESTAMP[] = "gps-timestamp";

const char CameraParameters::KEY_GPS_PROCESSING_METHOD[] = "gps-processing-method";

const char CameraParameters::KEY_WHITE_BALANCE[] = "whitebalance";

const char CameraParameters::KEY_SUPPORTED_WHITE_BALANCE[] = "whitebalance-values";

const char CameraParameters::KEY_EFFECT[] = "effect";