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

Commit f224f8a2 authored by Kholoud Mohamed's avatar Kholoud Mohamed
Browse files

Expose some constructors/getters required for testing 

Also fixed some bugs related to parceling

Bug: 232918480
Test: btest android.devicepolicy.cts.DeviceManagementCoexistenceTests
Change-Id: Ib0a30cd2297e5e8b31137bd40b3759bec9c8d4f1
parent 769e9a2c

core/api/system-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -1217,6 +1217,7 @@ package android.app.admin { 
  }















  public final class DeviceAdminAuthority extends android.app.admin.Authority {













    ctor public DeviceAdminAuthority();















    method public void writeToParcel(@NonNull android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.DeviceAdminAuthority> CREATOR;















  }










@@ -1400,11 +1401,13 @@ package android.app.admin {













  }





























  public final class DpcAuthority extends android.app.admin.Authority {













    ctor public DpcAuthority();















    method public void writeToParcel(@NonNull android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.DpcAuthority> CREATOR;















  }





























  public final class EnforcingAdmin implements android.os.Parcelable {













    ctor public EnforcingAdmin(@NonNull String, @NonNull android.app.admin.Authority, @NonNull android.os.UserHandle);















    method public int describeContents();















    method @NonNull public android.app.admin.Authority getAuthority();















    method @NonNull public String getPackageName();










@@ -1528,6 +1531,7 @@ package android.app.admin {













  }





























  public final class RoleAuthority extends android.app.admin.Authority {













    ctor public RoleAuthority(@NonNull java.util.Set<java.lang.String>);















    method @NonNull public java.util.Set<java.lang.String> getRoles();















    method public void writeToParcel(@NonNull android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.RoleAuthority> CREATOR;









@@ -1548,6 +1552,7 @@ package android.app.admin {













  }





























  public final class UnknownAuthority extends android.app.admin.Authority {













    ctor public UnknownAuthority();















    method public void writeToParcel(@NonNull android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.UnknownAuthority> CREATOR;















  }

























core/api/test-current.txt



+18
−1




























Original line number
Diff line number
Diff line








@@ -512,6 +512,10 @@ package android.app {





























package android.app.admin {





























  public final class DeviceAdminAuthority extends android.app.admin.Authority {













    field @NonNull public static final android.app.admin.DeviceAdminAuthority DEVICE_ADMIN_AUTHORITY;













  }





























  public class DevicePolicyManager {















    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public void acknowledgeNewUserDisclaimer();















    method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void clearOrganizationId();










@@ -592,21 +596,28 @@ package android.app.admin {













    field @Deprecated public static final int STATUS_SPLIT_SYSTEM_USER_DEVICE_SYSTEM_USER = 14; // 0xe















  }





























  public final class DpcAuthority extends android.app.admin.Authority {













    field @NonNull public static final android.app.admin.DpcAuthority DPC_AUTHORITY;













  }





























  public final class FlagUnion extends android.app.admin.ResolutionMechanism<java.lang.Integer> {















    method public int describeContents();















    method public void writeToParcel(@NonNull android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.FlagUnion> CREATOR;













    field @NonNull public static final android.app.admin.FlagUnion FLAG_UNION;















  }































  public final class MostRecent<V> extends android.app.admin.ResolutionMechanism<V> {















    ctor public MostRecent();















    method public int describeContents();















    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.MostRecent> CREATOR;













    field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.MostRecent<?>> CREATOR;













    field @NonNull public static final android.app.admin.MostRecent<?> MOST_RECENT;















  }































  public final class MostRestrictive<V> extends android.app.admin.ResolutionMechanism<V> {















    method public int describeContents();













    method @NonNull public java.util.List<V> getMostToLeastRestrictiveValues();















    method public void writeToParcel(@NonNull android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.MostRestrictive<?>> CREATOR;















  }









@@ -627,14 +638,20 @@ package android.app.admin {













    method public int describeContents();















    method public void writeToParcel(@NonNull android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.StringSetUnion> CREATOR;













    field @NonNull public static final android.app.admin.StringSetUnion STRING_SET_UNION;















  }































  public final class TopPriority<V> extends android.app.admin.ResolutionMechanism<V> {















    method public int describeContents();













    method @NonNull public java.util.List<android.app.admin.Authority> getHighestToLowestPriorityAuthorities();















    method public void writeToParcel(@NonNull android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.TopPriority<?>> CREATOR;















  }





























  public final class UnknownAuthority extends android.app.admin.Authority {













    field @NonNull public static final android.app.admin.UnknownAuthority UNKNOWN_AUTHORITY;













  }





























  public final class UnsafeStateException extends java.lang.IllegalStateException implements android.os.Parcelable {















    ctor public UnsafeStateException(int, int);















    method public int getOperation();

































core/java/android/app/admin/DeviceAdminAuthority.java



+13
−4




























Original line number
Diff line number
Diff line








@@ -19,6 +19,7 @@ package android.app.admin;













import android.annotation.NonNull;















import android.annotation.Nullable;















import android.annotation.SystemApi;













import android.annotation.TestApi;















import android.os.Parcel;































/**









@@ -31,11 +32,18 @@ import android.os.Parcel;













public final class DeviceAdminAuthority extends Authority {































    /**













     * Object representing a device admin authority.













     *















     * @hide















     */













    @TestApi













    @NonNull















    public static final DeviceAdminAuthority DEVICE_ADMIN_AUTHORITY = new DeviceAdminAuthority();





























    private DeviceAdminAuthority() {}













    /**













     * Creates an authority that represents a device admin.













     */













    public DeviceAdminAuthority() {}































    @Override















    public String toString() {









@@ -44,12 +52,13 @@ public final class DeviceAdminAuthority extends Authority {





























    @Override















    public boolean equals(@Nullable Object o) {













        return super.equals(o);













        if (this == o) return true;













        return o != null && getClass() == o.getClass();















    }































    @Override















    public int hashCode() {













        return super.hashCode();













        return 0;















    }































    @Override









@@ -65,7 +74,7 @@ public final class DeviceAdminAuthority extends Authority {













            new Creator<DeviceAdminAuthority>() {















                @Override















                public DeviceAdminAuthority createFromParcel(Parcel source) {













                    return new DeviceAdminAuthority();













                    return DEVICE_ADMIN_AUTHORITY;















                }































                @Override

































core/java/android/app/admin/DevicePolicyState.java



+5
−0




























Original line number
Diff line number
Diff line








@@ -81,6 +81,11 @@ public final class DevicePolicyState implements Parcelable {













        return mPolicies.containsKey(user) ? mPolicies.get(user) : new HashMap<>();















    }





























    @Override













    public String toString() {













        return "DevicePolicyState { mPolicies= " + mPolicies + " }";













    }





























    @Override















    public int describeContents() {















        return 0;

































core/java/android/app/admin/DpcAuthority.java



+13
−4




























Original line number
Diff line number
Diff line








@@ -19,6 +19,7 @@ package android.app.admin;













import android.annotation.NonNull;















import android.annotation.Nullable;















import android.annotation.SystemApi;













import android.annotation.TestApi;















import android.os.Parcel;































/**









@@ -31,11 +32,18 @@ import android.os.Parcel;













public final class DpcAuthority extends Authority {































    /**













     * Object representing a DPC authority.













     *















     * @hide















     */













    @NonNull













    @TestApi















    public static final DpcAuthority DPC_AUTHORITY = new DpcAuthority();





























    private DpcAuthority() {}













    /**













     * Creates an authority that represents a DPC admin.













     */













    public DpcAuthority() {}































    @Override















    public String toString() {









@@ -44,12 +52,13 @@ public final class DpcAuthority extends Authority {





























    @Override















    public boolean equals(@Nullable Object o) {













        return super.equals(o);













        if (this == o) return true;













        return o != null && getClass() == o.getClass();















    }































    @Override















    public int hashCode() {













        return super.hashCode();













        return 0;















    }































    @Override









@@ -65,7 +74,7 @@ public final class DpcAuthority extends Authority {













            new Creator<DpcAuthority>() {















                @Override















                public DpcAuthority createFromParcel(Parcel source) {













                    return new DpcAuthority();













                    return DPC_AUTHORITY;















                }































                @Override