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

Merge "API tweaks"

Browse Source
This commit is contained in:
Hall Liu
2019-03-07 00:11:31 +00:00
committed by Gerrit Code Review
parent 5819a3378d ee609ff1c1
commit f3fbbeaa05
5 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -41736,6 +41736,7 @@ package android.telecom {
} }
public final class PhoneAccountSuggestion implements android.os.Parcelable { public final class PhoneAccountSuggestion implements android.os.Parcelable {
ctor public PhoneAccountSuggestion(@NonNull android.telecom.PhoneAccountHandle, int, boolean);
method public int describeContents(); method public int describeContents();
method @NonNull public android.telecom.PhoneAccountHandle getPhoneAccountHandle(); method @NonNull public android.telecom.PhoneAccountHandle getPhoneAccountHandle();
method public int getReason(); method public int getReason();

4
api/system-current.txt
View File

@@ -5413,10 +5413,6 @@ package android.telecom {
field public static final int CAPABILITY_MULTI_USER = 32; // 0x20 field public static final int CAPABILITY_MULTI_USER = 32; // 0x20
} }
public final class PhoneAccountSuggestion implements android.os.Parcelable {
ctor public PhoneAccountSuggestion(@NonNull android.telecom.PhoneAccountHandle, int, boolean);
}
public class PhoneAccountSuggestionService extends android.app.Service { public class PhoneAccountSuggestionService extends android.app.Service {
ctor public PhoneAccountSuggestionService(); ctor public PhoneAccountSuggestionService();
method public void onAccountSuggestionRequest(@NonNull String); method public void onAccountSuggestionRequest(@NonNull String);

4
api/test-current.txt
View File

@@ -1444,10 +1444,6 @@ package android.telecom {
method public android.telecom.Connection getPrimaryConnection(); method public android.telecom.Connection getPrimaryConnection();
} }
public final class PhoneAccountSuggestion implements android.os.Parcelable {
ctor public PhoneAccountSuggestion(@NonNull android.telecom.PhoneAccountHandle, int, boolean);
}
public class PhoneAccountSuggestionService extends android.app.Service { public class PhoneAccountSuggestionService extends android.app.Service {
ctor public PhoneAccountSuggestionService(); ctor public PhoneAccountSuggestionService();
method public void onAccountSuggestionRequest(@NonNull String); method public void onAccountSuggestionRequest(@NonNull String);

4
core/res/AndroidManifest.xml
View File

@@ -1839,12 +1839,12 @@
<!-- Must be required by a {@link android.telecom.PhoneAccountSuggestionService}, <!-- Must be required by a {@link android.telecom.PhoneAccountSuggestionService},
to ensure that only the system can bind to it. to ensure that only the system can bind to it.
<p>Protection level: signature|privileged <p>Protection level: signature
@SystemApi @SystemApi
@hide @hide
--> -->
<permission android:name="android.permission.BIND_PHONE_ACCOUNT_SUGGESTION_SERVICE" <permission android:name="android.permission.BIND_PHONE_ACCOUNT_SUGGESTION_SERVICE"
android:protectionLevel="signature|privileged" /> android:protectionLevel="signature" />
<!-- Must be required by a {@link android.telecom.CallRedirectionService}, <!-- Must be required by a {@link android.telecom.CallRedirectionService},
to ensure that only the system can bind to it. to ensure that only the system can bind to it.

13
telecomm/java/android/telecom/PhoneAccountSuggestion.java
View File

@@ -18,8 +18,6 @@ package android.telecom;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
@@ -69,10 +67,15 @@ public final class PhoneAccountSuggestion implements Parcelable {
private boolean mShouldAutoSelect; private boolean mShouldAutoSelect;
/** /**
* @hide * Creates a new instance of {@link PhoneAccountSuggestion}. This constructor is intended for
* use by apps implementing a {@link PhoneAccountSuggestionService}, and generally should not be
* used by dialer apps other than for testing purposes.
*
* @param handle The {@link PhoneAccountHandle} for this suggestion.
* @param reason The reason for this suggestion
* @param shouldAutoSelect Whether the dialer should automatically place the call using this
* account. See {@link #shouldAutoSelect()}.
*/ */
@SystemApi
@TestApi
public PhoneAccountSuggestion(@NonNull PhoneAccountHandle handle, @SuggestionReason int reason, public PhoneAccountSuggestion(@NonNull PhoneAccountHandle handle, @SuggestionReason int reason,
boolean shouldAutoSelect) { boolean shouldAutoSelect) {
this.mHandle = handle; this.mHandle = handle;