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

Commit 1dbf0bd0 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

Merge "Revert "Apps shouldn't be disabling StrictMode checks."" into rvc-dev am: c99a5082 

Change-Id: I7e9d36568edb56912fd89b814fd187d45c44d205
parents eaa00a21 c99a5082

core/java/android/os/StrictMode.java

+2 −2
Original line number Diff line number Diff line
@@ -1451,7 +1451,7 @@ public final class StrictMode { 
     *

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q, publicAlternatives = "Apps must always use {@code content://} Uris when sharing data")

    @UnsupportedAppUsage

    public static void enableDeathOnFileUriExposure() {

        sVmPolicy =

                new VmPolicy(
@@ -1469,7 +1469,7 @@ public final class StrictMode { 
     *

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q, publicAlternatives = "Apps must always use {@code content://} Uris when sharing data")

    @UnsupportedAppUsage

    public static void disableDeathOnFileUriExposure() {

        sVmPolicy =

                new VmPolicy(