commit 84e706fb9b1cd6e3c7e6a4cd97bee6f22732b288
author Esteban Talavera <etalavera@google.com> Tue Feb 07 15:04:44 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 07 15:04:48 2017 +0000
tree be905735ceab0ca8855eeffefb96d36129de88c4
parent 8874d6efdac61fcebcc20d27a3a1fecb3771c886
parent bfb666da53c6ca65ab4c469fc6e2c0631aeaffc0

Merge "Unhide getLockTaskPackages"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index d772181..50f7338 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -6217,6 +6217,7 @@
     method public java.lang.CharSequence getDeviceOwnerLockScreenInfo();
     method public java.util.List<byte[]> getInstalledCaCerts(android.content.ComponentName);
     method public int getKeyguardDisabledFeatures(android.content.ComponentName);
+    method public java.lang.String[] getLockTaskPackages(android.content.ComponentName);
     method public java.lang.CharSequence getLongSupportMessage(android.content.ComponentName);
     method public int getMaximumFailedPasswordsForWipe(android.content.ComponentName);
     method public long getMaximumTimeToLock(android.content.ComponentName);

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 6affa7f..e73ad4d 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -6428,6 +6428,7 @@
     method public java.lang.CharSequence getDeviceOwnerOrganizationName();
     method public java.util.List<byte[]> getInstalledCaCerts(android.content.ComponentName);
     method public int getKeyguardDisabledFeatures(android.content.ComponentName);
+    method public java.lang.String[] getLockTaskPackages(android.content.ComponentName);
     method public java.lang.CharSequence getLongSupportMessage(android.content.ComponentName);
     method public int getMaximumFailedPasswordsForWipe(android.content.ComponentName);
     method public long getMaximumTimeToLock(android.content.ComponentName);

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index bbb7f89..3cb21d2 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -6238,6 +6238,7 @@
     method public long getLastBugReportRequestTime();
     method public long getLastNetworkLogRetrievalTime();
     method public long getLastSecurityLogRetrievalTime();
+    method public java.lang.String[] getLockTaskPackages(android.content.ComponentName);
     method public java.lang.CharSequence getLongSupportMessage(android.content.ComponentName);
     method public int getMaximumFailedPasswordsForWipe(android.content.ComponentName);
     method public long getMaximumTimeToLock(android.content.ComponentName);

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 1913d91..f1ccabe 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -6108,8 +6108,6 @@
      * @throws SecurityException if {@code admin} is not the device owner, or the profile owner of
      * an affiliated user or profile.
      * @see #setLockTaskPackages
-     *
-     * @hide
      */
     public @NonNull String[] getLockTaskPackages(@NonNull ComponentName admin) {
         throwIfParentInstance("getLockTaskPackages");

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 8d769d9..003b6d0 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -8617,9 +8617,6 @@
         }
     }
 
-    /**
-     * This function returns the list of components allowed to start the task lock mode.
-     */
     @Override
     public String[] getLockTaskPackages(ComponentName who) {
         Preconditions.checkNotNull(who, "ComponentName is null");