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

Change-Id: I5d4a4161fa0c9e9ab8bef9a543c357bab4576408
This commit is contained in:
Jeff Sharkey
2020-06-01 16:04:05 +00:00
committed by Automerger Merge Worker

View File

@@ -1451,7 +1451,7 @@ public final class StrictMode {
* *
* @hide * @hide
*/ */
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q, publicAlternatives = "Apps must always use {@code content://} Uris when sharing data") @UnsupportedAppUsage
public static void enableDeathOnFileUriExposure() { public static void enableDeathOnFileUriExposure() {
sVmPolicy = sVmPolicy =
new VmPolicy( new VmPolicy(
@@ -1469,7 +1469,7 @@ public final class StrictMode {
* *
* @hide * @hide
*/ */
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q, publicAlternatives = "Apps must always use {@code content://} Uris when sharing data") @UnsupportedAppUsage
public static void disableDeathOnFileUriExposure() { public static void disableDeathOnFileUriExposure() {
sVmPolicy = sVmPolicy =
new VmPolicy( new VmPolicy(