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

Unverified Commit 37fd0557 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-14.0.0_r50' into staging/lineage-21.0_merge-android-14.0.0_r50 

Android 14.0.0 Release 50 (AP2A.240605.024)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZmdzpQAKCRDorT+BmrEO
# eOxsAJ9P+6mJ1GYrlyEhvgxoXhY6uaRflgCgiYkZvtWspiTAqwUP7diZ1L+A4rY=
# =3yGN
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun 11 00:44:05 2024 EEST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2296 signatures in the past
#      2 years.  Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Bill Yi (192) and others
# Via Android (Google) Code Review (3884) and others
* tag 'android-14.0.0_r50': (4732 commits)
  Revert "Add the Finder shutdown message to AOSP"
  Don't throw ANR if onTimeout flag is disabled.
  Revert "Anisotropy correction for external displays only"
  Anisotropy correction for external displays only
  Revert StatusBarManager disable logging
  Revert^2 [Mobile] Make sure we +1 the reported level if INFLATE_SIGNAL_STRENGTH is true
  Revert^2 [Mobile] Make sure we +1 the reported level if INFLATE_SIGNAL_STRENGTH is true
  Update media_controls_lock_screen setting behavior
  [Mobile] Wrap AccessibilityContentDescriptions in a static getter
  Revert "Update media_controls_lock_screen setting behavior"
  Revert "[CDM][CMD] Check permissions for CDM shell commands"
  [CDM][CMD] Check permissions for CDM shell commands
  Inline notification_row_user_context
  Revert "AudioService: optimize BT device config change"
  Merge changes from topic "fbe-wipe-no-reboot" into main am: fd9335cd am: 4073ee27
  AccessibilityManagerService: remove uninstalled services from enabled list after service update.
  Add more checkKeyIntent checks to AccountManagerService.
  Fix error handling for non-dynamic permissions
  Update media_controls_lock_screen setting behavior
  [Autofill Framework] Add in check for intent filter when setting/updating service
  ...

 Conflicts:
	apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java
	core/java/android/app/admin/DevicePolicyManager.java
	core/java/android/app/admin/IDevicePolicyManager.aidl
	core/java/android/view/IWindowManager.aidl
	core/res/res/values-eu/strings.xml
	core/res/res/values-hi/strings.xml
	core/res/res/values-te/strings.xml
	core/tests/utiltests/src/com/android/internal/util/LockPatternUtilsTest.java
	libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java
	libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenTransitions.java
	libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
	libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java
	nfc/java/android/nfc/cardemulation/ApduServiceInfo.java
	packages/CompanionDeviceManager/res/values-bs/strings.xml
	packages/CompanionDeviceManager/res/values-es-rUS/strings.xml
	packages/CompanionDeviceManager/res/values-et/strings.xml
	packages/CompanionDeviceManager/res/values-hu/strings.xml
	packages/CompanionDeviceManager/res/values-in/strings.xml
	packages/PackageInstaller/res/values-ky/strings.xml
	packages/SystemUI/Android.bp
	packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeFacade.kt
	packages/SystemUI/res/layout/bluetooth_tile_dialog.xml
	packages/SystemUI/res/values-af/strings.xml
	packages/SystemUI/res/values-am/strings.xml
	packages/SystemUI/res/values-ar/strings.xml
	packages/SystemUI/res/values-as/strings.xml
	packages/SystemUI/res/values-az/strings.xml
	packages/SystemUI/res/values-b+sr+Latn/strings.xml
	packages/SystemUI/res/values-be/strings.xml
	packages/SystemUI/res/values-bg/strings.xml
	packages/SystemUI/res/values-bn/strings.xml
	packages/SystemUI/res/values-bs/strings.xml
	packages/SystemUI/res/values-ca/strings.xml
	packages/SystemUI/res/values-cs/strings.xml
	packages/SystemUI/res/values-da/strings.xml
	packages/SystemUI/res/values-de/strings.xml
	packages/SystemUI/res/values-el/strings.xml
	packages/SystemUI/res/values-en-rAU/strings.xml
	packages/SystemUI/res/values-en-rCA/strings.xml
	packages/SystemUI/res/values-en-rGB/strings.xml
	packages/SystemUI/res/values-en-rIN/strings.xml
	packages/SystemUI/res/values-en-rXC/strings.xml
	packages/SystemUI/res/values-es-rUS/strings.xml
	packages/SystemUI/res/values-es/strings.xml
	packages/SystemUI/res/values-et/strings.xml
	packages/SystemUI/res/values-eu/strings.xml
	packages/SystemUI/res/values-fa/strings.xml
	packages/SystemUI/res/values-fi/strings.xml
	packages/SystemUI/res/values-fr-rCA/strings.xml
	packages/SystemUI/res/values-fr/strings.xml
	packages/SystemUI/res/values-gl/strings.xml
	packages/SystemUI/res/values-gu/strings.xml
	packages/SystemUI/res/values-hi/strings.xml
	packages/SystemUI/res/values-hr/strings.xml
	packages/SystemUI/res/values-hu/strings.xml
	packages/SystemUI/res/values-hy/strings.xml
	packages/SystemUI/res/values-in/strings.xml
	packages/SystemUI/res/values-is/strings.xml
	packages/SystemUI/res/values-it/strings.xml
	packages/SystemUI/res/values-iw/strings.xml
	packages/SystemUI/res/values-ja/strings.xml
	packages/SystemUI/res/values-ka/strings.xml
	packages/SystemUI/res/values-kk/strings.xml
	packages/SystemUI/res/values-km/strings.xml
	packages/SystemUI/res/values-kn/strings.xml
	packages/SystemUI/res/values-kn/tiles_states_strings.xml
	packages/SystemUI/res/values-ko/strings.xml
	packages/SystemUI/res/values-ky/strings.xml
	packages/SystemUI/res/values-lo/strings.xml
	packages/SystemUI/res/values-lt/strings.xml
	packages/SystemUI/res/values-lv/strings.xml
	packages/SystemUI/res/values-mk/strings.xml
	packages/SystemUI/res/values-ml/strings.xml
	packages/SystemUI/res/values-mn/strings.xml
	packages/SystemUI/res/values-mr/strings.xml
	packages/SystemUI/res/values-ms/strings.xml
	packages/SystemUI/res/values-my/strings.xml
	packages/SystemUI/res/values-nb/strings.xml
	packages/SystemUI/res/values-ne/strings.xml
	packages/SystemUI/res/values-nl/strings.xml
	packages/SystemUI/res/values-or/strings.xml
	packages/SystemUI/res/values-pa/strings.xml
	packages/SystemUI/res/values-pl/strings.xml
	packages/SystemUI/res/values-pt-rBR/strings.xml
	packages/SystemUI/res/values-pt-rPT/strings.xml
	packages/SystemUI/res/values-pt/strings.xml
	packages/SystemUI/res/values-ro/strings.xml
	packages/SystemUI/res/values-ru/strings.xml
	packages/SystemUI/res/values-si/strings.xml
	packages/SystemUI/res/values-sk/strings.xml
	packages/SystemUI/res/values-sl/strings.xml
	packages/SystemUI/res/values-sq/strings.xml
	packages/SystemUI/res/values-sr/strings.xml
	packages/SystemUI/res/values-sv/strings.xml
	packages/SystemUI/res/values-sw/strings.xml
	packages/SystemUI/res/values-ta/strings.xml
	packages/SystemUI/res/values-te/strings.xml
	packages/SystemUI/res/values-th/strings.xml
	packages/SystemUI/res/values-tl/strings.xml
	packages/SystemUI/res/values-tr/strings.xml
	packages/SystemUI/res/values-uk/strings.xml
	packages/SystemUI/res/values-ur/strings.xml
	packages/SystemUI/res/values-uz/strings.xml
	packages/SystemUI/res/values-vi/strings.xml
	packages/SystemUI/res/values-zh-rCN/strings.xml
	packages/SystemUI/res/values-zh-rHK/strings.xml
	packages/SystemUI/res/values-zh-rTW/strings.xml
	packages/SystemUI/res/values-zu/strings.xml
	packages/SystemUI/res/values/config.xml
	packages/SystemUI/shared/Android.bp
	packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
	packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java
	packages/SystemUI/src/com/android/systemui/biometrics/dagger/BiometricsModule.kt
	packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/SideFpsOverlayViewBinder.kt
	packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
	packages/SystemUI/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlow.kt
	packages/SystemUI/src/com/android/systemui/media/controls/ui/binder/SeekBarObserver.kt
	packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerImpl.java
	packages/SystemUI/src/com/android/systemui/qs/QSHost.java
	packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java
	packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSFactoryImpl.java
	packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogDelegate.kt
	packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModel.kt
	packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java
	packages/SystemUI/src/com/android/systemui/screenrecord/RecordingService.java
	packages/SystemUI/src/com/android/systemui/screenshot/SaveImageInBackgroundTask.java
	packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
	packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java
	packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java
	packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java
	packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
	packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
	packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogLiteTest.java
	packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogDelegateTest.kt
	packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModelTest.kt
	packages/SystemUI/tests/src/com/android/systemui/screenrecord/RecordingServiceTest.java
	packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotNotificationSmartActionsTest.java
	packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt
	packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt
	packages/SystemUI/tests/utils/src/com/android/systemui/authentication/data/repository/FakeAuthenticationRepository.kt
	services/core/java/com/android/server/BatteryService.java
	services/core/java/com/android/server/display/DisplayPowerController.java
	services/core/java/com/android/server/display/DisplayPowerController2.java
	services/core/java/com/android/server/input/InputSettingsObserver.java
	services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
	services/core/java/com/android/server/pm/ComputerEngine.java
	services/core/java/com/android/server/policy/PhoneWindowManager.java
	services/core/java/com/android/server/wm/Session.java
	services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java

Change-Id: If804b2a43558180d7050e1c471c8a77e76032b81
parents a4296270 ae7c8db0

AconfigFlags.bp

+377 −78
Original line number Diff line number Diff line
@@ -12,78 +12,109 @@ 
// See the License for the specific language governing permissions and

// limitations under the License.



aconfig_srcjars = [

    ":android.app.usage.flags-aconfig-java{.generated_srcjars}",

    ":android.app.smartspace.flags-aconfig-java{.generated_srcjars}",

    ":android.companion.flags-aconfig-java{.generated_srcjars}",

    ":android.content.pm.flags-aconfig-java{.generated_srcjars}",

    ":android.content.res.flags-aconfig-java{.generated_srcjars}",

    ":android.hardware.flags-aconfig-java{.generated_srcjars}",

    ":android.hardware.radio.flags-aconfig-java{.generated_srcjars}",

    ":android.location.flags-aconfig-java{.generated_srcjars}",

    ":android.net.vcn.flags-aconfig-java{.generated_srcjars}",

    ":android.nfc.flags-aconfig-java{.generated_srcjars}",

    ":android.os.flags-aconfig-java{.generated_srcjars}",

    ":android.os.vibrator.flags-aconfig-java{.generated_srcjars}",

    ":android.security.flags-aconfig-java{.generated_srcjars}",

    ":android.server.app.flags-aconfig-java{.generated_srcjars}",

    ":android.service.chooser.flags-aconfig-java{.generated_srcjars}",

    ":android.service.dreams.flags-aconfig-java{.generated_srcjars}",

    ":android.service.notification.flags-aconfig-java{.generated_srcjars}",

    ":android.view.flags-aconfig-java{.generated_srcjars}",

    ":android.view.accessibility.flags-aconfig-java{.generated_srcjars}",

    ":audio-framework-aconfig",

    ":camera_platform_flags_core_java_lib{.generated_srcjars}",

    ":com.android.window.flags.window-aconfig-java{.generated_srcjars}",

    ":android.hardware.biometrics.flags-aconfig-java{.generated_srcjars}",

    ":com.android.hardware.input-aconfig-java{.generated_srcjars}",

    ":com.android.input.flags-aconfig-java{.generated_srcjars}",

    ":com.android.text.flags-aconfig-java{.generated_srcjars}",

    ":framework-jobscheduler-job.flags-aconfig-java{.generated_srcjars}",

    ":telecom_flags_core_java_lib{.generated_srcjars}",

    ":telephony_flags_core_java_lib{.generated_srcjars}",

    ":android.companion.virtual.flags-aconfig-java{.generated_srcjars}",

    ":android.view.inputmethod.flags-aconfig-java{.generated_srcjars}",

    ":android.widget.flags-aconfig-java{.generated_srcjars}",

    ":com.android.media.flags.bettertogether-aconfig-java{.generated_srcjars}",

    ":sdk_sandbox_flags_lib{.generated_srcjars}",

    ":android.permission.flags-aconfig-java{.generated_srcjars}",

    ":android.database.sqlite-aconfig-java{.generated_srcjars}",

    ":hwui_flags_java_lib{.generated_srcjars}",

    ":framework_graphics_flags_java_lib{.generated_srcjars}",

    ":display_flags_lib{.generated_srcjars}",

    ":com.android.internal.foldables.flags-aconfig-java{.generated_srcjars}",

    ":android.multiuser.flags-aconfig-java{.generated_srcjars}",

    ":android.app.flags-aconfig-java{.generated_srcjars}",

    ":android.credentials.flags-aconfig-java{.generated_srcjars}",

    ":android.view.contentprotection.flags-aconfig-java{.generated_srcjars}",

    ":com.android.server.flags.pinner-aconfig-java{.generated_srcjars}",

    ":android.service.controls.flags-aconfig-java{.generated_srcjars}",

    ":android.service.voice.flags-aconfig-java{.generated_srcjars}",

    ":android.media.tv.flags-aconfig-java{.generated_srcjars}",

    ":android.service.autofill.flags-aconfig-java{.generated_srcjars}",

    ":com.android.net.flags-aconfig-java{.generated_srcjars}",

    ":device_policy_aconfig_flags_lib{.generated_srcjars}",

    ":surfaceflinger_flags_java_lib{.generated_srcjars}",

    ":android.view.contentcapture.flags-aconfig-java{.generated_srcjars}",

    ":android.hardware.usb.flags-aconfig-java{.generated_srcjars}",

    ":android.tracing.flags-aconfig-java{.generated_srcjars}",

    ":android.appwidget.flags-aconfig-java{.generated_srcjars}",

    ":android.webkit.flags-aconfig-java{.generated_srcjars}",

    ":android.provider.flags-aconfig-java{.generated_srcjars}",

]

aconfig_declarations_group {

    name: "framework-minus-apex-aconfig-declarations",

    aconfig_declarations_groups: [

        "audio-framework-aconfig",

    ],

    java_aconfig_libraries: [

        // !!! KEEP THIS LIST ALPHABETICAL !!!

        "aconfig_mediacodec_flags_java_lib",

        "android.adaptiveauth.flags-aconfig-java",

        "android.app.flags-aconfig-java",

        "android.app.ondeviceintelligence-aconfig-java",

        "android.app.smartspace.flags-aconfig-java",

        "android.app.usage.flags-aconfig-java",

        "android.app.wearable.flags-aconfig-java",

        "android.appwidget.flags-aconfig-java",

        "android.chre.flags-aconfig-java",

        "android.companion.flags-aconfig-java",

        "android.companion.virtual.flags-aconfig-java",

        "android.companion.virtualdevice.flags-aconfig-java",

        "android.content.flags-aconfig-java",

        "android.content.pm.flags-aconfig-java",

        "android.content.res.flags-aconfig-java",

        "android.crashrecovery.flags-aconfig-java",

        "android.credentials.flags-aconfig-java",

        "android.database.sqlite-aconfig-java",

        "android.hardware.biometrics.flags-aconfig-java",

        "android.hardware.devicestate.feature.flags-aconfig-java",

        "android.hardware.flags-aconfig-java",

        "android.hardware.radio.flags-aconfig-java",

        "android.hardware.usb.flags-aconfig-java",

        "android.location.flags-aconfig-java",

        "android.media.codec-aconfig-java",

        "android.media.tv.flags-aconfig-java",

        "android.multiuser.flags-aconfig-java",

        "android.net.platform.flags-aconfig-java",

        "android.net.vcn.flags-aconfig-java",

        "android.net.wifi.flags-aconfig-java",

        "android.nfc.flags-aconfig-java",

        "android.os.flags-aconfig-java",

        "android.os.vibrator.flags-aconfig-java",

        "android.permission.flags-aconfig-java",

        "android.provider.flags-aconfig-java",

        "android.security.flags-aconfig-java",

        "android.server.app.flags-aconfig-java",

        "android.service.autofill.flags-aconfig-java",

        "android.service.chooser.flags-aconfig-java",

        "android.service.controls.flags-aconfig-java",

        "android.service.dreams.flags-aconfig-java",

        "android.service.notification.flags-aconfig-java",

        "android.service.appprediction.flags-aconfig-java",

        "android.service.voice.flags-aconfig-java",

        "android.speech.flags-aconfig-java",

        "android.systemserver.flags-aconfig-java",

        "android.tracing.flags-aconfig-java",

        "android.view.accessibility.flags-aconfig-java",

        "android.view.contentcapture.flags-aconfig-java",

        "android.view.contentprotection.flags-aconfig-java",

        "android.view.flags-aconfig-java",

        "android.view.inputmethod.flags-aconfig-java",

        "android.webkit.flags-aconfig-java",

        "android.widget.flags-aconfig-java",

        "backup_flags_lib",

        "camera_platform_flags_core_java_lib",

        "com.android.hardware.input-aconfig-java",

        "com.android.input.flags-aconfig-java",

        "com.android.internal.foldables.flags-aconfig-java",

        "com.android.internal.pm.pkg.component.flags-aconfig-java",

        "com.android.media.flags.bettertogether-aconfig-java",

        "com.android.media.flags.editing-aconfig-java",

        "com.android.media.flags.projection-aconfig-java",

        "com.android.net.thread.platform.flags-aconfig-java",

        "com.android.server.flags.services-aconfig-java",

        "com.android.text.flags-aconfig-java",

        "com.android.window.flags.window-aconfig-java",

        "device_policy_aconfig_flags_lib",

        "display_flags_lib",

        "framework-jobscheduler-job.flags-aconfig-java",

        "framework_graphics_flags_java_lib",

        "hwui_flags_java_lib",

        "power_flags_lib",

        "sdk_sandbox_flags_lib",

        "surfaceflinger_flags_java_lib",

        "telecom_flags_core_java_lib",

        "telephony_flags_core_java_lib",

        // !!! KEEP THIS LIST ALPHABETICAL !!!

    ],

}



filegroup {

    name: "framework-minus-apex-aconfig-srcjars",

    srcs: aconfig_srcjars,

    srcs: [

        ":framework-minus-apex-aconfig-declarations{.srcjars}",

    ],

}



// Aconfig declarations and libraries for the core framework

java_defaults {

    name: "framework-minus-apex-aconfig-libraries",

    // Add java_aconfig_libraries to here to add them to the core framework

    srcs: aconfig_srcjars,

    // Add aconfig-annotations-lib as a dependency for the optimization

    srcs: [

        ":framework-minus-apex-aconfig-declarations{.srcjars}",

    ],

    libs: ["aconfig-annotations-lib"],

}
@@ -134,6 +165,19 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// DeviceStateManager

aconfig_declarations {

    name: "android.hardware.devicestate.feature.flags-aconfig",

    package: "android.hardware.devicestate.feature.flags",

    srcs: ["core/java/android/hardware/devicestate/feature/*.aconfig"],

}



java_aconfig_library {

    name: "android.hardware.devicestate.feature.flags-aconfig-java",

    aconfig_declarations: "android.hardware.devicestate.feature.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Input

aconfig_declarations {

    name: "com.android.hardware.input.input-aconfig",
@@ -180,6 +224,12 @@ aconfig_declarations { 
    ],

}



cc_aconfig_library {

    name: "android_location_flags_c_lib",

    vendor_available: true,

    aconfig_declarations: "android.location.flags-aconfig",

}



java_aconfig_library {

    name: "android.location.flags-aconfig-java",

    aconfig_declarations: "android.location.flags-aconfig",
@@ -190,7 +240,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.nfc.flags-aconfig",

    package: "android.nfc",

    srcs: ["core/java/android/nfc/*.aconfig"],

    srcs: ["nfc/java/android/nfc/*.aconfig"],

}



cc_aconfig_library {
@@ -208,7 +258,7 @@ cc_aconfig_library { 
java_aconfig_library {

    name: "android.nfc.flags-aconfig-java",

    aconfig_declarations: "android.nfc.flags-aconfig",

    min_sdk_version: "VanillaIceCream",

    min_sdk_version: "34",

    apex_available: [

        "//apex_available:platform",

        "com.android.nfcservices",
@@ -249,6 +299,13 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "android.app.usage.flags-aconfig-java-host",

    aconfig_declarations: "android.app.usage.flags-aconfig",

    host_supported: true,

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// OS

aconfig_declarations {

    name: "android.os.flags-aconfig",
@@ -430,10 +487,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "com.android.media.flags.bettertogether-aconfig",

    package: "com.android.media.flags",

    srcs: [

        "media/java/android/media/flags/media_better_together.aconfig",

        "media/java/android/media/flags/fade_manager_configuration.aconfig",

    ],

    srcs: ["media/java/android/media/flags/media_better_together.aconfig"],

}



java_aconfig_library {
@@ -442,6 +496,43 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "com.android.media.flags.bettertogether-aconfig-java-host",

    aconfig_declarations: "com.android.media.flags.bettertogether-aconfig",

    host_supported: true,

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Media Editing

aconfig_declarations {

    name: "com.android.media.flags.editing-aconfig",

    package: "com.android.media.editing.flags",

    srcs: [

        "media/java/android/media/flags/editing.aconfig",

    ],

}



java_aconfig_library {

    name: "com.android.media.flags.editing-aconfig-java",

    aconfig_declarations: "com.android.media.flags.editing-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// MediaProjection

aconfig_declarations {

    name: "com.android.media.flags.projection-aconfig",

    package: "com.android.media.projection.flags",

    srcs: [

        "media/java/android/media/flags/projection.aconfig",

    ],

}



java_aconfig_library {

    name: "com.android.media.flags.projection-aconfig-java",

    aconfig_declarations: "com.android.media.flags.projection-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Media TV

aconfig_declarations {

    name: "android.media.tv.flags-aconfig",
@@ -455,6 +546,19 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// OnDeviceIntelligence

aconfig_declarations {

    name: "android.app.ondeviceintelligence-aconfig",

    package: "android.app.ondeviceintelligence.flags",

    srcs: ["core/java/android/app/ondeviceintelligence/flags/ondevice_intelligence.aconfig"],

}



java_aconfig_library {

    name: "android.app.ondeviceintelligence-aconfig-java",

    aconfig_declarations: "android.app.ondeviceintelligence-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Permissions

aconfig_declarations {

    name: "android.permission.flags-aconfig",
@@ -470,8 +574,8 @@ java_aconfig_library { 
    apex_available: [

        "//apex_available:platform",

        "com.android.permission",

        "com.android.nfcservices",

    ],



}



// SQLite
@@ -591,16 +695,29 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Pinner Service

// Server Services Flags

aconfig_declarations {

    name: "com.android.server.flags.pinner-aconfig",

    name: "com.android.server.flags.services-aconfig",

    package: "com.android.server.flags",

    srcs: ["services/core/java/com/android/server/flags/pinner.aconfig"],

    srcs: ["services/core/java/com/android/server/flags/*.aconfig"],

}



java_aconfig_library {

    name: "com.android.server.flags.pinner-aconfig-java",

    aconfig_declarations: "com.android.server.flags.pinner-aconfig",

    name: "com.android.server.flags.services-aconfig-java",

    aconfig_declarations: "com.android.server.flags.services-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// App prediction

aconfig_declarations {

    name: "android.service.appprediction.flags-aconfig",

    package: "android.service.appprediction.flags",

    srcs: ["core/java/android/service/appprediction/flags/*.aconfig"],

}



java_aconfig_library {

    name: "android.service.appprediction.flags-aconfig-java",

    aconfig_declarations: "android.service.appprediction.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}
@@ -661,14 +778,29 @@ java_aconfig_library { 


// Networking

aconfig_declarations {

    name: "com.android.net.flags-aconfig",

    package: "com.android.net.flags",

    name: "android.net.platform.flags-aconfig",

    package: "android.net.platform.flags",

    srcs: ["core/java/android/net/flags.aconfig"],

    visibility: [":__subpackages__"],

}



// Thread network

aconfig_declarations {

    name: "com.android.net.thread.platform.flags-aconfig",

    package: "com.android.net.thread.platform.flags",

    srcs: ["core/java/android/net/thread/flags.aconfig"],

}



java_aconfig_library {

    name: "com.android.net.flags-aconfig-java",

    aconfig_declarations: "com.android.net.flags-aconfig",

    name: "android.net.platform.flags-aconfig-java",

    aconfig_declarations: "android.net.platform.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

    visibility: [":__subpackages__"],

}



java_aconfig_library {

    name: "com.android.net.thread.platform.flags-aconfig-java",

    aconfig_declarations: "com.android.net.thread.platform.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}
@@ -718,6 +850,13 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "device_policy_aconfig_flags_lib_host",

    aconfig_declarations: "device_policy_aconfig_flags",

    host_supported: true,

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



cc_aconfig_library {

    name: "device_policy_aconfig_flags_c_lib",

    aconfig_declarations: "device_policy_aconfig_flags",
@@ -733,6 +872,11 @@ aconfig_declarations { 
java_aconfig_library {

    name: "android.service.chooser.flags-aconfig-java",

    aconfig_declarations: "android.service.chooser.flags-aconfig",

    min_sdk_version: "34",

    apex_available: [

        "//apex_available:platform",

        "com.android.nfcservices",

    ],

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}
@@ -766,6 +910,8 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.service.notification.flags-aconfig",

    package: "android.service.notification",

    exportable: true,

    container: "system",

    srcs: ["core/java/android/service/notification/flags.aconfig"],

}
@@ -775,6 +921,18 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "android.service.notification.flags-aconfig-export-java",

    aconfig_declarations: "android.service.notification.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

    mode: "exported",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "com.android.extservices",

    ],

}



// Smartspace

aconfig_declarations {

    name: "android.app.smartspace.flags-aconfig",
@@ -841,6 +999,11 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



cc_aconfig_library {

    name: "android.tracing.flags_c_lib",

    aconfig_declarations: "android.tracing.flags-aconfig",

}



// App Widgets

aconfig_declarations {

    name: "android.appwidget.flags-aconfig",
@@ -895,3 +1058,139 @@ java_aconfig_library { 
    aconfig_declarations: "android.provider.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// ContextHub

java_aconfig_library {

    name: "android.chre.flags-aconfig-java",

    aconfig_declarations: "chre_flags",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Speech

aconfig_declarations {

    name: "android.speech.flags-aconfig",

    package: "android.speech.flags",

    srcs: ["core/java/android/speech/flags/*.aconfig"],

}



java_aconfig_library {

    name: "android.speech.flags-aconfig-java",

    aconfig_declarations: "android.speech.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Power

java_aconfig_library {

    name: "power_flags_lib",

    aconfig_declarations: "power_flags",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Content

aconfig_declarations {

    name: "android.content.flags-aconfig",

    package: "android.content.flags",

    srcs: ["core/java/android/content/flags/flags.aconfig"],

}



java_aconfig_library {

    name: "android.content.flags-aconfig-java",

    aconfig_declarations: "android.content.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Adaptive Auth

aconfig_declarations {

    name: "android.adaptiveauth.flags-aconfig",

    package: "android.adaptiveauth",

    srcs: ["core/java/android/adaptiveauth/*.aconfig"],

}



java_aconfig_library {

    name: "android.adaptiveauth.flags-aconfig-java",

    aconfig_declarations: "android.adaptiveauth.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// CrashRecovery Module

aconfig_declarations {

    name: "android.crashrecovery.flags-aconfig",

    package: "android.crashrecovery.flags",

    srcs: ["packages/CrashRecovery/aconfig/flags.aconfig"],

}



java_aconfig_library {

    name: "android.crashrecovery.flags-aconfig-java",

    aconfig_declarations: "android.crashrecovery.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Backup

java_aconfig_library {

    name: "backup_flags_lib",

    aconfig_declarations: "backup_flags",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Wifi

aconfig_declarations {

    name: "android.net.wifi.flags-aconfig",

    package: "android.net.wifi.flags",

    srcs: ["wifi/*.aconfig"],

}



java_aconfig_library {

    name: "android.net.wifi.flags-aconfig-java",

    aconfig_declarations: "android.net.wifi.flags-aconfig",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "com.android.wifi",

    ],

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Wearable Sensing

aconfig_declarations {

    name: "android.app.wearable.flags-aconfig",

    package: "android.app.wearable",

    srcs: ["core/java/android/app/wearable/*.aconfig"],

}



java_aconfig_library {

    name: "android.app.wearable.flags-aconfig-java",

    aconfig_declarations: "android.app.wearable.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



aconfig_declarations {

    name: "com.android.internal.pm.pkg.component.flags-aconfig",

    package: "com.android.internal.pm.pkg.component.flags",

    srcs: ["core/java/com/android/internal/pm/pkg/component/flags/flags.aconfig"],

}



java_aconfig_library {

    name: "com.android.internal.pm.pkg.component.flags-aconfig-java",

    aconfig_declarations: "com.android.internal.pm.pkg.component.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "com.android.internal.pm.pkg.component.flags-aconfig-java-host",

    aconfig_declarations: "com.android.internal.pm.pkg.component.flags-aconfig",

    host_supported: true,

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// System Server

aconfig_declarations {

    name: "android.systemserver.flags-aconfig",

    package: "android.server",

    srcs: ["services/java/com/android/server/flags.aconfig"],

}



java_aconfig_library {

    name: "android.systemserver.flags-aconfig-java",

    aconfig_declarations: "android.systemserver.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}

Android.bp

+18 −1
Original line number Diff line number Diff line
@@ -95,8 +95,10 @@ filegroup { 
        ":platform-compat-native-aidl",



        // AIDL sources from external directories

        ":android.frameworks.location.altitude-V2-java-source",

        ":android.hardware.biometrics.common-V4-java-source",

        ":android.hardware.biometrics.fingerprint-V3-java-source",

        ":android.hardware.biometrics.face-V4-java-source",

        ":android.hardware.gnss-V2-java-source",

        ":android.hardware.graphics.common-V3-java-source",

        ":android.hardware.keymaster-V4-java-source",
@@ -131,6 +133,7 @@ filegroup { 
        ":libcamera_client_aidl",

        ":libcamera_client_framework_aidl",

        ":libupdate_engine_aidl",

        ":libupdate_engine_stable-V2-java-source",

        ":logd_aidl",

        ":resourcemanager_aidl",

        ":storaged_aidl",
@@ -149,6 +152,7 @@ filegroup { 
        ":framework-javastream-protos",

        ":statslog-framework-java-gen", // FrameworkStatsLog.java

        ":audio_policy_configuration_V7_0",

        ":perfetto_trace_javastream_protos",

    ],

}
@@ -208,6 +212,9 @@ java_defaults { 
// framework_srcs. These have no or very limited dependency to the framework.

java_library {

    name: "framework-internal-utils",

    defaults: [

        "android.hardware.power-java_static",

    ],

    static_libs: [

        "apex_aidl_interface-java",

        "packagemanager_aidl-java",
@@ -215,6 +222,7 @@ java_library { 
        "updatable-driver-protos",

        "ota_metadata_proto_java",

        "android.hidl.base-V1.0-java",

        "android.hidl.manager-V1.2-java",

        "android.hardware.cas-V1-java", // AIDL

        "android.hardware.cas-V1.0-java",

        "android.hardware.cas-V1.1-java",
@@ -382,6 +390,7 @@ java_defaults { 
        // system propagates "required" properly.

        "gps_debug.conf",

        "protolog.conf.json.gz",

        "core.protolog.pb",

        "framework-res",

        // any install dependencies should go into framework-minus-apex-install-dependencies

        // rather than here to avoid bloating incremental build time
@@ -428,7 +437,6 @@ java_library { 
    name: "framework-non-updatable-unbundled-impl-libs",

    static_libs: [

        "framework-location.impl",

        "framework-nfc.impl",

    ],

    sdk_version: "core_platform",

    installable: false,
@@ -502,6 +510,10 @@ java_library { 
            "-Xep:AndroidFrameworkUid:ERROR",

        ],

    },

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

    jarjar_prefix: "com.android.internal.hidden_from_bootclasspath",

}



java_library {
@@ -516,6 +528,7 @@ java_library { 
    },

    lint: {

        enabled: false,



    },

}
@@ -634,6 +647,10 @@ java_library { 
        "//frameworks/base/services/net",

        "//packages/modules/Wifi/framework",

    ],

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

    apex_available: ["com.android.wifi"],

}



filegroup {

INPUT_OWNERS

+2 −0
Original line number Diff line number Diff line 
# Bug component: 136048

arpitks@google.com

asmitapoddar@google.com

hcutts@google.com

joseprio@google.com

michaelwr@google.com

LSE_APP_COMPAT_OWNERS

0 → 100644
+6 −0
Original line number Diff line number Diff line 
# Owners for the App Compat flags (large_screen_experiences_app_compat)

mcarli@google.com

eevlachavas@google.com

gracielawputri@google.com

minagranic@google.com

mariiasand@google.com

MEMORY_OWNERS

0 → 100644
+6 −0
Original line number Diff line number Diff line 
surenb@google.com

tjmercier@google.com

kaleshsingh@google.com

jyescas@google.com

carlosgalo@google.com

jji@google.com