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

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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31116452',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31116452', 'googleplex-android-review.googlesource.com/30811115', 'googleplex-android-review.googlesource.com/30684702', 'googleplex-android-review.googlesource.com/31592951', 'googleplex-android-review.googlesource.com/31584425', 'googleplex-android-review.googlesource.com/31583379', 'googleplex-android-review.googlesource.com/31789962', 'googleplex-android-review.googlesource.com/32102394', 'googleplex-android-review.googlesource.com/31995061', 'googleplex-android-review.googlesource.com/31997925', 'googleplex-android-review.googlesource.com/31995123', 'googleplex-android-review.googlesource.com/31191873', 'googleplex-android-review.googlesource.com/31191626'] into security-aosp-24Q3-release.

Change-Id: Ie2a5c18057e18190e2bbeafdb52378d34d56200f
parents 54e1c387 ccba6717

core/java/android/app/BackgroundStartPrivileges.java

+20 −1
Original line number Diff line number Diff line
@@ -23,12 +23,13 @@ import android.os.IBinder; 
import com.android.internal.util.Preconditions;



import java.util.List;

import java.util.Objects;



/**

 * Privileges granted to a Process that allows it to execute starts from the background.

 * @hide

 */

public class BackgroundStartPrivileges {

public final class BackgroundStartPrivileges {

    /** No privileges. */

    public static final BackgroundStartPrivileges NONE = new BackgroundStartPrivileges(

            false, false, null);
@@ -190,4 +191,22 @@ public class BackgroundStartPrivileges { 
                + ", originatingToken=" + mOriginatingToken

                + ']';

    }



    @Override

    public boolean equals(Object o) {

        if (this == o) return true;

        if (o == null || getClass() != o.getClass()) return false;

        BackgroundStartPrivileges that = (BackgroundStartPrivileges) o;

        return mAllowsBackgroundActivityStarts == that.mAllowsBackgroundActivityStarts

                && mAllowsBackgroundForegroundServiceStarts

                == that.mAllowsBackgroundForegroundServiceStarts

                && Objects.equals(mOriginatingToken, that.mOriginatingToken);

    }



    @Override

    public int hashCode() {

        return Objects.hash(mAllowsBackgroundActivityStarts,

                mAllowsBackgroundForegroundServiceStarts,

                mOriginatingToken);

    }

}

core/java/android/app/IUserSwitchObserver.aidl

+6 −6
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ package android.app; 
import android.os.IRemoteCallback;



/** {@hide} */

interface IUserSwitchObserver {

    void onBeforeUserSwitching(int newUserId);

    oneway void onUserSwitching(int newUserId, IRemoteCallback reply);

    oneway void onUserSwitchComplete(int newUserId);

    oneway void onForegroundProfileSwitch(int newProfileId);

    oneway void onLockedBootComplete(int newUserId);

oneway interface IUserSwitchObserver {

    void onBeforeUserSwitching(int newUserId, IRemoteCallback reply);

    void onUserSwitching(int newUserId, IRemoteCallback reply);

    void onUserSwitchComplete(int newUserId);

    void onForegroundProfileSwitch(int newProfileId);

    void onLockedBootComplete(int newUserId);

}

core/java/android/app/UserSwitchObserver.java

+5 −1
Original line number Diff line number Diff line
@@ -30,7 +30,11 @@ public class UserSwitchObserver extends IUserSwitchObserver.Stub { 
    }



    @Override

    public void onBeforeUserSwitching(int newUserId) throws RemoteException {}

    public void onBeforeUserSwitching(int newUserId, IRemoteCallback reply) throws RemoteException {

        if (reply != null) {

            reply.sendResult(null);

        }

    }



    @Override

    public void onUserSwitching(int newUserId, IRemoteCallback reply) throws RemoteException {

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -7088,4 +7088,8 @@ 
    <!-- Whether to show GAIA education screen during account login of private space setup.

         OEM/Partner can explicitly opt to disable the screen. -->

    <bool name="config_enableGaiaEducationInPrivateSpace">true</bool>



    <!-- List of protected packages that require biometric authentication for modification

         (Disable, force-stop or uninstalling updates). -->

    <string-array name="config_biometric_protected_package_names" translatable="false" />

</resources>

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -5526,4 +5526,7 @@ 
  <java-symbol type="drawable" name="ic_zen_mode_type_theater" />

  <java-symbol type="drawable" name="ic_zen_mode_type_unknown" />



  <!-- List of protected packages that require biometric authentication for modification -->

  <java-symbol type="array" name="config_biometric_protected_package_names" />



</resources>