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

Commit a044500a authored by Jonathan Scott's avatar Jonathan Scott Committed by Android (Google) Code Review
Browse files

Merge "Deprecate cross profile calendar APIs."

parents 51f86c92 3c795441

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -7475,7 +7475,7 @@ package android.app.admin { 
    method public boolean getBluetoothContactSharingDisabled(@NonNull android.content.ComponentName);

    method public boolean getCameraDisabled(@Nullable android.content.ComponentName);

    method @Deprecated @Nullable public String getCertInstallerPackage(@NonNull android.content.ComponentName) throws java.lang.SecurityException;

    method @Nullable public java.util.Set<java.lang.String> getCrossProfileCalendarPackages(@NonNull android.content.ComponentName);

    method @Deprecated @Nullable public java.util.Set<java.lang.String> getCrossProfileCalendarPackages(@NonNull android.content.ComponentName);

    method public boolean getCrossProfileCallerIdDisabled(@NonNull android.content.ComponentName);

    method public boolean getCrossProfileContactsSearchDisabled(@NonNull android.content.ComponentName);

    method @NonNull public java.util.Set<java.lang.String> getCrossProfilePackages(@NonNull android.content.ComponentName);
@@ -7624,7 +7624,7 @@ package android.app.admin { 
    method @Deprecated public void setCertInstallerPackage(@NonNull android.content.ComponentName, @Nullable String) throws java.lang.SecurityException;

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

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

    method public void setCrossProfileCalendarPackages(@NonNull android.content.ComponentName, @Nullable java.util.Set<java.lang.String>);

    method @Deprecated 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 setCrossProfilePackages(@NonNull android.content.ComponentName, @NonNull java.util.Set<java.lang.String>);

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

+4 −0
Original line number Diff line number Diff line
@@ -14449,7 +14449,9 @@ public class DevicePolicyManager { 
     * @throws SecurityException if {@code admin} is not a profile owner

     *

     * @see #getCrossProfileCalendarPackages(ComponentName)

     * @deprecated Use {@link #setCrossProfilePackages(ComponentName, Set)}.

     */

    @Deprecated

    public void setCrossProfileCalendarPackages(@NonNull ComponentName admin,

            @Nullable Set<String> packageNames) {

        throwIfParentInstance("setCrossProfileCalendarPackages");
@@ -14475,7 +14477,9 @@ public class DevicePolicyManager { 
     * @throws SecurityException if {@code admin} is not a profile owner

     *

     * @see #setCrossProfileCalendarPackages(ComponentName, Set)

     * @deprecated Use {@link #setCrossProfilePackages(ComponentName, Set)}.

     */

    @Deprecated

    public @Nullable Set<String> getCrossProfileCalendarPackages(@NonNull ComponentName admin) {

        throwIfParentInstance("getCrossProfileCalendarPackages");

        if (mService != null) {