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

Commit 0600f09b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make DPM's setDefaultSmsApplication public API"

parents 9df71506 05bf3498

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6738,6 +6738,7 @@ package android.app.admin { 
    method public void setCrossProfileCalendarPackages(@NonNull android.content.ComponentName, @Nullable java.util.Set<java.lang.String>);

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

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

    method public void setDefaultSmsApplication(@NonNull android.content.ComponentName, @NonNull String);

    method public void setDelegatedScopes(@NonNull android.content.ComponentName, @NonNull String, @NonNull java.util.List<java.lang.String>);

    method public void setDeviceOwnerLockScreenInfo(@NonNull android.content.ComponentName, CharSequence);

    method public void setEndUserSessionMessage(@NonNull android.content.ComponentName, @Nullable CharSequence);

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

+2 −4
Original line number Diff line number Diff line
@@ -6408,11 +6408,9 @@ public class DevicePolicyManager { 
     * @param admin Which {@link DeviceAdminReceiver} this request is associated with.

     * @param packageName The name of the package to set as the default SMS application.

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

     *

     * @hide

     */

    @UnsupportedAppUsage

    public void setDefaultSmsApplication(@NonNull ComponentName admin, String packageName) {

    public void setDefaultSmsApplication(@NonNull ComponentName admin,

            @NonNull String packageName) {

        throwIfParentInstance("setDefaultSmsApplication");

        if (mService != null) {

            try {