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

Commit 17a071f2 authored by Xin Li's avatar Xin Li Committed by Android (Google) Code Review
Browse files

Merge "Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future" into aosp-main-future

parents 110b6f3a 2e74dfde

core/api/system-current.txt

+1 −15
Original line number Original line Diff line number Diff line
@@ -403,7 +403,6 @@ package android { 
    field @Deprecated public static final String UPDATE_TIME_ZONE_RULES = "android.permission.UPDATE_TIME_ZONE_RULES";

    field @Deprecated public static final String UPDATE_TIME_ZONE_RULES = "android.permission.UPDATE_TIME_ZONE_RULES";

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

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

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

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

    field @FlaggedApi("android.hardware.biometrics.face_background_authentication") public static final String USE_BACKGROUND_FACE_AUTHENTICATION = "android.permission.USE_BACKGROUND_FACE_AUTHENTICATION";

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

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

    field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public static final String USE_ON_DEVICE_INTELLIGENCE = "android.permission.USE_ON_DEVICE_INTELLIGENCE";

    field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public static final String USE_ON_DEVICE_INTELLIGENCE = "android.permission.USE_ON_DEVICE_INTELLIGENCE";

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

    field public static final String USE_RESERVED_DISK = "android.permission.USE_RESERVED_DISK";
@@ -1143,16 +1142,13 @@ package android.app { 
    field public static final int NAV_BAR_MODE_KIDS = 1; // 0x1

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

  }

  }

















  public static final class StatusBarManager.DisableInfo implements android.os.Parcelable {







  public static final class StatusBarManager.DisableInfo {











    method public boolean areAllComponentsEnabled();







    method public boolean areAllComponentsEnabled();











    method public int describeContents();














    method public boolean isNavigateToHomeDisabled();







    method public boolean isNavigateToHomeDisabled();











    method public boolean isNotificationPeekingDisabled();







    method public boolean isNotificationPeekingDisabled();











    method public boolean isRecentsDisabled();







    method public boolean isRecentsDisabled();











    method public boolean isSearchDisabled();







    method public boolean isSearchDisabled();











    method public boolean isStatusBarExpansionDisabled();







    method public boolean isStatusBarExpansionDisabled();











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














    field @NonNull public static final android.os.Parcelable.Creator<android.app.StatusBarManager.DisableInfo> CREATOR;














  }







  }



























  public final class SystemServiceRegistry {







  public final class SystemServiceRegistry {










@@ -3759,7 +3755,6 @@ package android.content {









    field @FlaggedApi("android.permission.flags.enhanced_confirmation_mode_apis_enabled") public static final String ECM_ENHANCED_CONFIRMATION_SERVICE = "ecm_enhanced_confirmation";







    field @FlaggedApi("android.permission.flags.enhanced_confirmation_mode_apis_enabled") public static final String ECM_ENHANCED_CONFIRMATION_SERVICE = "ecm_enhanced_confirmation";











    field public static final String ETHERNET_SERVICE = "ethernet";







    field public static final String ETHERNET_SERVICE = "ethernet";











    field public static final String EUICC_CARD_SERVICE = "euicc_card";







    field public static final String EUICC_CARD_SERVICE = "euicc_card";











    field @FlaggedApi("android.hardware.biometrics.face_background_authentication") public static final String FACE_SERVICE = "face";














    field public static final String FONT_SERVICE = "font";







    field public static final String FONT_SERVICE = "font";











    field public static final String HDMI_CONTROL_SERVICE = "hdmi_control";







    field public static final String HDMI_CONTROL_SERVICE = "hdmi_control";











    field public static final String MEDIA_TRANSCODING_SERVICE = "media_transcoding";







    field public static final String MEDIA_TRANSCODING_SERVICE = "media_transcoding";










@@ -5131,15 +5126,6 @@ package android.hardware.display {

























}







}



























package android.hardware.face {



























  @FlaggedApi("android.hardware.biometrics.face_background_authentication") public class FaceManager {














    method @FlaggedApi("android.hardware.biometrics.face_background_authentication") @RequiresPermission(android.Manifest.permission.USE_BACKGROUND_FACE_AUTHENTICATION) public void authenticateInBackground(@Nullable java.util.concurrent.Executor, @Nullable android.hardware.biometrics.BiometricPrompt.CryptoObject, @Nullable android.os.CancellationSignal, @NonNull android.hardware.biometrics.BiometricPrompt.AuthenticationCallback);














    method @FlaggedApi("android.hardware.biometrics.face_background_authentication") @RequiresPermission(anyOf={"android.permission.USE_BIOMETRIC_INTERNAL", android.Manifest.permission.USE_BACKGROUND_FACE_AUTHENTICATION}) public boolean hasEnrolledTemplates();














  }



























}



























package android.hardware.hdmi {







package android.hardware.hdmi {



























  public abstract class HdmiClient {







  public abstract class HdmiClient {

























core/api/system-lint-baseline.txt



+0
−4




























Original line number
Original line
Diff line number
Diff line








@@ -1941,10 +1941,6 @@ UnflaggedApi: android.app.ActivityManager#getExternalHistoricalProcessStartReaso









    New API must be flagged with @FlaggedApi: method android.app.ActivityManager.getExternalHistoricalProcessStartReasons(String,int)







    New API must be flagged with @FlaggedApi: method android.app.ActivityManager.getExternalHistoricalProcessStartReasons(String,int)











UnflaggedApi: android.app.AppOpsManager#OPSTR_RECEIVE_SANDBOX_TRIGGER_AUDIO:







UnflaggedApi: android.app.AppOpsManager#OPSTR_RECEIVE_SANDBOX_TRIGGER_AUDIO:











    New API must be flagged with @FlaggedApi: field android.app.AppOpsManager.OPSTR_RECEIVE_SANDBOX_TRIGGER_AUDIO







    New API must be flagged with @FlaggedApi: field android.app.AppOpsManager.OPSTR_RECEIVE_SANDBOX_TRIGGER_AUDIO











UnflaggedApi: android.app.StatusBarManager.DisableInfo#CREATOR:














    New API must be flagged with @FlaggedApi: field android.app.StatusBarManager.DisableInfo.CREATOR














UnflaggedApi: android.app.StatusBarManager.DisableInfo#isBackDisabled():














    New API must be flagged with @FlaggedApi: method android.app.StatusBarManager.DisableInfo.isBackDisabled()














UnflaggedApi: android.companion.virtual.VirtualDeviceManager.VirtualDevice#getPersistentDeviceId():







UnflaggedApi: android.companion.virtual.VirtualDeviceManager.VirtualDevice#getPersistentDeviceId():











    New API must be flagged with @FlaggedApi: method android.companion.virtual.VirtualDeviceManager.VirtualDevice.getPersistentDeviceId()







    New API must be flagged with @FlaggedApi: method android.companion.virtual.VirtualDeviceManager.VirtualDevice.getPersistentDeviceId()











UnflaggedApi: android.content.Context#THREAD_NETWORK_SERVICE:







UnflaggedApi: android.content.Context#THREAD_NETWORK_SERVICE:

































core/api/test-current.txt



+2
−18




























Original line number
Original line
Diff line number
Diff line








@@ -461,7 +461,7 @@ package android.app {









    method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void togglePanel();







    method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void togglePanel();











  }







  }































  public static final class StatusBarManager.DisableInfo implements android.os.Parcelable {







  public static final class StatusBarManager.DisableInfo {











    method public boolean isRotationSuggestionDisabled();







    method public boolean isRotationSuggestionDisabled();











  }







  }






























@@ -1547,10 +1547,6 @@ package android.hardware.biometrics {









    method public boolean isAllowBackgroundAuthentication();







    method public boolean isAllowBackgroundAuthentication();











  }







  }































  public abstract static class BiometricPrompt.AuthenticationCallback {














    method @FlaggedApi("android.hardware.biometrics.face_background_authentication") public void onAuthenticationAcquired(int);














  }





























  public static class BiometricPrompt.Builder {







  public static class BiometricPrompt.Builder {











    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.TEST_BIOMETRIC, "android.permission.USE_BIOMETRIC_INTERNAL"}) public android.hardware.biometrics.BiometricPrompt.Builder setAllowBackgroundAuthentication(boolean);







    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.TEST_BIOMETRIC, "android.permission.USE_BIOMETRIC_INTERNAL"}) public android.hardware.biometrics.BiometricPrompt.Builder setAllowBackgroundAuthentication(boolean);











    method @FlaggedApi("android.multiuser.enable_biometrics_to_unlock_private_space") @NonNull @RequiresPermission(anyOf={android.Manifest.permission.TEST_BIOMETRIC, "android.permission.USE_BIOMETRIC_INTERNAL"}) public android.hardware.biometrics.BiometricPrompt.Builder setAllowBackgroundAuthentication(boolean, boolean);







    method @FlaggedApi("android.multiuser.enable_biometrics_to_unlock_private_space") @NonNull @RequiresPermission(anyOf={android.Manifest.permission.TEST_BIOMETRIC, "android.permission.USE_BIOMETRIC_INTERNAL"}) public android.hardware.biometrics.BiometricPrompt.Builder setAllowBackgroundAuthentication(boolean, boolean);









@@ -1569,7 +1565,6 @@ package android.hardware.biometrics {









  }







  }































  public class SensorProperties {







  public class SensorProperties {











    ctor @FlaggedApi("android.hardware.biometrics.face_background_authentication") public SensorProperties(int, int, @NonNull java.util.List<android.hardware.biometrics.SensorProperties.ComponentInfo>);














    method @NonNull public java.util.List<android.hardware.biometrics.SensorProperties.ComponentInfo> getComponentInfo();







    method @NonNull public java.util.List<android.hardware.biometrics.SensorProperties.ComponentInfo> getComponentInfo();











    method public int getSensorId();







    method public int getSensorId();











    method public int getSensorStrength();







    method public int getSensorStrength();










@@ -1714,18 +1709,6 @@ package android.hardware.display {





























}







}































package android.hardware.face {





























  @FlaggedApi("android.hardware.biometrics.face_background_authentication") public class FaceManager {














    method @FlaggedApi("android.hardware.biometrics.face_background_authentication") @NonNull @RequiresPermission(android.Manifest.permission.TEST_BIOMETRIC) public android.hardware.biometrics.BiometricTestSession createTestSession(int);














    method @FlaggedApi("android.hardware.biometrics.face_background_authentication") @NonNull public java.util.List<android.hardware.face.FaceSensorProperties> getSensorProperties();














  }





























  @FlaggedApi("android.hardware.biometrics.face_background_authentication") public class FaceSensorProperties extends android.hardware.biometrics.SensorProperties {














  }





























}





























package android.hardware.fingerprint {







package android.hardware.fingerprint {































  @Deprecated public class FingerprintManager {







  @Deprecated public class FingerprintManager {










@@ -3946,6 +3929,7 @@ package android.view.inputmethod {









  }







  }































  public final class InputMethodInfo implements android.os.Parcelable {







  public final class InputMethodInfo implements android.os.Parcelable {














    ctor public InputMethodInfo(@NonNull String, @NonNull String, @NonNull CharSequence, @NonNull String, boolean, @NonNull String);











    ctor public InputMethodInfo(@NonNull String, @NonNull String, @NonNull CharSequence, @NonNull String, @NonNull String, boolean, @NonNull String);







    ctor public InputMethodInfo(@NonNull String, @NonNull String, @NonNull CharSequence, @NonNull String, @NonNull String, boolean, @NonNull String);











    ctor @FlaggedApi("android.view.inputmethod.connectionless_handwriting") public InputMethodInfo(@NonNull String, @NonNull String, @NonNull CharSequence, @NonNull String, @NonNull String, boolean, boolean, @NonNull String);







    ctor @FlaggedApi("android.view.inputmethod.connectionless_handwriting") public InputMethodInfo(@NonNull String, @NonNull String, @NonNull CharSequence, @NonNull String, @NonNull String, boolean, boolean, @NonNull String);











    ctor public InputMethodInfo(@NonNull String, @NonNull String, @NonNull CharSequence, @NonNull String, int);







    ctor public InputMethodInfo(@NonNull String, @NonNull String, @NonNull CharSequence, @NonNull String, int);

































core/java/android/app/StatusBarManager.java



+48
−392


























File changed.
Preview size limit exceeded, changes collapsed.
























core/java/android/content/Context.java



+0
−2




























Original line number
Original line
Diff line number
Diff line








@@ -5081,8 +5081,6 @@ public abstract class Context {









     * @see #getSystemService







     * @see #getSystemService











     * @see android.hardware.face.FaceManager







     * @see android.hardware.face.FaceManager











     */







     */











    @FlaggedApi(android.hardware.biometrics.Flags.FLAG_FACE_BACKGROUND_AUTHENTICATION)














    @SystemApi














    public static final String FACE_SERVICE = "face";







    public static final String FACE_SERVICE = "face";































    /**







    /**