commit 06ae4b8dc3d2c39561d4975bf601aa2a572d7947
author David Brazdil <dbrazdil@google.com> Fri Nov 02 18:01:45 2018 +0000
committer David Brazdil <dbrazdil@google.com> Tue Nov 06 11:34:26 2018 +0000
tree 9569903136935d94badb4dc67767057e0f4486f3
parent b1eeab34a658b9b592452328c2011ce4e02fc98b

Simplify HIDDEN_API_ENFORCEMENT_ flags

Remove the distinction between pre-P and P apps and simplify the flags
to ENABLED, DISABLED and JUST_WARN.

Test: m
Change-Id: I87ef00a15ac9a3abfaeb011bbd8804b216f26c90

core/tests/coretests/src/android/provider/SettingsBackupTest.java

diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
index 4980210..ea35bc5 100644
--- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
@@ -260,8 +260,7 @@
                     Settings.Global.HDMI_SYSTEM_AUDIO_CONTROL_ENABLED,
                     Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED,
                     Settings.Global.HIDDEN_API_ACCESS_LOG_SAMPLING_RATE,
-                    Settings.Global.HIDDEN_API_POLICY_P_APPS,
-                    Settings.Global.HIDDEN_API_POLICY_PRE_P_APPS,
+                    Settings.Global.HIDDEN_API_POLICY,
                     Settings.Global.HIDE_ERROR_DIALOGS,
                     Settings.Global.HTTP_PROXY,
                     HYBRID_SYSUI_BATTERY_WARNING_FLAGS,