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

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

Merge d661be8b on remote branch 

Change-Id: Ia76d1b310e189105cc25c875f622f1c7349db5ec
parents fe5db2f6 d661be8b

AndroidManifest.xml

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

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

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

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

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

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

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

100644 → 100755
+5 −2
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ public class MovieActivity extends AbstractPermissionActivity { 
    private boolean mIsHeadsetOn = false;

    private boolean mVirtualizerSupported = false;

    private boolean mBassBoostSupported = false;

    private boolean mUserPresentReceived = false;



    static enum Key {

        global_enabled, bb_strength, virt_strength
@@ -751,13 +752,15 @@ public class MovieActivity extends AbstractPermissionActivity { 
            }

            if (Intent.ACTION_SCREEN_OFF.equals(intent.getAction())) {

                // Only stop video.

                if (mControlResumed) {

                if (mControlResumed && mUserPresentReceived) {

                    mPlayer.onStop();

                    mUserPresentReceived = false;

                    mControlResumed = false;

                }

            } else if (Intent.ACTION_USER_PRESENT.equals(intent.getAction())) {

                if (!mControlResumed) {

                if (!mControlResumed && !mUserPresentReceived) {

                    mPlayer.onResume();

                    mUserPresentReceived = true;

                    mControlResumed = true;

                }

            }