diff options
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index c810691fcb4d..a79fd11cb3a7 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -8084,7 +8084,7 @@ package android.app.admin { method public CharSequence getStartUserSessionMessage(@NonNull android.content.ComponentName); method @Deprecated public boolean getStorageEncryption(@Nullable android.content.ComponentName); method public int getStorageEncryptionStatus(); - method @FlaggedApi("android.app.admin.flags.esim_management_enabled") @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS) public java.util.Set<java.lang.Integer> getSubscriptionsIds(); + method @FlaggedApi("android.app.admin.flags.esim_management_enabled") @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS) public java.util.Set<java.lang.Integer> getSubscriptionIds(); method @Nullable public android.app.admin.SystemUpdatePolicy getSystemUpdatePolicy(); method @Nullable public android.os.PersistableBundle getTransferOwnershipBundle(); method @Nullable public java.util.List<android.os.PersistableBundle> getTrustAgentConfiguration(@Nullable android.content.ComponentName, @NonNull android.content.ComponentName); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index de22072d5941..620bbaf4bbf5 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -17457,24 +17457,24 @@ public class DevicePolicyManager { } /** - * Returns the subscription ids of all subscriptions which was downloaded by the calling + * Returns the subscription ids of all subscriptions which were downloaded by the calling * admin. * * <p> This returns only the subscriptions which were downloaded by the calling admin via * {@link android.telephony.euicc.EuiccManager#downloadSubscription}. - * If a susbcription is returned by this method then in it subject to management controls + * If a subscription is returned by this method then in it subject to management controls * and cannot be removed by users. * * <p> Callable by device owners and profile owners. * - * @throws SecurityException if the caller is not authorized to call this method - * @return ids of all managed subscriptions currently downloaded by an admin on the device + * @throws SecurityException if the caller is not authorized to call this method. + * @return ids of all managed subscriptions currently downloaded by an admin on the device. */ @FlaggedApi(FLAG_ESIM_MANAGEMENT_ENABLED) @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS) @NonNull - public Set<Integer> getSubscriptionsIds() { - throwIfParentInstance("getSubscriptionsIds"); + public Set<Integer> getSubscriptionIds() { + throwIfParentInstance("getSubscriptionIds"); if (mService != null) { try { return intArrayToSet(mService.getSubscriptionIds(mContext.getPackageName())); |