google_pixel: Initial Android 13 import

* From `raven-user-13-TP1A.220624.021-8877034-release-keys`. Change-Id: Ia518744966b4087c7b090c9604476bf9071d29c7
2 years ago · e3d8dbe48c
parent cfe09c60b6
commit e3d8dbe48c
46 changed files with 114 additions and 71 deletions
--- a/ThemePickerGoogle/PixelThemesStub.apk
+++ b/ThemePickerGoogle/PixelThemesStub.apk
--- a/apps/apks/FlipendoPrebuilt.apk
+++ b/apps/apks/FlipendoPrebuilt.apk
--- a/apps/apks/GoogleCamera.apk
+++ b/apps/apks/GoogleCamera.apk
--- a/apps/apks/GoogleExtServicesMobile.apk
+++ b/apps/apks/GoogleExtServicesMobile.apk
--- a/apps/apks/MarkupGoogle.apk
+++ b/apps/apks/MarkupGoogle.apk
--- a/apps/apks/NexusLauncherRelease.apk
+++ b/apps/apks/NexusLauncherRelease.apk
--- a/apps/apks/PixelSetupWizard.apk
+++ b/apps/apks/PixelSetupWizard.apk
--- a/apps/apks/PixelThemesStub.apk
+++ b/apps/apks/PixelThemesStub.apk
--- a/apps/apks/PlayAutoInstallConfig.apk
+++ b/apps/apks/PlayAutoInstallConfig.apk
--- a/apps/apks/RecorderPrebuilt.apk
+++ b/apps/apks/RecorderPrebuilt.apk
--- a/apps/apks/TurboPrebuilt.apk
+++ b/apps/apks/TurboPrebuilt.apk
--- a/apps/apks/WallpaperPickerGooglePrebuilt.apk
+++ b/apps/apks/WallpaperPickerGooglePrebuilt.apk
--- a/apps/permissions/privapp-permissions-google-p-pixel.xml
+++ b/apps/permissions/privapp-permissions-google-p-pixel.xml
@ -62,6 +62,15 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>
    </privapp-permissions>

+    <privapp-permissions package="com.google.android.apps.betterbug.partners">
+        <permission name="android.permission.DUMP"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.READ_LOGS"/>
+    </privapp-permissions>
+
    <privapp-permissions package="com.google.android.apps.restore">
        <permission name="android.permission.BACKUP"/>
        <permission name="android.permission.MANAGE_USB"/>
@ -121,6 +130,9 @@ It allows additional grants on top of privapp-permissions-platform.xml
    </privapp-permissions>

    <privapp-permissions package="com.google.android.as">
+        <permission name="android.permission.ACCESS_CONTEXT_HUB"/>
+        <permission name="android.permission.ACCESS_ULTRASOUND"/>
+        <permission name="android.permission.BLUETOOTH_PRIVILEGED"/>
        <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
        <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
        <permission name="android.permission.CAPTURE_MEDIA_OUTPUT"/>
@ -128,6 +140,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
        <permission name="android.permission.EXEMPT_FROM_AUDIO_RECORD_RESTRICTIONS"/>
        <permission name="android.permission.LOCATION_HARDWARE"/>
+        <permission name="android.permission.MANAGE_CLOUDSEARCH"/>
        <permission name="android.permission.MANAGE_SOUND_TRIGGER"/>
        <permission name="android.permission.MANAGE_MUSIC_RECOGNITION"/>
        <permission name="android.permission.MANAGE_UI_TRANSLATION"/>
@ -137,6 +150,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
        <permission name="android.permission.READ_OEM_UNLOCK_STATE"/>
        <permission name="android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE"/>
+        <permission name="android.permission.SET_SYSTEM_AUDIO_CAPTION"/>
        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
        <permission name="android.permission.SYSTEM_CAMERA"/>
@ -223,6 +237,10 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.WRITE_APN_SETTINGS"/>
    </privapp-permissions>

+    <privapp-permissions package="com.google.android.wallpaper.effects">
+        <permission name="android.permission.MANAGE_WALLPAPER_EFFECTS_GENERATION"/>
+    </privapp-permissions>
+
    <privapp-permissions package="com.google.android.wfcactivation">
        <permission name="android.permission.CONNECTIVITY_INTERNAL"/>
        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
@ -257,6 +275,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.INSTALL_PACKAGES"/>
        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
        <permission name="android.permission.LOADER_USAGE_STATS"/>
+        <permission name="android.permission.MANAGE_CLOUDSEARCH"/>
        <permission name="android.permission.MANAGE_ROLLBACKS"/>
        <permission name="android.permission.MANAGE_USERS"/>
        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
@ -266,6 +285,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.REAL_GET_TASKS"/>
        <permission name="android.permission.REBOOT"/>
        <permission name="android.permission.SEND_DEVICE_CUSTOMIZATION_READY"/>
+        <permission name="android.permission.SEND_SAFETY_CENTER_UPDATE"/>
        <permission name="android.permission.SEND_SMS_NO_CONFIRMATION"/>
        <permission name="android.permission.SET_PREFERRED_APPLICATIONS"/>
        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
@ -280,6 +300,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
    <privapp-permissions package="com.google.android.feedback">
        <permission name="android.permission.READ_LOGS"/>
        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
    </privapp-permissions>

    <privapp-permissions package="com.google.android.apps.gcs">
@ -299,6 +320,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.BATTERY_STATS" />
        <permission name="android.permission.BRIGHTNESS_SLIDER_USAGE"/>
        <permission name="android.permission.CHANGE_APP_IDLE_STATE"/>
+        <permission name="android.permission.CHANGE_APP_LAUNCH_TIME_ESTIMATE"/>
        <permission name="android.permission.CONFIGURE_DISPLAY_BRIGHTNESS"/>
        <permission name="android.permission.DUMP"/>
        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
@ -311,6 +333,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS"/>
        <permission name="android.permission.CONTROL_DISPLAY_SATURATION"/>
        <permission name="android.permission.LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK"/>
+        <permission name="android.permission.MODIFY_DAY_NIGHT_MODE"/>
        <permission name="android.permission.MODIFY_PHONE_STATE"/>
        <permission name="android.permission.MODIFY_QUIET_MODE"/>
        <permission name="android.permission.OBSERVE_APP_USAGE"/>
@ -319,6 +342,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.READ_WALLPAPER_INTERNAL"/>
        <permission name="android.permission.REAL_GET_TASKS"/>
        <permission name="android.permission.SET_WALLPAPER_COMPONENT"/>
+        <permission name="android.permission.SET_WALLPAPER_DIM_AMOUNT"/>
        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
        <permission name="android.permission.START_TASKS_FROM_RECENTS"/>
        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
@ -337,9 +361,12 @@ It allows additional grants on top of privapp-permissions-platform.xml
    </privapp-permissions>

    <privapp-permissions package="com.google.android.gms">
+        <permission name="android.permission.ACCESS_BROADCAST_RESPONSE_STATS"/>
        <permission name="android.permission.ACCESS_CACHE_FILESYSTEM"/>
        <permission name="android.permission.ACCESS_CONTEXT_HUB"/>
+        <permission name="android.permission.ACCESS_FPS_COUNTER"/>
        <permission name="android.permission.ACCESS_NETWORK_CONDITIONS"/>
+        <permission name="android.permission.ACCESS_VIBRATOR_STATE"/>
        <permission name="android.permission.ACTIVITY_EMBEDDING"/>
        <permission name="android.permission.ALLOCATE_AGGRESSIVE"/>
        <permission name="android.permission.BACKUP"/>
@ -366,10 +393,13 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
        <permission name="android.permission.INVOKE_CARRIER_SETUP"/>
        <permission name="android.permission.LOCAL_MAC_ADDRESS"/>
+        <permission name="android.permission.LOCATION_BYPASS"/>
        <permission name="android.permission.LOCATION_HARDWARE"/>
        <permission name="android.permission.LOCK_DEVICE"/>
        <permission name="android.permission.MANAGE_DEVICE_ADMINS"/>
        <permission name="android.permission.MANAGE_FACTORY_RESET_PROTECTION" />
+        <permission name="android.permission.MANAGE_GAME_ACTIVITY" />
+        <permission name="android.permission.MANAGE_GAME_MODE" />
        <permission name="android.permission.MANAGE_ROLLBACKS"/>
        <permission name="android.permission.MANAGE_SOUND_TRIGGER"/>
        <permission name="android.permission.MANAGE_SUBSCRIPTION_PLANS"/>
@ -377,7 +407,10 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.MANAGE_USB"/>
        <permission name="android.permission.MANAGE_USERS"/>
        <permission name="android.permission.MANAGE_VOICE_KEYPHRASES"/>
+        <permission name="android.permission.MANAGE_WIFI_AUTO_JOIN"/>
+        <permission name="android.permission.MANAGE_WIFI_NETWORK_SELECTION"/>
        <permission name="android.permission.MASTER_CLEAR"/>
+        <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
        <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
        <permission name="android.permission.MODIFY_DAY_NIGHT_MODE"/>
        <permission name="android.permission.MODIFY_NETWORK_ACCOUNTING"/>
@ -390,6 +423,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.PROVIDE_TRUST_AGENT"/>
        <permission name="android.permission.READ_DREAM_STATE"/>
        <permission name="android.permission.READ_LOGS"/>
+        <permission name="android.permission.READ_NEARBY_STREAMING_POLICY"/>
        <permission name="android.permission.READ_NETWORK_USAGE_HISTORY"/>
        <permission name="android.permission.READ_OEM_UNLOCK_STATE"/>
        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
@ -402,9 +436,12 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.REGISTER_CALL_PROVIDER"/>
        <permission name="android.permission.REMOTE_DISPLAY_PROVIDER"/>
        <permission name="android.permission.RENOUNCE_PERMISSIONS"/>
+        <permission name="android.permission.REQUEST_COMPANION_PROFILE_COMPUTER"/>
+        <permission name="android.permission.REQUEST_COMPANION_SELF_MANAGED"/>
        <permission name="android.permission.RESET_PASSWORD"/>
        <permission name="android.permission.SCHEDULE_PRIORITIZED_ALARM"/>
        <permission name="android.permission.SCORE_NETWORKS"/>
+        <permission name="android.permission.SEND_SAFETY_CENTER_UPDATE"/>
        <permission name="android.permission.SEND_SMS_NO_CONFIRMATION"/>
        <permission name="android.permission.SET_TIME"/>
        <permission name="android.permission.SET_TIME_ZONE"/>
@ -425,7 +462,34 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="com.android.voicemail.permission.READ_VOICEMAIL"/>
    </privapp-permissions>

+    <privapp-permissions package="com.google.android.gms.supervision">
+        <permission name="android.permission.ACCESS_NETWORK_CONDITIONS"/>
+        <permission name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST"/>
+        <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>
+        <permission name="android.permission.GET_APP_OPS_STATS"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.MANAGE_DEVICE_ADMINS"/>
+        <permission name="android.permission.MANAGE_FACTORY_RESET_PROTECTION" />
+        <permission name="android.permission.MANAGE_TIME_AND_ZONE_DETECTION"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.MASTER_CLEAR"/>
+        <permission name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS"/>
+        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+        <permission name="android.permission.READ_DREAM_STATE"/>
+        <permission name="android.permission.RESET_PASSWORD"/>
+        <permission name="android.permission.SCHEDULE_EXACT_ALARM"/>
+        <permission name="android.permission.SET_TIME"/>
+        <permission name="android.permission.SET_TIME_ZONE"/>
+        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
+        <permission name="android.permission.STATUS_BAR"/>
+        <permission name="android.permission.SYSTEM_ALERT_WINDOW"/>
+        <permission name="android.permission.USER_ACTIVITY"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+        <permission name="android.permission.WRITE_SYNC_SETTINGS"/>
+    </privapp-permissions>
+
    <privapp-permissions package="com.google.android.projection.gearhead">
+        <permission name="android.permission.ACTIVITY_EMBEDDING"/>
        <permission name="android.permission.BLUETOOTH_PRIVILEGED"/>
        <permission name="android.permission.CALL_PRIVILEGED"/>
        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
@ -439,9 +503,8 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
        <permission name="android.permission.MODIFY_DAY_NIGHT_MODE"/>
        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.REQUEST_COMPANION_SELF_MANAGED"/>
        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
-        <!-- Should be removed once it is granted via role. -->
-        <permission name="android.permission.TOGGLE_AUTOMOTIVE_PROJECTION"/>
        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
    </privapp-permissions>

@ -458,6 +521,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
        <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+        <permission name="android.permission.READ_DREAM_STATE"/>
        <permission name="android.permission.REAL_GET_TASKS"/>
        <permission name="android.permission.SET_MEDIA_KEY_LISTENER"/>
        <permission name="android.permission.SET_VOLUME_KEY_LONG_PRESS_LISTENER"/>
@ -469,9 +533,12 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.STOP_APP_SWITCHES"/>
        <permission name="com.google.android.permission.SET_WATCH_FACE_PRIVILEGED"/>
        <permission name="android.permission.WRITE_APN_SETTINGS"/>
+        <permission name="android.permission.WRITE_DREAM_STATE"/>
        <permission name="android.permission.SUBSTITUTE_SHARE_TARGET_APP_NAME_AND_ICON"/>
    </privapp-permissions>
    <privapp-permissions package="com.google.android.settings.intelligence">
+        <permission name="android.permission.BATTERY_STATS"/>
+        <permission name="android.permission.BLUETOOTH_CONNECT"/>
        <permission name="android.permission.MANAGE_FINGERPRINT"/>
        <permission name="android.permission.MODIFY_PHONE_STATE"/>
        <permission name="android.permission.READ_DEVICE_CONFIG"/>
@ -497,10 +564,12 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.MASTER_CLEAR"/>
        <permission name="android.permission.MODIFY_DAY_NIGHT_MODE"/>
        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.NEARBY_WIFI_DEVICES"/>
        <permission name="android.permission.NOTIFICATION_DURING_SETUP"/>
        <permission name="android.permission.OVERRIDE_WIFI_CONFIG"/>
        <permission name="android.permission.PERFORM_CDMA_PROVISIONING"/>
        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.READ_WIFI_CREDENTIAL"/>
        <permission name="android.permission.REBOOT"/>
        <permission name="android.permission.REQUEST_NETWORK_SCORES"/>
        <permission name="android.permission.SET_TIME"/>
@ -537,6 +606,22 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
    </privapp-permissions>

+    <privapp-permissions package="com.google.ambient.streaming">
+        <permission name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>
+        <permission name="android.permission.REQUEST_COMPANION_SELF_MANAGED"/>
+        <permission name="android.permission.CAPTURE_VOICE_COMMUNICATION_OUTPUT"/>
+        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
+        <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
+        <permission name="android.permission.BLUETOOTH_PRIVILEGED"/>
+        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
+        <permission name="android.permission.BATTERY_STATS"/>
+        <permission name="android.permission.ACCESS_NOTIFICATIONS"/>
+        <permission name="android.permission.FORCE_STOP_PACKAGES"/>
+        <permission name="android.permission.REQUEST_COMPANION_PROFILE_APP_STREAMING"/>
+        <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
+        <permission name="android.permission.REAL_GET_TASKS"/>
+    </privapp-permissions>
+
    <privapp-permissions package="com.google.android.GoogleCamera">
        <permission name="android.permission.INSTALL_PACKAGE_UPDATES"/>
        <permission name="android.permission.BIND_WALLPAPER"/>
@ -550,6 +635,18 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
        <!-- Required to allow security hub to identify when a system update is needed. -->
        <permission name="android.permission.READ_SYSTEM_UPDATE_INFO"/>
+        <!-- Required to allow security hub to check if Safety Center is enabled. -->
+        <permission name="android.permission.READ_SAFETY_CENTER_STATUS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.apps.kids.home">
+        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+        <permission name="android.permission.STATUS_BAR"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.pixel.livewallpaper">
+        <permission name="android.permission.READ_WALLPAPER_INTERNAL"/>
+        <permission name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>
    </privapp-permissions>

 </permissions>
--- a/apps/permissions/privapp-permissions-google-se-pixel.xml
+++ b/apps/permissions/privapp-permissions-google-se-pixel.xml
@ -23,8 +23,10 @@ It allows additional grants on top of privapp-permissions-platform.xml
 <permissions>

    <privapp-permissions package="com.android.systemui">
+        <permission name="android.permission.ALLOW_SLIPPERY_TOUCHES"/>
        <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
        <permission name="android.permission.SET_WALLPAPER_COMPONENT"/>
+        <permission name="android.permission.SET_WALLPAPER_DIM_AMOUNT"/>
        <permission name="android.permission.LOCATION_HARDWARE"/>
        <permission name="android.permission.ACCESS_CONTEXT_HUB"/>
        <permission name="android.permission.REGISTER_STATS_PULL_ATOM"/>
@ -56,6 +58,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
    </privapp-permissions>

    <privapp-permissions package="com.google.android.apps.nexuslauncher">
+        <permission name="android.permission.ALLOW_SLIPPERY_TOUCHES"/>
        <permission name="android.permission.BIND_APPWIDGET"/>
        <permission name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS"/>
        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
@ -66,6 +69,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="com.google.pixel.exo.PUSH_STREAMING_CONTENT"/>
        <permission name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS"/>
        <permission name="android.permission.REGISTER_STATS_PULL_ATOM"/>
+        <permission name="android.permission.SET_UNRESTRICTED_KEEP_CLEAR_AREAS"/>
    </privapp-permissions>

    <privapp-permissions package="com.google.android.gsf">
@ -114,6 +118,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
    <privapp-permissions package="com.google.android.feedback">
        <permission name="android.permission.READ_LOGS"/>
        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
    </privapp-permissions>

    <privapp-permissions package="com.android.yadayada">
@ -128,6 +133,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
        <permission name="android.permission.SHUTDOWN"/>
        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
+        <permission name="android.permission.DISPATCH_PROVISIONING_MESSAGE"/>
    </privapp-permissions>

    <privapp-permissions package="com.google.android.grilservice">
@ -208,6 +214,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
    </privapp-permissions>

    <privapp-permissions package="com.google.android.turboadapter">
+        <permission name="android.permission.BATTERY_STATS"/>
        <permission name="android.permission.DUMP"/>
    </privapp-permissions>
 </permissions>
--- a/apps/permissions/privapp-permissions-pixel-s.xml
+++ b/apps/permissions/privapp-permissions-pixel-s.xml
@ -21,27 +21,6 @@ applications in /system on GMS or Google-branded devices.
 It allows additional grants on top of privapp-permissions-platform.xml
 -->
 <permissions>
-    <privapp-permissions package="com.google.android.ext.services">
-        <permission name="android.permission.MONITOR_DEFAULT_SMS_PACKAGE" />
-        <permission name="android.permission.PROVIDE_RESOLVER_RANKER_SERVICE" />
-        <permission name="android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE" />
-        <permission name="android.permission.INTERACT_ACROSS_USERS" />
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.permissioncontroller">
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS"/>
-        <permission name="android.permission.GET_APP_OPS_STATS"/>
-        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
-        <permission name="android.permission.REQUEST_INCIDENT_REPORT_APPROVAL"/>
-        <permission name="android.permission.APPROVE_INCIDENT_REPORTS"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
-        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME" />
-        <permission name="android.permission.PACKAGE_USAGE_STATS" />
-        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
-        <permission name="android.permission.MODIFY_AUDIO_ROUTING" />
-    </privapp-permissions>
-
    <privapp-permissions package="com.google.android.packageinstaller">
        <permission name="android.permission.DELETE_PACKAGES"/>
        <permission name="android.permission.INSTALL_PACKAGES"/>
@ -85,51 +64,4 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>
    </privapp-permissions>

-    <privapp-permissions package="com.google.android.providers.media.module">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.USE_RESERVED_DISK"/>
-        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
-        <permission name="android.permission.WATCH_APPOPS"/>
-        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
-        <permission name="android.permission.UPDATE_DEVICE_STATS"/>
-        <!-- Permissions required for reading and logging compat changes -->
-        <permission name="android.permission.LOG_COMPAT_CHANGE" />
-        <permission name="android.permission.READ_COMPAT_CHANGE_CONFIG" />
-        <permission name="android.permission.REGISTER_STATS_PULL_ATOM" />
-        <!-- Permissions required for reading DeviceConfig -->
-        <permission name="android.permission.READ_DEVICE_CONFIG" />
-        <permission name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>
-        <permission name="android.permission.MODIFY_QUIET_MODE"/>
-        <!-- Permissions required to check if an app is in the foreground or not during IO -->
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.networkstack.tethering">
-        <permission name="android.permission.BLUETOOTH_PRIVILEGED" />
-        <permission name="android.permission.MANAGE_USB"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_NETWORK_USAGE_HISTORY"/>
-        <permission name="android.permission.TETHER_PRIVILEGED"/>
-        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
-        <permission name="android.permission.UPDATE_DEVICE_STATS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.cellbroadcastreceiver">
-        <permission name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.STATUS_BAR"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.MODIFY_CELL_BROADCASTS"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.RECEIVE_EMERGENCY_BROADCAST"/>
-        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.cellbroadcastservice">
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.RECEIVE_EMERGENCY_BROADCAST"/>
-    </privapp-permissions>
 </permissions>
--- a/apps/sysconfig/aiai_allowlist.xml
+++ b/apps/sysconfig/aiai_allowlist.xml
@ -18,12 +18,13 @@
         interact with, including the providers that back the implementation of the APIs
         provided by the package. -->
    <allow-association target="com.google.android.as" allowed="com.android.bluetooth" />
+    <allow-association target="com.google.android.as" allowed="com.android.bluetooth.services" />
    <allow-association target="com.google.android.as" allowed="com.android.providers.contacts" />
    <allow-association target="com.google.android.as" allowed="com.android.providers.media" />
    <allow-association target="com.google.android.as" allowed="com.android.providers.telephony" />
    <allow-association target="com.google.android.as" allowed="com.android.systemui" />
+    <allow-association target="com.google.android.as" allowed="com.google.android.bluetooth.services" />
    <allow-association target="com.google.android.as" allowed="com.google.android.providers.media.module" />
-
    <!-- AI services can bind to its open-source network component. -->
    <allow-association target="com.google.android.as" allowed="com.google.android.as.oss" />

--- a/sounds/GoogleAudio.mk
+++ b/sounds/GoogleAudio.mk
@ -13,6 +13,7 @@ PRODUCT_COPY_FILES += \
    $(LOCAL_PATH)/material/alarms/Bright_morning.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Bright_morning.ogg \
    $(LOCAL_PATH)/material/alarms/Cuckoo_clock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Cuckoo_clock.ogg \
    $(LOCAL_PATH)/material/alarms/Early_twilight.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Early_twilight.ogg \
+    $(LOCAL_PATH)/material/alarms/Fresh_start.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Fresh_start.ogg \
    $(LOCAL_PATH)/material/alarms/Full_of_wonder.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Full_of_wonder.ogg \
    $(LOCAL_PATH)/material/alarms/Gentle_breeze.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Gentle_breeze.ogg \
    $(LOCAL_PATH)/material/alarms/Icicles.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Icicles.ogg \
@ -22,11 +23,14 @@ PRODUCT_COPY_FILES += \
    $(LOCAL_PATH)/material/alarms/Spokes.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Spokes.ogg \
    $(LOCAL_PATH)/material/alarms/Sunshower.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Sunshower.ogg \
    $(LOCAL_PATH)/material/ui/audio_end.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/audio_end.ogg \
+    $(LOCAL_PATH)/material/ui/audio_end.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/audio_end.ogg \
    $(LOCAL_PATH)/material/ui/audio_initiate.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/audio_initiate.ogg \
    $(LOCAL_PATH)/material/ui/camera_click.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_click.ogg \
    $(LOCAL_PATH)/material/ui/camera_focus.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/camera_focus.ogg \
    $(LOCAL_PATH)/material/ui/reverse_charging_end.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/reverse_charging_end.ogg \
    $(LOCAL_PATH)/material/ui/reverse_charging_start.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/reverse_charging_start.ogg \
+    $(LOCAL_PATH)/material/ui/audio_end.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/audio_end.ogg \
+    $(LOCAL_PATH)/material/ui/AttentionalHaptics.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/AttentionalHaptics.ogg \
    $(LOCAL_PATH)/material/ui/ChargingStarted.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/ChargingStarted.ogg \
    $(LOCAL_PATH)/material/ui/Dock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Dock.ogg \
    $(LOCAL_PATH)/material/ui/Effect_Tick.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Effect_Tick.ogg \
@ -52,6 +56,7 @@ PRODUCT_COPY_FILES += \
    $(LOCAL_PATH)/material/notifications/Beginning.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Beginning.ogg \
    $(LOCAL_PATH)/material/notifications/Coconuts.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Coconuts.ogg \
    $(LOCAL_PATH)/material/notifications/Duet.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Duet.ogg \
+    $(LOCAL_PATH)/material/notifications/Eureka.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Eureka.ogg \
    $(LOCAL_PATH)/material/notifications/End_note.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/End_note.ogg \
    $(LOCAL_PATH)/material/notifications/Gentle_gong.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Gentle_gong.ogg \
    $(LOCAL_PATH)/material/notifications/Mallet.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Mallet.ogg \
@ -75,4 +80,5 @@ PRODUCT_COPY_FILES += \
    $(LOCAL_PATH)/material/ringtones/Monkey_around.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Monkey_around.ogg \
    $(LOCAL_PATH)/material/ringtones/Schools_out.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Schools_out.ogg \
    $(LOCAL_PATH)/material/ringtones/The_big_adventure.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/The_big_adventure.ogg \
+    $(LOCAL_PATH)/material/ringtones/Your_new_adventure.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Your_new_adventure.ogg \
    $(LOCAL_PATH)/material/ringtones/Zen_too.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Zen_too.ogg
--- a/sounds/SoundPickerPrebuilt.apk
+++ b/sounds/SoundPickerPrebuilt.apk
--- a/sounds/material/alarms/A_real_hoot.ogg
+++ b/sounds/material/alarms/A_real_hoot.ogg
--- a/sounds/material/alarms/Bright_morning.ogg
+++ b/sounds/material/alarms/Bright_morning.ogg
--- a/sounds/material/alarms/Cuckoo_clock.ogg
+++ b/sounds/material/alarms/Cuckoo_clock.ogg
--- a/sounds/material/alarms/Early_twilight.ogg
+++ b/sounds/material/alarms/Early_twilight.ogg
--- a/sounds/material/alarms/Fresh_start.ogg
+++ b/sounds/material/alarms/Fresh_start.ogg
--- a/sounds/material/alarms/Full_of_wonder.ogg
+++ b/sounds/material/alarms/Full_of_wonder.ogg
--- a/sounds/material/alarms/Gentle_breeze.ogg
+++ b/sounds/material/alarms/Gentle_breeze.ogg
--- a/sounds/material/alarms/Icicles.ogg
+++ b/sounds/material/alarms/Icicles.ogg
--- a/sounds/material/alarms/Jump_start.ogg
+++ b/sounds/material/alarms/Jump_start.ogg
--- a/sounds/material/alarms/Loose_change.ogg
+++ b/sounds/material/alarms/Loose_change.ogg
--- a/sounds/material/alarms/Rolling_fog.ogg
+++ b/sounds/material/alarms/Rolling_fog.ogg
--- a/sounds/material/alarms/Spokes.ogg
+++ b/sounds/material/alarms/Spokes.ogg
--- a/sounds/material/alarms/Sunshower.ogg
+++ b/sounds/material/alarms/Sunshower.ogg
--- a/sounds/material/notifications/Eureka.ogg
+++ b/sounds/material/notifications/Eureka.ogg
--- a/sounds/material/ringtones/Copycat.ogg
+++ b/sounds/material/ringtones/Copycat.ogg
--- a/sounds/material/ringtones/Crackle.ogg
+++ b/sounds/material/ringtones/Crackle.ogg
--- a/sounds/material/ringtones/Flutterby.ogg
+++ b/sounds/material/ringtones/Flutterby.ogg
--- a/sounds/material/ringtones/Hotline.ogg
+++ b/sounds/material/ringtones/Hotline.ogg
--- a/sounds/material/ringtones/Leaps_and_bounds.ogg
+++ b/sounds/material/ringtones/Leaps_and_bounds.ogg
--- a/sounds/material/ringtones/Lollipop.ogg
+++ b/sounds/material/ringtones/Lollipop.ogg
--- a/sounds/material/ringtones/Lost_and_found.ogg
+++ b/sounds/material/ringtones/Lost_and_found.ogg
--- a/sounds/material/ringtones/Mash_up.ogg
+++ b/sounds/material/ringtones/Mash_up.ogg
--- a/sounds/material/ringtones/Monkey_around.ogg
+++ b/sounds/material/ringtones/Monkey_around.ogg
--- a/sounds/material/ringtones/Schools_out.ogg
+++ b/sounds/material/ringtones/Schools_out.ogg
--- a/sounds/material/ringtones/The_big_adventure.ogg
+++ b/sounds/material/ringtones/The_big_adventure.ogg
--- a/sounds/material/ringtones/Your_new_adventure.ogg
+++ b/sounds/material/ringtones/Your_new_adventure.ogg
--- a/sounds/material/ringtones/Zen_too.ogg
+++ b/sounds/material/ringtones/Zen_too.ogg
--- a/sounds/material/ui/AttentionalHaptics.ogg
+++ b/sounds/material/ui/AttentionalHaptics.ogg