diff options
19 files changed, 21 insertions, 3 deletions
diff --git a/flags/Android.bp b/flags/Android.bp index 386831cbb..807344e80 100644 --- a/flags/Android.bp +++ b/flags/Android.bp @@ -21,6 +21,7 @@ package { aconfig_declarations { name: "telecom_flags", package: "com.android.server.telecom.flags", + container: "system", srcs: [ "telecom_broadcast_flags.aconfig", "telecom_ringer_flag_declarations.aconfig", diff --git a/flags/telecom_anomaly_report_flags.aconfig b/flags/telecom_anomaly_report_flags.aconfig index dbacc08c2..6879d8686 100644 --- a/flags/telecom_anomaly_report_flags.aconfig +++ b/flags/telecom_anomaly_report_flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.telecom.flags" +container: "system" flag { name: "gen_anom_report_on_focus_timeout" diff --git a/flags/telecom_api_flags.aconfig b/flags/telecom_api_flags.aconfig index 74cb447a4..a211c7cdf 100644 --- a/flags/telecom_api_flags.aconfig +++ b/flags/telecom_api_flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.telecom.flags" +container: "system" flag { name: "voip_app_actions_support" diff --git a/flags/telecom_bluetoothroutemanager_flags.aconfig b/flags/telecom_bluetoothroutemanager_flags.aconfig index ddd8571c1..1df1e9b7e 100644 --- a/flags/telecom_bluetoothroutemanager_flags.aconfig +++ b/flags/telecom_bluetoothroutemanager_flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.telecom.flags" +container: "system" flag { name: "use_actual_address_to_enter_connecting_state" diff --git a/flags/telecom_broadcast_flags.aconfig b/flags/telecom_broadcast_flags.aconfig index 348d57473..de8dd279c 100644 --- a/flags/telecom_broadcast_flags.aconfig +++ b/flags/telecom_broadcast_flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.telecom.flags" +container: "system" flag { name: "is_new_outgoing_call_broadcast_unblocking" diff --git a/flags/telecom_call_filtering_flags.aconfig b/flags/telecom_call_filtering_flags.aconfig index 95e74ce86..72f9db31b 100644 --- a/flags/telecom_call_filtering_flags.aconfig +++ b/flags/telecom_call_filtering_flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.telecom.flags" +container: "system" flag { name: "skip_filter_phone_account_perform_dnd_filter" diff --git a/flags/telecom_call_flags.aconfig b/flags/telecom_call_flags.aconfig index b5ea6a28e..27a4b22df 100644 --- a/flags/telecom_call_flags.aconfig +++ b/flags/telecom_call_flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.telecom.flags" +container: "system" flag { name: "transactional_cs_verifier" diff --git a/flags/telecom_callaudiomodestatemachine_flags.aconfig b/flags/telecom_callaudiomodestatemachine_flags.aconfig index b26311378..1d81535e6 100644 --- a/flags/telecom_callaudiomodestatemachine_flags.aconfig +++ b/flags/telecom_callaudiomodestatemachine_flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.telecom.flags" +container: "system" flag { name: "set_audio_mode_before_abandon_focus" diff --git a/flags/telecom_callaudioroutestatemachine_flags.aconfig b/flags/telecom_callaudioroutestatemachine_flags.aconfig index 6f2c7fc7d..fadaa13b1 100644 --- a/flags/telecom_callaudioroutestatemachine_flags.aconfig +++ b/flags/telecom_callaudioroutestatemachine_flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.telecom.flags" +container: "system" flag { name: "available_routes_never_updated_after_set_system_audio_state" diff --git a/flags/telecom_calllog_flags.aconfig b/flags/telecom_calllog_flags.aconfig index 3ce7b632a..593b7e5c4 100644 --- a/flags/telecom_calllog_flags.aconfig +++ b/flags/telecom_calllog_flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.telecom.flags" +container: "system" flag { name: "telecom_log_external_wearable_calls" diff --git a/flags/telecom_calls_manager_flags.aconfig b/flags/telecom_calls_manager_flags.aconfig index 1a1948039..cdfcc30bf 100644 --- a/flags/telecom_calls_manager_flags.aconfig +++ b/flags/telecom_calls_manager_flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.telecom.flags" +container: "system" flag { name: "use_improved_listener_order" diff --git a/flags/telecom_connection_service_wrapper_flags.aconfig b/flags/telecom_connection_service_wrapper_flags.aconfig index 5f46c272a..80a8dfe4d 100644 --- a/flags/telecom_connection_service_wrapper_flags.aconfig +++ b/flags/telecom_connection_service_wrapper_flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.telecom.flags" +container: "system" flag { name: "updated_rcs_call_count_tracking" diff --git a/flags/telecom_default_phone_account_flags.aconfig b/flags/telecom_default_phone_account_flags.aconfig index 03f324cf3..e6baddec6 100644 --- a/flags/telecom_default_phone_account_flags.aconfig +++ b/flags/telecom_default_phone_account_flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.telecom.flags" +container: "system" flag { name: "only_update_telephony_on_valid_sub_ids" diff --git a/flags/telecom_incallservice_flags.aconfig b/flags/telecom_incallservice_flags.aconfig index e1a652ba8..efb1df697 100644 --- a/flags/telecom_incallservice_flags.aconfig +++ b/flags/telecom_incallservice_flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.telecom.flags" +container: "system" flag { name: "early_binding_to_incall_service" diff --git a/flags/telecom_resolve_hidden_dependencies.aconfig b/flags/telecom_resolve_hidden_dependencies.aconfig index ecc01238a..cde952e5f 100644 --- a/flags/telecom_resolve_hidden_dependencies.aconfig +++ b/flags/telecom_resolve_hidden_dependencies.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.telecom.flags" +container: "system" flag { name: "telecom_resolve_hidden_dependencies" diff --git a/flags/telecom_ringer_flag_declarations.aconfig b/flags/telecom_ringer_flag_declarations.aconfig index 54748d0b0..13577bbf6 100644 --- a/flags/telecom_ringer_flag_declarations.aconfig +++ b/flags/telecom_ringer_flag_declarations.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.telecom.flags" +container: "system" flag { name: "use_device_provided_serialized_ringer_vibration" diff --git a/flags/telecom_work_profile_flags.aconfig b/flags/telecom_work_profile_flags.aconfig index 180af5915..854568b0b 100644 --- a/flags/telecom_work_profile_flags.aconfig +++ b/flags/telecom_work_profile_flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.telecom.flags" +container: "system" flag { name: "associated_user_refactor_for_work_profile" diff --git a/src/com/android/server/telecom/TelecomServiceImpl.java b/src/com/android/server/telecom/TelecomServiceImpl.java index 1dd68c91e..bd2a97555 100644 --- a/src/com/android/server/telecom/TelecomServiceImpl.java +++ b/src/com/android/server/telecom/TelecomServiceImpl.java @@ -1749,11 +1749,12 @@ public class TelecomServiceImpl { throw new SecurityException("Package " + callingPackage + " is not allowed" + " to start conference call"); } - + // Binder is clearing the identity, so we need to keep the store the handle + UserHandle currentUserHandle = Binder.getCallingUserHandle(); long token = Binder.clearCallingIdentity(); try { mCallsManager.startConference(participants, extras, callingPackage, - Binder.getCallingUserHandle()); + currentUserHandle); } finally { Binder.restoreCallingIdentity(token); } diff --git a/tests/src/com/android/server/telecom/tests/TransactionTests.java b/tests/src/com/android/server/telecom/tests/TransactionTests.java index e58c6c4d0..0f7fd4810 100644 --- a/tests/src/com/android/server/telecom/tests/TransactionTests.java +++ b/tests/src/com/android/server/telecom/tests/TransactionTests.java @@ -310,8 +310,8 @@ public class TransactionTests extends TelecomTestCase { // simulate the transaction being processed and the setOnHold() being called / state change t.processTransaction(null); - t.getCallStateListenerImpl().onCallStateChanged(CallState.ON_HOLD); when(mMockCall1.getState()).thenReturn(CallState.ON_HOLD); + t.getCallStateListenerImpl().onCallStateChanged(CallState.ON_HOLD); // THEN verify(mMockCall1, times(1)).addCallStateListener(t.getCallStateListenerImpl()); |