diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-01-17 09:52:40 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-01-17 09:52:40 +0000 |
commit | d723876bf1ade40517c904c7a5152e65a3538359 (patch) | |
tree | 640e1a87e3f62af0315c3edd80e9a9cca36646e6 | |
parent | 11ddd67f7197c29460a749db0bbb2a9517d883d3 (diff) | |
parent | 355223f19cc8575cd9039977fab88ebaf086dc7a (diff) | |
download | Telecomm-android12-mainline-ipsec-release.tar.gz |
Snap for 8086475 from 355223f19cc8575cd9039977fab88ebaf086dc7a to mainline-ipsec-releaseandroid-mainline-12.0.0_r88android-mainline-12.0.0_r73android12-mainline-ipsec-release
Change-Id: Ie4da2018490a85f18222fed2aee93e1908db0022
-rw-r--r-- | res/values-nl/strings.xml | 6 | ||||
-rw-r--r-- | src/com/android/server/telecom/ServiceBinder.java | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index a72d2938e..8dc58d03c 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -72,7 +72,7 @@ <string name="block_button" msgid="485080149164258770">"Blokkeren"</string> <string name="non_primary_user" msgid="315564589279622098">"Alleen de eigenaar van het apparaat kan geblokkeerd nummers bekijken en beheren."</string> <string name="delete_icon_description" msgid="5335959254954774373">"Blokkering opheffen"</string> - <string name="blocked_numbers_butter_bar_title" msgid="582982373755950791">"Blokkering tijdelijk uitgeschakeld"</string> + <string name="blocked_numbers_butter_bar_title" msgid="582982373755950791">"Blokkering tijdelijk uitgezet"</string> <string name="blocked_numbers_butter_bar_body" msgid="1261213114919301485">"Als je een noodnummer belt of er een sms naartoe stuurt, wordt de blokkering uitgeschakeld om te zorgen dat hulpdiensten contact met je kunnen opnemen."</string> <string name="blocked_numbers_butter_bar_button" msgid="2704456308072489793">"Nu opnieuw aanzetten"</string> <string name="blocked_numbers_number_blocked_message" msgid="4314736791180919167">"<xliff:g id="BLOCKED_NUMBER">%1$s</xliff:g> geblokkeerd"</string> @@ -115,9 +115,9 @@ <string name="phone_settings_unknown_txt" msgid="3577926178354772728">"Onbekend"</string> <string name="phone_settings_unknown_summary_txt" msgid="5446657192535779645">"Gesprekken van onbekende bellers blokkeren"</string> <string name="phone_strings_call_blocking_turned_off_notification_title_txt" msgid="2895809176537908791">"Gesprekken blokkeren"</string> - <string name="phone_strings_call_blocking_turned_off_notification_text_txt" msgid="1713632946174016619">"Gesprekken blokkeren uitgeschakeld"</string> + <string name="phone_strings_call_blocking_turned_off_notification_text_txt" msgid="1713632946174016619">"Gesprekken blokkeren staat uit"</string> <string name="phone_strings_emergency_call_made_dialog_title_txt" msgid="6629412508584507377">"Noodoproep geplaatst"</string> - <string name="phone_strings_emergency_call_made_dialog_call_blocking_text_txt" msgid="3140411733995271126">"Gesprekken blokkeren is uitgeschakeld zodat nooddiensten je kunnen bereiken."</string> + <string name="phone_strings_emergency_call_made_dialog_call_blocking_text_txt" msgid="3140411733995271126">"Gesprekken blokkeren is uitgezet zodat nooddiensten je kunnen bereiken."</string> <string name="developer_title" msgid="9146088855661672353">"Telecomontwikkelaarsmenu"</string> <string name="toast_emergency_can_not_pull_call" msgid="9074229465338410869">"Gesprekken kunnen niet worden aangenomen tijdens een noodoproep."</string> </resources> diff --git a/src/com/android/server/telecom/ServiceBinder.java b/src/com/android/server/telecom/ServiceBinder.java index aa2e2a247..2fcd2f5f8 100644 --- a/src/com/android/server/telecom/ServiceBinder.java +++ b/src/com/android/server/telecom/ServiceBinder.java @@ -87,8 +87,7 @@ public abstract class ServiceBinder { ServiceConnection connection = new ServiceBinderConnection(call); Log.addEvent(call, LogUtils.Events.BIND_CS, mComponentName); - final int bindingFlags = Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE - | Context.BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS; + final int bindingFlags = Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE; final boolean isBound; if (mUserHandle != null) { isBound = mContext.bindServiceAsUser(serviceIntent, connection, bindingFlags, |