diff options
| author | 2019-02-06 18:14:40 +0000 | |
|---|---|---|
| committer | 2019-02-06 18:14:40 +0000 | |
| commit | 0600f09bd283b85008a93c0a02a58ceecf02838d (patch) | |
| tree | 8cdfd4a3585457913e7ede44a0b4a5af449de993 | |
| parent | 9df71506ebed7f7c77976820adf6cb02016e186c (diff) | |
| parent | 05bf34985ea68b7d0ef309461820e4c708e89185 (diff) | |
Merge "Make DPM's setDefaultSmsApplication public API"
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index 3461eff49d1a..288f59e6e4b1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 428c9b01d101..3ff6973a09ff 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -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 { |