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

Unverified Commit 1f4c5def authored by Raman Tenneti's avatar Raman Tenneti Committed by Michael Bestas
Browse files

AOSP/Gallery - Deleted "Set As" menu item and ability to ATTACH_DATA. 

Fixes Gallery2 ATTACH_DATA Intent Action Could be Intercepted to Grant
Access of Its Own Non-picture Private Files to OutSide.

Bug: 201535148
Test: manual
+ Will attach the test results to the above bug.

Change-Id: Ie47945cc3519099cb685a26eee81130c2766be80
(cherry picked from commit 35ab9cd99173079886c3cd636b0606f55fefd846)
parent d86de890

AndroidManifest.xml

+0 −5
Original line number Diff line number Diff line
@@ -239,11 +239,6 @@ 
                android:configChanges="keyboardHidden|orientation|screenSize"

                android:exported="true"

                android:theme="@style/android:Theme.Translucent.NoTitleBar">

            <intent-filter android:label="@string/camera_setas_wallpaper">

                <action android:name="android.intent.action.ATTACH_DATA" />

                <data android:mimeType="image/*" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter android:label="@string/app_name">

                <action android:name="android.intent.action.SET_WALLPAPER" />

                <category android:name="android.intent.category.DEFAULT" />

res/menu/gallery_multiselect.xml

+0 −4
Original line number Diff line number Diff line
@@ -25,8 +25,4 @@ 
            android:title="@string/mute_action"

            android:visible="false"

            android:showAsAction="never" />

    <item android:id="@+id/menu_set_as"

            android:title="@string/set_as"

            android:visible="false"

            android:showAsAction="never" />

</menu>

res/menu/operation.xml

+0 −4
Original line number Diff line number Diff line
@@ -55,10 +55,6 @@ 
            android:title="@string/crop_action"

            android:showAsAction="never"

            android:visible="false" />

    <item android:id="@+id/action_setas"

            android:title="@string/set_image"

            android:showAsAction="never"

            android:visible="false" />

    <item android:id="@+id/action_details"

            android:icon="@drawable/ic_menu_info_details"

            android:title="@string/details"

res/menu/photo.xml

+0 −3
Original line number Diff line number Diff line
@@ -64,9 +64,6 @@ 
    <item android:id="@+id/action_mute"

            android:title="@string/mute_action"

            android:showAsAction="never" />

    <item android:id="@+id/action_setas"

            android:title="@string/set_image"

            android:showAsAction="never" />

    <item android:id="@+id/action_details"

            android:title="@string/details"

            android:showAsAction="never" />

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

+0 −1
Original line number Diff line number Diff line
@@ -1282,7 +1282,6 @@ public abstract class PhotoPage extends ActivityState implements 
            case R.id.action_delete:

                confirmMsg = mActivity.getResources().getQuantityString(

                        R.plurals.delete_selection, 1);

            case R.id.action_setas:

            //case R.id.action_rotate_ccw:

            //case R.id.action_rotate_cw:

            case R.id.action_show_on_map: