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

Change-Id: I7dac790e4d20497fd4f07494152d775d69b2d3f2
This commit is contained in:
Jeff Sharkey
2020-06-01 16:15:34 +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(