Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84e706fb authored by Esteban Talavera's avatar Esteban Talavera Committed by Android (Google) Code Review
Browse files

Merge "Unhide getLockTaskPackages"

parents 8874d6ef bfb666da

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6217,6 +6217,7 @@ package android.app.admin { 
    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

+1 −0
Original line number Diff line number Diff line
@@ -6428,6 +6428,7 @@ package android.app.admin { 
    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

+1 −0
Original line number Diff line number Diff line
@@ -6238,6 +6238,7 @@ package android.app.admin { 
    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

+0 −2
Original line number Diff line number Diff line
@@ -6108,8 +6108,6 @@ public class DevicePolicyManager { 
     * @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

+0 −3
Original line number Diff line number Diff line
@@ -8617,9 +8617,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        }

    }



    /**

     * 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");