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

Commit 05277989 authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Android (Google) Code Review
Browse files

Merge changes from topic "filterEqualsRefactor" 

* changes:
  Add DPM#getDevicePolicyState API
  Move IntentResolver#filterEquals to IntentFilter
parents f5130b49 523c560a

core/api/system-current.txt

+91 −0
Original line number Original line Diff line number Diff line
@@ -1197,6 +1197,15 @@ package android.app { 
















package android.app.admin {







package android.app.admin {






























  public abstract class Authority implements android.os.Parcelable {














    method public int describeContents();














  }



























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














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














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














  }
























  public final class DevicePolicyDrawableResource implements android.os.Parcelable {







  public final class DevicePolicyDrawableResource implements android.os.Parcelable {











    ctor public DevicePolicyDrawableResource(@NonNull android.content.Context, @NonNull String, @NonNull String, @NonNull String, @DrawableRes int);







    ctor public DevicePolicyDrawableResource(@NonNull android.content.Context, @NonNull String, @NonNull String, @NonNull String, @DrawableRes int);











    ctor public DevicePolicyDrawableResource(@NonNull android.content.Context, @NonNull String, @NonNull String, @DrawableRes int);







    ctor public DevicePolicyDrawableResource(@NonNull android.content.Context, @NonNull String, @NonNull String, @DrawableRes int);










@@ -1228,6 +1237,7 @@ package android.app.admin {









    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS}) public String getDeviceOwnerNameOnAnyUser();







    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS}) public String getDeviceOwnerNameOnAnyUser();











    method @Nullable public CharSequence getDeviceOwnerOrganizationName();







    method @Nullable public CharSequence getDeviceOwnerOrganizationName();











    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public android.os.UserHandle getDeviceOwnerUser();







    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public android.os.UserHandle getDeviceOwnerUser();














    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public android.app.admin.DevicePolicyState getDevicePolicyState();











    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.QUERY_ADMIN_POLICY}) public java.util.List<java.lang.String> getPermittedAccessibilityServices(int);







    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.QUERY_ADMIN_POLICY}) public java.util.List<java.lang.String> getPermittedAccessibilityServices(int);











    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.QUERY_ADMIN_POLICY}) public java.util.List<java.lang.String> getPermittedInputMethodsForCurrentUser();







    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.QUERY_ADMIN_POLICY}) public java.util.List<java.lang.String> getPermittedInputMethodsForCurrentUser();











    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public java.util.List<android.os.UserHandle> getPolicyManagedProfiles(@NonNull android.os.UserHandle);







    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public java.util.List<android.os.UserHandle> getPolicyManagedProfiles(@NonNull android.os.UserHandle);










@@ -1355,6 +1365,14 @@ package android.app.admin {









    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void setStrings(@NonNull java.util.Set<android.app.admin.DevicePolicyStringResource>);







    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void setStrings(@NonNull java.util.Set<android.app.admin.DevicePolicyStringResource>);











  }







  }






























  public final class DevicePolicyState implements android.os.Parcelable {














    method public int describeContents();














    method @NonNull public java.util.Map<android.os.UserHandle,java.util.Map<android.app.admin.PolicyKey,android.app.admin.PolicyState<?>>> getPoliciesForAllUsers();














    method @NonNull public java.util.Map<android.app.admin.PolicyKey,android.app.admin.PolicyState<?>> getPoliciesForUser(@NonNull android.os.UserHandle);














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














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














  }
























  public final class DevicePolicyStringResource implements android.os.Parcelable {







  public final class DevicePolicyStringResource implements android.os.Parcelable {











    ctor public DevicePolicyStringResource(@NonNull android.content.Context, @NonNull String, @StringRes int);







    ctor public DevicePolicyStringResource(@NonNull android.content.Context, @NonNull String, @StringRes int);











    method public int describeContents();







    method public int describeContents();









@@ -1364,6 +1382,20 @@ package android.app.admin {









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







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











  }







  }






























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














    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 {














    method public int describeContents();














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














    method @NonNull public String getPackageName();














    method @NonNull public android.os.UserHandle getUserHandle();














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














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














  }
























  public final class FullyManagedDeviceProvisioningParams implements android.os.Parcelable {







  public final class FullyManagedDeviceProvisioningParams implements android.os.Parcelable {











    method public boolean canDeviceOwnerGrantSensorsPermissions();







    method public boolean canDeviceOwnerGrantSensorsPermissions();











    method public int describeContents();







    method public int describeContents();










@@ -1391,6 +1423,21 @@ package android.app.admin {









    method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams.Builder setTimeZone(@Nullable String);







    method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams.Builder setTimeZone(@Nullable String);











  }







  }






























  public final class IntentFilterPolicyKey extends android.app.admin.PolicyKey {














    method public int describeContents();














    method @NonNull public android.content.IntentFilter getIntentFilter();














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














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














  }



























  public final class LockTaskPolicy implements android.os.Parcelable {














    method public int describeContents();














    method public int getFlags();














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














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














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














  }
























  public final class ManagedProfileProvisioningParams implements android.os.Parcelable {







  public final class ManagedProfileProvisioningParams implements android.os.Parcelable {











    method public int describeContents();







    method public int describeContents();











    method @Nullable public android.accounts.Account getAccountToMigrate();







    method @Nullable public android.accounts.Account getAccountToMigrate();









@@ -1416,6 +1463,39 @@ package android.app.admin {









    method @NonNull public android.app.admin.ManagedProfileProvisioningParams.Builder setProfileName(@Nullable String);







    method @NonNull public android.app.admin.ManagedProfileProvisioningParams.Builder setProfileName(@Nullable String);











  }







  }






























  public final class NoArgsPolicyKey extends android.app.admin.PolicyKey {














    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.NoArgsPolicyKey> CREATOR;














  }



























  public final class PackagePermissionPolicyKey extends android.app.admin.PolicyKey {














    method public int describeContents();














    method @NonNull public String getPackageName();














    method @NonNull public String getPermissionName();














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














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














  }



























  public final class PackagePolicyKey extends android.app.admin.PolicyKey {














    method public int describeContents();














    method @NonNull public String getPackageName();














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














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














  }



























  public abstract class PolicyKey implements android.os.Parcelable {














    method @NonNull public String getIdentifier();














  }



























  public final class PolicyState<V> implements android.os.Parcelable {














    method public int describeContents();














    method @Nullable public V getCurrentResolvedPolicy();














    method @NonNull public java.util.LinkedHashMap<android.app.admin.EnforcingAdmin,V> getPoliciesSetByAdmins();














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














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














  }
























  public class ProvisioningException extends android.util.AndroidException {







  public class ProvisioningException extends android.util.AndroidException {











    ctor public ProvisioningException(@NonNull Exception, int);







    ctor public ProvisioningException(@NonNull Exception, int);











    ctor public ProvisioningException(@NonNull Exception, int, @Nullable String);







    ctor public ProvisioningException(@NonNull Exception, int, @Nullable String);









@@ -1430,6 +1510,12 @@ package android.app.admin {









    field public static final int ERROR_UNKNOWN = 0; // 0x0







    field public static final int ERROR_UNKNOWN = 0; // 0x0











  }







  }






























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














    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;














  }
























  public class SecurityLog {







  public class SecurityLog {











    method @RequiresPermission(android.Manifest.permission.WRITE_SECURITY_LOG) public static int writeEvent(int, @NonNull java.lang.Object...);







    method @RequiresPermission(android.Manifest.permission.WRITE_SECURITY_LOG) public static int writeEvent(int, @NonNull java.lang.Object...);











  }







  }









@@ -1444,6 +1530,11 @@ package android.app.admin {









    method public int getType();







    method public int getType();











  }







  }






























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














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














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














  }
























}







}



























package android.app.ambientcontext {







package android.app.ambientcontext {

























core/api/test-current.txt



+32
−0




























Original line number
Original line
Diff line number
Diff line








@@ -592,10 +592,42 @@ package android.app.admin {









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







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











  }







  }


































  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;














  }





























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














    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.MostRestrictive<?>> CREATOR;














  }





























  public final class PolicyState<V> implements android.os.Parcelable {














    method @NonNull public android.app.admin.ResolutionMechanism<V> getResolutionMechanism();














  }





























  public abstract class ResolutionMechanism<V> implements android.os.Parcelable {














  }


























  public static final class SecurityLog.SecurityEvent implements android.os.Parcelable {







  public static final class SecurityLog.SecurityEvent implements android.os.Parcelable {











    ctor public SecurityLog.SecurityEvent(long, byte[]);







    ctor public SecurityLog.SecurityEvent(long, byte[]);











  }







  }


































  public final class StringSetUnion extends android.app.admin.ResolutionMechanism<java.util.Set<java.lang.String>> {














    ctor public StringSetUnion();














    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;














  }





























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














    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.TopPriority<?>> CREATOR;














  }


























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







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











    ctor public UnsafeStateException(int, int);







    ctor public UnsafeStateException(int, int);











    method public int getOperation();







    method public int getOperation();

































core/java/android/app/admin/Authority.java
0 → 100644



+55
−0




























Original line number
Original line
Diff line number
Diff line














/*














 * Copyright (C) 2023 The Android Open Source Project














 *














 * Licensed under the Apache License, Version 2.0 (the "License");














 * you may not use this file except in compliance with the License.














 * You may obtain a copy of the License at














 *














 *      http://www.apache.org/licenses/LICENSE-2.0














 *














 * Unless required by applicable law or agreed to in writing, software














 * distributed under the License is distributed on an "AS IS" BASIS,














 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.














 * See the License for the specific language governing permissions and














 * limitations under the License.














 */





























package android.app.admin;





























import android.annotation.Nullable;














import android.annotation.SuppressLint;














import android.annotation.SystemApi;














import android.os.Parcelable;





























/**














 * Abstract class used to identify the authority of the {@link EnforcingAdmin}.














 *














 * @hide














 */














// This is ok as the constructor is package-protected and all subclasses have implemented














// Parcelable.














@SuppressLint({"ParcelNotFinal", "ParcelCreator"})














@SystemApi














public abstract class Authority implements Parcelable {





























    /**














     * @hide














     */














    protected Authority() {}





























    @Override














    public boolean equals(@Nullable Object o) {














        if (this == o) return true;














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














    }





























    @Override














    public int hashCode() {














        return 0;














    }





























    @Override














    public int describeContents() {














        return 0;














    }














}
























core/java/android/app/admin/BooleanPolicyValue.java
0 → 100644



+79
−0




























Original line number
Original line
Diff line number
Diff line














/*














 * Copyright (C) 2023 The Android Open Source Project














 *














 * Licensed under the Apache License, Version 2.0 (the "License");














 * you may not use this file except in compliance with the License.














 * You may obtain a copy of the License at














 *














 *      http://www.apache.org/licenses/LICENSE-2.0














 *














 * Unless required by applicable law or agreed to in writing, software














 * distributed under the License is distributed on an "AS IS" BASIS,














 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.














 * See the License for the specific language governing permissions and














 * limitations under the License.














 */





























package android.app.admin;





























import android.annotation.NonNull;














import android.annotation.Nullable;














import android.os.Parcel;





























import java.util.Objects;





























/**














 * @hide














 */














public final class BooleanPolicyValue extends PolicyValue<Boolean> {





























    public BooleanPolicyValue(boolean value) {














        super(value);














    }





























    private BooleanPolicyValue(Parcel source) {














        this(source.readBoolean());














    }





























    @Override














    public boolean equals(@Nullable Object o) {














        if (this == o) return true;














        if (o == null || getClass() != o.getClass()) return false;














        BooleanPolicyValue other = (BooleanPolicyValue) o;














        return Objects.equals(getValue(), other.getValue());














    }





























    @Override














    public int hashCode() {














        return Objects.hash(getValue());














    }





























    @Override














    public String toString() {














        return "BooleanPolicyValue { mValue= " + getValue() + " }";














    }





























    @Override














    public int describeContents() {














        return 0;














    }





























    @Override














    public void writeToParcel(@NonNull Parcel dest, int flags) {














        dest.writeBoolean(getValue());














    }





























    @NonNull














    public static final Creator<BooleanPolicyValue> CREATOR =














            new Creator<BooleanPolicyValue>() {














                @Override














                public BooleanPolicyValue createFromParcel(Parcel source) {














                    return new BooleanPolicyValue(source);














                }





























                @Override














                public BooleanPolicyValue[] newArray(int size) {














                    return new BooleanPolicyValue[size];














                }














            };














}
























core/java/android/app/admin/ComponentNamePolicyValue.java
0 → 100644



+80
−0




























Original line number
Original line
Diff line number
Diff line














/*














 * Copyright (C) 2023 The Android Open Source Project














 *














 * Licensed under the Apache License, Version 2.0 (the "License");














 * you may not use this file except in compliance with the License.














 * You may obtain a copy of the License at














 *














 *      http://www.apache.org/licenses/LICENSE-2.0














 *














 * Unless required by applicable law or agreed to in writing, software














 * distributed under the License is distributed on an "AS IS" BASIS,














 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.














 * See the License for the specific language governing permissions and














 * limitations under the License.














 */





























package android.app.admin;





























import android.annotation.NonNull;














import android.annotation.Nullable;














import android.content.ComponentName;














import android.os.Parcel;





























import java.util.Objects;





























/**














 * @hide














 */














public final class ComponentNamePolicyValue extends PolicyValue<ComponentName> {





























    public ComponentNamePolicyValue(@NonNull ComponentName value) {














        super(value);














    }





























    private ComponentNamePolicyValue(Parcel source) {














        this((ComponentName) source.readParcelable(ComponentName.class.getClassLoader()));














    }





























    @Override














    public boolean equals(@Nullable Object o) {














        if (this == o) return true;














        if (o == null || getClass() != o.getClass()) return false;














        ComponentNamePolicyValue other = (ComponentNamePolicyValue) o;














        return Objects.equals(getValue(), other.getValue());














    }





























    @Override














    public int hashCode() {














        return Objects.hash(getValue());














    }





























    @Override














    public String toString() {














        return "ComponentNamePolicyValue { mValue= " + getValue() + " }";














    }





























    @Override














    public int describeContents() {














        return 0;














    }





























    @Override














    public void writeToParcel(@NonNull Parcel dest, int flags) {














        dest.writeParcelable(getValue(), flags);














    }





























    @NonNull














    public static final Creator<ComponentNamePolicyValue> CREATOR =














            new Creator<ComponentNamePolicyValue>() {














                @Override














                public ComponentNamePolicyValue createFromParcel(Parcel source) {














                    return new ComponentNamePolicyValue(source);














                }





























                @Override














                public ComponentNamePolicyValue[] newArray(int size) {














                    return new ComponentNamePolicyValue[size];














                }














            };














}