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

Commit 6eb262c3 authored by Evan Charlton's avatar Evan Charlton
Browse files

Rename PhoneAccount to PhoneAccountHandle 

Change-Id: I2e97b348e6316a8b3ccc39fd81013e7f514a2889
parent 8b4f091b

api/current.txt

+16 −16
Original line number Diff line number Diff line
@@ -28292,7 +28292,7 @@ package android.telecomm { 
    method public int getState();

    method public void hold();

    method public void phoneAccountClicked();

    method public void phoneAccountSelected(android.telecomm.PhoneAccount);

    method public void phoneAccountSelected(android.telecomm.PhoneAccountHandle);

    method public void playDtmfTone(char);

    method public void postDialContinue(boolean);

    method public void reject(boolean, java.lang.String);
@@ -28311,7 +28311,7 @@ package android.telecomm { 
  }















  public static class Call.Details {













    method public android.telecomm.PhoneAccount getAccount();













    method public android.telecomm.PhoneAccountHandle getAccount();















    method public java.lang.String getCallerDisplayName();















    method public int getCallerDisplayNamePresentation();















    method public int getCapabilities();










@@ -28495,9 +28495,9 @@ package android.telecomm {













  }





























  public final class ConnectionRequest implements android.os.Parcelable {













    ctor public ConnectionRequest(android.telecomm.PhoneAccount, java.lang.String, android.net.Uri, int, android.os.Bundle, int);













    ctor public ConnectionRequest(android.telecomm.PhoneAccountHandle, java.lang.String, android.net.Uri, int, android.os.Bundle, int);















    method public int describeContents();













    method public android.telecomm.PhoneAccount getAccount();













    method public android.telecomm.PhoneAccountHandle getAccount();















    method public java.lang.String getCallId();















    method public android.os.Bundle getExtras();















    method public android.net.Uri getHandle();









@@ -28512,7 +28512,7 @@ package android.telecomm {













    method public final void createRemoteIncomingConnection(android.telecomm.ConnectionRequest, android.telecomm.ConnectionService.CreateConnectionResponse<android.telecomm.RemoteConnection>);















    method public final void createRemoteOutgoingConnection(android.telecomm.ConnectionRequest, android.telecomm.ConnectionService.CreateConnectionResponse<android.telecomm.RemoteConnection>);















    method public final java.util.Collection<android.telecomm.Connection> getAllConnections();













    method public final void lookupRemoteAccounts(android.net.Uri, android.telecomm.SimpleResponse<android.net.Uri, java.util.List<android.telecomm.PhoneAccount>>);













    method public final void lookupRemoteAccounts(android.net.Uri, android.telecomm.SimpleResponse<android.net.Uri, java.util.List<android.telecomm.PhoneAccountHandle>>);















    method public final void maybeRespondToAccountLookup();















    method public final android.os.IBinder onBind(android.content.Intent);















    method protected void onConnectionAdded(android.telecomm.Connection);










@@ -28544,7 +28544,7 @@ package android.telecomm {













    method public void holdCall(java.lang.String);















    method public void mute(boolean);















    method public void phoneAccountClicked(java.lang.String);













    method public void phoneAccountSelected(java.lang.String, android.telecomm.PhoneAccount);













    method public void phoneAccountSelected(java.lang.String, android.telecomm.PhoneAccountHandle);















    method public void playDtmfTone(java.lang.String, char);















    method public void postDialContinue(java.lang.String, boolean);















    method public void rejectCall(java.lang.String, boolean, java.lang.String);









@@ -28556,7 +28556,7 @@ package android.telecomm {



























  public final class InCallCall implements android.os.Parcelable {















    method public int describeContents();













    method public android.telecomm.PhoneAccount getAccount();













    method public android.telecomm.PhoneAccountHandle getAccount();















    method public android.telecomm.RemoteCallVideoProvider getCallVideoProvider() throws android.os.RemoteException;















    method public java.lang.String getCallerDisplayName();















    method public int getCallerDisplayNamePresentation();










@@ -28601,8 +28601,8 @@ package android.telecomm {













    method public void onCallRemoved(android.telecomm.Phone, android.telecomm.Call);















  }



























  public class PhoneAccount implements android.os.Parcelable {













    ctor public PhoneAccount(android.content.ComponentName, java.lang.String);













  public class PhoneAccountHandle implements android.os.Parcelable {













    ctor public PhoneAccountHandle(android.content.ComponentName, java.lang.String);















    method public int describeContents();















    method public android.content.ComponentName getComponentName();















    method public java.lang.String getId();









@@ -28611,9 +28611,9 @@ package android.telecomm {













  }





























  public class PhoneAccountMetadata implements android.os.Parcelable {













    ctor public PhoneAccountMetadata(android.telecomm.PhoneAccount, android.net.Uri, java.lang.String, int, int, java.lang.String, java.lang.String, boolean);













    ctor public PhoneAccountMetadata(android.telecomm.PhoneAccountHandle, android.net.Uri, java.lang.String, int, int, java.lang.String, java.lang.String, boolean);















    method public int describeContents();













    method public android.telecomm.PhoneAccount getAccount();













    method public android.telecomm.PhoneAccountHandle getAccount();















    method public int getCapabilities();















    method public android.net.Uri getHandle();















    method public android.graphics.drawable.Drawable getIcon(android.content.Context);










@@ -28719,11 +28719,11 @@ package android.telecomm {



























  public class TelecommManager {















    method public void clearAccounts(java.lang.String);













    method public android.telecomm.PhoneAccount getDefaultOutgoingPhoneAccount();













    method public java.util.List<android.telecomm.PhoneAccount> getEnabledPhoneAccounts();













    method public android.telecomm.PhoneAccountMetadata getPhoneAccountMetadata(android.telecomm.PhoneAccount);













    method public android.telecomm.PhoneAccountHandle getDefaultOutgoingPhoneAccount();













    method public java.util.List<android.telecomm.PhoneAccountHandle> getEnabledPhoneAccounts();













    method public android.telecomm.PhoneAccountMetadata getPhoneAccountMetadata(android.telecomm.PhoneAccountHandle);















    method public void registerPhoneAccount(android.telecomm.PhoneAccountMetadata);













    method public void unregisterPhoneAccount(android.telecomm.PhoneAccount);













    method public void unregisterPhoneAccount(android.telecomm.PhoneAccountHandle);















    field public static final java.lang.String ACTION_CONNECTION_SERVICE;















    field public static final java.lang.String ACTION_CONNECTION_SERVICE_CONFIGURE = "android.intent.action.CONNECTION_SERVICE_CONFIGURE";















    field public static final java.lang.String ACTION_INCOMING_CALL = "android.intent.action.INCOMING_CALL";









@@ -28734,7 +28734,7 @@ package android.telecomm {













    field public static final java.lang.String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecomm.extra.CALL_DISCONNECT_MESSAGE";















    field public static final java.lang.String EXTRA_CONNECTION_SERVICE = "android.telecomm.extra.CONNECTION_SERVICE";















    field public static final java.lang.String EXTRA_INCOMING_CALL_EXTRAS = "android.intent.extra.INCOMING_CALL_EXTRAS";













    field public static final java.lang.String EXTRA_PHONE_ACCOUNT = "android.intent.extra.PHONE_ACCOUNT";













    field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.intent.extra.PHONE_ACCOUNT_HANDLE";















    field public static final java.lang.String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.intent.extra.START_CALL_WITH_SPEAKERPHONE";















    field public static final java.lang.String EXTRA_START_CALL_WITH_VIDEO_STATE = "android.intent.extra.START_CALL_WITH_VIDEO_STATE";















  }

























core/java/android/provider/CallLog.java



+3
−3






























Original line number
Diff line number
Diff line








@@ -26,7 +26,7 @@ import android.net.Uri;













import android.provider.ContactsContract.CommonDataKinds.Callable;















import android.provider.ContactsContract.CommonDataKinds.Phone;















import android.provider.ContactsContract.DataUsageFeedback;













import android.telecomm.PhoneAccount;













import android.telecomm.PhoneAccountHandle;















import android.text.TextUtils;































import com.android.internal.telephony.CallerInfo;










@@ -352,8 +352,8 @@ public class CallLog {













         * {@hide}















         */















        public static Uri addCall(CallerInfo ci, Context context, String number,













                int presentation, int callType, int features, PhoneAccount account, long start,













                int duration, Long dataUsage) {













                int presentation, int callType, int features, PhoneAccountHandle account,













                long start, int duration, Long dataUsage) {















            final ContentResolver resolver = context.getContentResolver();















            int numberPresentation = PRESENTATION_ALLOWED;

















































telecomm/java/android/telecomm/Call.java



+7
−6






























Original line number
Diff line number
Diff line








@@ -73,7 +73,7 @@ public final class Call {













        private final int mHandlePresentation;















        private final String mCallerDisplayName;















        private final int mCallerDisplayNamePresentation;













        private final PhoneAccount mAccount;













        private final PhoneAccountHandle mAccount;















        private final int mCapabilities;















        private final int mDisconnectCauseCode;















        private final String mDisconnectCauseMsg;










@@ -114,9 +114,10 @@ public final class Call {













        }































        /**













         * @return The {@code PhoneAccount} whereby the {@code Call} is currently being routed.













         * @return The {@code PhoneAccountHandle} whereby the {@code Call} is currently being













         * routed.















         */













        public PhoneAccount getAccount() {













        public PhoneAccountHandle getAccount() {















            return mAccount;















        }


























@@ -219,7 +220,7 @@ public final class Call {













                int handlePresentation,















                String callerDisplayName,















                int callerDisplayNamePresentation,













                PhoneAccount account,













                PhoneAccountHandle account,















                int capabilities,















                int disconnectCauseCode,















                String disconnectCauseMsg,










@@ -457,10 +458,10 @@ public final class Call {













    }































    /**













     * Notifies this {@code Call} the a {@code PhoneAccount} has been selected and to proceed













     * Notifies this {@code Call} the a {@code PhoneAccountHandle} has been selected and to proceed















     * with placing an outgoing call.















     */













    public void phoneAccountSelected(PhoneAccount account) {













    public void phoneAccountSelected(PhoneAccountHandle account) {















        mInCallAdapter.phoneAccountSelected(mTelecommCallId, account);































    }

































telecomm/java/android/telecomm/CallState.java



+3
−3






























Original line number
Diff line number
Diff line








@@ -33,9 +33,9 @@ public enum CallState {





























    /**















     * Indicates that the call is about to go into the outgoing and dialing state but is waiting for













     * user input before it proceeds. For example, where no default {@link PhoneAccount} is set,













     * this is the state where the InCallUI is waiting for the user to select a {@link PhoneAccount}













     * to call from.













     * user input before it proceeds. For example, where no default {@link PhoneAccountHandle} is













     * set, this is the state where the InCallUI is waiting for the user to select a













     * {@link PhoneAccountHandle} to call from.















     */















    PRE_DIAL_WAIT,

















































telecomm/java/android/telecomm/ConnectionRequest.java



+3
−3






























Original line number
Diff line number
Diff line








@@ -30,7 +30,7 @@ public final class ConnectionRequest implements Parcelable {













    // TODO: Token to limit recursive invocations















    // TODO: Consider upgrading "mHandle" to ordered list of handles, indicating a set of phone















    //         numbers that would satisfy the client's needs, in order of preference













    private final PhoneAccount mAccount;













    private final PhoneAccountHandle mAccount;















    private final String mCallId;















    private final Uri mHandle;















    private final int mHandlePresentation;









@@ -47,7 +47,7 @@ public final class ConnectionRequest implements Parcelable {













     * @param videoState Determines the video state for the connection.















     */















    public ConnectionRequest(













            PhoneAccount account,













            PhoneAccountHandle account,















            String callId,















            Uri handle,















            int handlePresentation,









@@ -73,7 +73,7 @@ public final class ConnectionRequest implements Parcelable {













    /**















     * The account which should be used to place the call.















     */













    public PhoneAccount getAccount() { return mAccount; }













    public PhoneAccountHandle getAccount() { return mAccount; }































    /**















     * An identifier for this call.