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

Commit fe5db2f6 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 5b873ebc on remote branch 

Change-Id: I304d8e30e371d3d276c0c2e2167d58f183d05b93
parents 32b1b584 5b873ebc

Android.mk

100644 → 100755
+1 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ LOCAL_STATIC_JAVA_LIBRARIES += org.codeaurora.gallery.common 
LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit

LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit

LOCAL_STATIC_JAVA_LIBRARIES += mp4parser

LOCAL_STATIC_JAVA_LIBRARIES += mp4parser

#LOCAL_STATIC_JAVA_LIBRARIES += android-support-v8-renderscript

#LOCAL_STATIC_JAVA_LIBRARIES += android-support-v8-renderscript

LOCAL_STATIC_JAVA_LIBRARIES += androidx.heifwriter_heifwriter





#LOCAL_RENDERSCRIPT_TARGET_API := 18

#LOCAL_RENDERSCRIPT_TARGET_API := 18

#LOCAL_RENDERSCRIPT_COMPATIBILITY := 18

#LOCAL_RENDERSCRIPT_COMPATIBILITY := 18

AndroidManifest.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -45,6 +45,7 @@ 
    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />

    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />

    <uses-permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER" />

    <uses-permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER" />

    <uses-permission android:name="android.permission.BLUETOOTH" />

    <uses-permission android:name="android.permission.BLUETOOTH" />

    <uses-permission android:name="android.permission.MODIFY_AUDIO_ROUTING" />

    <!-- add for guest to set system property -->

    <!-- add for guest to set system property -->

    <uses-permission android:name="android.permission.READ_PHONE_STATE" />

    <uses-permission android:name="android.permission.READ_PHONE_STATE" />

src/com/android/gallery3d/app/AbstractGalleryActivity.java

100644 → 100755
+2 −0
Original line number Original line Diff line number Diff line
@@ -352,6 +352,8 @@ public abstract class AbstractGalleryActivity extends AbstractPermissionActivity 
            printer.printBitmap(printJobName, uri);

            printer.printBitmap(printJobName, uri);

        } catch (FileNotFoundException fnfe) {

        } catch (FileNotFoundException fnfe) {

            Log.e(TAG, "Error printing an image", fnfe);

            Log.e(TAG, "Error printing an image", fnfe);

        } catch (RuntimeException e) {

            Log.e(TAG,"Print failure,",e);

        }

        }

    }

    }

src/com/android/gallery3d/app/MoviePlayer.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -579,6 +579,7 @@ public class MoviePlayer implements 
            boolean start) {

            boolean start) {

        // For streams that we expect to be slow to start up, show a

        // For streams that we expect to be slow to start up, show a

        // progress spinner until playback starts.

        // progress spinner until playback starts.

        requestAudioFocus();

        String scheme = mMovieItem.getUri().getScheme();

        String scheme = mMovieItem.getUri().getScheme();

        if ("http".equalsIgnoreCase(scheme) || "rtsp".equalsIgnoreCase(scheme)

        if ("http".equalsIgnoreCase(scheme) || "rtsp".equalsIgnoreCase(scheme)

                || "https".equalsIgnoreCase(scheme)) {

                || "https".equalsIgnoreCase(scheme)) {
@@ -630,7 +631,7 @@ public class MoviePlayer implements 
            Log.w(TAG, "CS/CSVT Call is in progress, can't play video");

            Log.w(TAG, "CS/CSVT Call is in progress, can't play video");

            return false;

            return false;

        }

        }



        requestAudioFocus();

        mTState = TState.PLAYING;

        mTState = TState.PLAYING;

        mVideoView.start();

        mVideoView.start();

        mController.showPlaying();

        mController.showPlaying();
@@ -808,6 +809,7 @@ public class MoviePlayer implements 
        mOverlayExt.setCanScrubbing(canSeek);

        mOverlayExt.setCanScrubbing(canSeek);

        mController.setPlayPauseReplayResume();

        mController.setPlayPauseReplayResume();

        if (!canPause && !mVideoView.isTargetPlaying()) {

        if (!canPause && !mVideoView.isTargetPlaying()) {

            requestAudioFocus();

            mVideoView.start();

            mVideoView.start();

        }

        }

        updateRewindAndForwardUI();

        updateRewindAndForwardUI();

src/com/android/gallery3d/app/PhotoPage.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -694,6 +694,10 @@ public abstract class PhotoPage extends ActivityState implements 
                 mShareIntent.putExtra(Intent.EXTRA_STREAM, uri);

                 mShareIntent.putExtra(Intent.EXTRA_STREAM, uri);

                 String shareTitle = mActivity.getResources().

                 String shareTitle = mActivity.getResources().

                         getString(R.string.share_dialogue_title);

                         getString(R.string.share_dialogue_title);

                 if (uri.toString().contains("file:")) {

                     Log.d(TAG, "can't share uri started with file://");

                     return;

                 }

                 mActivity.startActivity(Intent.createChooser(mShareIntent,

                 mActivity.startActivity(Intent.createChooser(mShareIntent,

                    shareTitle));

                    shareTitle));

                 }

                 }