diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 4d1b219a2cbb..a34e7522cb64 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -278267,6 +278267,13 @@ function {
   parameter_id: 0xc9082b19
   parameter_id: 0xc9082b19
 }
+function {
+  id: 0x126f3be6
+  return_type_id: 0x48b5725f
+  parameter_id: 0x0483e6f8
+  parameter_id: 0xf435685e
+  parameter_id: 0x1d19a9d5
+}
 function {
   id: 0x12725ea0
   return_type_id: 0x48b5725f
@@ -287681,6 +287688,11 @@ function {
   return_type_id: 0x0490bb4a
   parameter_id: 0x3e146274
 }
+function {
+  id: 0x36eaa726
+  return_type_id: 0x33756485
+  parameter_id: 0x1d19a9d5
+}
 function {
   id: 0x36f1d1fd
   return_type_id: 0x0490bb4a
@@ -306102,6 +306114,13 @@ function {
   parameter_id: 0x6720d32f
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0x9bff5408
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x1d19a9d5
+  parameter_id: 0x92233392
+}
 function {
   id: 0x9c00c8ec
   return_type_id: 0x6720d32f
@@ -321185,6 +321204,42 @@ elf_symbol {
   type_id: 0x9b506e5c
   full_name: "__traceiter_sched_overutilized_tp"
 }
+elf_symbol {
+  id: 0x2de60b3e
+  name: "__traceiter_sched_stat_blocked"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x555bfe74
+  type_id: 0x9bff5408
+  full_name: "__traceiter_sched_stat_blocked"
+}
+elf_symbol {
+  id: 0x9cf075c5
+  name: "__traceiter_sched_stat_iowait"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xf933c73c
+  type_id: 0x9bff5408
+  full_name: "__traceiter_sched_stat_iowait"
+}
+elf_symbol {
+  id: 0xa785ee77
+  name: "__traceiter_sched_stat_sleep"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x5bd3966f
+  type_id: 0x9bff5408
+  full_name: "__traceiter_sched_stat_sleep"
+}
+elf_symbol {
+  id: 0x41fdc249
+  name: "__traceiter_sched_stat_wait"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xd469207b
+  type_id: 0x9bff5408
+  full_name: "__traceiter_sched_stat_wait"
+}
 elf_symbol {
   id: 0x570f3032
   name: "__traceiter_sched_switch"
@@ -321203,6 +321258,15 @@ elf_symbol {
   type_id: 0x9b0e782a
   full_name: "__traceiter_sched_update_nr_running_tp"
 }
+elf_symbol {
+  id: 0x20097074
+  name: "__traceiter_sched_waking"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x28dae5ba
+  type_id: 0x9bdbdcc4
+  full_name: "__traceiter_sched_waking"
+}
 elf_symbol {
   id: 0x863777a0
   name: "__traceiter_suspend_resume"
@@ -323498,6 +323562,42 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_sched_overutilized_tp"
 }
+elf_symbol {
+  id: 0x37548d14
+  name: "__tracepoint_sched_stat_blocked"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xcc6130e1
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_sched_stat_blocked"
+}
+elf_symbol {
+  id: 0x6aa1a617
+  name: "__tracepoint_sched_stat_iowait"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x3dcb44d9
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_sched_stat_iowait"
+}
+elf_symbol {
+  id: 0xbc210559
+  name: "__tracepoint_sched_stat_sleep"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xf3492e73
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_sched_stat_sleep"
+}
+elf_symbol {
+  id: 0x7d5529d3
+  name: "__tracepoint_sched_stat_wait"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xc977be89
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_sched_stat_wait"
+}
 elf_symbol {
   id: 0xe10cee18
   name: "__tracepoint_sched_switch"
@@ -323516,6 +323616,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_sched_update_nr_running_tp"
 }
+elf_symbol {
+  id: 0xa70e8cd2
+  name: "__tracepoint_sched_waking"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x36772c03
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_sched_waking"
+}
 elf_symbol {
   id: 0x5b327cd6
   name: "__tracepoint_suspend_resume"
@@ -340508,6 +340617,15 @@ elf_symbol {
   type_id: 0x904bd3e9
   full_name: "get_vaddr_frames"
 }
+elf_symbol {
+  id: 0x4ba4e06f
+  name: "get_wchan"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x470d5699
+  type_id: 0x36eaa726
+  full_name: "get_wchan"
+}
 elf_symbol {
   id: 0xbac82e84
   name: "get_zeroed_page"
@@ -372174,6 +372292,15 @@ elf_symbol {
   type_id: 0x1af18e52
   full_name: "wpan_phy_unregister"
 }
+elf_symbol {
+  id: 0x180eeaeb
+  name: "wq_worker_comm"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x6aede2ad
+  type_id: 0x126f3be6
+  full_name: "wq_worker_comm"
+}
 elf_symbol {
   id: 0x61731bd0
   name: "ww_mutex_lock"
@@ -375170,6 +375297,22 @@ symbols {
     key: "__traceiter_sched_overutilized_tp"
     value: 0xb614ca1f
   }
+  symbol {
+    key: "__traceiter_sched_stat_blocked"
+    value: 0x2de60b3e
+  }
+  symbol {
+    key: "__traceiter_sched_stat_iowait"
+    value: 0x9cf075c5
+  }
+  symbol {
+    key: "__traceiter_sched_stat_sleep"
+    value: 0xa785ee77
+  }
+  symbol {
+    key: "__traceiter_sched_stat_wait"
+    value: 0x41fdc249
+  }
   symbol {
     key: "__traceiter_sched_switch"
     value: 0x570f3032
@@ -375178,6 +375321,10 @@ symbols {
     key: "__traceiter_sched_update_nr_running_tp"
     value: 0xc42d0053
   }
+  symbol {
+    key: "__traceiter_sched_waking"
+    value: 0x20097074
+  }
   symbol {
     key: "__traceiter_suspend_resume"
     value: 0x863777a0
@@ -376198,6 +376345,22 @@ symbols {
     key: "__tracepoint_sched_overutilized_tp"
     value: 0x2497fb4d
   }
+  symbol {
+    key: "__tracepoint_sched_stat_blocked"
+    value: 0x37548d14
+  }
+  symbol {
+    key: "__tracepoint_sched_stat_iowait"
+    value: 0x6aa1a617
+  }
+  symbol {
+    key: "__tracepoint_sched_stat_sleep"
+    value: 0xbc210559
+  }
+  symbol {
+    key: "__tracepoint_sched_stat_wait"
+    value: 0x7d5529d3
+  }
   symbol {
     key: "__tracepoint_sched_switch"
     value: 0xe10cee18
@@ -376206,6 +376369,10 @@ symbols {
     key: "__tracepoint_sched_update_nr_running_tp"
     value: 0x477e3555
   }
+  symbol {
+    key: "__tracepoint_sched_waking"
+    value: 0xa70e8cd2
+  }
   symbol {
     key: "__tracepoint_suspend_resume"
     value: 0x5b327cd6
@@ -383754,6 +383921,10 @@ symbols {
     key: "get_vaddr_frames"
     value: 0xce04fca2
   }
+  symbol {
+    key: "get_wchan"
+    value: 0x4ba4e06f
+  }
   symbol {
     key: "get_zeroed_page"
     value: 0xbac82e84
@@ -397830,6 +398001,10 @@ symbols {
     key: "wpan_phy_unregister"
     value: 0x887e1dde
   }
+  symbol {
+    key: "wq_worker_comm"
+    value: 0x180eeaeb
+  }
   symbol {
     key: "ww_mutex_lock"
     value: 0x61731bd0
diff --git a/android/abi_gki_aarch64_oplus b/android/abi_gki_aarch64_oplus
index c074f9194b69..adf5722edd99 100644
--- a/android/abi_gki_aarch64_oplus
+++ b/android/abi_gki_aarch64_oplus
@@ -15,6 +15,7 @@
   for_each_kernel_tracepoint
   freq_qos_add_notifier
   freq_qos_remove_notifier
+  get_wchan
   gov_attr_set_get
   gpiod_to_chip
   have_governor_per_policy
@@ -105,6 +106,11 @@
   __traceiter_android_vh_rwsem_opt_spin_finish
   __traceiter_android_vh_rwsem_opt_spin_start
   __traceiter_android_vh_rwsem_wake_finish
+  __traceiter_sched_stat_blocked
+  __traceiter_sched_stat_iowait
+  __traceiter_sched_stat_sleep
+  __traceiter_sched_stat_wait
+  __traceiter_sched_waking
   __tracepoint_android_vh_alter_mutex_list_add
   __tracepoint_android_vh_binder_free_proc
   __tracepoint_android_vh_binder_has_work_ilocked
@@ -132,6 +138,11 @@
   __tracepoint_android_vh_rwsem_opt_spin_finish
   __tracepoint_android_vh_rwsem_opt_spin_start
   __tracepoint_android_vh_rwsem_wake_finish
+  __tracepoint_sched_stat_blocked
+  __tracepoint_sched_stat_iowait
+  __tracepoint_sched_stat_sleep
+  __tracepoint_sched_stat_wait
+  __tracepoint_sched_waking
   typec_mux_get_drvdata
   unregister_memory_notifier
   unregister_tcf_proto_ops
@@ -139,3 +150,4 @@
   wait_for_completion_io_timeout
   wait_for_completion_killable_timeout
   wakeup_source_remove
+  wq_worker_comm