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

Commit d5f81ced authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13518610 from 6cf5dee4 to 25Q3-release 

Change-Id: I92de89a9e832e26e68b5309d4cfac38e8bc2e1e6
parents a711930b 6cf5dee4

WEAR_OWNERS

+0 −1
Original line number Diff line number Diff line 
yzj@google.com

shreerag@google.com

yeabkal@google.com

adsule@google.com

andriyn@google.com

core/api/current.txt

+5 −4
Original line number Diff line number Diff line
@@ -6532,8 +6532,8 @@ package android.app { 
    method public long getTimeoutAfter();

    method public boolean hasImage();

    method @FlaggedApi("android.app.api_rich_ongoing") public boolean hasPromotableCharacteristics();

    method @FlaggedApi("android.app.opt_in_rich_ongoing") public boolean hasRequestedPromotedOngoing();

    method @FlaggedApi("android.app.nm_summarization") public boolean hasSummarizedContent();

    method @FlaggedApi("android.app.opt_in_rich_ongoing") public boolean isRequestPromotedOngoing();

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

    field public static final android.media.AudioAttributes AUDIO_ATTRIBUTES_DEFAULT;

    field public static final int BADGE_ICON_LARGE = 2; // 0x2
@@ -10108,7 +10108,7 @@ package android.companion { 
    method public int describeContents();

    method @Nullable public android.companion.AssociatedDevice getAssociatedDevice();

    method @FlaggedApi("android.companion.association_device_icon") @Nullable public android.graphics.drawable.Icon getDeviceIcon();

    method @FlaggedApi("android.companion.association_tag") @Nullable public android.companion.DeviceId getDeviceId();

    method @Nullable public android.companion.DeviceId getDeviceId();

    method @Nullable public android.net.MacAddress getDeviceMacAddress();

    method @Nullable public String getDeviceProfile();

    method @Nullable public CharSequence getDisplayName();
@@ -10187,6 +10187,7 @@ package android.companion { 
    method @RequiresPermission(android.Manifest.permission.DELIVER_COMPANION_MESSAGES) public void attachSystemDataTransport(int, @NonNull java.io.InputStream, @NonNull java.io.OutputStream) throws android.companion.DeviceNotAssociatedException;

    method @Nullable public android.content.IntentSender buildAssociationCancellationIntent();

    method @Nullable public android.content.IntentSender buildPermissionTransferUserConsentIntent(int) throws android.companion.DeviceNotAssociatedException;

    method @FlaggedApi("android.companion.association_verification") @Nullable public android.companion.DeviceId createAndSetDeviceId(int, @Nullable android.companion.DeviceId);

    method @RequiresPermission(android.Manifest.permission.DELIVER_COMPANION_MESSAGES) public void detachSystemDataTransport(int) throws android.companion.DeviceNotAssociatedException;

    method public void disableSystemDataSyncForTypes(int, int);

    method @Deprecated public void disassociate(@NonNull String);
@@ -10198,7 +10199,7 @@ package android.companion { 
    method @FlaggedApi("android.companion.perm_sync_user_consent") public boolean isPermissionTransferUserConsented(int);

    method @FlaggedApi("android.companion.unpair_associated_device") @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean removeBond(int);

    method public void requestNotificationAccess(android.content.ComponentName);

    method @FlaggedApi("android.companion.association_tag") public void setDeviceId(int, @Nullable android.companion.DeviceId);

    method @Deprecated @FlaggedApi("android.companion.association_verification") public void setDeviceId(int, @Nullable android.companion.DeviceId);

    method @Deprecated @FlaggedApi("android.companion.device_presence") @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void startObservingDevicePresence(@NonNull String) throws android.companion.DeviceNotAssociatedException;

    method @FlaggedApi("android.companion.device_presence") @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void startObservingDevicePresence(@NonNull android.companion.ObservingDevicePresenceRequest);

    method public void startSystemDataTransfer(int, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,android.companion.CompanionException>) throws android.companion.DeviceNotAssociatedException;
@@ -10243,7 +10244,7 @@ package android.companion { 
  public interface DeviceFilter<D extends android.os.Parcelable> extends android.os.Parcelable {

  }













  @FlaggedApi("android.companion.association_tag") public final class DeviceId implements android.os.Parcelable {













  public final class DeviceId implements android.os.Parcelable {















    method public int describeContents();















    method @Nullable public String getCustomId();















    method @Nullable public android.net.MacAddress getMacAddress();

























core/api/system-current.txt



+10
−0




























Original line number
Diff line number
Diff line








@@ -7,6 +7,7 @@ package android {













    field public static final String ACCESS_BROADCAST_RADIO = "android.permission.ACCESS_BROADCAST_RADIO";















    field public static final String ACCESS_BROADCAST_RESPONSE_STATS = "android.permission.ACCESS_BROADCAST_RESPONSE_STATS";















    field public static final String ACCESS_CACHE_FILESYSTEM = "android.permission.ACCESS_CACHE_FILESYSTEM";













    field @FlaggedApi("android.companion.association_verification") public static final String ACCESS_COMPANION_INFO = "android.permission.ACCESS_COMPANION_INFO";















    field public static final String ACCESS_CONTEXTUAL_SEARCH = "android.permission.ACCESS_CONTEXTUAL_SEARCH";















    field public static final String ACCESS_CONTEXT_HUB = "android.permission.ACCESS_CONTEXT_HUB";















    field public static final String ACCESS_DRM_CERTIFICATES = "android.permission.ACCESS_DRM_CERTIFICATES";










@@ -3405,6 +3406,7 @@ package android.companion {













    method @RequiresPermission(android.Manifest.permission.ASSOCIATE_COMPANION_DEVICES) public void associate(@NonNull String, @NonNull android.net.MacAddress, @NonNull byte[]);















    method @RequiresPermission("android.permission.MANAGE_COMPANION_DEVICES") public boolean canPairWithoutPrompt(@NonNull String, @NonNull String, @NonNull android.os.UserHandle);















    method @NonNull @RequiresPermission("android.permission.MANAGE_COMPANION_DEVICES") public java.util.List<android.companion.AssociationInfo> getAllAssociations();













    method @FlaggedApi("android.companion.association_verification") @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_COMPANION_INFO) public android.companion.AssociationInfo getAssociationByDeviceId(@NonNull android.companion.DeviceId);















    method @RequiresPermission("android.permission.MANAGE_COMPANION_DEVICES") public boolean isDeviceAssociatedForWifiConnection(@NonNull String, @NonNull android.net.MacAddress, @NonNull android.os.UserHandle);















    method @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_SELF_MANAGED) public void notifyDeviceAppeared(int);















    method @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_SELF_MANAGED) public void notifyDeviceDisappeared(int);









@@ -3415,6 +3417,14 @@ package android.companion {













    method public void onAssociationsChanged(@NonNull java.util.List<android.companion.AssociationInfo>);















  }



























  @FlaggedApi("android.companion.device_presence") public final class ObservingDevicePresenceRequest implements android.os.Parcelable {













    method @FlaggedApi("android.companion.association_verification") @Nullable public android.companion.DeviceId getDeviceId();













  }

























  public static final class ObservingDevicePresenceRequest.Builder {













    method @FlaggedApi("android.companion.association_verification") @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_COMPANION_INFO) public android.companion.ObservingDevicePresenceRequest.Builder setDeviceId(@NonNull android.companion.DeviceId);













  }



























}





























package android.companion.virtual {

























core/api/test-current.txt



+2
−1




























Original line number
Diff line number
Diff line








@@ -913,12 +913,13 @@ package android.companion {













    method @NonNull public android.companion.AssociationInfo build();















    method @NonNull public android.companion.AssociationInfo.Builder setAssociatedDevice(@Nullable android.companion.AssociatedDevice);















    method @FlaggedApi("android.companion.association_device_icon") @NonNull public android.companion.AssociationInfo.Builder setDeviceIcon(@Nullable android.graphics.drawable.Icon);













    method @FlaggedApi("android.companion.association_tag") @NonNull public android.companion.AssociationInfo.Builder setDeviceId(@Nullable android.companion.DeviceId);













    method @NonNull public android.companion.AssociationInfo.Builder setDeviceId(@Nullable android.companion.DeviceId);















    method @NonNull public android.companion.AssociationInfo.Builder setDeviceMacAddress(@Nullable android.net.MacAddress);















    method @NonNull public android.companion.AssociationInfo.Builder setDeviceProfile(@Nullable String);















    method @NonNull public android.companion.AssociationInfo.Builder setDisplayName(@Nullable CharSequence);















    method @NonNull public android.companion.AssociationInfo.Builder setLastTimeConnected(long);















    method @NonNull public android.companion.AssociationInfo.Builder setNotifyOnDeviceNearby(boolean);













    method @NonNull public android.companion.AssociationInfo.Builder setPackagesToNotify(@Nullable java.util.List<java.lang.String>);















    method @NonNull public android.companion.AssociationInfo.Builder setRevoked(boolean);















    method @NonNull public android.companion.AssociationInfo.Builder setSelfManaged(boolean);















    method @NonNull public android.companion.AssociationInfo.Builder setSystemDataSyncFlags(int);

































core/java/android/app/Instrumentation.java



+4
−2




























Original line number
Diff line number
Diff line








@@ -1241,8 +1241,10 @@ public class Instrumentation {













     * @see #sendKeySync(KeyEvent)















     */















    public void sendKeyDownUpSync(int keyCode) {













        sendKeySync(new KeyEvent(KeyEvent.ACTION_DOWN, keyCode));













        sendKeySync(new KeyEvent(KeyEvent.ACTION_UP, keyCode));













        long downtime = SystemClock.uptimeMillis();













        sendKeySync(new KeyEvent(downtime, downtime, KeyEvent.ACTION_DOWN, keyCode, 0 /*repeat*/));













        sendKeySync(new KeyEvent(downtime, SystemClock.uptimeMillis(), KeyEvent.ACTION_UP, keyCode,













                0 /*repeat*/));















    }































    /**