Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ec61a32 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by android-build-merger
Browse files

Merge "Revert "API tweaks"" am: c61bb461 am: 8230f428 

am: fdc3dc56

Change-Id: I53aba1bcac7bc5aabba152dcb9f6510befba4f69
parents dd823c03 fdc3dc56

api/current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -43830,7 +43830,6 @@ 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();

























api/system-current.txt



+4
−0




























Original line number
Original line
Diff line number
Diff line








@@ -7002,6 +7002,10 @@ 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);

































api/test-current.txt



+4
−0




























Original line number
Original line
Diff line number
Diff line








@@ -2355,6 +2355,10 @@ 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);

































core/res/AndroidManifest.xml



+2
−2




























Original line number
Original line
Diff line number
Diff line








@@ -2002,12 +2002,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







         <p>Protection level: signature|privileged











         @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" />







        android:protectionLevel="signature|privileged" />































    <!-- 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.

































telecomm/java/android/telecom/PhoneAccountSuggestion.java



+5
−8




























Original line number
Original line
Diff line number
Diff line








@@ -18,6 +18,8 @@ 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;






























@@ -67,15 +69,10 @@ public final class PhoneAccountSuggestion implements Parcelable {









    private boolean mShouldAutoSelect;







    private boolean mShouldAutoSelect;































    /**







    /**











     * Creates a new instance of {@link PhoneAccountSuggestion}. This constructor is intended for







     * @hide











     * 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;