commit 05bf34985ea68b7d0ef309461820e4c708e89185
author Christine Franks <christyfranks@google.com> Wed Jan 16 18:34:28 2019 -0800
committer Christine Franks <christyfranks@google.com> Tue Jan 22 16:51:31 2019 -0800
tree 03c64a760e22852ce2f3d5db1637ba55482d96a1
parent 3985258afdd253306c26a33940807195241d0c92

Make DPM's setDefaultSmsApplication public API

Bug: 79122183
Test: atest CtsDevicePolicyManagerTestCases
Change-Id: I56e076eec06d59ac8e809939e5b09c73cd5c8b90

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index c229379..a073bf8 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -6721,6 +6721,7 @@
     method @Deprecated public void setCertInstallerPackage(@NonNull android.content.ComponentName, @Nullable String) throws java.lang.SecurityException;
     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

diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 86db99bf..1bf1e4f 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -6199,11 +6199,9 @@
      * @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 {