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

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

Snap for 12695596 from 87dd3ef4 to 25Q1-release 

Change-Id: Ic61e81086085d1aceba867c2f1c727d9857b5875
parents 8a478fce 87dd3ef4

AconfigFlags.bp

+5 −0
Original line number Diff line number Diff line
@@ -373,6 +373,11 @@ java_aconfig_library { 
    name: "android.security.flags-aconfig-java-export",

    aconfig_declarations: "android.security.flags-aconfig",

    mode: "exported",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "com.android.wifi",

    ],

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}

boot/boot-image-profile-extra.txt

+22 −1
Original line number Diff line number Diff line
@@ -23,4 +23,25 @@ HSPLandroid/graphics/Color;->luminance()F 
# For now, compile all methods in MessageQueue to avoid performance cliffs for

# flagged/evolving hot code paths. See: b/338098106

HSPLandroid/os/MessageQueue;->*

HSPLandroid/os/MessageQueue$*;->*
 
HSPLandroid/os/MessageQueue$FileDescriptorRecord;->*

HSPLandroid/os/MessageQueue$IdleHandler;->*

HSPLandroid/os/MessageQueue$MessageCompare;->*

HSPLandroid/os/MessageQueue$MatchAllFutureMessages;->*

HSPLandroid/os/MessageQueue$MatchAllMessages;->*

HSPLandroid/os/MessageQueue$MatchBarrierToken;->*

HSPLandroid/os/MessageQueue$MatchDeliverableMessages;->*

HSPLandroid/os/MessageQueue$MatchHandler;->*

HSPLandroid/os/MessageQueue$MatchHandlerAndObject;->*

HSPLandroid/os/MessageQueue$MatchHandlerAndObjectEquals;->*

HSPLandroid/os/MessageQueue$MatchHandlerRunnableAndObject;->*

HSPLandroid/os/MessageQueue$MatchHandlerRunnableAndObjectEquals;->*

HSPLandroid/os/MessageQueue$MatchHandlerWhatAndObject;->*

HSPLandroid/os/MessageQueue$MatchHandlerWhatAndObjectEquals;->*

HSPLandroid/os/MessageQueue$MessageCounts;->*

HSPLandroid/os/MessageQueue$StackNode;->*

HSPLandroid/os/MessageQueue$MessageNode;->*

HSPLandroid/os/MessageQueue$OnFileDescriptorEventListener$Events;->*

HSPLandroid/os/MessageQueue$OnFileDescriptorEventListener;->*

HSPLandroid/os/MessageQueue$StackNodeType;->*

HSPLandroid/os/MessageQueue$StateNode;->*

HSPLandroid/os/MessageQueue$TimedParkStateNode;->*

cmds/idmap2/idmap2/CreateMultiple.cpp

+3 −3
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ Result<Unit> CreateMultiple(const std::vector<std::string>& args) { 


  std::vector<std::string> idmap_paths;

  for (const std::string& overlay_apk_path : overlay_apk_paths) {

    const std::string idmap_path = Idmap::CanonicalIdmapPathFor(idmap_dir, overlay_apk_path);

    std::string idmap_path = Idmap::CanonicalIdmapPathFor(idmap_dir, overlay_apk_path);

    const uid_t uid = getuid();

    if (!UidHasWriteAccessToPath(uid, idmap_path)) {

      LOG(WARNING) << "uid " << uid << "does not have write access to " << idmap_path.c_str();
@@ -111,7 +111,7 @@ Result<Unit> CreateMultiple(const std::vector<std::string>& args) { 
                !ignore_overlayable)) {

      const auto overlay = OverlayResourceContainer::FromPath(overlay_apk_path);

      if (!overlay) {

        LOG(WARNING) << "failed to load apk " << overlay_apk_path.c_str();

        LOG(WARNING) << "failed to load apk " << overlay_apk_path;

        continue;

      }
@@ -138,7 +138,7 @@ Result<Unit> CreateMultiple(const std::vector<std::string>& args) { 
      }

    }



    idmap_paths.emplace_back(idmap_path);

    idmap_paths.emplace_back(std::move(idmap_path));

  }



  for (const std::string& idmap_path : idmap_paths) {

core/api/current.txt

+14 −1
Original line number Diff line number Diff line
@@ -1502,6 +1502,7 @@ package android { 
    field public static final int shadowRadius = 16843108; // 0x1010164

    field public static final int shape = 16843162; // 0x101019a

    field public static final int shareInterpolator = 16843195; // 0x10101bb

    field @FlaggedApi("android.nfc.nfc_associated_role_services") public static final int shareRolePriority;

    field @Deprecated public static final int sharedUserId = 16842763; // 0x101000b

    field @Deprecated public static final int sharedUserLabel = 16843361; // 0x1010261

    field public static final int sharedUserMaxSdkVersion = 16844365; // 0x101064d
@@ -2451,6 +2452,7 @@ package android { 
    field public static final int primary = 16908300; // 0x102000c

    field public static final int progress = 16908301; // 0x102000d

    field public static final int redo = 16908339; // 0x1020033

    field @FlaggedApi("android.appwidget.flags.engagement_metrics") public static final int remoteViewsMetricsId;

    field public static final int replaceText = 16908340; // 0x1020034

    field public static final int secondaryProgress = 16908303; // 0x102000f

    field public static final int selectAll = 16908319; // 0x102001f
@@ -9892,6 +9894,8 @@ package android.appwidget { 
    field public static final String ACTION_APPWIDGET_PICK = "android.appwidget.action.APPWIDGET_PICK";

    field public static final String ACTION_APPWIDGET_RESTORED = "android.appwidget.action.APPWIDGET_RESTORED";

    field public static final String ACTION_APPWIDGET_UPDATE = "android.appwidget.action.APPWIDGET_UPDATE";

    field @FlaggedApi("android.appwidget.flags.engagement_metrics") public static final String EVENT_CATEGORY_APPWIDGET = "android.appwidget";

    field @FlaggedApi("android.appwidget.flags.engagement_metrics") public static final String EVENT_TYPE_WIDGET_INTERACTION = "widget_interaction";

    field public static final String EXTRA_APPWIDGET_ID = "appWidgetId";

    field public static final String EXTRA_APPWIDGET_IDS = "appWidgetIds";

    field public static final String EXTRA_APPWIDGET_OLD_IDS = "appWidgetOldIds";
@@ -9901,6 +9905,10 @@ package android.appwidget { 
    field public static final String EXTRA_APPWIDGET_PROVIDER_PROFILE = "appWidgetProviderProfile";

    field public static final String EXTRA_CUSTOM_EXTRAS = "customExtras";

    field public static final String EXTRA_CUSTOM_INFO = "customInfo";

    field @FlaggedApi("android.appwidget.flags.engagement_metrics") public static final String EXTRA_EVENT_CLICKED_VIEWS = "android.appwidget.extra.EVENT_CLICKED_VIEWS";

    field @FlaggedApi("android.appwidget.flags.engagement_metrics") public static final String EXTRA_EVENT_DURATION_MS = "android.appwidget.extra.EVENT_DURATION_MS";

    field @FlaggedApi("android.appwidget.flags.engagement_metrics") public static final String EXTRA_EVENT_POSITION_RECT = "android.appwidget.extra.EVENT_POSITION_RECT";

    field @FlaggedApi("android.appwidget.flags.engagement_metrics") public static final String EXTRA_EVENT_SCROLLED_VIEWS = "android.appwidget.extra.EVENT_SCROLLED_VIEWS";

    field public static final String EXTRA_HOST_ID = "hostId";

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

    field public static final String META_DATA_APPWIDGET_PROVIDER = "android.appwidget.provider";
@@ -18954,6 +18962,7 @@ package android.hardware { 
    method @FlaggedApi("android.hardware.flags.luts_api") @NonNull public int[] getSamplingKeys();

    method @FlaggedApi("android.hardware.flags.luts_api") public int getSize();

    field @FlaggedApi("android.hardware.flags.luts_api") public static final int ONE_DIMENSION = 1; // 0x1

    field @FlaggedApi("android.hardware.flags.luts_api") public static final int SAMPLING_KEY_CIE_Y = 2; // 0x2

    field @FlaggedApi("android.hardware.flags.luts_api") public static final int SAMPLING_KEY_MAX_RGB = 1; // 0x1

    field @FlaggedApi("android.hardware.flags.luts_api") public static final int SAMPLING_KEY_RGB = 0; // 0x0

    field @FlaggedApi("android.hardware.flags.luts_api") public static final int THREE_DIMENSION = 3; // 0x3
@@ -24166,6 +24175,8 @@ package android.media { 
    field public static final String KEY_OPERATING_RATE = "operating-rate";

    field public static final String KEY_OUTPUT_REORDER_DEPTH = "output-reorder-depth";

    field public static final String KEY_PCM_ENCODING = "pcm-encoding";

    field @FlaggedApi("android.media.tv.flags.apply_picture_profiles") public static final String KEY_PICTURE_PROFILE_ID = "picture-profile-id";

    field @FlaggedApi("android.media.tv.flags.apply_picture_profiles") public static final String KEY_PICTURE_PROFILE_INSTANCE = "picture-profile-instance";

    field public static final String KEY_PICTURE_TYPE = "picture-type";

    field public static final String KEY_PIXEL_ASPECT_RATIO_HEIGHT = "sar-height";

    field public static final String KEY_PIXEL_ASPECT_RATIO_WIDTH = "sar-width";
@@ -25613,6 +25624,7 @@ package android.media { 
    method public void addOnSpatializerStateChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.Spatializer.OnSpatializerStateChangedListener);

    method public boolean canBeSpatialized(@NonNull android.media.AudioAttributes, @NonNull android.media.AudioFormat);

    method public int getImmersiveAudioLevel();

    method @FlaggedApi("android.media.audio.spatializer_capabilities") @NonNull public java.util.List<java.lang.Integer> getSpatializedChannelMasks();

    method public boolean isAvailable();

    method public boolean isEnabled();

    method public boolean isHeadTrackerAvailable();
@@ -51925,7 +51937,7 @@ package android.view { 
    method public int getState();

    method @FlaggedApi("com.android.server.display.feature.flags.enable_get_suggested_frame_rate") public float getSuggestedFrameRate(int);

    method public android.view.Display.Mode[] getSupportedModes();

    method @Deprecated public float[] getSupportedRefreshRates();

    method @FlaggedApi("com.android.server.display.feature.flags.enable_get_supported_refresh_rates") @NonNull public float[] getSupportedRefreshRates();

    method @Deprecated public int getWidth();

    method @FlaggedApi("com.android.server.display.feature.flags.enable_has_arr_support") public boolean hasArrSupport();

    method public boolean isHdr();
@@ -56483,6 +56495,7 @@ package android.view.accessibility { 
    method public float getMin();

    method public int getType();

    method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo.RangeInfo obtain(int, float, float, float);

    field @FlaggedApi("android.view.accessibility.indeterminate_range_info") @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.RangeInfo INDETERMINATE;

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

    field @FlaggedApi("android.view.accessibility.indeterminate_range_info") public static final int RANGE_TYPE_INDETERMINATE = 3; // 0x3

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

core/api/system-current.txt

+29 −3
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ package android { 
    field public static final String ACCESS_VIBRATOR_STATE = "android.permission.ACCESS_VIBRATOR_STATE";

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

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

    field @FlaggedApi("android.companion.virtualdevice.flags.enable_limited_vdm_role") public static final String ADD_MIRROR_DISPLAY = "android.permission.ADD_MIRROR_DISPLAY";

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

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

    field public static final String ALLOCATE_AGGRESSIVE = "android.permission.ALLOCATE_AGGRESSIVE";
@@ -4249,6 +4250,7 @@ package android.content.pm { 
    method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public void setPermissionsResult(int, boolean);

    field public static final String ACTION_CONFIRM_INSTALL = "android.content.pm.action.CONFIRM_INSTALL";

    field public static final String ACTION_CONFIRM_PRE_APPROVAL = "android.content.pm.action.CONFIRM_PRE_APPROVAL";

    field @FlaggedApi("android.content.pm.sdk_dependency_installer") public static final String ACTION_INSTALL_DEPENDENCY = "android.content.pm.action.INSTALL_DEPENDENCY";

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

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

    field public static final int DATA_LOADER_TYPE_STREAMING = 1; // 0x1
@@ -5273,9 +5275,8 @@ package android.hardware.contexthub { 
  }















  @FlaggedApi("android.chre.flags.offload_api") public final class HubServiceInfo implements android.os.Parcelable {













    ctor public HubServiceInfo(@NonNull String, int, int, int, @NonNull android.os.ParcelableHolder);













    ctor public HubServiceInfo(@NonNull String, int, int, int);















    method public int describeContents();













    method @NonNull public android.os.ParcelableHolder getExtendedInfo();















    method public int getFormat();















    method public int getMajorVersion();















    method public int getMinorVersion();









@@ -5290,7 +5291,6 @@ package android.hardware.contexthub {













  public static final class HubServiceInfo.Builder {















    ctor public HubServiceInfo.Builder(@NonNull String, int, int, int);















    method @NonNull public android.hardware.contexthub.HubServiceInfo build();













    method @NonNull public android.hardware.contexthub.HubServiceInfo.Builder setExtendedInfo(@Nullable android.os.Parcelable);















  }





























  @FlaggedApi("android.chre.flags.offload_api") public interface IHubEndpointLifecycleCallback {










@@ -11110,6 +11110,7 @@ package android.nfc.cardemulation {













    method @FlaggedApi("android.nfc.enable_nfc_mainline") public void setDynamicAidGroup(@NonNull android.nfc.cardemulation.AidGroup);















    method @FlaggedApi("android.nfc.enable_nfc_mainline") public void setOffHostSecureElement(@NonNull String);















    method @FlaggedApi("android.nfc.nfc_observe_mode") public void setShouldDefaultToObserveMode(boolean);













    method @FlaggedApi("android.nfc.nfc_associated_role_services") public boolean shareRolePriority();















    method @FlaggedApi("android.nfc.nfc_observe_mode") public boolean shouldDefaultToObserveMode();















    method @FlaggedApi("android.nfc.enable_nfc_mainline") public void writeToParcel(@NonNull android.os.Parcel, int);















    field @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public static final android.os.Parcelable.Creator<android.nfc.cardemulation.ApduServiceInfo> CREATOR;










@@ -12865,6 +12866,30 @@ package android.security.authenticationpolicy {



























package android.security.intrusiondetection {



























  @FlaggedApi("android.security.afl_api") public final class IntrusionDetectionEvent implements android.os.Parcelable {













    ctor public IntrusionDetectionEvent(@NonNull android.app.admin.SecurityLog.SecurityEvent);













    ctor public IntrusionDetectionEvent(@NonNull android.app.admin.DnsEvent);













    ctor public IntrusionDetectionEvent(@NonNull android.app.admin.ConnectEvent);













    method @FlaggedApi("android.security.afl_api") public int describeContents();













    method @NonNull public android.app.admin.ConnectEvent getConnectEvent();













    method @NonNull public android.app.admin.DnsEvent getDnsEvent();













    method @NonNull public android.app.admin.SecurityLog.SecurityEvent getSecurityEvent();













    method @NonNull public int getType();













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













    field @NonNull public static final android.os.Parcelable.Creator<android.security.intrusiondetection.IntrusionDetectionEvent> CREATOR;













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













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













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













  }

























  @FlaggedApi("android.security.afl_api") public class IntrusionDetectionEventTransport {













    ctor public IntrusionDetectionEventTransport();













    method public boolean addData(@NonNull java.util.List<android.security.intrusiondetection.IntrusionDetectionEvent>);













    method @NonNull public android.os.IBinder getBinder();













    method public boolean initialize();













    method public boolean release();













  }



























  @FlaggedApi("android.security.afl_api") public class IntrusionDetectionManager {















    method @RequiresPermission(android.Manifest.permission.READ_INTRUSION_DETECTION_STATE) public void addStateCallback(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);















    method @RequiresPermission(android.Manifest.permission.MANAGE_INTRUSION_DETECTION_STATE) public void disable(@NonNull java.util.concurrent.Executor, @NonNull android.security.intrusiondetection.IntrusionDetectionManager.CommandCallback);










@@ -16196,6 +16221,7 @@ package android.telephony {













    method @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public android.content.ComponentName getAndUpdateDefaultRespondViaMessageApplication();















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getCallForwarding(int, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CallForwardingInfoCallback);















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getCallWaitingStatus(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);













    method @FlaggedApi("com.android.internal.telephony.flags.carrier_id_from_carrier_identifier") @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public int getCarrierIdFromCarrierIdentifier(@NonNull android.service.carrier.CarrierIdentifier);















    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.ImsiEncryptionInfo getCarrierInfoForImsiEncryption(int);















    method public java.util.List<java.lang.String> getCarrierPackageNamesForIntent(android.content.Intent);















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<java.lang.String> getCarrierPackageNamesForIntentAndPhone(android.content.Intent, int);