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

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

Snap for 11603317 from 6e38a9d3 to 24Q3-release 

Change-Id: If5de687316bab074b28b364626a06b72cd7944fc
parents d3f6567b 6e38a9d3

TEST_MAPPING

+0 −25
Original line number Diff line number Diff line
@@ -232,30 +232,5 @@ 
       }

     ]

   }

 ],

 "auto-features-postsubmit": [

   // Test tag for automotive feature targets. These are only running in postsubmit.

   // This tag is used in targeted test features testing to limit resource use.

   // TODO(b/256932212): this tag to be removed once the above is no longer in use.

   {

     "name": "FrameworksMockingServicesTests",

     "options": [

       {

         "include-filter": "com.android.server.pm.UserVisibilityMediatorSUSDTest"

       },

       {

         "include-filter": "com.android.server.pm.UserVisibilityMediatorMUMDTest"

       },

       {

         "include-filter": "com.android.server.pm.UserVisibilityMediatorMUPANDTest"

       },

       {

         "exclude-annotation": "androidx.test.filters.FlakyTest"

       },

       {

         "exclude-annotation": "org.junit.Ignore"

       }

     ]

   }

 ]

}

core/api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -10764,6 +10764,7 @@ package android.content { 
    field public static final String OVERLAY_SERVICE = "overlay";

    field public static final String PEOPLE_SERVICE = "people";

    field public static final String PERFORMANCE_HINT_SERVICE = "performance_hint";

    field @FlaggedApi("android.security.frp_enforcement") public static final String PERSISTENT_DATA_BLOCK_SERVICE = "persistent_data_block";

    field public static final String POWER_SERVICE = "power";

    field public static final String PRINT_SERVICE = "print";

    field @FlaggedApi("android.os.telemetry_apis_framework_initialization") public static final String PROFILING_SERVICE = "profiling";
@@ -20235,10 +20236,10 @@ package android.hardware.camera2.params { 
    method public android.hardware.camera2.CaptureRequest getSessionParameters();

    method public int getSessionType();

    method public android.hardware.camera2.CameraCaptureSession.StateCallback getStateCallback();

    method @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") public void setCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.CameraCaptureSession.StateCallback);

    method public void setColorSpace(@NonNull android.graphics.ColorSpace.Named);

    method public void setInputConfiguration(@NonNull android.hardware.camera2.params.InputConfiguration);

    method public void setSessionParameters(android.hardware.camera2.CaptureRequest);

    method @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") public void setStateCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.CameraCaptureSession.StateCallback);

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

    field @NonNull public static final android.os.Parcelable.Creator<android.hardware.camera2.params.SessionConfiguration> CREATOR;

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

core/api/system-current.txt

+1 −3
Original line number Diff line number Diff line
@@ -598,7 +598,6 @@ package android.app { 
    field public static final int FOREGROUND_SERVICE_API_TYPE_MICROPHONE = 6; // 0x6

    field public static final int FOREGROUND_SERVICE_API_TYPE_PHONE_CALL = 7; // 0x7

    field public static final int FOREGROUND_SERVICE_API_TYPE_USB = 8; // 0x8

    field @FlaggedApi("android.media.audio.foreground_audio_control") public static final int PROCESS_CAPABILITY_FOREGROUND_AUDIO_CONTROL = 64; // 0x40

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

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

    field public static final int PROCESS_CAPABILITY_FOREGROUND_MICROPHONE = 4; // 0x4
@@ -3797,7 +3796,6 @@ package android.content { 
    field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public static final String ON_DEVICE_INTELLIGENCE_SERVICE = "on_device_intelligence";

    field public static final String PERMISSION_CONTROLLER_SERVICE = "permission_controller";

    field public static final String PERMISSION_SERVICE = "permission";

    field public static final String PERSISTENT_DATA_BLOCK_SERVICE = "persistent_data_block";

    field public static final String REBOOT_READINESS_SERVICE = "reboot_readiness";

    field public static final String ROLLBACK_SERVICE = "rollback";

    field public static final String SAFETY_CENTER_SERVICE = "safety_center";
@@ -4356,7 +4354,7 @@ package android.content.pm { 
    field @Deprecated public static final int INTENT_FILTER_VERIFICATION_SUCCESS = 1; // 0x1

    field @Deprecated public static final int MASK_PERMISSION_FLAGS = 255; // 0xff

    field public static final int MATCH_ANY_USER = 4194304; // 0x400000

    field public static final int MATCH_CLONE_PROFILE = 536870912; // 0x20000000

    field @Deprecated public static final int MATCH_CLONE_PROFILE = 536870912; // 0x20000000

    field @FlaggedApi("android.content.pm.fix_duplicated_flags") public static final long MATCH_CLONE_PROFILE_LONG = 17179869184L; // 0x400000000L

    field public static final int MATCH_FACTORY_ONLY = 2097152; // 0x200000

    field public static final int MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS = 536870912; // 0x20000000

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2460,6 +2460,7 @@ package android.os { 
  }



  public class UserManager {

    method @FlaggedApi("android.os.allow_private_profile") @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}, conditional=true) public boolean canAddPrivateProfile();

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo createProfileForUser(@Nullable String, @NonNull String, int, int, @Nullable String[]);

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo createRestrictedProfile(@Nullable String);

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo createUser(@Nullable String, @NonNull String, int);

core/java/android/app/ActivityManager.java

+0 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.app.WindowConfiguration.activityTypeToString; 
import static android.app.WindowConfiguration.windowingModeToString;

import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;

import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE;

import static android.media.audio.Flags.FLAG_FOREGROUND_AUDIO_CONTROL;



import android.Manifest;

import android.annotation.ColorInt;
@@ -948,8 +947,6 @@ public class ActivityManager { 
     * @hide

     * Process can access volume APIs and can request audio focus with GAIN.

     */

    @FlaggedApi(FLAG_FOREGROUND_AUDIO_CONTROL)

    @SystemApi

    public static final int PROCESS_CAPABILITY_FOREGROUND_AUDIO_CONTROL = 1 << 6;



    /**