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

Commit 37355a9f authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Tweaks to file:// Uri StrictMode checks. 

Whitelist two more legacy intent actions, and don't enforce the
StrictMode checks when resolving intents that might be coming from
legacy apps.  Newer apps would have already been yelled at directly
before getting to the resolver.

Bug: 26976516, 26977622
Change-Id: Ibf72a361ed68c52cfaac16c32ab40e79005a42e7
parent 2a2ec864

core/java/android/content/Intent.java

+2 −0
Original line number Diff line number Diff line
@@ -8939,6 +8939,8 @@ public class Intent implements Parcelable, Cloneable { 
                case ACTION_MEDIA_SCANNER_STARTED:

                case ACTION_MEDIA_SCANNER_FINISHED:

                case ACTION_MEDIA_SCANNER_SCAN_FILE:

                case ACTION_PACKAGE_NEEDS_VERIFICATION:

                case ACTION_PACKAGE_VERIFIED:

                    // Ignore legacy actions

                    break;

                default:

core/java/com/android/internal/app/ResolverActivity.java

+5 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import android.os.Build; 
import android.os.Bundle;

import android.os.PatternMatcher;

import android.os.RemoteException;

import android.os.StrictMode;

import android.os.UserHandle;

import android.os.UserManager;

import android.util.Log;
@@ -173,6 +174,10 @@ public class ResolverActivity extends Activity { 


    @Override

    protected void onCreate(Bundle savedInstanceState) {

        // We're dispatching intents that might be coming from legacy apps, so

        // don't kill ourselves.

        StrictMode.disableDeathOnFileUriExposure();



        // Use a specialized prompt when we're handling the 'Home' app startActivity()

        final Intent intent = makeMyIntent();

        final Set<String> categories = intent.getCategories();