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

Commit 1d47bb6d authored by Winson Chiu's avatar Winson Chiu Committed by Automerger Merge Worker
Browse files

Merge changes I28bc7390,I2b248726,Ia7b7acff,Ia81866d2,I5b0deac6, ... into sc-dev am: 933bea0e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13746616

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1599daf63253bb6f982321bf1cbcd1da25c1abb9
parents 5d777977 933bea0e

core/api/current.txt

+21 −0
Original line number Diff line number Diff line
@@ -12948,6 +12948,27 @@ package android.content.pm { 














}



























package android.content.pm.verify.domain {

























  public final class DomainVerificationManager {













    method @Nullable public android.content.pm.verify.domain.DomainVerificationUserState getDomainVerificationUserState(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;













  }

























  public final class DomainVerificationUserState implements android.os.Parcelable {













    method public int describeContents();













    method @NonNull public java.util.Map<java.lang.String,java.lang.Integer> getHostToStateMap();













    method @NonNull public String getPackageName();













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













    method @NonNull public boolean isLinkHandlingAllowed();













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













    field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.verify.domain.DomainVerificationUserState> CREATOR;













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













    field public static final int DOMAIN_STATE_SELECTED = 1; // 0x1













    field public static final int DOMAIN_STATE_VERIFIED = 2; // 0x2













  }

























}



























package android.content.res {





























  public class AssetFileDescriptor implements java.io.Closeable android.os.Parcelable {

























core/api/system-current.txt



+3
−14




























Original line number
Diff line number
Diff line








@@ -2789,13 +2789,12 @@ package android.content.pm.verify.domain {













    field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.verify.domain.DomainVerificationInfo> CREATOR;















  }



























  public interface DomainVerificationManager {













  public final class DomainVerificationManager {















    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.DOMAIN_VERIFICATION_AGENT, android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION}) public android.content.pm.verify.domain.DomainVerificationInfo getDomainVerificationInfo(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;













    method @Nullable @RequiresPermission(android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION) public android.content.pm.verify.domain.DomainVerificationUserSelection getDomainVerificationUserSelection(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;















    method @NonNull @RequiresPermission(android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION) public java.util.List<android.content.pm.verify.domain.DomainOwner> getOwnersForDomain(@NonNull String);













    method @NonNull @RequiresPermission(android.Manifest.permission.DOMAIN_VERIFICATION_AGENT) public java.util.List<java.lang.String> getValidVerificationPackageNames();















    method public static boolean isStateModifiable(int);















    method public static boolean isStateVerified(int);













    method @NonNull @RequiresPermission(android.Manifest.permission.DOMAIN_VERIFICATION_AGENT) public java.util.List<java.lang.String> queryValidVerificationPackageNames();















    method @RequiresPermission(android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION) public void setDomainVerificationLinkHandlingAllowed(@NonNull String, boolean) throws android.content.pm.PackageManager.NameNotFoundException;















    method @RequiresPermission(android.Manifest.permission.DOMAIN_VERIFICATION_AGENT) public void setDomainVerificationStatus(@NonNull java.util.UUID, @NonNull java.util.Set<java.lang.String>, int) throws android.content.pm.PackageManager.NameNotFoundException;















    method @RequiresPermission(android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION) public void setDomainVerificationUserSelection(@NonNull java.util.UUID, @NonNull java.util.Set<java.lang.String>, boolean) throws android.content.pm.PackageManager.NameNotFoundException;









@@ -2812,18 +2811,8 @@ package android.content.pm.verify.domain {













    field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.verify.domain.DomainVerificationRequest> CREATOR;















  }



























  public final class DomainVerificationUserSelection implements android.os.Parcelable {













    method public int describeContents();













    method @NonNull public java.util.Map<java.lang.String,java.lang.Integer> getHostToStateMap();













  public final class DomainVerificationUserState implements android.os.Parcelable {















    method @NonNull public java.util.UUID getIdentifier();













    method @NonNull public String getPackageName();













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













    method @NonNull public boolean isLinkHandlingAllowed();













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













    field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.verify.domain.DomainVerificationUserSelection> CREATOR;













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













    field public static final int DOMAIN_STATE_SELECTED = 1; // 0x1













    field public static final int DOMAIN_STATE_VERIFIED = 2; // 0x2















  }





























}

































core/java/android/app/SystemServiceRegistry.java



+1
−3




























Original line number
Diff line number
Diff line








@@ -71,7 +71,6 @@ import android.content.pm.LauncherApps;













import android.content.pm.PackageManager;















import android.content.pm.ShortcutManager;















import android.content.pm.verify.domain.DomainVerificationManager;













import android.content.pm.verify.domain.DomainVerificationManagerImpl;















import android.content.pm.verify.domain.IDomainVerificationManager;















import android.content.res.Resources;















import android.content.rollback.RollbackManagerFrameworkInitializer;










@@ -1422,7 +1421,6 @@ public final class SystemServiceRegistry {













                    }















                });





























        // TODO(b/159952358): Only register this service for the domain verification agent?















        registerService(Context.DOMAIN_VERIFICATION_SERVICE, DomainVerificationManager.class,















                new CachedServiceFetcher<DomainVerificationManager>() {















                    @Override









@@ -1432,7 +1430,7 @@ public final class SystemServiceRegistry {













                                Context.DOMAIN_VERIFICATION_SERVICE);















                        IDomainVerificationManager service =















                                IDomainVerificationManager.Stub.asInterface(binder);













                        return new DomainVerificationManagerImpl(context, service);













                        return new DomainVerificationManager(context, service);















                    }















                });

















































core/java/android/content/pm/PackageManager.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -7017,7 +7017,7 @@ public abstract class PackageManager {













     * domain to an application, use















     * {@link DomainVerificationManager#setDomainVerificationUserSelection(UUID, Set, boolean)},















     * passing in all of the domains returned inside













     * {@link DomainVerificationManager#getDomainVerificationUserSelection(String)}.













     * {@link DomainVerificationManager#getDomainVerificationUserState(String)}.















     *















     * @hide















     */

































core/java/android/content/pm/verify/domain/DomainOwner.java



+5
−21




























Original line number
Diff line number
Diff line








@@ -66,16 +66,7 @@ public final class DomainOwner implements Parcelable {













     * @param packageName















     *   Package name of that owns the domain.















     * @param overrideable













     *   Whether or not this owner can be automatically overridden. If all owners for a domain are













     *   overrideable, then calling













     *   {@link DomainVerificationManager#setDomainVerificationUserSelection(UUID,













     *   Set, boolean)} to enable the domain will disable all other owners. On the other hand, if any













     *   of the owners are non-overrideable, then













     *   {@link DomainVerificationManager#setDomainVerificationLinkHandlingAllowed(String,













     *   boolean)} must be called with false to disable all of the other owners before this domain can













     *   be taken by a new owner through













     *   {@link DomainVerificationManager#setDomainVerificationUserSelection(UUID,













     *   Set, boolean)}.













     *   Whether or not this owner can be automatically overridden.















     */















    @DataClass.Generated.Member















    public DomainOwner(









@@ -98,16 +89,9 @@ public final class DomainOwner implements Parcelable {













    }































    /**













     * Whether or not this owner can be automatically overridden. If all owners for a domain are













     * overrideable, then calling













     * {@link DomainVerificationManager#setDomainVerificationUserSelection(UUID,













     * Set, boolean)} to enable the domain will disable all other owners. On the other hand, if any













     * of the owners are non-overrideable, then













     * {@link DomainVerificationManager#setDomainVerificationLinkHandlingAllowed(String,













     * boolean)} must be called with false to disable all of the other owners before this domain can













     * be taken by a new owner through













     * {@link DomainVerificationManager#setDomainVerificationUserSelection(UUID,













     * Set, boolean)}.













     * Whether or not this owner can be automatically overridden.













     *













     * @see DomainVerificationManager#setDomainVerificationUserSelection(UUID, Set, boolean)















     */















    @DataClass.Generated.Member















    public boolean isOverrideable() {










@@ -205,7 +189,7 @@ public final class DomainOwner implements Parcelable {













    };































    @DataClass.Generated(













            time = 1614119379978L,













            time = 1614721802044L,















            codegenVersion = "1.0.22",















            sourceFile = "frameworks/base/core/java/android/content/pm/verify/domain/DomainOwner.java",















            inputSignatures = "private final @android.annotation.NonNull java.lang.String mPackageName\nprivate final  boolean mOverrideable\nclass DomainOwner extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genParcelable=true, genEqualsHashCode=true, genAidl=true, genToString=true)")