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

Commit fd580f7d authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Update {set,get}{Long,Short}SupportMessage APIs to use CharSequence." into nyc-dev

parents 4db7675d 3ccca91e

api/current.txt

+4 −4
Original line number Diff line number Diff line
@@ -5897,7 +5897,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 getLongSupportMessage(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);

    method public int getOrganizationColor(android.content.ComponentName);
@@ -5920,7 +5920,7 @@ package android.app.admin { 
    method public java.util.List<java.lang.String> getPermittedAccessibilityServices(android.content.ComponentName);

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

    method public boolean getScreenCaptureDisabled(android.content.ComponentName);

    method public java.lang.String getShortSupportMessage(android.content.ComponentName);

    method public java.lang.CharSequence getShortSupportMessage(android.content.ComponentName);

    method public boolean getStorageEncryption(android.content.ComponentName);

    method public int getStorageEncryptionStatus();

    method public android.app.admin.SystemUpdatePolicy getSystemUpdatePolicy();
@@ -5971,7 +5971,7 @@ package android.app.admin { 
    method public boolean setKeyguardDisabled(android.content.ComponentName, boolean);

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

    method public void setLockTaskPackages(android.content.ComponentName, java.lang.String[]) throws java.lang.SecurityException;

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

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

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

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

    method public void setMaximumTimeToLock(android.content.ComponentName, long);
@@ -5999,7 +5999,7 @@ package android.app.admin { 
    method public void setScreenCaptureDisabled(android.content.ComponentName, boolean);

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

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

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

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

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

    method public int setStorageEncryption(android.content.ComponentName, boolean);

    method public void setSystemUpdatePolicy(android.content.ComponentName, android.app.admin.SystemUpdatePolicy);

api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -6040,7 +6040,7 @@ package android.app.admin { 
    method public java.lang.String getDeviceOwnerNameOnAnyUser();

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

    method public java.lang.CharSequence getLongSupportMessage(android.content.ComponentName);

    method public int getMaximumFailedPasswordsForWipe(android.content.ComponentName);

    method public long getMaximumTimeToLock(android.content.ComponentName);

    method public int getOrganizationColor(android.content.ComponentName);
@@ -6067,7 +6067,7 @@ package android.app.admin { 
    method public android.content.ComponentName getProfileOwner() throws java.lang.IllegalArgumentException;

    method public java.lang.String getProfileOwnerNameAsUser(int) throws java.lang.IllegalArgumentException;

    method public boolean getScreenCaptureDisabled(android.content.ComponentName);

    method public java.lang.String getShortSupportMessage(android.content.ComponentName);

    method public java.lang.CharSequence getShortSupportMessage(android.content.ComponentName);

    method public boolean getStorageEncryption(android.content.ComponentName);

    method public int getStorageEncryptionStatus();

    method public android.app.admin.SystemUpdatePolicy getSystemUpdatePolicy();
@@ -6121,7 +6121,7 @@ package android.app.admin { 
    method public boolean setKeyguardDisabled(android.content.ComponentName, boolean);

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

    method public void setLockTaskPackages(android.content.ComponentName, java.lang.String[]) throws java.lang.SecurityException;

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

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

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

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

    method public void setMaximumTimeToLock(android.content.ComponentName, long);
@@ -6149,7 +6149,7 @@ package android.app.admin { 
    method public void setScreenCaptureDisabled(android.content.ComponentName, boolean);

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

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

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

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

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

    method public int setStorageEncryption(android.content.ComponentName, boolean);

    method public void setSystemUpdatePolicy(android.content.ComponentName, android.app.admin.SystemUpdatePolicy);

api/test-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -5901,7 +5901,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 getLongSupportMessage(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);

    method public int getOrganizationColor(android.content.ComponentName);
@@ -5924,7 +5924,7 @@ package android.app.admin { 
    method public java.util.List<java.lang.String> getPermittedAccessibilityServices(android.content.ComponentName);

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

    method public boolean getScreenCaptureDisabled(android.content.ComponentName);

    method public java.lang.String getShortSupportMessage(android.content.ComponentName);

    method public java.lang.CharSequence getShortSupportMessage(android.content.ComponentName);

    method public boolean getStorageEncryption(android.content.ComponentName);

    method public int getStorageEncryptionStatus();

    method public android.app.admin.SystemUpdatePolicy getSystemUpdatePolicy();
@@ -5975,7 +5975,7 @@ package android.app.admin { 
    method public boolean setKeyguardDisabled(android.content.ComponentName, boolean);

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

    method public void setLockTaskPackages(android.content.ComponentName, java.lang.String[]) throws java.lang.SecurityException;

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

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

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

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

    method public void setMaximumTimeToLock(android.content.ComponentName, long);
@@ -6003,7 +6003,7 @@ package android.app.admin { 
    method public void setScreenCaptureDisabled(android.content.ComponentName, boolean);

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

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

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

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

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

    method public int setStorageEncryption(android.content.ComponentName, boolean);

    method public void setSystemUpdatePolicy(android.content.ComponentName, android.app.admin.SystemUpdatePolicy);

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

+13 −12
Original line number Diff line number Diff line
@@ -5762,7 +5762,7 @@ public class DevicePolicyManager { 
     * @throws SecurityException if {@code admin} is not an active administrator.

     */

    public void setShortSupportMessage(@NonNull ComponentName admin,

            @Nullable String message) {

            @Nullable CharSequence message) {

        if (mService != null) {

            try {

                mService.setShortSupportMessage(admin, message);
@@ -5776,11 +5776,11 @@ public class DevicePolicyManager { 
     * Called by a device admin to get the short support message.

     *

     * @param admin Which {@link DeviceAdminReceiver} this request is associated with.

     * @return The message set by {@link #setShortSupportMessage(ComponentName, String)} or null if

     *         no message has been set.

     * @return The message set by {@link #setShortSupportMessage(ComponentName, CharSequence)} or

     *         null if no message has been set.

     * @throws SecurityException if {@code admin} is not an active administrator.

     */

    public String getShortSupportMessage(@NonNull ComponentName admin) {

    public CharSequence getShortSupportMessage(@NonNull ComponentName admin) {

        if (mService != null) {

            try {

                return mService.getShortSupportMessage(admin);
@@ -5806,7 +5806,7 @@ public class DevicePolicyManager { 
     * @throws SecurityException if {@code admin} is not an active administrator.

     */

    public void setLongSupportMessage(@NonNull ComponentName admin,

            @Nullable String message) {

            @Nullable CharSequence message) {

        if (mService != null) {

            try {

                mService.setLongSupportMessage(admin, message);
@@ -5820,11 +5820,11 @@ public class DevicePolicyManager { 
     * Called by a device admin to get the long support message.

     *

     * @param admin Which {@link DeviceAdminReceiver} this request is associated with.

     * @return The message set by {@link #setLongSupportMessage(ComponentName, String)} or null if

     *         no message has been set.

     * @return The message set by {@link #setLongSupportMessage(ComponentName, CharSequence)} or

     *         null if no message has been set.

     * @throws SecurityException if {@code admin} is not an active administrator.

     */

    public String getLongSupportMessage(@NonNull ComponentName admin) {

    public CharSequence getLongSupportMessage(@NonNull ComponentName admin) {

        if (mService != null) {

            try {

                return mService.getLongSupportMessage(admin);
@@ -5840,11 +5840,12 @@ public class DevicePolicyManager { 
     *

     * @param admin Which {@link DeviceAdminReceiver} this request is associated with.

     * @param userHandle user id the admin is running as.

     * @return The message set by {@link #setShortSupportMessage(ComponentName, String)}

     * @return The message set by {@link #setShortSupportMessage(ComponentName, CharSequence)}

     *

     * @hide

     */

    public String getShortSupportMessageForUser(@NonNull ComponentName admin, int userHandle) {

    public CharSequence getShortSupportMessageForUser(@NonNull ComponentName admin,

            int userHandle) {

        if (mService != null) {

            try {

                return mService.getShortSupportMessageForUser(admin, userHandle);
@@ -5861,11 +5862,11 @@ public class DevicePolicyManager { 
     *

     * @param admin Which {@link DeviceAdminReceiver} this request is associated with.

     * @param userHandle user id the admin is running as.

     * @return The message set by {@link #setLongSupportMessage(ComponentName, String)}

     * @return The message set by {@link #setLongSupportMessage(ComponentName, CharSequence)}

     *

     * @hide

     */

    public String getLongSupportMessageForUser(@NonNull ComponentName admin, int userHandle) {

    public CharSequence getLongSupportMessageForUser(@NonNull ComponentName admin, int userHandle) {

        if (mService != null) {

            try {

                return mService.getLongSupportMessageForUser(admin, userHandle);

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

+6 −6
Original line number Diff line number Diff line
@@ -269,13 +269,13 @@ interface IDevicePolicyManager { 
    String getWifiMacAddress(in ComponentName admin);

    void reboot(in ComponentName admin);



    void setShortSupportMessage(in ComponentName admin, in String message);

    String getShortSupportMessage(in ComponentName admin);

    void setLongSupportMessage(in ComponentName admin, in String message);

    String getLongSupportMessage(in ComponentName admin);

    void setShortSupportMessage(in ComponentName admin, in CharSequence message);

    CharSequence getShortSupportMessage(in ComponentName admin);

    void setLongSupportMessage(in ComponentName admin, in CharSequence message);

    CharSequence getLongSupportMessage(in ComponentName admin);



    String getShortSupportMessageForUser(in ComponentName admin, int userHandle);

    String getLongSupportMessageForUser(in ComponentName admin, int userHandle);

    CharSequence getShortSupportMessageForUser(in ComponentName admin, int userHandle);

    CharSequence getLongSupportMessageForUser(in ComponentName admin, int userHandle);



    boolean isSeparateProfileChallengeAllowed(int userHandle);