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

Commit f604fc33 authored by Anju Mathapati's avatar Anju Mathapati Committed by Tyler Gunn
Browse files

IMS: Changes for MultiEndpoint 

- Interface changes for MultiEndpoint

- Extra for CallPull in -
  - TelephonyProperties
  - ImsProfile
- Error codes in ImsReasonInfo

Change-Id: I9a497cf04a412dc9d2f80b489e3455d289c3dfb7
parent f52ebd11

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -413,6 +413,8 @@ LOCAL_SRC_FILES += \ 
	telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl \

	telephony/java/com/android/ims/internal/IImsEcbm.aidl \

	telephony/java/com/android/ims/internal/IImsEcbmListener.aidl \

        telephony/java/com/android/ims/internal/IImsExternalCallStateListener.aidl \

        telephony/java/com/android/ims/internal/IImsMultiEndpoint.aidl \

	telephony/java/com/android/ims/internal/IImsService.aidl \

	telephony/java/com/android/ims/internal/IImsStreamMediaSession.aidl \

	telephony/java/com/android/ims/internal/IImsUt.aidl \

telephony/java/com/android/ims/ImsExternalCallState.aidl

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016 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 com.android.ims;



parcelable ImsExternalCallState;

telephony/java/com/android/ims/ImsExternalCallState.java

0 → 100644
+132 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016 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 com.android.ims;



import android.net.Uri;

import android.os.Parcel;

import android.os.Parcelable;

import android.telephony.Rlog;



/*

 * This file contains all the api's through which

 * information received in Dialog Event Package can be

 * queried

 */



/**

 * Parcelable object to handle VICE Dialog Information

 * @hide

 */

public class ImsExternalCallState implements Parcelable {



    private static final String TAG = "ImsExternalCallState";



    // Dialog States

    public static final int CALL_STATE_CONFIRMED = 1;

    public static final int CALL_STATE_TERMINATED = 2;

    // Dialog Id

    public int mCallId;

    // Number

    public Uri mAddress;

    public boolean mIsPullable;

    // CALL_STATE_CONFIRMED / CALL_STATE_TERMINATED

    public int mCallState;

    // ImsCallProfile#CALL_TYPE_*

    public int mCallType;

    public boolean mIsHeld;



    public ImsExternalCallState() {

    }



    public ImsExternalCallState(Parcel in) {

        mCallId = in.readInt();

        ClassLoader classLoader = ImsExternalCallState.class.getClassLoader();

        mAddress = in.readParcelable(classLoader);

        mIsPullable = (in.readInt() != 0);

        mCallState = in.readInt();

        mCallType = in.readInt();

        mIsHeld = (in.readInt() != 0);

        Rlog.d(TAG, "ImsExternalCallState const = " +

                "callid = " + getCallId() +

                ", address = " + getAddress() +

                ", mCallState = " + getCallState() +

                ", calltype = " + getCallType() +

                ", isheld = " + isCallHeld());

    }



    @Override

    public int describeContents() {

        return 0;

    }



    @Override

    public void writeToParcel(Parcel out, int flags) {

        out.writeInt(mCallId);

        out.writeParcelable(mAddress, 0);

        out.writeInt(mIsPullable ? 1 : 0);

        out.writeInt(mCallState);

        out.writeInt(mCallType);

        out.writeInt(mIsHeld ? 1 : 0);

    }



    public static final Parcelable.Creator<ImsExternalCallState> CREATOR =

            new Parcelable.Creator<ImsExternalCallState>() {

        @Override

        public ImsExternalCallState createFromParcel(Parcel in) {

            return new ImsExternalCallState(in);

        }



        @Override

        public ImsExternalCallState[] newArray(int size) {

            return new ImsExternalCallState[size];

        }

    };



    public int getCallId() {

        return mCallId;

    }



    public Uri getAddress() {

        return mAddress;

    }



    public boolean isCallPullable() {

        return mIsPullable;

    }



    public int getCallState() {

        return mCallState;

    }



    public int getCallType() {

        return mCallType;

    }



    public boolean isCallHeld() {

        return mIsHeld;

    }



    @Override

    public String toString() {

        return "ImsExternalCallState { mCallId = " + mCallId +

                ", mAddress = " + mAddress +

                ", mIsPullable = " + mIsPullable +

                ", mCallState = " + mCallState +

                ", mCallType = " + mCallType +

                ", mIsHeld = " + mIsHeld + "}";

    }

}

telephony/java/com/android/ims/ImsReasonInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -241,12 +241,12 @@ public class ImsReasonInfo implements Parcelable { 
    public static final int CODE_ANSWERED_ELSEWHERE = 1014;



    /**

     * Call pull request failure from the network.

     * For MultiEndpoint - Call Pull request has failed

     */

    public static final int CODE_CALL_PULL_OUT_OF_SYNC = 1015;



    /**

     * Call ended due to being pulled onto another device.

     * For MultiEndpoint - Call has been pulled from primary to secondary

     */

    public static final int CODE_CALL_END_CAUSE_CALL_PULL = 1016;

telephony/java/com/android/ims/internal/IImsExternalCallStateListener.aidl

0 → 100644
+38 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016 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 com.android.ims.internal;



import com.android.ims.ImsExternalCallState;



/**

 * A listener type for receiving notifications about DEP through IMS

 *

 * {@hide}

 */

interface IImsExternalCallStateListener {



    /**

     * Notifies client when Dialog Event Package update is received

     *

     * @param List<ImsExternalCallState> - External Call Dialog

     *

     * @return void.

     */

    void notifyRefreshExternalCallState(in List<ImsExternalCallState> externalCallDialogs);



}