Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "composer-final-integration" into sc-dev

Browse Source 
* changes:
  Rename TelecomManager.EXTRA_INCOMING_PICTURE
  Add support for integrating call composer
This commit is contained in:
Hall Liu
2021-01-28 22:49:22 +00:00
committed by Android (Google) Code Review
parent e6a05d7167 8fee7eaa81
commit 0fdcbb8cfb
4 changed files with 60 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -39715,7 +39715,6 @@ package android.telecom {
field public static final String EXTRA_HAS_PICTURE = "android.telecom.extra.HAS_PICTURE";
field public static final String EXTRA_INCOMING_CALL_ADDRESS = "android.telecom.extra.INCOMING_CALL_ADDRESS";
field public static final String EXTRA_INCOMING_CALL_EXTRAS = "android.telecom.extra.INCOMING_CALL_EXTRAS";
field public static final String EXTRA_INCOMING_PICTURE = "android.telecom.extra.INCOMING_PICTURE";
field public static final String EXTRA_INCOMING_VIDEO_STATE = "android.telecom.extra.INCOMING_VIDEO_STATE";
field public static final String EXTRA_IS_DEFAULT_CALL_SCREENING_APP = "android.telecom.extra.IS_DEFAULT_CALL_SCREENING_APP";
field public static final String EXTRA_LOCATION = "android.telecom.extra.LOCATION";
@@ -39724,6 +39723,7 @@ package android.telecom {
field public static final String EXTRA_OUTGOING_CALL_EXTRAS = "android.telecom.extra.OUTGOING_CALL_EXTRAS";
field public static final String EXTRA_OUTGOING_PICTURE = "android.telecom.extra.OUTGOING_PICTURE";
field public static final String EXTRA_PHONE_ACCOUNT_HANDLE = "android.telecom.extra.PHONE_ACCOUNT_HANDLE";
field public static final String EXTRA_PICTURE_URI = "android.telecom.extra.PICTURE_URI";
field public static final String EXTRA_PRIORITY = "android.telecom.extra.PRIORITY";
field public static final String EXTRA_START_CALL_WITH_RTT = "android.telecom.extra.START_CALL_WITH_RTT";
field public static final String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.telecom.extra.START_CALL_WITH_SPEAKERPHONE";

8
core/java/android/provider/CallLog.java
View File

@@ -249,11 +249,13 @@ public class CallLog {
// Nasty casework for the shadow calllog begins...
// First see if we're just inserting for one user. If so, insert into the shadow
// based on whether that user is unlocked.
if (user != null) {
Uri baseUri = userManager.isUserUnlocked(user) ? CALL_COMPOSER_PICTURE_URI
UserHandle realUser = UserHandle.CURRENT.equals(user)
? android.os.Process.myUserHandle() : user;
if (realUser != null) {
Uri baseUri = userManager.isUserUnlocked(realUser) ? CALL_COMPOSER_PICTURE_URI
: SHADOW_CALL_COMPOSER_PICTURE_URI;
Uri pictureInsertionUri = ContentProvider.maybeAddUserId(baseUri,
user.getIdentifier());
realUser.getIdentifier());
Log.i(LOG_TAG, "Inserting call composer for single user at "
+ pictureInsertionUri);

12
telecomm/java/android/telecom/TelecomManager.java
View File

@@ -314,20 +314,22 @@ public class TelecomManager {
public static final String EXTRA_HAS_PICTURE = "android.telecom.extra.HAS_PICTURE";
/**
* A URI representing the picture that was downloaded when a call is received.
* A URI representing the picture that was downloaded when a call is received or uploaded
* when a call is placed.
*
* This is a content URI within the call log provider which can be used to open a file
* descriptor. This could be set a short time after a call is added to the Dialer app if the
* download is delayed for some reason. The Dialer app will receive a callback via
* download/upload is delayed for some reason. The Dialer app will receive a callback via
* {@link Call.Callback#onDetailsChanged} when this value has changed.
*
* Reference: RCC.20 Section 2.4.3.2
*/
public static final String EXTRA_INCOMING_PICTURE = "android.telecom.extra.INCOMING_PICTURE";
public static final String EXTRA_PICTURE_URI = "android.telecom.extra.PICTURE_URI";
// TODO(hallliu), This UUID is obtained from TelephonyManager#uploadCallComposerPicture.
/**
* A ParcelUuid used as a token to represent a picture that was uploaded prior to the call
* being placed.
* being placed. The value of this extra should be set using the {@link android.os.ParcelUuid}
* obtained from the callback in {@link TelephonyManager#uploadCallComposerPicture}.
*/
public static final String EXTRA_OUTGOING_PICTURE = "android.telecom.extra.OUTGOING_PICTURE";

47
telephony/java/android/telephony/TelephonyLocalConnection.java Normal file
View File

@@ -0,0 +1,47 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.telephony;
import java.util.UUID;
/**
* Shim used for code in frameworks/opt/telephony to be able to call code in
* packages/services/Telephony. A singleton instance of this class is set when the phone process
* is brought up.
* @hide
*/
public class TelephonyLocalConnection {
public interface ConnectionImpl {
String getCallComposerServerUrlForHandle(int subscriptionId, UUID uuid);
}
private static ConnectionImpl sInstance;
public static String getCallComposerServerUrlForHandle(int subscriptionId, UUID uuid) {
checkInstance();
return sInstance.getCallComposerServerUrlForHandle(subscriptionId, uuid);
}
private static void checkInstance() {
if (sInstance == null) {
throw new IllegalStateException("Connection impl is null!");
}
}
public static void setInstance(ConnectionImpl impl) {
sInstance = impl;
}
}