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

Commit 3efb972a authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge 24Q3 to AOSP main" into main

parents 7c9f1454 b3356e7c

Android.bp

+5 −6
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ android_library { 
        "net-utils-framework-common",

        "notification_flags_lib",

        "securebox",

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



        // Settings dependencies

        "FingerprintManagerInteractor",
@@ -94,23 +95,21 @@ android_library { 
        "SettingsLibActivityEmbedding",

        "aconfig_settings_flags_lib",

        "accessibility_settings_flags_lib",

        "app-usage-event-protos-lite",

        "battery-event-protos-lite",

        "battery-usage-slot-protos-lite",

        "contextualcards",

        "development_settings_flag_lib",

        "factory_reset_flags_lib",

        "fuelgauge-log-protos-lite",

        "fuelgauge-usage-state-protos-lite",

        "power-anomaly-event-protos-lite",

        "fuelgauge-protos-lite",

        "settings-contextual-card-protos-lite",

        "settings-log-bridge-protos-lite",

        "settings-logtags",

        "settings-telephony-protos-lite",

        "statslog-settings",

        "androidx.test.rules",

        "telephony_flags_core_java_lib",

        "setupdesign-lottie-loading-layout",

        "device_policy_aconfig_flags_lib",

        "kotlinx-coroutines-core",

        "kotlinx-coroutines-android",

    ],



    plugins: ["androidx.room_room-compiler-plugin"],

AndroidManifest.xml

+149 −50
Original line number Diff line number Diff line
@@ -139,11 +139,15 @@ 
    <uses-permission android:name="android.permission.CUSTOMIZE_SYSTEM_UI" />

    <uses-permission android:name="android.permission.REMAP_MODIFIER_KEYS" />

    <uses-permission android:name="android.permission.ACCESS_GPU_SERVICE" />

    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />

    <uses-permission android:name="android.permission.MANAGE_GAME_MODE" />

    <uses-permission android:name="android.permission.RESTART_PHONE_PROCESS" />

    <uses-permission android:name="android.permission.RESTART_TELEPHONY_PROCESS" />

    <uses-permission android:name="android.permission.MANAGE_ENHANCED_CONFIRMATION_STATES" />

    <uses-permission android:name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" />

    <uses-permission android:name="android.permission.MANAGE_NETWORK_POLICY" />

    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />

    <uses-permission android:name="android.permission.GET_BACKGROUND_INSTALLED_PACKAGES" />

    <uses-permission android:name="android.permission.SATELLITE_COMMUNICATION" />

    <uses-permission android:name="android.permission.READ_SYSTEM_GRAMMATICAL_GENDER" />



    <application

            android:name=".SettingsApplication"
@@ -154,6 +158,7 @@ 
            android:requiredForAllUsers="true"

            android:supportsRtl="true"

            android:backupAgent="com.android.settings.backup.SettingsBackupHelper"

            android:restoreAnyVersion="true"

            android:usesCleartextTraffic="true"

            android:defaultToDeviceProtectedStorage="true"

            android:directBootAware="true"
@@ -651,6 +656,17 @@ 
                android:value="true" />

        </activity>



        <activity android:name="Settings$CellularSecuritySettingsActivity"

                  android:label="@string/cellular_security_settings_title"

                  android:exported="true">

            <intent-filter android:priority="1">

                <action android:name="android.settings.CELLULAR_NETWORK_SECURITY" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

              android:value="com.android.settings.network.telephony.CellularSecuritySettingsFragment"/>

        </activity>



        <activity android:name="Settings$SatelliteSettingActivity"

                  android:label="@string/satellite_setting"

                  android:exported="true"
@@ -828,6 +844,7 @@ 


        <activity android:name=".network.SimOnboardingActivity"

            android:exported="false"

            android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize"

            android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"

            android:theme="@style/Theme.SpaLib.BottomSheetDialog"/>
@@ -976,39 +993,6 @@ 
                       android:value="@string/menu_key_apps"/>

        </activity>



        <activity-alias

            android:name="BackupTasksActivity"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:exported="true"

            android:targetActivity=".spa.SpaBridgeActivity"

            android:label="@string/run_backup_tasks_title">

            <intent-filter android:priority="1">

                <action android:name="android.settings.REQUEST_RUN_BACKUP_JOBS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.spa.DESTINATION"

                       android:value="TogglePermissionAppList/BackupTasksApps"/>

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                       android:value="@string/menu_key_apps"/>

        </activity-alias>



        <activity-alias

            android:name="AppBackupTasksActivity"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:exported="true"

            android:targetActivity=".spa.SpaAppBridgeActivity"

            android:label="@string/run_backup_tasks_title">

            <intent-filter android:priority="1">

                <action android:name="android.settings.REQUEST_RUN_BACKUP_JOBS" />

                <category android:name="android.intent.category.DEFAULT" />

                <data android:scheme="package" />

            </intent-filter>

            <meta-data android:name="com.android.settings.spa.DESTINATION"

                       android:value="TogglePermissionAppInfoPage/BackupTasksApps"/>

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                       android:value="@string/menu_key_apps"/>

        </activity-alias>



        <activity

            android:name="Settings$DateTimeSettingsActivity"

            android:label="@string/date_and_time"
@@ -1636,6 +1620,39 @@ 
                       android:value="true" />

        </activity>



        <activity

            android:name=".Settings$HearingDevicesActivity"

            android:label="@string/accessibility_hearingaid_title"

            android:exported="true">

            <intent-filter android:priority="1">

                <action android:name="android.settings.HEARING_DEVICES_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.accessibility.AccessibilityHearingAidsFragment" />

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                android:value="@string/menu_key_accessibility"/>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>



        <activity

            android:name=".Settings$HearingDevicesPairingActivity"

            android:label="@string/accessibility_hearing_device_pairing_title"

            android:permission="android.permission.BLUETOOTH_SCAN"

            android:exported="true">

            <intent-filter android:priority="1">

                <action android:name="android.settings.HEARING_DEVICES_PAIRING_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.accessibility.HearingDevicePairingFragment" />

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                android:value="@string/menu_key_accessibility"/>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>



        <activity

            android:name="SettingsLicenseActivity"

            android:label="@string/settings_license_activity_title"
@@ -1764,12 +1781,6 @@ 
                <category android:name="android.intent.category.BROWSABLE" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter android:priority="1">

                <action android:name="android.settings.BACKGROUND_RESTRICTIONS_SETTINGS" />

                <category android:name="android.intent.category.BROWSABLE" />

                <category android:name="android.intent.category.DEFAULT" />

                <data android:scheme="package" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.applications.manageapplications.ManageApplications" />

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
@@ -2540,9 +2551,9 @@ 
                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.accessibility.ColorContrastFragment" />

                android:value="com.android.settings.display.ColorContrastFragment" />

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                android:value="@string/menu_key_accessibility"/>

                android:value="@string/menu_key_display"/>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>
@@ -2665,6 +2676,7 @@ 


        <activity android:name=".biometrics.face.FaceEnrollIntroduction"

                  android:exported="true"

                  android:theme="@style/GlifV4Theme.DayNight"

                  android:screenOrientation="nosensor">

            <intent-filter>

                <action android:name="android.settings.FACE_ENROLL"/>
@@ -2675,18 +2687,22 @@ 
        <activity android:name=".biometrics.face.FaceEnrollIntroductionInternal"

                  android:exported="false"

                  android:screenOrientation="nosensor"

                  android:theme="@style/GlifV4Theme.DayNight"

                  android:taskAffinity="com.android.settings.root" />



        <activity android:name=".biometrics.face.FaceEnrollEducation"

            android:exported="false"

            android:theme="@style/GlifV4Theme.DayNight"

            android:screenOrientation="nosensor"/>



        <activity android:name=".biometrics.face.FaceEnrollEnrolling"

            android:exported="false"

            android:theme="@style/GlifV4Theme.DayNight"

            android:screenOrientation="portrait"/>



        <activity android:name=".biometrics.face.FaceEnrollFinish"

            android:exported="false"

            android:theme="@style/GlifV4Theme.DayNight"

            android:screenOrientation="portrait"/>



        <activity android:name=".biometrics.BiometricHandoffActivity"
@@ -2761,6 +2777,7 @@ 
        <activity android:name=".biometrics.fingerprint2.ui.enrollment.activity.FingerprintEnrollmentV2Activity"

            android:exported="true"

            android:permission="android.permission.MANAGE_FINGERPRINT"

            android:configChanges="density"

            android:theme="@style/GlifTheme.Light">

            <intent-filter>

                <action android:name="android.settings.FINGERPRINT_SETUP" />
@@ -2815,17 +2832,20 @@ 
        <!-- Note this must not be exported since it returns the password in the intent -->

        <activity android:name=".password.ConfirmLockPattern$InternalActivity"

            android:exported="false"

            android:enableOnBackInvokedCallback="false"

            android:theme="@style/GlifTheme.Light"/>



        <!-- Note this must not be exported since it returns the password in the intent -->

        <activity android:name=".password.ConfirmLockPassword$InternalActivity"

            android:exported="false"

            android:windowSoftInputMode="adjustResize"

            android:enableOnBackInvokedCallback="false"

            android:theme="@style/GlifTheme.Light"/>



        <activity android:name=".password.SetupChooseLockGeneric"

            android:theme="@style/GlifTheme.Light"

            android:exported="true"

            android:enableOnBackInvokedCallback="false"

            android:label="@string/lock_settings_picker_title">

            <intent-filter android:priority="1">

                <action android:name="com.android.settings.SETUP_LOCK_SCREEN" />
@@ -2835,16 +2855,19 @@ 


        <activity android:name=".password.SetupChooseLockGeneric$InternalActivity"

            android:exported="false"

            android:enableOnBackInvokedCallback="false"

            android:excludeFromRecents="true" />



        <activity android:name=".password.ChooseLockGeneric"

            android:label="@string/lockpassword_choose_lock_generic_header"

            android:excludeFromRecents="true"

            android:enableOnBackInvokedCallback="false"

            android:exported="false" />



        <activity android:name=".password.SetNewPasswordActivity"

            android:theme="@android:style/Theme.NoDisplay"

            android:exported="true"

            android:enableOnBackInvokedCallback="false"

            android:excludeFromRecents="true" >

            <intent-filter android:priority="1">

                <action android:name="android.app.action.SET_NEW_PASSWORD" />
@@ -2890,24 +2913,29 @@ 
        <activity android:name=".password.ChooseLockGeneric$InternalActivity"

            android:exported="false"

            android:label="@string/lockpassword_choose_lock_generic_header"

            android:enableOnBackInvokedCallback="false"

            android:excludeFromRecents="true" />



        <activity android:name=".password.SetupChooseLockPattern"

            android:exported="false"

            android:enableOnBackInvokedCallback="false"

            android:theme="@style/GlifTheme.Light" />



        <activity android:name=".password.ChooseLockPattern"

            android:exported="false"

            android:enableOnBackInvokedCallback="false"

            android:theme="@style/GlifTheme.Light" />



        <activity android:name=".password.SetupChooseLockPassword"

            android:exported="false"

            android:theme="@style/GlifTheme.Light"

            android:enableOnBackInvokedCallback="false"

            android:windowSoftInputMode="stateVisible|adjustResize" />



        <activity android:name=".password.ChooseLockPassword"

            android:exported="false"

            android:theme="@style/GlifTheme.Light"

            android:enableOnBackInvokedCallback="false"

            android:windowSoftInputMode="stateVisible|adjustResize"/>



        <activity
@@ -3033,9 +3061,6 @@ 
                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES"/>

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.intent.action.SHOW_CONTRAST_DIALOG" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.development.DevelopmentSettingsDashboardFragment" />

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
@@ -3327,6 +3352,7 @@ 
                <action android:name="com.google.android.setupwizard.SETUP_WIZARD_FINISHED"/>

                <action android:name="com.android.settings.battery.action.PERIODIC_JOB_RECHECK"/>

                <action android:name="android.intent.action.TIME_SET"/>

                <action android:name="android.intent.action.TIMEZONE_CHANGED"/>

            </intent-filter>

        </receiver>
@@ -3975,6 +4001,9 @@ 
            </intent-filter>

        </receiver>



        <service android:name=".sim.PrimarySubscriptionListChangedService"

            android:permission="android.permission.BIND_JOB_SERVICE" />



        <provider

            android:name="androidx.core.content.FileProvider"

            android:authorities="${applicationId}.files"
@@ -5114,9 +5143,9 @@ 
        <activity

            android:name=".privatespace.PrivateSpaceAuthenticationActivity"

            android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"

            android:exported="true">

            android:exported="false">

            <intent-filter>

                <action android:name="com.android.settings.action.PRIVATE_SPACE_SETUP_FLOW" />

                <action android:name="com.android.settings.action.OPEN_PRIVATE_SPACE_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT"/>

            </intent-filter>

        </activity>
@@ -5128,6 +5157,14 @@ 
                  android:exported="false">

        </activity>



        <receiver android:name=".privatespace.PrivateSpaceBroadcastReceiver"

            android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.PRE_BOOT_COMPLETED"/>

                <action android:name="android.intent.action.BOOT_COMPLETED"/>

            </intent-filter>

        </receiver>



        <activity-alias android:name="UsageStatsActivity"

                        android:exported="true"

                        android:label="@string/testing_usage_stats"
@@ -5150,11 +5187,73 @@ 


        <activity

            android:name="com.android.settings.network.WepNetworkDialogActivity"

            android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize"

            android:excludeFromRecents="true"

            android:exported="true"

            android:theme="@style/Theme.SpaLib.Dialog"

            android:permission="android.permission.NETWORK_SETTINGS">

            android:permission="android.permission.NETWORK_SETTINGS"

            android:theme="@style/Theme.SpaLib.Dialog">

        </activity>



        <activity

            android:name="com.android.settings.network.SatelliteWarningDialogActivity"

            android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize"

            android:excludeFromRecents="true"

            android:exported="true"

            android:permission="android.permission.NETWORK_SETTINGS"

            android:theme="@style/Theme.SpaLib.Dialog">

        </activity>



        <activity android:name="Settings$BluetoothDashboardActivity"

            android:label="@string/bluetooth_settings_title"

            android:permission="android.permission.BLUETOOTH_CONNECT"

            android:exported="true">

            <intent-filter>

                <action android:name="android.settings.BLUETOOTH_DASHBOARD_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.connecteddevice.BluetoothDashboardFragment"/>

        </activity>



        <activity

            android:name="com.android.settings.connecteddevice.audiosharing.AudioSharingActivity"

            android:label="@string/audio_sharing_title"

            android:exported="true">

            <intent-filter>

                <action android:name="com.android.settings.BLUETOOTH_AUDIO_SHARING_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.connecteddevice.audiosharing.AudioSharingDashboardFragment"/>

        </activity>



        <activity

            android:name="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamConfirmDialogActivity"

            android:exported="true"

            android:theme="@style/Transparent"

            android:configChanges="orientation|keyboardHidden|screenSize">

            <intent-filter android:priority="1">

                <action android:name="android.settings.AUDIO_STREAM_DIALOG" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamConfirmDialog" />

        </activity>



        <service

            android:name="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamMediaService"

            android:foregroundServiceType="mediaPlayback"

            android:enabled="true"

            android:exported="false" />



        <receiver android:name="com.android.settings.connecteddevice.audiosharing.AudioSharingReceiver"

            android:exported="false">

            <intent-filter>

                <action android:name="com.android.settings.action.BLUETOOTH_LE_AUDIO_SHARING_STATE_CHANGE" />

                <action android:name="com.android.settings.action.BLUETOOTH_LE_AUDIO_SHARING_STOP" />

            </intent-filter>

        </receiver>



        <!-- This is the longest AndroidManifest.xml ever. -->

    </application>

</manifest>

TEST_MAPPING

+13 −16
Original line number Diff line number Diff line
@@ -7,19 +7,16 @@ 
      "name": "SettingsUnitTests",

      "options": [

              {

          "include-filter": "com.android.settings.biometrics"

                "exclude-filter": "com.android.settings.fuelgauge.batterysaver"

              },

              {

          "include-filter": "com.android.settings.biometrics2"

                "exclude-filter": "com.android.settings.network.telephony"

              },

              {

          "include-filter": "com.android.settings.password"

                "exclude-filter": "com.android.settings.privatespace"

              },

              {

          "include-filter": "com.android.settings.safetycenter"

        },

        {

          "include-filter": "com.android.settings.security"

                "exclude-filter": "com.android.settings.regionalpreferences"

              }

            ]

    }

aconfig/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "factory_reset_flags",

    package: "com.android.settings.factory_reset",

    container: "system",

    container: "system_ext",

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

}
@@ -32,7 +32,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "media_drm_flags",

    package: "com.android.settings.media_drm",

    container: "system",

    container: "system_ext",

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

}
@@ -44,7 +44,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "accessibility_flags",

    package: "com.android.settings.accessibility",

    container: "system",

    container: "system_ext",

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

}
@@ -56,7 +56,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "development_settings_flags",

    package: "com.android.settings.development",

    container: "system",

    container: "system_ext",

    srcs: [

        "development/**/*.aconfig",

    ],

aconfig/accessibility/accessibility_flags.aconfig

+18 −1
Original line number Diff line number Diff line 
package: "com.android.settings.accessibility"

container: "system"

container: "system_ext"



# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.



flag {

  name: "add_brightness_settings_in_suw"

  namespace: "accessibility"

  description: "Whether to add brightness preference in SUW Vision Settings"

  bug: "332974327"

}



flag {

  name: "edit_shortcuts_in_full_screen"

  namespace: "accessibility"
@@ -24,6 +31,16 @@ flag { 
  bug: "301198830"

}



flag {

  name: "hide_magnification_always_on_toggle_when_window_mode_only"

  namespace: "accessibility"

  description: "Decides whether to hide the magnification always on setting when capabilities is window mode only."

  bug: "328787031"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "remove_qs_tooltip_in_suw"

  namespace: "accessibility"