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

Commit f46e776b authored by Andrei Stingaceanu's avatar Andrei Stingaceanu Committed by android-build-merger
Browse files

Merge "AfW custom lock screen message - API polish" into nyc-dev 

am: b70ba197

* commit 'b70ba197':
  AfW custom lock screen message - API polish

Change-Id: Id2ce5fced3d6b39ab2948cb6ab7ee5001fa534cf
parents 10e66243 b70ba197

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -5855,7 +5855,7 @@ package android.app.admin { 
    method public boolean getCrossProfileContactsSearchDisabled(android.content.ComponentName);

    method public java.util.List<java.lang.String> getCrossProfileWidgetProviders(android.content.ComponentName);

    method public int getCurrentFailedPasswordAttempts();

    method public java.lang.String getDeviceOwnerLockScreenInfo();

    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 getLongSupportMessage(android.content.ComponentName);
@@ -5926,7 +5926,7 @@ package android.app.admin { 
    method public void setCertInstallerPackage(android.content.ComponentName, java.lang.String) throws java.lang.SecurityException;

    method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean);

    method public void setCrossProfileContactsSearchDisabled(android.content.ComponentName, boolean);

    method public boolean setDeviceOwnerLockScreenInfo(android.content.ComponentName, java.lang.String);

    method public void setDeviceOwnerLockScreenInfo(android.content.ComponentName, java.lang.CharSequence);

    method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String);

    method public boolean setKeyguardDisabled(android.content.ComponentName, boolean);

    method public void setKeyguardDisabledFeatures(android.content.ComponentName, int);

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -5995,7 +5995,7 @@ package android.app.admin { 
    method public deprecated java.lang.String getDeviceInitializerApp();

    method public deprecated android.content.ComponentName getDeviceInitializerComponent();

    method public java.lang.String getDeviceOwner();

    method public java.lang.String getDeviceOwnerLockScreenInfo();

    method public java.lang.CharSequence getDeviceOwnerLockScreenInfo();

    method public java.lang.String getDeviceOwnerNameOnAnyUser();

    method public java.util.List<byte[]> getInstalledCaCerts(android.content.ComponentName);

    method public int getKeyguardDisabledFeatures(android.content.ComponentName);
@@ -6074,7 +6074,7 @@ package android.app.admin { 
    method public void setCertInstallerPackage(android.content.ComponentName, java.lang.String) throws java.lang.SecurityException;

    method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean);

    method public void setCrossProfileContactsSearchDisabled(android.content.ComponentName, boolean);

    method public boolean setDeviceOwnerLockScreenInfo(android.content.ComponentName, java.lang.String);

    method public void setDeviceOwnerLockScreenInfo(android.content.ComponentName, java.lang.CharSequence);

    method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String);

    method public boolean setKeyguardDisabled(android.content.ComponentName, boolean);

    method public void setKeyguardDisabledFeatures(android.content.ComponentName, int);

api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -5859,7 +5859,7 @@ package android.app.admin { 
    method public boolean getCrossProfileContactsSearchDisabled(android.content.ComponentName);

    method public java.util.List<java.lang.String> getCrossProfileWidgetProviders(android.content.ComponentName);

    method public int getCurrentFailedPasswordAttempts();

    method public java.lang.String getDeviceOwnerLockScreenInfo();

    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 getLongSupportMessage(android.content.ComponentName);
@@ -5930,7 +5930,7 @@ package android.app.admin { 
    method public void setCertInstallerPackage(android.content.ComponentName, java.lang.String) throws java.lang.SecurityException;

    method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean);

    method public void setCrossProfileContactsSearchDisabled(android.content.ComponentName, boolean);

    method public boolean setDeviceOwnerLockScreenInfo(android.content.ComponentName, java.lang.String);

    method public void setDeviceOwnerLockScreenInfo(android.content.ComponentName, java.lang.CharSequence);

    method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String);

    method public boolean setKeyguardDisabled(android.content.ComponentName, boolean);

    method public void setKeyguardDisabledFeatures(android.content.ComponentName, int);

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

+3 −5
Original line number Diff line number Diff line
@@ -3736,24 +3736,22 @@ public class DevicePolicyManager { 
     *

     * @param admin The name of the admin component to check.

     * @param info Device owner information which will be displayed instead of the user owner info.

     * @return Whether the device owner information has been set.

     * @throws SecurityException if {@code admin} is not a device owner.

     */

    public boolean setDeviceOwnerLockScreenInfo(@NonNull ComponentName admin, String info) {

    public void setDeviceOwnerLockScreenInfo(@NonNull ComponentName admin, CharSequence info) {

        if (mService != null) {

            try {

                return mService.setDeviceOwnerLockScreenInfo(admin, info);

                mService.setDeviceOwnerLockScreenInfo(admin, info);

            } catch (RemoteException re) {

                throw re.rethrowFromSystemServer();

            }

        }

        return false;

    }



    /**

     * @return The device owner information. If it is not set returns {@code null}.

     */

    public String getDeviceOwnerLockScreenInfo() {

    public CharSequence getDeviceOwnerLockScreenInfo() {

        if (mService != null) {

            try {

                return mService.getDeviceOwnerLockScreenInfo();

core/java/android/app/admin/IDevicePolicyManager.aidl

+2 −2
Original line number Diff line number Diff line
@@ -135,8 +135,8 @@ interface IDevicePolicyManager { 
    void clearProfileOwner(in ComponentName who);

    boolean hasUserSetupCompleted();



    boolean setDeviceOwnerLockScreenInfo(in ComponentName who, String deviceOwnerInfo);

    String getDeviceOwnerLockScreenInfo();

    void setDeviceOwnerLockScreenInfo(in ComponentName who, CharSequence deviceOwnerInfo);

    CharSequence getDeviceOwnerLockScreenInfo();



    String[] setPackagesSuspended(in ComponentName admin, in String[] packageNames, boolean suspended);

    boolean getPackageSuspended(in ComponentName admin, String packageName);