Snap for 10068852 from 14dc0110a232ff6788e948d5aec83df8b83d02a9 to udc-release (49d5d194) · Commits · e / os / android_packages_services_Telecomm

res/values-as/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -108,7 +108,7 @@
		<string name="phone_settings_call_blocking_txt" msgid="7311523114822507178">"কল অৱৰোধ"</string>
		<string name="phone_settings_number_not_in_contact_txt" msgid="2602249106007265757">"আপোনাৰ সর্ম্পকসূচীত নথকা"</string>
		<string name="phone_settings_number_not_in_contact_summary_txt" msgid="963327038085718969">"আপোনাৰ সর্ম্পকসূচীত নথকা নম্বৰ অৱৰোধ কৰক"</string>
		<string name="phone_settings_private_num_txt" msgid="6339272760338475619">"ব্য়ক্তিগত"</string>
		<string name="phone_settings_private_num_txt" msgid="6339272760338475619">"ব্যক্তিগত"</string>
		<string name="phone_settings_private_num_summary_txt" msgid="6755758240544021037">"যিসকল কল কৰোঁতাই তেওঁলোকৰ নম্বৰ প্ৰকাশ নকৰে তেওঁলোকক অৱৰোধ কৰক"</string>
		<string name="phone_settings_payphone_txt" msgid="5003987966052543965">"পে\'ফ\'ন"</string>
		<string name="phone_settings_payphone_summary_txt" msgid="3936631076065563665">"পে\'ফ\'নৰ পৰা অহা কল অৱৰোধ কৰক"</string>

res/values-kk/strings.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -75,10 +75,10 @@
		<string name="blocked_numbers_butter_bar_title" msgid="582982373755950791">"Тыйым уақытша алынды"</string>
		<string name="blocked_numbers_butter_bar_body" msgid="1261213114919301485">"Төтенше жағдай нөмірін терген немесе мәтіндік хабар жіберген соң, төтенше жағдай қызметтері сізге хабарласа алуы үшін тыйым алынады."</string>
		<string name="blocked_numbers_butter_bar_button" msgid="2704456308072489793">"Қазір қайта қосу"</string>
		<string name="blocked_numbers_number_blocked_message" msgid="4314736791180919167">"<xliff:g id="BLOCKED_NUMBER">%1$s</xliff:g> бөгелген"</string>
		<string name="blocked_numbers_number_blocked_message" msgid="4314736791180919167">"<xliff:g id="BLOCKED_NUMBER">%1$s</xliff:g> блокталған"</string>
		<string name="blocked_numbers_number_unblocked_message" msgid="2933071624674945601">"<xliff:g id="UNBLOCKED_NUMBER">%1$s</xliff:g> бөгеуден шығарылды"</string>
		<string name="blocked_numbers_block_emergency_number_message" msgid="4198550501500893890">"Жедел қызмет нөмірін бөгеу мүмкін емес."</string>
		<string name="blocked_numbers_number_already_blocked_message" msgid="2301270825735665458">"<xliff:g id="BLOCKED_NUMBER">%1$s</xliff:g> бұрыннан бөгелген."</string>
		<string name="blocked_numbers_number_already_blocked_message" msgid="2301270825735665458">"<xliff:g id="BLOCKED_NUMBER">%1$s</xliff:g> бұрыннан блокталған."</string>
		<string name="toast_personal_call_msg" msgid="5817631570381795610">"Қоңырау шалу үшін жеке нөмір тергішті пайдалану"</string>
		<string name="notification_incoming_call" msgid="1233481138362230894">"<xliff:g id="CALL_VIA">%1$s</xliff:g> қоңырауы: <xliff:g id="CALL_FROM">%2$s</xliff:g>"</string>
		<string name="notification_incoming_video_call" msgid="5795968314037063900">"<xliff:g id="CALL_VIA">%1$s</xliff:g> бейне қоңырауы: <xliff:g id="CALL_FROM">%2$s</xliff:g>"</string>

src/com/android/server/telecom/ConnectionServiceWrapper.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -919,6 +919,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
		callingPhoneAccountHandle.getComponentName().getPackageName());
		}

		boolean hasCrossUserAccess = mContext.checkCallingOrSelfPermission(
		android.Manifest.permission.INTERACT_ACROSS_USERS)
		== PackageManager.PERMISSION_GRANTED;
		long token = Binder.clearCallingIdentity();
		try {
		synchronized (mLock) {
		@@ -930,7 +933,7 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
		// an emergency call.
		mPhoneAccountRegistrar.getCallCapablePhoneAccounts(null /uriScheme/,
		false /includeDisabledAccounts/, userHandle, 0 /capabilities/,
		0 /excludedCapabilities/, false);
		0 /excludedCapabilities/, hasCrossUserAccess);
		PhoneAccountHandle phoneAccountHandle = null;
		for (PhoneAccountHandle accountHandle : accountHandles) {
		if(accountHandle.equals(callingPhoneAccountHandle)) {

src/com/android/server/telecom/TransactionalServiceWrapper.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -425,6 +425,15 @@ public class TransactionalServiceWrapper implements

		@Override
		public void onError(CallException exception) {
		if (isAnswerRequest) {
		// This also sends the signal to untrack from TSW and the client_TSW
		removeCallFromCallsManager(call,
		new DisconnectCause(DisconnectCause.REJECTED,
		"client rejected to answer the call;"
		+ " force disconnecting"));
		} else {
		mCallsManager.markCallAsOnHold(call);
		}
		maybeResetForegroundCall(foregroundCallBeforeSwap, wasActive);
		}
		});

src/com/android/server/telecom/voip/CallEventCallbackAckTransaction.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -128,6 +128,8 @@ public class CallEventCallbackAckTransaction extends VoipCallTransaction {
		boolean success = latch.await(VoipCallTransaction.TIMEOUT_LIMIT, TimeUnit.MILLISECONDS);
		if (!success) {
		// client send onError and failed to complete transaction
		Log.i(TAG, String.format("CallEventCallbackAckTransaction:"
		+ " client failed to complete the [%s] transaction", mAction));
		return CompletableFuture.completedFuture(TRANSACTION_FAILED);
		} else {
		// success