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

API tweaks in response to feedback am: 5968c09340 am: 429a15d480

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471167

Change-Id: Id99748d0b831349929744ecd24c5ba1069054633
This commit is contained in:
Hall Liu
2020-10-23 03:44:08 +00:00
committed by Automerger Merge Worker
parent 6f5eda09a7 429a15d480
commit 5cff38cc1b
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -45977,6 +45977,7 @@ package android.telecom {
field public static final int MISSED = 5; // 0x5
field public static final int OTHER = 9; // 0x9
field public static final String REASON_EMERGENCY_CALL_PLACED = "REASON_EMERGENCY_CALL_PLACED";
field public static final String REASON_EMULATING_SINGLE_CALL = "EMULATING_SINGLE_CALL";
field public static final String REASON_IMS_ACCESS_BLOCKED = "REASON_IMS_ACCESS_BLOCKED";
field public static final String REASON_WIFI_ON_BUT_WFC_OFF = "REASON_WIFI_ON_BUT_WFC_OFF";
field public static final int REJECTED = 6; // 0x6

4
api/system-current.txt
View File

@@ -10270,10 +10270,6 @@ package android.telecom {
method public final void addExistingConnection(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.telecom.Connection, @NonNull android.telecom.Conference);
}
public final class DisconnectCause implements android.os.Parcelable {
field public static final String REASON_EMULATING_SINGLE_CALL = "EMULATING_SINGLE_CALL";
}
public abstract class InCallService extends android.app.Service {
method @Deprecated public android.telecom.Phone getPhone();
method @Deprecated public void onPhoneCreated(android.telecom.Phone);

1
non-updatable-api/current.txt
View File

@@ -44145,6 +44145,7 @@ package android.telecom {
field public static final int MISSED = 5; // 0x5
field public static final int OTHER = 9; // 0x9
field public static final String REASON_EMERGENCY_CALL_PLACED = "REASON_EMERGENCY_CALL_PLACED";
field public static final String REASON_EMULATING_SINGLE_CALL = "EMULATING_SINGLE_CALL";
field public static final String REASON_IMS_ACCESS_BLOCKED = "REASON_IMS_ACCESS_BLOCKED";
field public static final String REASON_WIFI_ON_BUT_WFC_OFF = "REASON_WIFI_ON_BUT_WFC_OFF";
field public static final int REJECTED = 6; // 0x6

4
non-updatable-api/system-current.txt
View File

@@ -9152,10 +9152,6 @@ package android.telecom {
method public final void addExistingConnection(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.telecom.Connection, @NonNull android.telecom.Conference);
}
public final class DisconnectCause implements android.os.Parcelable {
field public static final String REASON_EMULATING_SINGLE_CALL = "EMULATING_SINGLE_CALL";
}
public abstract class InCallService extends android.app.Service {
method @Deprecated public android.telecom.Phone getPhone();
method @Deprecated public void onPhoneCreated(android.telecom.Phone);

4
telecomm/java/android/telecom/DisconnectCause.java
View File

@@ -16,7 +16,6 @@
package android.telecom;
import android.annotation.SystemApi;
import android.media.ToneGenerator;
import android.os.Parcel;
import android.os.Parcelable;
@@ -97,10 +96,7 @@ public final class DisconnectCause implements Parcelable {
*
* This reason code is only used for communication between a {@link ConnectionService} and
* Telecom and should not be surfaced to the user.
*
* @hide
*/
@SystemApi
public static final String REASON_EMULATING_SINGLE_CALL = "EMULATING_SINGLE_CALL";
/**

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

@@ -27,6 +27,7 @@ import android.net.Uri;
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import java.util.ArrayList;
@@ -51,8 +52,17 @@ public final class PhoneAccount implements Parcelable {
*
* This is an extras key set via {@link Builder#setExtras} which determines the order in which
* {@link PhoneAccount}s from the same {@link ConnectionService} are sorted. The accounts
* are sorted by this key via standard lexicographical order, and this ordering is used to
* are sorted by this key via standard lexicographical order, (as implemented in
* {@link String#compareTo}), and this ordering is used to
* determine priority when a call can be placed via multiple accounts.
*
* When multiple {@link PhoneAccount}s are supplied with the same sort order key, no ordering is
* guaranteed between those {@link PhoneAccount}s. Additionally, no ordering is guaranteed
* between {@link PhoneAccount}s that do not supply this extra, and all such accounts
* will be sorted after the accounts that do supply this extra.
*
* An example of a sort order key is slot index (see {@link TelephonyManager#getSlotIndex()}),
* which is the one used by the cell Telephony stack.
* @hide
*/
@SystemApi