commit 47c203d4b0476d557a5e2d5d8250dc48d74b49f4
author Makoto Onuki <omakoto@google.com> Mon Feb 13 16:21:19 2017 -0800
committer Makoto Onuki <omakoto@google.com> Mon Feb 13 16:27:35 2017 -0800
tree c6e67c457b6e075e8c36ac5d02b591414c27c38d
parent b068dd5b6613d34383923f1cecdbcae4638ba4b7

Make the DPM account strings system-APIs.

Bug: 33670246
Test: After making the CTS change in the same topic:
 cts-tradefed run cts --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.AccountCheckHostSideTest

Change-Id: Icefb6aec04a5ec805313e027424e99bdbf769e67

core/java/android/app/admin/DevicePolicyManager.java

diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index f1ccabe..eda7f5f 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -1773,10 +1773,14 @@
      *     if any of the accounts have it.
      * </ul>
      */
+    @SystemApi
+    @TestApi
     public static final String ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_ALLOWED =
             "android.account.DEVICE_OR_PROFILE_OWNER_ALLOWED";
 
     /** @hide See {@link #ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_ALLOWED} */
+    @SystemApi
+    @TestApi
     public static final String ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_DISALLOWED =
             "android.account.DEVICE_OR_PROFILE_OWNER_DISALLOWED";