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

Change-Id: I1b9292eb0e16412ac4bacb20753c9ae426fb042e
This commit is contained in:
Jeff Sharkey
2020-06-01 16:15:41 +00:00
committed by Automerger Merge Worker

View File

@@ -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(