From d73fd7eb45f643c98c40279d6a096de56f39260c Mon Sep 17 00:00:00 2001
From: Rob Walker <rwalker@codeaurora.org>
Date: Thu, 26 Jan 2012 13:32:35 -0800
Subject: Gallery2: add support for the DASH mimetype

Add support for the DASH mimetype

CRs-Fixed: 539815
Change-Id: Ibbd03a2e4e3b1ca9224d4651e1c518e2ba51ba77
---
 AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7c290c768..95beee19c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -82,6 +82,7 @@
                 <data android:mimeType="audio/mpegurl" />
                 <data android:mimeType="application/vnd.apple.mpegurl" />
                 <data android:mimeType="application/x-mpegurl" />
+                <data android:mimeType="application/dash+xml" />
              </intent-filter>
         </activity>
 
-- 
cgit v1.2.3


From 65b4d0c1ded85105802bf69ddb5646eb72839e17 Mon Sep 17 00:00:00 2001
From: Likai Ding <likaid@codeaurora.org>
Date: Tue, 13 Aug 2013 14:43:40 +0800
Subject: Gallery2: support GIF animation

This change implements a Java GIF decoder.

Change-Id: I72b6e8eb25572bba77a2a46e1754d8db8c47a0cc
Signed-off-by: Xiaojing Zhang <zhangx@codeaurora.org>
---
 AndroidManifest.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 95beee19c..52048895b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -297,6 +297,16 @@
                 android:theme="@style/Theme.Gallery"
                 android:configChanges="orientation|keyboardHidden|screenSize" />
 
+        <activity android:name="com.android.gallery3d.util.ViewGifImage"
+                android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
+                android:configChanges="orientation|keyboardHidden|screenSize|keyboard|navigation">
+            <intent-filter>
+                <action android:name="com.android.gallery3d.VIEW_GIF" />
+                <data android:mimeType="image/gif" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <provider android:name="com.android.gallery3d.provider.GalleryProvider"
                 android:syncable="false"
                 android:grantUriPermissions="true"
-- 
cgit v1.2.3


From d42e6dcbee24b917936c1d670ca659970c76d4d1 Mon Sep 17 00:00:00 2001
From: Likai Ding <likaid@codeaurora.org>
Date: Mon, 19 Aug 2013 16:33:24 +0800
Subject: Gallery2: support live streaming and bookmarks

Users can input a URL for streaming display.
URL bookmarking is supported.

Change-Id: Ia69497cdcfee963ba2209119a5b9dc82b64497da
---
 AndroidManifest.xml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 52048895b..58b2a1a6f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -29,6 +29,7 @@
     <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="com.android.gallery3d.permission.GALLERY_PROVIDER" />
 
@@ -364,5 +365,33 @@
         </receiver>
 
         <service android:name="com.android.camera.MediaSaveService" />
+
+        <activity android:name="org.codeaurora.gallery3d.video.SettingsActivity"
+                android:configChanges="keyboardHidden|orientation|screenSize"
+                android:label="@string/streaming_settings" >
+            <intent-filter>
+                <action android:name="org.codeaurora.settings.streaming" />
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <receiver android:name="org.codeaurora.gallery3d.video.DmReceiver" >
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="streaming.action.WRITE_SETTINGS" />
+            </intent-filter>
+        </receiver>
+
+        <activity android:name="org.codeaurora.gallery3d.video.BookmarkActivity"
+                android:configChanges="keyboardHidden|orientation|screenSize"
+                android:icon="@drawable/ic_menu_display_bookmark"
+                android:label="@string/bookmark_list"
+                android:theme="@android:style/Theme.Holo" >
+            <intent-filter>
+                <action android:name="org.codeaurora.bookmark.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
     </application>
 </manifest>
-- 
cgit v1.2.3


From 253ebbd3baff765d034adcd960bdaf40e949a44f Mon Sep 17 00:00:00 2001
From: Likai Ding <likaid@codeaurora.org>
Date: Tue, 20 Aug 2013 16:21:57 +0800
Subject: Gallery2: add some video features

including: previous/next video play mode, screen mode,
fast forward/rewind button, step settings.

Change-Id: I3f4890c4dd95956e0eca889a5fd8b8d83b8d542e
---
 AndroidManifest.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 58b2a1a6f..780ee8bc6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -63,6 +63,7 @@
                 <data android:scheme="https" />
                 <data android:scheme="content" />
                 <data android:scheme="file" />
+                <data android:scheme="rtsp" />
                 <data android:mimeType="video/mpeg4" />
                 <data android:mimeType="video/mp4" />
                 <data android:mimeType="video/3gp" />
@@ -392,6 +393,9 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-
+        <activity android:name="org.codeaurora.gallery3d.video.VideoSettingsActivity"
+                android:label="@string/movie_view_label"
+                android:configChanges="orientation|keyboardHidden|screenSize|mnc|mcc">
+        </activity>
     </application>
 </manifest>
-- 
cgit v1.2.3


From 47184c7b2bfb477a1ff800ac8a463478e4674dd9 Mon Sep 17 00:00:00 2001
From: wjiang <wjiang@codeaurora.org>
Date: Fri, 14 Feb 2014 17:45:53 +0800
Subject: Gallery2: Fix batches of issues in movie effects

Fix following issues:
- All settings aren't restored to previous state when user cancel
his operations.
- Check the validity to avoid calling member function of an already
released object.
- Recycle effect instance when MovieActivity pauses.
- Don't restore strength from pref when toggling switch.
- Force the Effect's dialog to be uncancelable.
- Fix null pointer and effect leak issue due to CMCC features.
- Fix audio effects dialog display on small screens.
- Recognize bluetooth headset.
- Update visual design.

Conflicts:
	src/com/android/gallery3d/ui/Knob.java

Change-Id: I803897508c0c1a6723170b7691e3ece03680e4f1
---
 AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 780ee8bc6..679ca0408 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -32,6 +32,7 @@
     <uses-permission android:name="android.permission.WRITE_APN_SETTINGS"/>
     <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" />
 
     <supports-screens android:smallScreens="false"
             android:normalScreens="true" android:largeScreens="true"
-- 
cgit v1.2.3


From df2a284b84ac35837d2b1c5c466b3eef6b7f08e7 Mon Sep 17 00:00:00 2001
From: kaiyiz <kaiyiz@codeaurora.org>
Date: Fri, 18 Apr 2014 16:13:11 +0800
Subject: Gallery2: Add audio output switcher between headset/speaker

There is no audio output switcher between headset/speaker.

Add the audio output switcher button to menu list in order to
let user use this function.

CRs-Fixed: 650867

Change-Id: I16f5fdc74a76ee55557ba87b0145e51165f0408a
---
 AndroidManifest.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 679ca0408..6136da96d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2010-2014, The Linux Foundation. All rights reserved.
+     Not a Contribution.
+
+     Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 
 <manifest android:versionCode="40030"
         android:versionName="1.1.40030"
@@ -19,6 +36,7 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-- 
cgit v1.2.3


From 2dccb62d8b640162a4183311e790f826f06bf82c Mon Sep 17 00:00:00 2001
From: kaiyiz <kaiyiz@codeaurora.org>
Date: Fri, 14 Nov 2014 14:28:44 +0800
Subject: Gallery2: Fix file exist in SD card when delete from Gallery

The permission of writing sd card is not effective which cause
this bug happen.

Add write sd card permission.

CRs-Fixed: 754706

Change-Id: Idd14a7ffbcce1e35d7ca6272118c48014758a1a5
---
 AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6136da96d..84b3eb700 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -49,6 +49,7 @@
     <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" />
 
-- 
cgit v1.2.3


From a28677726eaaaf1c90a2e04cf66e27bd76c91d06 Mon Sep 17 00:00:00 2001
From: lubiny <lubiny@codeaurora.org>
Date: Tue, 4 Mar 2014 16:40:36 +0800
Subject: Gallery2: add extra mimetypes to gallery manifest

- Add extra mimetypes so they can be used for streaming

Change-Id: I1df1b011ee54b646f23cfe3faa206c0aac41a838
CRs-Fixed: 620381
---
 AndroidManifest.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 84b3eb700..b7960a26d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -92,6 +92,14 @@
                 <data android:mimeType="video/webm" />
                 <data android:mimeType="video/avi" />
                 <data android:mimeType="application/sdp" />
+                <data android:mimeType="video/mp2ts" />
+                <data android:mimeType="video/x-ms-asf" />
+                <data android:mimeType="video/x-ms-wmv" />
+                <data android:mimeType="video/x-matroska" />
+                <data android:mimeType="video/x-msvideo"/>
+                <data android:mimeType="video/divx" />
+                <data android:mimeType="video/mkv" />
+                <data android:mimeType="video/mpeg" />
              </intent-filter>
              <intent-filter>
                 <!-- HTTP live support -->
-- 
cgit v1.2.3


From 9382a979292e52de5c60a39ba24688362dce8bc1 Mon Sep 17 00:00:00 2001
From: Paramananda Pradhan <parama@codeaurora.org>
Date: Sun, 14 Dec 2014 17:27:31 +0530
Subject: Gallery2: Make Gallery2 support OMADRM feature

- Make Gallery2 can recognize and consume DRM images and videos.

Change-Id: I1655d295bcec31b5760c2c86c06f815cf6ed57ee
---
 AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b7960a26d..4c9bf20cb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -172,6 +172,7 @@
                 <data android:mimeType="image/png" />
                 <data android:mimeType="image/webp" />
                 <data android:mimeType="image/x-ms-bmp" />
+                <data android:mimeType="image/x-MS-bmp" />
                 <data android:mimeType="image/vnd.wap.wbmp" />
                 <data android:mimeType="application/vnd.google.panorama360+jpg" />
             </intent-filter>
-- 
cgit v1.2.3


From ba37d51c1ddc20b0b8472a2eee768a2d024f4fff Mon Sep 17 00:00:00 2001
From: kaiyiz <kaiyiz@codeaurora.org>
Date: Tue, 27 Jan 2015 18:24:14 +0800
Subject: Gallery2: Grant permission to read/write files of Settings.

Set photo of "user" via statusbar->more settings fails, because
that Gallery2 does not have the permission to read and write
files of Settings.

Grant read and write Settings permission to Gallery2.

Change-Id: Ifcc5b4d8d938960296c4fa9d0f7f302d353c3197
CRs-Fixed: 785671
---
 AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4c9bf20cb..9ccac2dc7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,6 +20,7 @@
 <manifest android:versionCode="40030"
         android:versionName="1.1.40030"
         xmlns:android="http://schemas.android.com/apk/res/android"
+        android:sharedUserId="android.uid.system"
         package="com.android.gallery3d">
 
     <original-package android:name="com.android.gallery3d" />
-- 
cgit v1.2.3


From 7ff0557fb4e1af3ced80bd2ae52d49b2ed202898 Mon Sep 17 00:00:00 2001
From: Jing Wang <wangjing@codeaurora.org>
Date: Fri, 30 Jan 2015 01:31:17 -0800
Subject: Revert "Gallery2: Grant permission to read/write files of Settings."

it will be fixed by another way

This reverts commit ba37d51c1ddc20b0b8472a2eee768a2d024f4fff

Change-Id: I35b0ed339b427634f5056addfbefc20198dcfd04
---
 AndroidManifest.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9ccac2dc7..4c9bf20cb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,7 +20,6 @@
 <manifest android:versionCode="40030"
         android:versionName="1.1.40030"
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:sharedUserId="android.uid.system"
         package="com.android.gallery3d">
 
     <original-package android:name="com.android.gallery3d" />
-- 
cgit v1.2.3


From 2deb6f518822055f4b60bbe8afabc938a9023cc9 Mon Sep 17 00:00:00 2001
From: cretin45 <cretin45@gmail.com>
Date: Sun, 14 Dec 2014 09:21:04 -0800
Subject: Gallery2: Materialization

- Material theme
- FAB
- New Icon
- Add missing resources for movie settings
- Fix action mode
- Vector drawables

Change-Id: I9c8cc81759502a417a5585fd1d3fd9b61e0bd68b
---
 AndroidManifest.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4c9bf20cb..8b15d6cd0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -24,7 +24,7 @@
 
     <original-package android:name="com.android.gallery3d" />
 
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />
 
     <permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER"
             android:protectionLevel="signatureOrSystem" />
@@ -116,8 +116,9 @@
              </intent-filter>
         </activity>
 
-        <activity android:name="com.android.gallery3d.app.GalleryActivity" android:label="@string/app_name"
-                android:configChanges="keyboardHidden|orientation|screenSize">
+        <activity android:name="com.android.gallery3d.app.GalleryActivity"
+                  android:label="@string/app_name"
+                  android:configChanges="keyboardHidden|orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -195,8 +196,7 @@
 
         <!-- This activity acts as a trampoline to the new Gallery activity,
              so that existing shortcuts are preserved. -->
-        <activity android:name="com.android.gallery3d.app.Gallery"
-            android:theme="@style/android:Theme.NoDisplay">
+        <activity android:name="com.android.gallery3d.app.Gallery">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
-- 
cgit v1.2.3


From bbbc9107f02bf48505c1123cbb5bb1810572079c Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Sat, 28 Mar 2015 14:09:12 -0700
Subject: Revert OMADRM feature.

 * No need for this.

Revert "Gallery2 : Added support for Oma drm (CD and SD)"

This reverts commit 6144de8cc35fdd114802545c9922a1a234af8397.

Revert "Gallery2: Make Gallery2 support OMADRM feature"

This reverts commit 9382a979292e52de5c60a39ba24688362dce8bc1.

Change-Id: I13a0d69a792aad36d7b15bc0b3c78e3f55d396bc
---
 AndroidManifest.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8b15d6cd0..5171dc4be 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -173,7 +173,6 @@
                 <data android:mimeType="image/png" />
                 <data android:mimeType="image/webp" />
                 <data android:mimeType="image/x-ms-bmp" />
-                <data android:mimeType="image/x-MS-bmp" />
                 <data android:mimeType="image/vnd.wap.wbmp" />
                 <data android:mimeType="application/vnd.google.panorama360+jpg" />
             </intent-filter>
-- 
cgit v1.2.3


From a33834eae3f5b6b84331bc6c97a414c7471902c9 Mon Sep 17 00:00:00 2001
From: Scott Warner <Tortel1210@gmail.com>
Date: Sat, 25 Apr 2015 18:20:16 +0200
Subject: Add Storage preference (2/2)

Based on CM11, this patch adds an intent listener to listen for
storage path changes from the camera app and set the default camera folder.

Change-Id: I5efec988136c6daaffe9d209278b6aa4ca29116b
---
 AndroidManifest.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5171dc4be..88a218ca8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -29,6 +29,9 @@
     <permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER"
             android:protectionLevel="signatureOrSystem" />
 
+    <permission android:name="com.android.gallery3d.permission.STORAGE_CHANGE"
+            android:protectionLevel="signatureOrSystem" />
+
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -393,6 +396,14 @@
             </intent-filter>
         </receiver>
 
+        <!-- Receiver to keep the storage path for the camera in sync -->
+        <receiver android:name="com.android.gallery3d.app.StorageChangeReceiver"
+            android:permission="com.android.gallery3d.permission.STORAGE_CHANGE" >
+            <intent-filter>
+                <action android:name="com.android.gallery3d.STORAGE_CHANGE" />
+            </intent-filter>
+        </receiver>
+
         <service android:name="com.android.camera.MediaSaveService" />
 
         <activity android:name="org.codeaurora.gallery3d.video.SettingsActivity"
-- 
cgit v1.2.3


From a5aa75d6ac958822e145b61e7c475bd1dc1b5260 Mon Sep 17 00:00:00 2001
From: Danesh M <daneshm90@gmail.com>
Date: Wed, 9 Sep 2015 17:51:27 -0700
Subject: Gallery3d : Fix CROP_ACTION for third party apps

Certain apps such as google photos, don't respect
return-data true, since the bitmap could be very large.

Switch to a file provider to pass the external apps a uri
to write cropped results to.

Change-Id: I9ec8b8defaffa3d9fa0c2cdfd68422eeff5aef84
---
 AndroidManifest.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 88a218ca8..216996017 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -436,5 +436,14 @@
                 android:label="@string/movie_view_label"
                 android:configChanges="orientation|keyboardHidden|screenSize|mnc|mcc">
         </activity>
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="com.android.gallery3d.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
     </application>
 </manifest>
-- 
cgit v1.2.3


From 829f9ad8c06070038cdef24e5fac76a8a16f841b Mon Sep 17 00:00:00 2001
From: Paramananda Pradhan <parama@codeaurora.org>
Date: Sun, 14 Dec 2014 17:27:31 +0530
Subject: Gallery2: Make Gallery2 support OMADRM feature

- Make Gallery2 can recognize and consume DRM images and videos.

Change-Id: I1655d295bcec31b5760c2c86c06f815cf6ed57ee
---
 AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 216996017..e64fcf612 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -176,6 +176,7 @@
                 <data android:mimeType="image/png" />
                 <data android:mimeType="image/webp" />
                 <data android:mimeType="image/x-ms-bmp" />
+                <data android:mimeType="image/x-MS-bmp" />
                 <data android:mimeType="image/vnd.wap.wbmp" />
                 <data android:mimeType="application/vnd.google.panorama360+jpg" />
             </intent-filter>
-- 
cgit v1.2.3