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

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

Snap for 7981408 from 53065f93 to sc-v2-release

Change-Id: I327c39537c5775f3aba65bec44bd748970428999
parents ce63e10b 53065f93
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ public class ActivityOptions {
    private boolean mOverrideTaskTransition;
    private String mSplashScreenThemeResName;
    @SplashScreen.SplashScreenStyle
    private int mSplashScreenStyle;
    private int mSplashScreenStyle = SplashScreen.SPLASH_SCREEN_STYLE_UNDEFINED;
    private boolean mRemoveWithTaskOrganizer;
    private boolean mLaunchedFromBubble;
    private boolean mTransientLaunch;
+2 −2
Original line number Diff line number Diff line
@@ -1010,12 +1010,12 @@ public class ActivityInfo extends ComponentInfo implements Parcelable {
     * This change id restricts treatments that force a given min aspect ratio to activities
     * whose orientation is fixed to portrait.
     *
     * This treatment only takes effect if OVERRIDE_MIN_ASPECT_RATIO is also enabled.
     * This treatment is enabled by default and only takes effect if OVERRIDE_MIN_ASPECT_RATIO is
     * also enabled.
     * @hide
     */
    @ChangeId
    @Overridable
    @EnabledSince(targetSdkVersion = Build.VERSION_CODES.S_V2)
    @TestApi
    public static final long OVERRIDE_MIN_ASPECT_RATIO_PORTRAIT_ONLY = 203647190L; // buganizer id

+6 −0
Original line number Diff line number Diff line
@@ -150,6 +150,12 @@ public interface BiometricConstants {
     */
    int BIOMETRIC_ERROR_RE_ENROLL = 16;

    /**
     * The privacy setting has been enabled and will block use of the sensor.
     * @hide
     */
    int BIOMETRIC_ERROR_SENSOR_PRIVACY_ENABLED = 18;

    /**
     * This constant is only used by SystemUI. It notifies SystemUI that authentication was paused
     * because the authentication attempt was unsuccessful.
+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ public interface BiometricFaceConstants {
            BIOMETRIC_ERROR_NO_DEVICE_CREDENTIAL,
            BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED,
            BIOMETRIC_ERROR_RE_ENROLL,
            FACE_ERROR_UNKNOWN
            FACE_ERROR_UNKNOWN,
    })
    @Retention(RetentionPolicy.SOURCE)
    @interface FaceError {}
+6 −0
Original line number Diff line number Diff line
@@ -44,4 +44,10 @@ interface ITaskFragmentOrganizerController {
     * Unregisters remote animations per transition type for the organizer.
     */
    void unregisterRemoteAnimations(in ITaskFragmentOrganizer organizer);

    /**
      * Checks if an activity organized by a {@link android.window.TaskFragmentOrganizer} and
      * only occupies a portion of Task bounds.
      */
    boolean isActivityEmbedded(in IBinder activityToken);
}
Loading