commit e3644411a0ddb754bfba98c80f0b6c9505eb0283
author Jeff Sharkey <jsharkey@android.com> Sat Apr 27 17:13:57 2019 -0600
committer Jeff Sharkey <jsharkey@google.com> Sun Apr 28 17:03:47 2019 +0000
tree a3aa9a19f9ba52882d67a66b1eecdcfb7925280b
parent 09f2e5c3fa9687d671890ac706e485c65d35624c

Avoid triggering StrictMode for storage notifs.

Bug: 130129028
Test: none
Exempt-From-Owner-Approval: trivial bugfix
Change-Id: Ia9d9da589ee1f4d95a27bf327235f950f65c69a0

core/java/android/os/StrictMode.java

diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java
index 94cca30..c707ba8 100644
--- a/core/java/android/os/StrictMode.java
+++ b/core/java/android/os/StrictMode.java
@@ -1284,13 +1284,15 @@
         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

diff --git a/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java b/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java
index 329d029..de86f3d 100644
--- a/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java
+++ b/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java
@@ -29,6 +29,7 @@
 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 @@
     }
 
     private PendingIntent buildBrowsePendingIntent(VolumeInfo vol) {
-        final Intent intent = vol.buildBrowseIntentForUser(vol.getMountUserId());
+        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);
+            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) {