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

Commit bb17d092 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Tweaks to file:// Uri StrictMode checks."

parents 8c3b70bb 37355a9f
Loading
Loading
Loading
Loading
+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:
+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();