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

Commit 445efe7c authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Avoid triggering StrictMode for storage notifs." into qt-dev 

am: 8eccead1

Change-Id: I07852e7eb2002d1530fef714601eb5b05e5520d7
parents dc9cdc0e 8eccead1

core/java/android/os/StrictMode.java

+4 −2
Original line number Diff line number Diff line
@@ -1284,13 +1284,15 @@ public final class StrictMode { 
        return oldPolicyMask;

    }



    private static ThreadPolicy allowThreadViolations() {

    /** @hide */

    public static ThreadPolicy allowThreadViolations() {

        ThreadPolicy oldPolicy = getThreadPolicy();

        setThreadPolicyMask(0);

        return oldPolicy;

    }



    private static VmPolicy allowVmViolations() {

    /** @hide */

    public static VmPolicy allowVmViolations() {

        VmPolicy oldPolicy = getVmPolicy();

        sVmPolicy = VmPolicy.LAX;

        return oldPolicy;

packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java

+10 −4
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.content.pm.PackageManager; 
import android.content.pm.PackageManager.MoveCallback;

import android.os.Bundle;

import android.os.Handler;

import android.os.StrictMode;

import android.os.UserHandle;

import android.os.storage.DiskInfo;

import android.os.storage.StorageEventListener;
@@ -639,11 +640,16 @@ public class StorageNotification extends SystemUI { 
    }



    private PendingIntent buildBrowsePendingIntent(VolumeInfo vol) {

        final StrictMode.VmPolicy oldPolicy = StrictMode.allowVmViolations();

        try {

            final Intent intent = vol.buildBrowseIntentForUser(vol.getMountUserId());



            final int requestKey = vol.getId().hashCode();

            return PendingIntent.getActivityAsUser(mContext, requestKey, intent,

                    PendingIntent.FLAG_CANCEL_CURRENT, null, UserHandle.CURRENT);

        } finally {

            StrictMode.setVmPolicy(oldPolicy);

        }

    }



    private PendingIntent buildVolumeSettingsPendingIntent(VolumeInfo vol) {