From 2224cb827f2a28eb92c3ebee431d9fc2fd9df573 Mon Sep 17 00:00:00 2001 From: Svet Ganov Date: Tue, 23 Apr 2019 14:06:11 -0700 Subject: [PATCH] Address API council feedback Test: manual bug:130643623 Change-Id: I489f32858abfa4fe8eeda96cbb103d75e2a87551 --- api/system-current.txt | 1 - core/java/android/content/pm/PackageManager.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index acbd28f7cad1b..288cb9c9b3b24 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1714,7 +1714,6 @@ package android.content.pm { field public static final int MATCH_ANY_USER = 4194304; // 0x400000 field public static final int MATCH_FACTORY_ONLY = 2097152; // 0x200000 field public static final int MATCH_INSTANT = 8388608; // 0x800000 - field public static boolean RESTRICTED_PERMISSIONS_ENABLED; field public static final int RESTRICTION_HIDE_FROM_SUGGESTIONS = 1; // 0x1 field public static final int RESTRICTION_HIDE_NOTIFICATIONS = 2; // 0x2 field public static final int RESTRICTION_NONE = 0; // 0x0 diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index abb68e7550e47..5f3e0570840a7 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -87,8 +87,8 @@ public abstract class PackageManager { public static final boolean APPLY_DEFAULT_TO_DEVICE_PROTECTED_STORAGE = true; /** {@hide} */ - @SystemApi @TestApi + // STOPSHIP: Remove this once we get a Play prebuilt. public static boolean RESTRICTED_PERMISSIONS_ENABLED = false; /**