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

Commit 5f707afc authored by Sooraj S's avatar Sooraj S 👽
Browse files

Merge https://github.com/LineageOS/android_packages_apps_gallery2 into HEAD

parents afa9f971 40099ee1

Android.mk

+10 −3
Original line number Diff line number Diff line
@@ -59,11 +59,18 @@ LOCAL_JAVA_LIBRARIES += org.apache.http.legacy 


LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt



LOCAL_REQUIRED_MODULES += privapp_whitelist_com.android.gallery3d.xml



include $(BUILD_PACKAGE)



ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)

include $(CLEAR_VARS)

LOCAL_MODULE := privapp_whitelist_com.android.gallery3d.xml

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/permissions

LOCAL_PRODUCT_MODULE := true

LOCAL_SRC_FILES := $(LOCAL_MODULE)

include $(BUILD_PREBUILT)



# Use the following include to make gallery test apk

include $(call all-makefiles-under, $(LOCAL_PATH))
 


endif

AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ 
                <data android:mimeType="video/3gp" />

                <data android:mimeType="video/3gpp" />

                <data android:mimeType="video/3gpp2" />

                <data android:mimeType="application/sdp" />

            </intent-filter>

        </activity>

gallerycommon/src/com/android/gallery3d/common/ApiHelper.java

100644 → 100755
+2 −2
Original line number Diff line number Diff line
@@ -369,8 +369,8 @@ public class ApiHelper { 


    public static class AudioSystem {

        public static final int FORCE_NONE = 0;

        public static final int FORCE_SPEAKER_HEADSET = 1;

        public static final int FORCE_SPEAKER_BT = 10;

        public static final int FORCE_SPEAKER = 1;

        public static final int FORCE_NO_BT_A2DP = 10;



        public static final int FOR_MEDIA = 1;

gallerycommon/src/com/android/gallery3d/exif/ExifParser.java

100644 → 100755
+57 −25
Original line number Diff line number Diff line
@@ -143,6 +143,9 @@ class ExifParser { 


    protected static final int DEFAULT_IFD0_OFFSET = 8;



    //HEIC header

    protected static final int HEIC_HEADER = 0x68656963;



    private final CountedDataInputStream mTiffStream;

    private final int mOptions;

    private int mIfdStartOffset = 0;
@@ -753,10 +756,7 @@ class ExifParser { 
    private boolean seekTiffData(InputStream inputStream) throws IOException,

            ExifInvalidFormatException {

        CountedDataInputStream dataStream = new CountedDataInputStream(inputStream);

        if (dataStream.readShort() != JpegHeader.SOI) {

            throw new ExifInvalidFormatException("Invalid JPEG format");

        }



        if (dataStream.readShort() == JpegHeader.SOI) {

            short marker = dataStream.readShort();

            while (marker != JpegHeader.EOI

                    && !JpegHeader.isSofMarker(marker)) {
@@ -784,6 +784,38 @@ class ExifParser { 
                }

                marker = dataStream.readShort();

            }





        } else{

            dataStream.skip(6);

            if (dataStream.readInt() == HEIC_HEADER) {

                while(true){

                    try{

                        short marker = dataStream.readShort();

                        if (marker == JpegHeader.APP1) {

                            int header = 0;

                            short headerTail = 0;

                            int length = dataStream.readUnsignedShort();

                            header = dataStream.readInt();

                            headerTail = dataStream.readShort();

                            if (header == EXIF_HEADER && headerTail == EXIF_HEADER_TAIL) {

                                mTiffStartPosition = dataStream.getReadByteCount();

                                mApp1End = length;

                                mOffsetToApp1EndFromSOF = mTiffStartPosition + mApp1End;

                                return true;

                            }

                        }

                    }catch (Exception e){

                        break;

                    }

                }

                return false;

            } else {

                throw new ExifInvalidFormatException("Invalid JPEG format");

            }



        }



        return false;

    }

jni/Android.mk

+3 −10
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)



Gallery2_jni_cflags := \

    -Wall -Wextra -Werror \

    -Wno-error=constant-conversion \

    -Wno-unused-parameter \



# to fix implicit conversion from 'int' to 'char', (255 to -1, 128 to -128)



include $(CLEAR_VARS)



LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES

LOCAL_CFLAGS += $(Gallery2_jni_cflags)

LOCAL_CFLAGS += -Wall -Wextra -Werror



LOCAL_SRC_FILES := jni_egl_fence.cpp
@@ -56,7 +49,7 @@ LOCAL_SRC_FILES := filters/gradient.c \ 
                   filters/kmeans.cc



LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops

LOCAL_CFLAGS += $(Gallery2_jni_cflags)

LOCAL_CFLAGS += -Wall -Wextra -Werror

LOCAL_LDLIBS := -llog -ljnigraphics

LOCAL_ARM_MODE := arm