diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 14fce8227650..4d2d32e16e57 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -440,6 +440,7 @@
+
@@ -873,6 +874,9 @@
+
+
+
@@ -2127,6 +2131,7 @@
+
@@ -2181,10 +2186,12 @@
+
+
@@ -4520,6 +4527,7 @@
+
@@ -4534,6 +4542,7 @@
+
@@ -4799,6 +4808,7 @@
+
@@ -5935,6 +5945,7 @@
+
@@ -17180,6 +17191,12 @@
+
+
+
+
+
+
@@ -24181,6 +24198,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -51472,6 +51507,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -56560,6 +56618,7 @@
+
@@ -57985,6 +58044,7 @@
+
@@ -124336,6 +124396,11 @@
+
+
+
+
+
@@ -124539,6 +124604,7 @@
+
@@ -126988,6 +127054,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -133607,6 +133685,10 @@
+
+
+
+
@@ -133898,6 +133980,12 @@
+
+
+
+
+
+
@@ -133935,6 +134023,12 @@
+
+
+
+
+
+
@@ -145962,6 +146056,12 @@
+
+
+
+
+
+
@@ -146038,6 +146138,12 @@
+
+
+
+
+
+
@@ -147401,6 +147507,11 @@
+
+
+
+
+
diff --git a/android/abi_gki_aarch64_mtk b/android/abi_gki_aarch64_mtk
index ae8b68073a7f..48986183eb61 100644
--- a/android/abi_gki_aarch64_mtk
+++ b/android/abi_gki_aarch64_mtk
@@ -14,7 +14,6 @@
alloc_chrdev_region
alloc_etherdev_mqs
alloc_io_pgtable_ops
- alloc_netdev_mqs
__alloc_pages
alloc_pages_exact
__alloc_percpu
@@ -77,7 +76,6 @@
bpf_trace_run7
bpf_trace_run8
bpf_trace_run9
- build_skb
bus_register
bus_set_iommu
bus_unregister
@@ -90,38 +88,6 @@
cdev_device_add
cdev_device_del
cdev_init
- __cfg80211_alloc_event_skb
- __cfg80211_alloc_reply_skb
- cfg80211_chandef_create
- cfg80211_ch_switch_notify
- cfg80211_classify8021d
- cfg80211_connect_done
- cfg80211_del_sta_sinfo
- cfg80211_disconnected
- cfg80211_external_auth_request
- cfg80211_find_elem_match
- cfg80211_ft_event
- cfg80211_get_bss
- cfg80211_inform_bss_data
- cfg80211_inform_bss_frame_data
- cfg80211_mgmt_tx_status
- cfg80211_michael_mic_failure
- cfg80211_new_sta
- cfg80211_pmksa_candidate_notify
- cfg80211_put_bss
- cfg80211_ready_on_channel
- cfg80211_register_netdevice
- cfg80211_remain_on_channel_expired
- cfg80211_roamed
- cfg80211_rx_mgmt_khz
- cfg80211_scan_done
- cfg80211_sched_scan_results
- cfg80211_sched_scan_stopped
- __cfg80211_send_event_skb
- cfg80211_tdls_oper_request
- cfg80211_unlink_bss
- cfg80211_unregister_wdev
- cfg80211_vendor_cmd_reply
__cfi_slowpath_diag
cgroup_taskset_first
cgroup_taskset_next
@@ -137,8 +103,11 @@
clk_bulk_disable
clk_bulk_enable
clk_bulk_prepare
+ clk_bulk_put
clk_bulk_put_all
clk_bulk_unprepare
+ clkdev_add
+ clkdev_drop
clk_disable
clk_divider_ops
clk_enable
@@ -165,9 +134,11 @@
clk_register_divider_table
clk_register_fixed_factor
clk_register_fixed_rate
+ clk_register_gate
clk_set_parent
clk_set_rate
clk_unprepare
+ clk_unregister_gate
clockevents_config_and_register
clocks_calc_mult_shift
clocksource_mmio_init
@@ -264,6 +235,7 @@
_ctype
dapm_clock_event
dapm_kcontrol_get_value
+ dapm_regulator_event
deactivate_task
debugfs_attr_read
debugfs_attr_write
@@ -290,7 +262,6 @@
desc_to_gpio
destroy_workqueue
dev_base_lock
- dev_change_flags
dev_driver_string
_dev_err
dev_err_probe
@@ -523,11 +494,10 @@
dma_sync_sg_for_cpu
dma_sync_sg_for_device
dma_sync_single_for_cpu
- dma_sync_single_for_device
dma_unmap_page_attrs
+ dma_unmap_resource
dma_unmap_sg_attrs
do_exit
- do_trace_netlink_extack
double_rq_lock
do_wait_intr_irq
down
@@ -678,7 +648,6 @@
em_dev_register_perf_domain
enable_irq
enable_percpu_irq
- ether_setup
eth_header
eth_header_cache
eth_header_cache_update
@@ -712,6 +681,10 @@
font_vga_8x16
for_each_kernel_tracepoint
fput
+ frame_vector_create
+ frame_vector_destroy
+ frame_vector_to_pages
+ frame_vector_to_pfns
free_irq
free_netdev
__free_pages
@@ -757,6 +730,8 @@
gen_pool_create
gen_pool_destroy
gen_pool_dma_alloc_align
+ gen_pool_dma_zalloc
+ gen_pool_for_each_chunk
gen_pool_free_owner
gen_pool_has_addr
gen_pool_set_algo
@@ -778,6 +753,7 @@
get_task_mm
get_unused_fd_flags
get_user_pages_remote
+ get_vaddr_frames
get_zeroed_page
gic_nonsecure_priorities
gov_attr_set_get
@@ -803,19 +779,13 @@
gpiod_to_irq
gpio_free
gpio_request
- gpio_request_one
gpio_to_desc
handle_level_irq
handle_nested_irq
handle_simple_irq
have_governor_per_policy
- hci_alloc_dev_priv
- hci_free_dev
- hci_recv_frame
- hci_register_dev
- hci_unregister_dev
+ hdmi_audio_infoframe_init
hex_asc
- hex_dump_to_buffer
hex_to_bin
hrtimer_active
hrtimer_cancel
@@ -858,9 +828,6 @@
idr_for_each
idr_get_next
idr_remove
- ieee80211_channel_to_freq_khz
- ieee80211_get_channel_khz
- ieee80211_operating_class_to_band
iio_alloc_pollfunc
iio_buffer_init
iio_buffer_put
@@ -894,11 +861,11 @@
input_free_device
input_mt_init_slots
input_mt_report_slot_state
+ input_mt_sync_frame
input_register_device
input_set_abs_params
input_set_capability
input_unregister_device
- iomem_resource
iommu_alloc_resv_region
iommu_device_register
iommu_device_sysfs_add
@@ -1011,16 +978,13 @@
ksys_sync_helper
kthread_bind
kthread_bind_mask
- kthread_cancel_delayed_work_sync
kthread_cancel_work_sync
kthread_create_on_node
kthread_create_worker
- kthread_delayed_work_timer_fn
kthread_destroy_worker
kthread_flush_work
kthread_flush_worker
__kthread_init_worker
- kthread_queue_delayed_work
kthread_queue_work
kthread_should_stop
kthread_stop
@@ -1155,6 +1119,7 @@
mod_timer
mod_timer_pending
module_layout
+ module_put
__msecs_to_jiffies
msleep
msleep_interruptible
@@ -1166,13 +1131,11 @@
mutex_lock_killable
mutex_trylock
mutex_unlock
- napi_complete_done
napi_disable
napi_enable
napi_gro_flush
napi_gro_receive
__napi_schedule
- __napi_schedule_irqoff
napi_schedule_prep
nd_tbl
neigh_destroy
@@ -1184,18 +1147,13 @@
netdev_warn
netif_carrier_off
netif_carrier_on
- netif_device_attach
- netif_device_detach
netif_napi_add
netif_receive_skb
netif_receive_skb_list
netif_rx
netif_rx_ni
- netif_tx_stop_all_queues
netif_tx_wake_queue
- netlink_broadcast
__netlink_kernel_create
- netlink_kernel_release
netlink_unicast
net_namespace_list
net_selftest
@@ -1203,10 +1161,6 @@
net_selftest_get_strings
nf_register_net_hooks
nf_unregister_net_hooks
- __nla_parse
- nla_put
- nla_put_nohdr
- nla_strscpy
__nlmsg_put
no_llseek
nonseekable_open
@@ -1230,6 +1184,7 @@
of_clk_get
of_clk_get_by_name
of_clk_get_from_provider
+ of_clk_get_parent_count
of_clk_src_onecell_get
of_clk_src_simple_get
of_count_phandle_with_args
@@ -1309,9 +1264,6 @@
oops_in_progress
page_endio
page_mapping
- page_pool_alloc_pages
- page_pool_create
- page_pool_put_page
panic
panic_notifier_list
param_array_ops
@@ -1328,20 +1280,6 @@
param_set_charp
param_set_uint
param_set_ulong
- pci_alloc_irq_vectors_affinity
- pci_choose_state
- pci_free_irq_vectors
- pci_irq_vector
- pcim_enable_device
- pcim_iomap_regions
- pcim_iomap_table
- pcim_iounmap_regions
- __pci_register_driver
- pci_restore_state
- pci_save_state
- pci_set_master
- pci_set_power_state
- pci_unregister_driver
PDE_DATA
__per_cpu_offset
perf_event_create_kernel_counter
@@ -1413,6 +1351,7 @@
pm_genpd_add_device
pm_genpd_add_subdomain
pm_genpd_init
+ pm_genpd_remove
pm_genpd_remove_device
__pm_relax
pm_relax
@@ -1462,6 +1401,7 @@
put_pid
__put_task_struct
put_unused_fd
+ put_vaddr_frames
pwm_apply_state
pwmchip_add
pwmchip_remove
@@ -1516,7 +1456,6 @@
__register_chrdev
register_chrdev_region
register_die_notifier
- register_inetaddr_notifier
register_kprobe
register_module_notifier
register_netdev
@@ -1537,9 +1476,11 @@
regmap_field_update_bits_base
__regmap_init
regmap_irq_get_domain
+ regmap_multi_reg_write
regmap_raw_read
regmap_raw_write
regmap_read
+ regmap_register_patch
regmap_update_bits_base
regmap_write
regulator_count_voltages
@@ -1575,15 +1516,13 @@
regulator_sync_voltage
release_firmware
release_pages
- __release_region
remap_pfn_range
+ remap_vmalloc_range
remove_proc_entry
remove_proc_subtree
remove_wait_queue
request_firmware
- request_firmware_nowait
__request_percpu_irq
- __request_region
request_threaded_irq
reset_control_assert
reset_control_deassert
@@ -1614,17 +1553,14 @@
rtc_tm_to_time64
rtc_update_irq
rtc_valid_tm
- rtnl_is_locked
rtnl_lock
rtnl_unlock
runqueues
sched_clock
sched_clock_register
sched_feat_keys
- sched_setattr
sched_setattr_nocheck
sched_set_fifo
- sched_set_fifo_low
sched_set_normal
sched_setscheduler
sched_setscheduler_nocheck
@@ -1671,6 +1607,7 @@
set_capacity_and_notify
set_cpus_allowed_ptr
set_normalized_timespec64
+ set_page_dirty_lock
__SetPageMovable
set_task_cpu
set_user_nice
@@ -1696,28 +1633,32 @@
simple_read_from_buffer
simple_write_to_buffer
single_open
+ single_open_size
single_release
skb_add_rx_frag
skb_clone
- skb_copy
skb_copy_expand
skb_dequeue
skb_pull
- skb_pull_rcsum
skb_push
skb_put
- skb_queue_head
- skb_queue_purge
skb_queue_tail
skb_realloc_headroom
skb_trim
smp_call_function
smp_call_function_single
snd_card_add_dev_attr
+ snd_ctl_add
snd_ctl_boolean_mono_info
+ snd_ctl_new1
snd_jack_set_key
+ snd_pcm_add_chmap_ctls
+ snd_pcm_create_iec958_consumer_default
+ snd_pcm_fill_iec958_consumer
+ snd_pcm_fill_iec958_consumer_hw_params
snd_pcm_format_physical_width
snd_pcm_format_width
+ snd_pcm_hw_constraint_eld
snd_pcm_hw_constraint_integer
snd_pcm_hw_constraint_minmax
snd_pcm_hw_constraint_step
@@ -1727,11 +1668,13 @@
snd_pcm_lib_preallocate_pages_for_all
snd_pcm_period_elapsed
snd_pcm_set_ops
+ snd_soc_add_component
snd_soc_add_component_controls
snd_soc_bytes_info_ext
snd_soc_bytes_tlv_callback
snd_soc_card_jack_new
snd_soc_component_exit_regmap
+ snd_soc_component_initialize
snd_soc_component_init_regmap
snd_soc_component_read
snd_soc_component_set_jack
@@ -1745,19 +1688,24 @@
snd_soc_dapm_get_pin_switch
snd_soc_dapm_get_volsw
snd_soc_dapm_info_pin_switch
+ snd_soc_dapm_kcontrol_widget
snd_soc_dapm_new_controls
snd_soc_dapm_new_widgets
snd_soc_dapm_put_enum_double
snd_soc_dapm_put_pin_switch
snd_soc_dapm_put_volsw
snd_soc_dapm_sync
+ snd_soc_dpcm_get_substream
+ snd_soc_get_enum_double
snd_soc_get_volsw
snd_soc_info_enum_double
snd_soc_info_volsw
snd_soc_jack_report
snd_soc_new_compress
snd_soc_of_get_dai_link_codecs
+ snd_soc_of_parse_audio_routing
snd_soc_poweroff
+ snd_soc_put_enum_double
snd_soc_put_volsw
snd_soc_register_component
snd_soc_resume
@@ -1815,12 +1763,10 @@
strncpy_from_user
strnlen
strnstr
- strpbrk
strrchr
strreplace
strscpy
strsep
- strspn
strstr
suspend_set_ops
__sw_hweight32
@@ -1833,6 +1779,7 @@
syscon_node_to_regmap
syscon_regmap_lookup_by_compatible
syscon_regmap_lookup_by_phandle
+ syscon_regmap_lookup_by_phandle_optional
sysfs_create_bin_file
sysfs_create_file_ns
sysfs_create_group
@@ -1940,6 +1887,7 @@
__traceiter_mmap_lock_start_locking
__traceiter_pelt_se_tp
__traceiter_task_newtask
+ __traceiter_xhci_urb_giveback
__tracepoint_android_rvh_after_enqueue_task
__tracepoint_android_rvh_commit_creds
__tracepoint_android_rvh_cpu_overutilized
@@ -1998,6 +1946,7 @@
tracepoint_probe_register
tracepoint_probe_unregister
__tracepoint_task_newtask
+ __tracepoint_xhci_urb_giveback
trace_print_array_seq
trace_print_symbols_seq
__trace_puts
@@ -2005,6 +1954,7 @@
trace_seq_printf
trace_seq_putc
tracing_off
+ try_module_get
try_wait_for_completion
tty_flip_buffer_push
tty_insert_flip_string_fixed_flag
@@ -2067,7 +2017,6 @@
__unregister_chrdev
unregister_chrdev_region
unregister_die_notifier
- unregister_inetaddr_notifier
unregister_module_notifier
unregister_netdev
unregister_netdevice_notifier
@@ -2251,6 +2200,9 @@
v4l_bound_align_image
vabits_actual
vb2_buffer_done
+ vb2_common_vm_ops
+ vb2_create_framevec
+ vb2_destroy_framevec
vb2_dma_contig_memops
vb2_fop_mmap
vb2_fop_poll
@@ -2298,7 +2250,9 @@
vmalloc_user
vmap
vm_event_states
+ vm_map_ram
vm_node_stat
+ vm_unmap_ram
vm_zone_stat
vring_del_virtqueue
vring_interrupt
@@ -2326,12 +2280,6 @@
__warn_printk
watchdog_init_timeout
watchdog_set_restart_priority
- wiphy_apply_custom_regulatory
- wiphy_free
- wiphy_new_nm
- wiphy_register
- wiphy_unregister
- wireless_send_event
woken_wake_function
work_busy
work_on_cpu
@@ -2346,14 +2294,49 @@
xhci_reset_bandwidth
# preserved by --additions-only
+ alloc_netdev_mqs
all_vm_events
__arch_clear_user
__bitmap_equal
__bitmap_or
+ build_skb
cache_line_size
+ __cfg80211_alloc_event_skb
+ __cfg80211_alloc_reply_skb
+ cfg80211_chandef_create
+ cfg80211_ch_switch_notify
+ cfg80211_classify8021d
+ cfg80211_connect_done
+ cfg80211_del_sta_sinfo
+ cfg80211_disconnected
+ cfg80211_external_auth_request
+ cfg80211_find_elem_match
+ cfg80211_ft_event
+ cfg80211_get_bss
+ cfg80211_inform_bss_data
+ cfg80211_inform_bss_frame_data
+ cfg80211_mgmt_tx_status
+ cfg80211_michael_mic_failure
+ cfg80211_new_sta
+ cfg80211_pmksa_candidate_notify
+ cfg80211_put_bss
+ cfg80211_ready_on_channel
+ cfg80211_register_netdevice
+ cfg80211_remain_on_channel_expired
+ cfg80211_roamed
+ cfg80211_rx_mgmt_khz
+ cfg80211_scan_done
+ cfg80211_sched_scan_results
+ cfg80211_sched_scan_stopped
+ __cfg80211_send_event_skb
+ cfg80211_tdls_oper_request
+ cfg80211_unlink_bss
+ cfg80211_unregister_wdev
+ cfg80211_vendor_cmd_reply
clear_page
cpu_pm_register_notifier
cpu_pm_unregister_notifier
+ dev_change_flags
devfreq_add_device
devfreq_cooling_unregister
devfreq_register_opp_notifier
@@ -2365,27 +2348,79 @@
dma_buf_mmap
dma_fence_get_status
dma_fence_remove_callback
+ dma_sync_single_for_device
+ do_trace_netlink_extack
downgrade_write
+ ether_setup
gcd
genlmsg_put
genl_register_family
genl_unregister_family
+ get_user_pages
get_user_pages_fast
+ gpio_request_one
+ hci_alloc_dev_priv
+ hci_free_dev
+ hci_recv_frame
+ hci_register_dev
+ hci_unregister_dev
+ hex_dump_to_buffer
+ ieee80211_channel_to_freq_khz
+ ieee80211_get_channel_khz
+ ieee80211_operating_class_to_band
+ iomem_resource
irq_work_run
jiffies_64_to_clock_t
kstrtobool_from_user
+ kthread_cancel_delayed_work_sync
+ kthread_delayed_work_timer_fn
+ kthread_queue_delayed_work
__mmdrop
- module_put
+ napi_complete_done
+ __napi_schedule_irqoff
+ netif_device_attach
+ netif_device_detach
+ netif_tx_stop_all_queues
+ netlink_broadcast
+ netlink_kernel_release
+ __nla_parse
+ nla_put
+ nla_put_nohdr
+ nla_strscpy
n_tty_ioctl_helper
of_devfreq_cooling_register_power
of_dma_is_coherent
of_root
+ page_pool_alloc_pages
+ page_pool_create
+ page_pool_put_page
param_ops_byte
param_ops_string
+ pci_alloc_irq_vectors_affinity
+ pci_choose_state
+ pci_free_irq_vectors
+ pci_irq_vector
+ pcim_enable_device
+ pcim_iomap_regions
+ pcim_iomap_table
+ pcim_iounmap_regions
+ __pci_register_driver
+ pci_restore_state
+ pci_save_state
+ pci_set_master
+ pci_set_power_state
+ pci_unregister_driver
pin_user_pages_remote
+ _raw_spin_trylock_bh
rb_prev
rb_replace_node
- remap_vmalloc_range
+ register_inetaddr_notifier
+ __release_region
+ request_firmware_nowait
+ __request_region
+ rtnl_is_locked
+ sched_setattr
+ sched_set_fifo_low
sdio_claim_host
sdio_claim_irq
sdio_disable_func
@@ -2405,10 +2440,15 @@
sdio_writeb
sdio_writel
sdio_writesb
- set_page_dirty_lock
shmem_file_setup
si_meminfo
+ skb_copy
+ skb_pull_rcsum
+ skb_queue_head
+ skb_queue_purge
sprint_symbol_no_offset
+ strpbrk
+ strspn
system_long_wq
thermal_zone_device_update
__traceiter_android_vh_show_resume_epoch_val
@@ -2421,13 +2461,19 @@
__tracepoint_cpu_frequency
__tracepoint_gpu_mem_total
trace_print_flags_seq
- try_module_get
tty_driver_flush_buffer
tty_register_ldisc
tty_unregister_ldisc
unmap_mapping_range
+ unregister_inetaddr_notifier
vmf_insert_pfn_prot
wait_for_completion_killable_timeout
+ wiphy_apply_custom_regulatory
+ wiphy_free
+ wiphy_new_nm
+ wiphy_register
+ wiphy_unregister
+ wireless_send_event
zlib_deflate
zlib_deflateEnd
zlib_deflateInit2