commit 6fe9dc8da20ccad3ae5cf15421b9069bd4f87503
author Linux Build Service Account <lnxbuild@localhost> Fri Jul 27 23:12:51 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jul 27 23:12:51 2018 -0700
tree d4d33bb122af7f830707da62652b9c60b510377a
parent 9e64af485670d31e3f986a9a2317c7c2ea0d2caa
parent 0a4419b5f5849b380333ee94471e6acb6c43bc15

Merge "Fix focus close when select video in picker"

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 764ab2d..fdc7635 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -24,7 +24,7 @@
 
     <original-package android:name="com.android.gallery3d" />
 
-    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="23"/>
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="26"/>
 
     <permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER"
             android:protectionLevel="signatureOrSystem" />
@@ -42,13 +42,10 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_APN_SETTINGS"/>
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE"/>
     <uses-permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <!-- add for guest to set system property -->
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
     <supports-screens android:smallScreens="false"

src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java

diff --git a/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java b/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java
index 5d235ba..01061db 100644
--- a/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java
+++ b/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java
@@ -563,6 +563,7 @@
                 mMediaController.hide();
             }
             if (mOnCompletionListener != null) {
+                Log.d(TAG, "OnCompletion: " + mMediaPlayer.getMetrics());
                 mOnCompletionListener.onCompletion(mMediaPlayer);
             }
         }
@@ -799,6 +800,7 @@
             }
         }
         */
+        Log.d(TAG, "Suspend: " + mMediaPlayer.getMetrics());
         release(false);
     }