Merge "Check calling package before checking permission protection" into sc-dev
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 42c55d6..c62fffc 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -88,7 +88,7 @@
<string name="answering_ends_other_managed_call" msgid="4031778317409881805">"Ao responder, finalizará a túa chamada en curso"</string>
<string name="answering_ends_other_managed_calls" msgid="3974069768615307659">"Ao responder, finalizarán as túas chamadas en curso"</string>
<string name="answering_ends_other_managed_video_call" msgid="1988508241432031327">"Ao responder, finalizarán as túas videochamadas en curso"</string>
- <string name="answer_incoming_call" msgid="2045888814782215326">"Responder"</string>
+ <string name="answer_incoming_call" msgid="2045888814782215326">"Contestar"</string>
<string name="decline_incoming_call" msgid="922147089348451310">"Rexeitar"</string>
<string name="cant_call_due_to_no_supported_service" msgid="1635626384149947077">"Non se pode realizar a chamada porque non hai ningunha conta de chamadas que admita chamadas deste tipo."</string>
<string name="cant_call_due_to_ongoing_call" msgid="8004235328451385493">"Non se pode realizar a chamada porque hai unha chamada en curso en <xliff:g id="OTHER_CALL">%1$s</xliff:g>."</string>
diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index 575873b..687a882 100755
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -3019,6 +3019,7 @@
*/
boolean holdActiveCallForNewCall(Call call) {
Call activeCall = (Call) mConnectionSvrFocusMgr.getCurrentFocusCall();
+ Log.i(this, "holdActiveCallForNewCall, newCall: %s, activeCall: %s", call, activeCall);
if (activeCall != null && activeCall != call) {
if (canHold(activeCall)) {
activeCall.hold();
@@ -3074,6 +3075,7 @@
@VisibleForTesting
public void markCallAsActive(Call call) {
+ Log.i(this, "markCallAsActive, isSelfManaged: " + call.isSelfManaged());
if (call.isSelfManaged()) {
// backward compatibility, the self-managed connection service will set the call state
// to active directly. We should hold or disconnect the current active call based on the
diff --git a/src/com/android/server/telecom/ConnectionServiceFocusManager.java b/src/com/android/server/telecom/ConnectionServiceFocusManager.java
index fbb23f4..aa0a64f 100644
--- a/src/com/android/server/telecom/ConnectionServiceFocusManager.java
+++ b/src/com/android/server/telecom/ConnectionServiceFocusManager.java
@@ -391,7 +391,7 @@
}
private void handleRequestFocus(FocusRequest focusRequest) {
- Log.d(this, "handleRequestFocus req = %s", focusRequest);
+ Log.i(this, "handleRequestFocus req = %s", focusRequest);
if (mCurrentFocus == null
|| mCurrentFocus.equals(focusRequest.call.getConnectionServiceWrapper())) {
updateConnectionServiceFocus(focusRequest.call.getConnectionServiceWrapper());