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

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

Snap for 11830997 from 44b61706 to 24Q3-release 

Change-Id: I7fa9709f73bb4bc7973cc14846c3675ccd6481a5
parents cc761609 44b61706

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ $(call add-clean-step, rm -rf $(SOONG_OUT_DIR)/.intermediates/frameworks/base/li 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/InProcessTethering)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/OsuLogin)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system_other/system/app/OsuLogin)

$(call add-clean-step, rm -rf $(OUT_DIR)/host/linux-x86/testcases/ravenwood-runtime)

# ******************************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER

# ******************************************************************

Ravenwood.bp

+12 −1
Original line number Diff line number Diff line
@@ -246,12 +246,20 @@ java_genrule { 
    visibility: ["//visibility:private"],

}



java_genrule {

    name: "z00-all-updatable-modules-system-stubs",

    cmd: "cp $(in) $(out)",

    srcs: [":all-updatable-modules-system-stubs"],

    out: ["z00-all-updatable-modules-system-stubs.jar"],

    visibility: ["//visibility:private"],

}



android_ravenwood_libgroup {

    name: "ravenwood-runtime",

    libs: [

        "100-framework-minus-apex.ravenwood",

        "200-kxml2-android",

        "all-updatable-modules-system-stubs",



        "android.test.mock.ravenwood",

        "ravenwood-helper-runtime",

        "hoststubgen-helper-runtime.ravenwood",
@@ -267,6 +275,9 @@ android_ravenwood_libgroup { 
        "ravenwood-junit-impl-flag",

        "mockito-ravenwood-prebuilt",

        "inline-mockito-ravenwood-prebuilt",



        // It's a stub, so it should be towards the end.

        "z00-all-updatable-modules-system-stubs",

    ],

    jni_libs: [

        "libandroid_runtime",

apex/jobscheduler/service/java/com/android/server/job/controllers/FlexibilityController.java

+7 −1
Original line number Diff line number Diff line
@@ -1771,7 +1771,13 @@ public final class FlexibilityController extends StateController { 
                    final int logicalIndex = mapping.getLogicalSlotIndex();

                    if (mCarrierPrivilegedCallbacks.contains(logicalIndex)) {

                        // Callback already exists. No need to create a new one or remove it.

                        callbacksToRemove.remove(logicalIndex);

                        for (int i = callbacksToRemove.size() - 1; i >= 0; i--) {

                            if (callbacksToRemove.get(i) == logicalIndex) {

                                callbacksToRemove.remove(i);

                                break;

                            }

                        }



                        continue;

                    }

                    final LogicalIndexCarrierPrivilegesCallback callback =

core/api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -1774,16 +1774,16 @@ package android.hardware.input { 
  }



  public final class InputManager {

    method @RequiresPermission("android.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY") public void addUniqueIdAssociation(@NonNull String, @NonNull String);

    method @FlaggedApi("com.android.input.flags.device_associations") @RequiresPermission("android.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY") public void addUniqueIdAssociationByDescriptor(@NonNull String, @NonNull String);

    method @RequiresPermission("android.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY") public void addUniqueIdAssociationByPort(@NonNull String, @NonNull String);

    method @RequiresPermission(android.Manifest.permission.REMAP_MODIFIER_KEYS) public void clearAllModifierKeyRemappings();

    method @NonNull public java.util.List<java.lang.String> getKeyboardLayoutDescriptors();

    method @NonNull public String getKeyboardLayoutTypeForLayoutDescriptor(@NonNull String);

    method @NonNull @RequiresPermission(android.Manifest.permission.REMAP_MODIFIER_KEYS) public java.util.Map<java.lang.Integer,java.lang.Integer> getModifierKeyRemapping();

    method public int getMousePointerSpeed();

    method @RequiresPermission(android.Manifest.permission.REMAP_MODIFIER_KEYS) public void remapModifierKey(int, int);

    method @RequiresPermission("android.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY") public void removeUniqueIdAssociation(@NonNull String);

    method @FlaggedApi("com.android.input.flags.device_associations") @RequiresPermission("android.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY") public void removeUniqueIdAssociationByDescriptor(@NonNull String);

    method @RequiresPermission("android.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY") public void removeUniqueIdAssociationByPort(@NonNull String);

    field public static final long BLOCK_UNTRUSTED_TOUCHES = 158002302L; // 0x96aec7eL

  }

core/api/test-lint-baseline.txt

+8 −4
Original line number Diff line number Diff line
@@ -975,14 +975,14 @@ RequiresPermission: android.hardware.hdmi.HdmiControlManager#getHdmiCecVersion() 
    Method 'getHdmiCecVersion' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.hardware.hdmi.HdmiControlManager#setHdmiCecVersion(int):

    Method 'setHdmiCecVersion' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.hardware.input.InputManager#addUniqueIdAssociation(String, String):

    Method 'addUniqueIdAssociation' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.hardware.input.InputManager#addUniqueIdAssociationByDescriptor(String, String):

    Method 'addUniqueIdAssociationByDescriptor' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.hardware.input.InputManager#removeUniqueIdAssociation(String):

    Method 'removeUniqueIdAssociation' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.hardware.input.InputManager#addUniqueIdAssociationByPort(String, String):

    Method 'addUniqueIdAssociationByPort' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.hardware.input.InputManager#removeUniqueIdAssociationByDescriptor(String):

    Method 'removeUniqueIdAssociationByDescriptor' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.hardware.input.InputManager#removeUniqueIdAssociationByPort(String):

    Method 'removeUniqueIdAssociationByPort' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.hardware.location.GeofenceHardware#addGeofence(int, int, android.hardware.location.GeofenceHardwareRequest, android.hardware.location.GeofenceHardwareCallback):

    Method 'addGeofence' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.hardware.location.GeofenceHardware#getMonitoringTypes():
@@ -2035,6 +2035,10 @@ UnflaggedApi: android.content.pm.UserInfo#isPrivateProfile(): 
    New API must be flagged with @FlaggedApi: method android.content.pm.UserInfo.isPrivateProfile()

UnflaggedApi: android.credentials.CredentialProviderInfo#isPrimary():

    New API must be flagged with @FlaggedApi: method android.credentials.CredentialProviderInfo.isPrimary()

UnflaggedApi: android.hardware.input.InputManager#addUniqueIdAssociationByPort(String, String):

    New API must be flagged with @FlaggedApi: method android.hardware.input.InputManager.addUniqueIdAssociationByPort(String,String)

UnflaggedApi: android.hardware.input.InputManager#removeUniqueIdAssociationByPort(String):

    New API must be flagged with @FlaggedApi: method android.hardware.input.InputManager.removeUniqueIdAssociationByPort(String)

UnflaggedApi: android.media.AudioManager#enterAudioFocusFreezeForTest(java.util.List<java.lang.Integer>):

    New API must be flagged with @FlaggedApi: method android.media.AudioManager.enterAudioFocusFreezeForTest(java.util.List<java.lang.Integer>)

UnflaggedApi: android.media.AudioManager#exitAudioFocusFreezeForTest():