ims: Bring in line with current release (0f58f514) · Commits · e / os / android_frameworks_base

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

deleted100644 → 0

+0 −33

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015, The Linux Foundation. All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions are
		* met:
		* * Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* * Redistributions in binary form must reproduce the above
		* copyright notice, this list of conditions and the following
		* disclaimer in the documentation and/or other materials provided
		* with the distribution.
		* * Neither the name of The Linux Foundation nor the names of its
		* contributors may be used to endorse or promote products derived
		* from this software without specific prior written permission.
		*
		* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
		* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
		* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
		* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
		* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
		* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
		* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
		* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
		* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		*/


		package com.android.ims;

		parcelable ImsSuppServiceNotification;

telephony/java/com/android/ims/ImsSuppServiceNotification.java

deleted100644 → 0

+0 −114

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015, The Linux Foundation. All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions are
		* met:
		* * Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* * Redistributions in binary form must reproduce the above
		* copyright notice, this list of conditions and the following
		* disclaimer in the documentation and/or other materials provided
		* with the distribution.
		* * Neither the name of The Linux Foundation nor the names of its
		* contributors may be used to endorse or promote products derived
		* from this software without specific prior written permission.
		*
		* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
		* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
		* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
		* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
		* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
		* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
		* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
		* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
		* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		*/


		package com.android.ims;

		import android.os.Parcel;
		import android.os.Parcelable;

		import java.util.Arrays;


		/**
		* Parcelable object to handle IMS supplementary service notifications.
		*
		* @hide
		*/
		public class ImsSuppServiceNotification implements Parcelable {
		private static final String TAG = "ImsSuppServiceNotification";

		/** Type of notification: 0 = MO; 1 = MT */
		public int notificationType;
		/** TS 27.007 7.17 "code1" or "code2" */
		public int code;
		/** TS 27.007 7.17 "index" - Not used currently*/
		public int index;
		/** TS 27.007 7.17 "type" (MT only) - Not used currently */
		public int type;
		/** TS 27.007 7.17 "number" (MT only) */
		public String number;
		/** List of forwarded numbers, if any */
		public String[] history;

		public ImsSuppServiceNotification() {
		}

		public ImsSuppServiceNotification(Parcel in) {
		readFromParcel(in);
		}

		@Override
		public String toString() {
		return "{ notificationType=" + notificationType +
		", code=" + code +
		", index=" + index +
		", type=" + type +
		", number=" + number +
		", history=" + Arrays.toString(history) +
		" }";
		}

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(Parcel out, int flags) {
		out.writeInt(notificationType);
		out.writeInt(code);
		out.writeInt(index);
		out.writeInt(type);
		out.writeString(number);
		out.writeStringArray(history);
		}

		private void readFromParcel(Parcel in) {
		notificationType = in.readInt();
		code = in.readInt();
		index = in.readInt();
		type = in.readInt();
		number = in.readString();
		history = in.createStringArray();
		}

		public static final Creator<ImsSuppServiceNotification> CREATOR =
		new Creator<ImsSuppServiceNotification>() {
		@Override
		public ImsSuppServiceNotification createFromParcel(Parcel in) {
		return new ImsSuppServiceNotification(in);
		}

		@Override
		public ImsSuppServiceNotification[] newArray(int size) {
		return new ImsSuppServiceNotification[size];
		}
		};
		}

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

+0 −7

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import com.android.ims.ImsCallProfile;
		import com.android.ims.ImsReasonInfo;
		import com.android.ims.ImsConferenceState;
		import com.android.ims.internal.IImsCallSession;
		import com.android.ims.ImsSuppServiceNotification;

		/**
		* A listener type for receiving notification on IMS call session events.
		@@ -122,10 +121,4 @@ interface IImsCallSessionListener {
		*/
		void callSessionDeflected(in IImsCallSession session);
		void callSessionDeflectFailed(in IImsCallSession session, in ImsReasonInfo reasonInfo);

		/**
		* Notifies the supplementary service information for the current session.
		*/
		void callSessionSuppServiceReceived(in IImsCallSession session,
		in ImsSuppServiceNotification suppSrvNotification);
		}

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

+12 −4

Original line number	Diff line number	Diff line
		@@ -49,22 +49,22 @@ import com.android.ims.ImsConfigListener;
		*/
		interface IImsConfig {
		/**
		* Gets the value for ims service/capabilities parameters from the master
		* Gets the value for ims service/capabilities parameters from the provisioned
		* value storage. Synchronous blocking call.
		*
		* @param item, as defined in com.android.ims.ImsConfig#ConfigConstants.
		* @return value in Integer format.
		*/
		int getMasterValue(int item);
		int getProvisionedValue(int item);

		/**
		* Gets the value for ims service/capabilities parameters from the master
		* Gets the value for ims service/capabilities parameters from the provisioned
		* value storage. Synchronous blocking call.
		*
		* @param item, as defined in com.android.ims.ImsConfig#ConfigConstants.
		* @return value in String format.
		*/
		String getMasterStringValue(int item);
		String getProvisionedStringValue(int item);

		/**
		* Sets the value for IMS service/capabilities parameters by the operator device
		@@ -132,4 +132,12 @@ interface IImsConfig {
		* @throws ImsException if calling the IMS service results in an error.
		*/
		oneway void setVideoQuality(int quality, ImsConfigListener listener);

		/**
		* Gets the value for IMS volte provisioned.
		* This should be the same as the operator provisioned value if applies.
		*
		* @return void
		*/
		boolean getVolteProvisioned();
		}

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -79,8 +79,7 @@ interface IImsUt {
		/**
		* Updates the configuration of the call forward.
		*/
		int updateCallForward(int action, int condition, String number,
		int serviceClass, int timeSeconds);
		int updateCallForward(int action, int condition, String number, int timeSeconds);

		/**
		* Updates the configuration of the call forward unconditional timer.
		@@ -92,7 +91,7 @@ interface IImsUt {
		/**
		* Updates the configuration of the call waiting.
		*/
		int updateCallWaiting(boolean enable, int serviceClass);
		int updateCallWaiting(boolean enable);

		/**
		* Updates the configuration of the CLIR supplementary service.