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

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

Snap for 11192287 from 164dc5b3 to 24Q1-release 

Change-Id: I0189ef8fcc7dc816ddf53d91c5cd310551d868b5
parents 31047c97 164dc5b3

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

+20 −4
Original line number Diff line number Diff line
@@ -98,7 +98,10 @@ public final class BackgroundJobsController extends StateController { 
            switch (action) {

                case Intent.ACTION_PACKAGE_RESTARTED: {

                    synchronized (mLock) {

                        mPackageStoppedState.add(pkgUid, pkgName, Boolean.TRUE);

                        // ACTION_PACKAGE_RESTARTED doesn't always mean the app is placed and kept

                        // in the stopped state, so don't put TRUE in the cache. Remove any existing

                        // entry and rely on an explicit call to PackageManager's isStopped() API.

                        mPackageStoppedState.delete(pkgUid, pkgName);

                        updateJobRestrictionsForUidLocked(pkgUid, false);

                    }

                }
@@ -126,6 +129,7 @@ public final class BackgroundJobsController extends StateController { 
    }



    @Override

    @GuardedBy("mLock")

    public void startTrackingLocked() {

        mAppStateTracker.addListener(mForceAppStandbyListener);

        final IntentFilter filter = new IntentFilter();
@@ -137,15 +141,18 @@ public final class BackgroundJobsController extends StateController { 
    }



    @Override

    @GuardedBy("mLock")

    public void maybeStartTrackingJobLocked(JobStatus jobStatus, JobStatus lastJob) {

        updateSingleJobRestrictionLocked(jobStatus, sElapsedRealtimeClock.millis(), UNKNOWN);

    }



    @Override

    @GuardedBy("mLock")

    public void maybeStopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob) {

    }



    @Override

    @GuardedBy("mLock")

    public void evaluateStateLocked(JobStatus jobStatus) {

        if (jobStatus.isRequestedExpeditedJob()) {

            // Only requested-EJs could have their run-in-bg constraint change outside of something
@@ -155,11 +162,13 @@ public final class BackgroundJobsController extends StateController { 
    }



    @Override

    @GuardedBy("mLock")

    public void onAppRemovedLocked(String packageName, int uid) {

        mPackageStoppedState.delete(uid, packageName);

    }



    @Override

    @GuardedBy("mLock")

    public void onUserRemovedLocked(int userId) {

        for (int u = mPackageStoppedState.numMaps() - 1; u >= 0; --u) {

            final int uid = mPackageStoppedState.keyAt(u);
@@ -170,6 +179,7 @@ public final class BackgroundJobsController extends StateController { 
    }



    @Override

    @GuardedBy("mLock")

    public void dumpControllerStateLocked(final IndentingPrintWriter pw,

            final Predicate<JobStatus> predicate) {

        pw.println("Aconfig flags:");
@@ -223,6 +233,7 @@ public final class BackgroundJobsController extends StateController { 
    }



    @Override

    @GuardedBy("mLock")

    public void dumpControllerStateLocked(ProtoOutputStream proto, long fieldId,

            Predicate<JobStatus> predicate) {

        final long token = proto.start(fieldId);
@@ -260,14 +271,17 @@ public final class BackgroundJobsController extends StateController { 
        proto.end(token);

    }



    @GuardedBy("mLock")

    private void updateAllJobRestrictionsLocked() {

        updateJobRestrictionsLocked(/*filterUid=*/ -1, UNKNOWN);

    }



    @GuardedBy("mLock")

    private void updateJobRestrictionsForUidLocked(int uid, boolean isActive) {

        updateJobRestrictionsLocked(uid, (isActive) ? KNOWN_ACTIVE : KNOWN_INACTIVE);

    }



    @GuardedBy("mLock")

    private void updateJobRestrictionsLocked(int filterUid, int newActiveState) {

        mUpdateJobFunctor.prepare(newActiveState);
@@ -295,7 +309,8 @@ public final class BackgroundJobsController extends StateController { 
        }

    }



    private boolean isPackageStopped(String packageName, int uid) {

    @GuardedBy("mLock")

    private boolean isPackageStoppedLocked(String packageName, int uid) {

        if (mPackageStoppedState.contains(uid, packageName)) {

            return mPackageStoppedState.get(uid, packageName);

        }
@@ -304,19 +319,20 @@ public final class BackgroundJobsController extends StateController { 
        return isStopped;

    }



    @GuardedBy("mLock")

    boolean updateSingleJobRestrictionLocked(JobStatus jobStatus, final long nowElapsed,

            int activeState) {

        final int uid = jobStatus.getSourceUid();

        final String packageName = jobStatus.getSourcePackageName();



        final boolean isSourcePkgStopped =

                isPackageStopped(jobStatus.getSourcePackageName(), jobStatus.getSourceUid());

                isPackageStoppedLocked(jobStatus.getSourcePackageName(), jobStatus.getSourceUid());

        final boolean isCallingPkgStopped;

        if (!jobStatus.isProxyJob()) {

            isCallingPkgStopped = isSourcePkgStopped;

        } else {

            isCallingPkgStopped =

                    isPackageStopped(jobStatus.getCallingPackageName(), jobStatus.getUid());

                    isPackageStoppedLocked(jobStatus.getCallingPackageName(), jobStatus.getUid());

        }

        final boolean isStopped = android.content.pm.Flags.stayStopped()

                && (isCallingPkgStopped || isSourcePkgStopped);

core/api/current.txt

+10 −8
Original line number Diff line number Diff line
@@ -9706,9 +9706,9 @@ package android.companion { 
    method @RequiresPermission(android.Manifest.permission.DELIVER_COMPANION_MESSAGES) public final void detachSystemDataTransport(int) throws android.companion.DeviceNotAssociatedException;

    method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);

    method @Deprecated @MainThread public void onDeviceAppeared(@NonNull String);

    method @Deprecated @MainThread public void onDeviceAppeared(@NonNull android.companion.AssociationInfo);

    method @MainThread public void onDeviceAppeared(@NonNull android.companion.AssociationInfo);

    method @Deprecated @MainThread public void onDeviceDisappeared(@NonNull String);

    method @Deprecated @MainThread public void onDeviceDisappeared(@NonNull android.companion.AssociationInfo);

    method @MainThread public void onDeviceDisappeared(@NonNull android.companion.AssociationInfo);

    method @FlaggedApi("android.companion.device_presence") @MainThread public void onDeviceEvent(@NonNull android.companion.AssociationInfo, int);

    field @FlaggedApi("android.companion.device_presence") public static final int DEVICE_EVENT_BLE_APPEARED = 0; // 0x0

    field @FlaggedApi("android.companion.device_presence") public static final int DEVICE_EVENT_BLE_DISAPPEARED = 1; // 0x1
@@ -18787,6 +18787,7 @@ package android.hardware.camera2 { 
    method @NonNull public java.util.List<android.hardware.camera2.CaptureRequest.Key<?>> getAvailableCaptureRequestKeys();

    method @NonNull public java.util.List<android.hardware.camera2.CaptureResult.Key<?>> getAvailableCaptureResultKeys();

    method public java.util.List<android.hardware.camera2.CaptureRequest.Key<?>> getAvailablePhysicalCameraRequestKeys();

    method @FlaggedApi("com.android.internal.camera.flags.feature_combination_query") @NonNull public java.util.List<android.hardware.camera2.CameraCharacteristics.Key<?>> getAvailableSessionCharacteristicsKeys();

    method public java.util.List<android.hardware.camera2.CaptureRequest.Key<?>> getAvailableSessionKeys();

    method @NonNull public java.util.List<android.hardware.camera2.CameraCharacteristics.Key<?>> getKeys();

    method @NonNull public java.util.List<android.hardware.camera2.CameraCharacteristics.Key<?>> getKeysNeedingPermission();
@@ -18939,6 +18940,7 @@ package android.hardware.camera2 { 
    method @Deprecated public abstract void createReprocessableCaptureSessionByConfigurations(@NonNull android.hardware.camera2.params.InputConfiguration, @NonNull java.util.List<android.hardware.camera2.params.OutputConfiguration>, @NonNull android.hardware.camera2.CameraCaptureSession.StateCallback, @Nullable android.os.Handler) throws android.hardware.camera2.CameraAccessException;

    method public int getCameraAudioRestriction() throws android.hardware.camera2.CameraAccessException;

    method @NonNull public abstract String getId();

    method @FlaggedApi("com.android.internal.camera.flags.feature_combination_query") @NonNull public android.hardware.camera2.CameraCharacteristics getSessionCharacteristics(@NonNull android.hardware.camera2.params.SessionConfiguration) throws android.hardware.camera2.CameraAccessException;

    method @Deprecated public boolean isSessionConfigurationSupported(@NonNull android.hardware.camera2.params.SessionConfiguration) throws android.hardware.camera2.CameraAccessException;

    method public void setCameraAudioRestriction(int) throws android.hardware.camera2.CameraAccessException;

    field public static final int AUDIO_RESTRICTION_NONE = 0; // 0x0
@@ -39298,7 +39300,7 @@ package android.security.keystore { 
    method @Nullable public java.util.Date getKeyValidityStart();

    method @NonNull public String getKeystoreAlias();

    method public int getMaxUsageCount();

    method @FlaggedApi("MGF1_DIGEST_SETTER") @NonNull public java.util.Set<java.lang.String> getMgf1Digests();

    method @FlaggedApi("android.security.mgf1_digest_setter") @NonNull public java.util.Set<java.lang.String> getMgf1Digests();

    method public int getPurposes();

    method @NonNull public String[] getSignaturePaddings();

    method public int getUserAuthenticationType();
@@ -39306,7 +39308,7 @@ package android.security.keystore { 
    method public boolean isDevicePropertiesAttestationIncluded();

    method @NonNull public boolean isDigestsSpecified();

    method public boolean isInvalidatedByBiometricEnrollment();

    method @FlaggedApi("MGF1_DIGEST_SETTER") @NonNull public boolean isMgf1DigestsSpecified();

    method @FlaggedApi("android.security.mgf1_digest_setter") @NonNull public boolean isMgf1DigestsSpecified();

    method public boolean isRandomizedEncryptionRequired();

    method public boolean isStrongBoxBacked();

    method public boolean isUnlockedDeviceRequired();
@@ -39338,7 +39340,7 @@ package android.security.keystore { 
    method @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityForOriginationEnd(java.util.Date);

    method @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityStart(java.util.Date);

    method @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setMaxUsageCount(int);

    method @FlaggedApi("MGF1_DIGEST_SETTER") @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setMgf1Digests(@NonNull java.lang.String...);

    method @FlaggedApi("android.security.mgf1_digest_setter") @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setMgf1Digests(@NonNull java.lang.String...);

    method @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setRandomizedEncryptionRequired(boolean);

    method @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setSignaturePaddings(java.lang.String...);

    method @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setUnlockedDeviceRequired(boolean);
@@ -39443,14 +39445,14 @@ package android.security.keystore { 
    method @Nullable public java.util.Date getKeyValidityForOriginationEnd();

    method @Nullable public java.util.Date getKeyValidityStart();

    method public int getMaxUsageCount();

    method @FlaggedApi("MGF1_DIGEST_SETTER") @NonNull public java.util.Set<java.lang.String> getMgf1Digests();

    method @FlaggedApi("android.security.mgf1_digest_setter") @NonNull public java.util.Set<java.lang.String> getMgf1Digests();

    method public int getPurposes();

    method @NonNull public String[] getSignaturePaddings();

    method public int getUserAuthenticationType();

    method public int getUserAuthenticationValidityDurationSeconds();

    method public boolean isDigestsSpecified();

    method public boolean isInvalidatedByBiometricEnrollment();

    method @FlaggedApi("MGF1_DIGEST_SETTER") @NonNull public boolean isMgf1DigestsSpecified();

    method @FlaggedApi("android.security.mgf1_digest_setter") @NonNull public boolean isMgf1DigestsSpecified();

    method public boolean isRandomizedEncryptionRequired();

    method public boolean isUnlockedDeviceRequired();

    method public boolean isUserAuthenticationRequired();
@@ -39472,7 +39474,7 @@ package android.security.keystore { 
    method @NonNull public android.security.keystore.KeyProtection.Builder setKeyValidityForOriginationEnd(java.util.Date);

    method @NonNull public android.security.keystore.KeyProtection.Builder setKeyValidityStart(java.util.Date);

    method @NonNull public android.security.keystore.KeyProtection.Builder setMaxUsageCount(int);

    method @FlaggedApi("MGF1_DIGEST_SETTER") @NonNull public android.security.keystore.KeyProtection.Builder setMgf1Digests(@Nullable java.lang.String...);

    method @FlaggedApi("android.security.mgf1_digest_setter") @NonNull public android.security.keystore.KeyProtection.Builder setMgf1Digests(@Nullable java.lang.String...);

    method @NonNull public android.security.keystore.KeyProtection.Builder setRandomizedEncryptionRequired(boolean);

    method @NonNull public android.security.keystore.KeyProtection.Builder setSignaturePaddings(java.lang.String...);

    method @NonNull public android.security.keystore.KeyProtection.Builder setUnlockedDeviceRequired(boolean);

core/api/system-current.txt

+9 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ package android { 
    field public static final String OBSERVE_SENSOR_PRIVACY = "android.permission.OBSERVE_SENSOR_PRIVACY";

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

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

    field @FlaggedApi("com.android.input.flags.override_key_behavior_permission_apis") public static final String OVERRIDE_SYSTEM_KEY_BEHAVIOR_IN_FOCUSED_WINDOW = "android.permission.OVERRIDE_SYSTEM_KEY_BEHAVIOR_IN_FOCUSED_WINDOW";

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

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

    field public static final String PEERS_MAC_ADDRESS = "android.permission.PEERS_MAC_ADDRESS";
@@ -417,6 +418,7 @@ package android { 
    field public static final int allowClearUserDataOnFailedRestore = 16844288; // 0x1010600

    field public static final int gameSessionService = 16844373; // 0x1010655

    field public static final int hotwordDetectionService = 16844326; // 0x1010626

    field @FlaggedApi("android.companion.virtual.flags.vdm_custom_ime") public static final int isVirtualDeviceOnly;

    field public static final int isVrOnly = 16844152; // 0x1010578

    field public static final int minExtensionVersion = 16844305; // 0x1010611

    field public static final int playHomeTransitionSound = 16844358; // 0x1010646
@@ -3246,6 +3248,7 @@ package android.companion.virtual { 
    method @Deprecated public int getDefaultNavigationPolicy();

    method public int getDevicePolicy(int);

    method @FlaggedApi("android.companion.virtual.flags.vdm_custom_home") @Nullable public android.content.ComponentName getHomeComponent();

    method @FlaggedApi("android.companion.virtual.flags.vdm_custom_ime") @Nullable public android.content.ComponentName getInputMethodComponent();

    method public int getLockState();

    method @Nullable public String getName();

    method @NonNull public java.util.Set<android.os.UserHandle> getUsersWithMatchingAccounts();
@@ -3279,6 +3282,7 @@ package android.companion.virtual { 
    method @Deprecated @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setBlockedCrossTaskNavigations(@NonNull java.util.Set<android.content.ComponentName>);

    method @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setDevicePolicy(int, int);

    method @FlaggedApi("android.companion.virtual.flags.vdm_custom_home") @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setHomeComponent(@Nullable android.content.ComponentName);

    method @FlaggedApi("android.companion.virtual.flags.vdm_custom_ime") @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setInputMethodComponent(@Nullable android.content.ComponentName);

    method @NonNull @RequiresPermission(value=android.Manifest.permission.ADD_ALWAYS_UNLOCKED_DISPLAY, conditional=true) public android.companion.virtual.VirtualDeviceParams.Builder setLockState(int);

    method @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setName(@NonNull String);

    method @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setUsersWithMatchingAccounts(@NonNull java.util.Set<android.os.UserHandle>);
@@ -13040,6 +13044,7 @@ package android.service.voice { 
    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_HOTWORD_DETECTION) public final android.service.voice.HotwordDetector createHotwordDetector(@Nullable android.os.PersistableBundle, @Nullable android.os.SharedMemory, @NonNull java.util.concurrent.Executor, @NonNull android.service.voice.HotwordDetector.Callback);

    method @NonNull @RequiresPermission("android.permission.MANAGE_VOICE_KEYPHRASES") public final android.media.voice.KeyphraseModelManager createKeyphraseModelManager();

    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_HOTWORD_DETECTION) public final android.service.voice.VisualQueryDetector createVisualQueryDetector(@Nullable android.os.PersistableBundle, @Nullable android.os.SharedMemory, @NonNull java.util.concurrent.Executor, @NonNull android.service.voice.VisualQueryDetector.Callback);

    method @FlaggedApi("android.service.voice.flags.allow_training_data_egress_from_hds") @RequiresPermission(android.Manifest.permission.MANAGE_HOTWORD_DETECTION) public void setIsReceiveSandboxedTrainingDataAllowed(boolean);

  }















}










@@ -17288,6 +17293,10 @@ package android.view.displayhash {



























package android.view.inputmethod {



























  public final class InputMethodInfo implements android.os.Parcelable {













    method @FlaggedApi("android.companion.virtual.flags.vdm_custom_ime") public boolean isVirtualDeviceOnly();













  }



























  public final class InputMethodManager {















    method @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public android.view.inputmethod.InputMethodInfo getCurrentInputMethodInfoAsUser(@NonNull android.os.UserHandle);















  }

























core/api/test-current.txt



+1
−0






























Original line number
Diff line number
Diff line








@@ -259,6 +259,7 @@ package android.app {













    field public static final String OPSTR_ACTIVITY_RECOGNITION_SOURCE = "android:activity_recognition_source";















    field public static final String OPSTR_MANAGE_ONGOING_CALLS = "android:manage_ongoing_calls";















    field public static final String OPSTR_RECORD_AUDIO_HOTWORD = "android:record_audio_hotword";













    field public static final String OPSTR_RESERVED_FOR_TESTING = "android:reserved_for_testing";















    field public static final String OPSTR_USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER = "android:use_icc_auth_with_device_identifier";















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















    field public static final int OP_RECORD_AUDIO = 27; // 0x1b

































core/java/android/accessibilityservice/AccessibilityGestureEvent.java



+30
−6






























Original line number
Diff line number
Diff line








@@ -152,6 +152,7 @@ public final class AccessibilityGestureEvent implements Parcelable {





























    /**















     * Constructs an AccessibilityGestureEvent to be dispatched to an accessibility service.













     *















     * @param gestureId    the id number of the gesture.















     * @param displayId    the display on which this gesture was performed.















     * @param motionEvents the motion events that lead to this gesture.










@@ -205,6 +206,29 @@ public final class AccessibilityGestureEvent implements Parcelable {













        return mMotionEvents;















    }





























    /**













     * When we asynchronously use {@link AccessibilityGestureEvent}, we should make a copy,













     * because motionEvent may be recycled before we use async.













     *













     * @hide













     */













    @NonNull













    public AccessibilityGestureEvent copyForAsync() {













        return new AccessibilityGestureEvent(mGestureId, mDisplayId,













                mMotionEvents.stream().map(MotionEvent::copy).toList());













    }



























    /**













     * After we use {@link AccessibilityGestureEvent} asynchronously, we should recycle the













     * MotionEvent, avoid memory leaks.













     *













     * @hide













     */













    public void recycle() {













        mMotionEvents.forEach(MotionEvent::recycle);













        mMotionEvents.clear();













    }





























    @NonNull















    @Override















    public String toString() {