Merge "ims:rcs: Add UCE interface files for RCS." into nyc-dev (eac4de23) · Commits · e / os / android_frameworks_base

Android.mk

+6 −0

Original line number	Diff line number	Diff line
		@@ -422,6 +422,12 @@ LOCAL_SRC_FILES += \
		telephony/java/com/android/ims/internal/IImsUtListener.aidl \
		telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl \
		telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl \
		telephony/java/com/android/ims/internal/uce/uceservice/IUceService.aidl \
		telephony/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl \
		telephony/java/com/android/ims/internal/uce/options/IOptionsService.aidl \
		telephony/java/com/android/ims/internal/uce/options/IOptionsListener.aidl \
		telephony/java/com/android/ims/internal/uce/presence/IPresenceService.aidl \
		telephony/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl \
		telephony/java/com/android/ims/ImsConfigListener.aidl \
		telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl \
		telephony/java/com/android/internal/telephony/IMms.aidl \

core/res/AndroidManifest.xml

+23 −0

Original line number	Diff line number	Diff line
		@@ -458,6 +458,9 @@
		<protected-broadcast android:name="android.net.wifi.PASSPOINT_ICON_RECEIVED" />
		<protected-broadcast android:name="com.android.server.notification.CountdownConditionProvider" />

		<!-- @hide UCE service Notification -->
		<protected-broadcast android:name="com.android.ims.internal.uce.UCE_SERVICE_UP" />

		<!-- ====================================================================== -->
		<!-- RUNTIME PERMISSIONS -->
		<!-- ====================================================================== -->
		@@ -830,6 +833,26 @@
		android:description="@string/permdesc_recordAudio"
		android:protectionLevel="dangerous"/>

		<!-- ====================================================================== -->
		<!-- Permissions for accessing the UCE Service -->
		<!-- ====================================================================== -->

		<!-- @hide Allows an application to Access UCE-Presence.
		<p>Protection level: dangerous
		-->
		<permission android:name="android.permission.ACCESS_UCE_PRESENCE_SERVICE"
		android:permissionGroup="android.permission-group.PHONE"
		android:protectionLevel="dangerous"/>

		<!-- @hide Allows an application to Access UCE-OPTIONS.
		<p>Protection level: dangerous
		-->
		<permission android:name="android.permission.ACCESS_UCE_OPTIONS_SERVICE"
		android:permissionGroup="android.permission-group.PHONE"
		android:protectionLevel="dangerous"/>



		<!-- ====================================================================== -->
		<!-- Permissions for accessing the device camera -->
		<!-- ====================================================================== -->

telephony/java/com/android/ims/internal/uce/common/CapInfo.aidl

0 → 100644

+18 −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.uce.common;

		parcelable CapInfo;
		No newline at end of file

telephony/java/com/android/ims/internal/uce/common/CapInfo.java

0 → 100644

+443 −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.uce.common;

		import android.os.Parcel;
		import android.os.Parcelable;
		import android.util.Log;

		/** Class for capability discovery information.
		* @hide */
		public class CapInfo implements Parcelable {

		/** IM session support. */
		private boolean mImSupported = false;
		/** File transfer support. */
		private boolean mFtSupported = false;
		/** File transfer Thumbnail support. */
		private boolean mFtThumbSupported = false;
		/** File transfer Store and forward support. */
		private boolean mFtSnFSupported = false;
		/** File transfer HTTP support. */
		private boolean mFtHttpSupported = false;
		/** Image sharing support. */
		private boolean mIsSupported = false;
		/** Video sharing during a CS call support -- IR-74. */
		private boolean mVsDuringCSSupported = false;
		/** Video sharing outside of voice call support -- IR-84. */
		private boolean mVsSupported = false;
		/** Social presence support. */
		private boolean mSpSupported = false;
		/** Presence discovery support. */
		private boolean mCdViaPresenceSupported = false;
		/** IP voice call support (IR-92/IR-58). */
		private boolean mIpVoiceSupported = false;
		/** IP video call support (IR-92/IR-58). */
		private boolean mIpVideoSupported = false;
		/** IP Geo location Pull using File Transfer support. */
		private boolean mGeoPullFtSupported = false;
		/** IP Geo location Pull support. */
		private boolean mGeoPullSupported = false;
		/** IP Geo location Push support. */
		private boolean mGeoPushSupported = false;
		/** Standalone messaging support. */
		private boolean mSmSupported = false;
		/** Full Store and Forward Group Chat information. */
		private boolean mFullSnFGroupChatSupported = false;
		/** RCS IP Voice call support . */
		private boolean mRcsIpVoiceCallSupported = false;
		/** RCS IP Video call support . */
		private boolean mRcsIpVideoCallSupported = false;
		/** RCS IP Video call support . */
		private boolean mRcsIpVideoOnlyCallSupported = false;
		/** List of supported extensions. */
		private String[] mExts = new String[10];
		/** Time used to compute when to query again. */
		private long mCapTimestamp = 0;


		/**
		* Constructor for the CapInfo class.
		*/
		public CapInfo() {
		};


		/**
		* Checks whether IM is supported.
		*/
		public boolean isImSupported() {
		return mImSupported;
		}

		/**
		* Sets IM as supported or not supported.
		*/
		public void setImSupported(boolean imSupported) {
		this.mImSupported = imSupported;
		}

		/**
		* Checks whether FT Thumbnail is supported.
		*/
		public boolean isFtThumbSupported() {
		return mFtThumbSupported;
		}

		/**
		* Sets FT thumbnail as supported or not supported.
		*/
		public void setFtThumbSupported(boolean ftThumbSupported) {
		this.mFtThumbSupported = ftThumbSupported;
		}



		/**
		* Checks whether FT Store and Forward is supported
		*/
		public boolean isFtSnFSupported() {
		return mFtSnFSupported;
		}

		/**
		* Sets FT Store and Forward as supported or not supported.
		*/
		public void setFtSnFSupported(boolean ftSnFSupported) {
		this.mFtSnFSupported = ftSnFSupported;
		}

		/**
		* Checks whether File transfer HTTP is supported.
		*/
		public boolean isFtHttpSupported() {
		return mFtHttpSupported;
		}

		/**
		* Sets File transfer HTTP as supported or not supported.
		*/
		public void setFtHttpSupported(boolean ftHttpSupported) {
		this.mFtHttpSupported = ftHttpSupported;
		}

		/**
		* Checks whether FT is supported.
		*/
		public boolean isFtSupported() {
		return mFtSupported;
		}

		/**
		* Sets FT as supported or not supported.
		*/
		public void setFtSupported(boolean ftSupported) {
		this.mFtSupported = ftSupported;
		}

		/**
		* Checks whether IS is supported.
		*/
		public boolean isIsSupported() {
		return mIsSupported;
		}

		/**
		* Sets IS as supported or not supported.
		*/
		public void setIsSupported(boolean isSupported) {
		this.mIsSupported = isSupported;
		}

		/**
		* Checks whether video sharing is supported during a CS call.
		*/
		public boolean isVsDuringCSSupported() {
		return mVsDuringCSSupported;
		}

		/**
		* Sets video sharing as supported or not supported during a CS
		* call.
		*/
		public void setVsDuringCSSupported(boolean vsDuringCSSupported) {
		this.mVsDuringCSSupported = vsDuringCSSupported;
		}

		/**
		* Checks whether video sharing outside a voice call is
		* supported.
		*/
		public boolean isVsSupported() {
		return mVsSupported;
		}

		/**
		* Sets video sharing as supported or not supported.
		*/
		public void setVsSupported(boolean vsSupported) {
		this.mVsSupported = vsSupported;
		}

		/**
		* Checks whether social presence is supported.
		*/
		public boolean isSpSupported() {
		return mSpSupported;
		}

		/**
		* Sets social presence as supported or not supported.
		*/
		public void setSpSupported(boolean spSupported) {
		this.mSpSupported = spSupported;
		}

		/**
		* Checks whether capability discovery via presence is
		* supported.
		*/
		public boolean isCdViaPresenceSupported() {
		return mCdViaPresenceSupported;
		}

		/**
		* Sets capability discovery via presence as supported or not
		* supported.
		*/
		public void setCdViaPresenceSupported(boolean cdViaPresenceSupported) {
		this.mCdViaPresenceSupported = cdViaPresenceSupported;
		}

		/**
		* Checks whether IP voice call is supported.
		*/
		public boolean isIpVoiceSupported() {
		return mIpVoiceSupported;
		}

		/**
		* Sets IP voice call as supported or not supported.
		*/
		public void setIpVoiceSupported(boolean ipVoiceSupported) {
		this.mIpVoiceSupported = ipVoiceSupported;
		}

		/**
		* Checks whether IP video call is supported.
		*/
		public boolean isIpVideoSupported() {
		return mIpVideoSupported;
		}

		/**
		* Sets IP video call as supported or not supported.
		*/
		public void setIpVideoSupported(boolean ipVideoSupported) {
		this.mIpVideoSupported = ipVideoSupported;
		}

		/**
		* Checks whether Geo location Pull using File Transfer is
		* supported.
		*/
		public boolean isGeoPullFtSupported() {
		return mGeoPullFtSupported;
		}

		/**
		* Sets Geo location Pull using File Transfer as supported or
		* not supported.
		*/
		public void setGeoPullFtSupported(boolean geoPullFtSupported) {
		this.mGeoPullFtSupported = geoPullFtSupported;
		}

		/**
		* Checks whether Geo Pull is supported.
		*/
		public boolean isGeoPullSupported() {
		return mGeoPullSupported;
		}

		/**
		* Sets Geo Pull as supported or not supported.
		*/
		public void setGeoPullSupported(boolean geoPullSupported) {
		this.mGeoPullSupported = geoPullSupported;
		}

		/**
		* Checks whether Geo Push is supported.
		*/
		public boolean isGeoPushSupported() {
		return mGeoPushSupported;
		}

		/**
		* Sets Geo Push as supported or not supported.
		*/
		public void setGeoPushSupported(boolean geoPushSupported) {
		this.mGeoPushSupported = geoPushSupported;
		}

		/**
		* Checks whether short messaging is supported.
		*/
		public boolean isSmSupported() {
		return mSmSupported;
		}

		/**
		* Sets short messaging as supported or not supported.
		*/
		public void setSmSupported(boolean smSupported) {
		this.mSmSupported = smSupported;
		}

		/**
		* Checks whether store/forward and group chat are supported.
		*/
		public boolean isFullSnFGroupChatSupported() {
		return mFullSnFGroupChatSupported;
		}

		public boolean isRcsIpVoiceCallSupported() {
		return mRcsIpVoiceCallSupported;
		}

		public boolean isRcsIpVideoCallSupported() {
		return mRcsIpVideoCallSupported;
		}

		public boolean isRcsIpVideoOnlyCallSupported() {
		return mRcsIpVideoOnlyCallSupported;
		}

		/**
		* Sets store/forward and group chat supported or not supported.
		*/
		public void setFullSnFGroupChatSupported(boolean fullSnFGroupChatSupported) {
		this.mFullSnFGroupChatSupported = fullSnFGroupChatSupported;
		}

		public void setRcsIpVoiceCallSupported(boolean rcsIpVoiceCallSupported) {
		this.mRcsIpVoiceCallSupported = rcsIpVoiceCallSupported;
		}
		public void setRcsIpVideoCallSupported(boolean rcsIpVideoCallSupported) {
		this.mRcsIpVideoCallSupported = rcsIpVideoCallSupported;
		}
		public void setRcsIpVideoOnlyCallSupported(boolean rcsIpVideoOnlyCallSupported) {
		this.mRcsIpVideoOnlyCallSupported = rcsIpVideoOnlyCallSupported;
		}

		/** Gets the list of supported extensions. */
		public String[] getExts() {
		return mExts;
		}

		/** Sets the list of supported extensions. */
		public void setExts(String[] exts) {
		this.mExts = exts;
		}


		/** Gets the time stamp for when to query again. */
		public long getCapTimestamp() {
		return mCapTimestamp;
		}

		/** Sets the time stamp for when to query again. */
		public void setCapTimestamp(long capTimestamp) {
		this.mCapTimestamp = capTimestamp;
		}

		public int describeContents() {
		// TODO Auto-generated method stub
		return 0;
		}

		public void writeToParcel(Parcel dest, int flags) {

		dest.writeInt(mImSupported ? 1 : 0);
		dest.writeInt(mFtSupported ? 1 : 0);
		dest.writeInt(mFtThumbSupported ? 1 : 0);
		dest.writeInt(mFtSnFSupported ? 1 : 0);
		dest.writeInt(mFtHttpSupported ? 1 : 0);
		dest.writeInt(mIsSupported ? 1 : 0);
		dest.writeInt(mVsDuringCSSupported ? 1 : 0);
		dest.writeInt(mVsSupported ? 1 : 0);
		dest.writeInt(mSpSupported ? 1 : 0);
		dest.writeInt(mCdViaPresenceSupported ? 1 : 0);
		dest.writeInt(mIpVoiceSupported ? 1 : 0);
		dest.writeInt(mIpVideoSupported ? 1 : 0);
		dest.writeInt(mGeoPullFtSupported ? 1 : 0);
		dest.writeInt(mGeoPullSupported ? 1 : 0);
		dest.writeInt(mGeoPushSupported ? 1 : 0);
		dest.writeInt(mSmSupported ? 1 : 0);
		dest.writeInt(mFullSnFGroupChatSupported ? 1 : 0);

		dest.writeInt(mRcsIpVoiceCallSupported ? 1 : 0);
		dest.writeInt(mRcsIpVideoCallSupported ? 1 : 0);
		dest.writeInt(mRcsIpVideoOnlyCallSupported ? 1 : 0);
		dest.writeStringArray(mExts);
		dest.writeLong(mCapTimestamp);
		}

		public static final Parcelable.Creator<CapInfo> CREATOR = new Parcelable.Creator<CapInfo>() {

		public CapInfo createFromParcel(Parcel source) {
		return new CapInfo(source);
		}

		public CapInfo[] newArray(int size) {
		return new CapInfo[size];
		}
		};

		private CapInfo(Parcel source) {
		readFromParcel(source);
		}

		public void readFromParcel(Parcel source) {

		mImSupported = (source.readInt() == 0) ? false : true;
		mFtSupported = (source.readInt() == 0) ? false : true;
		mFtThumbSupported = (source.readInt() == 0) ? false : true;
		mFtSnFSupported = (source.readInt() == 0) ? false : true;
		mFtHttpSupported = (source.readInt() == 0) ? false : true;
		mIsSupported = (source.readInt() == 0) ? false : true;
		mVsDuringCSSupported = (source.readInt() == 0) ? false : true;
		mVsSupported = (source.readInt() == 0) ? false : true;
		mSpSupported = (source.readInt() == 0) ? false : true;
		mCdViaPresenceSupported = (source.readInt() == 0) ? false : true;
		mIpVoiceSupported = (source.readInt() == 0) ? false : true;
		mIpVideoSupported = (source.readInt() == 0) ? false : true;
		mGeoPullFtSupported = (source.readInt() == 0) ? false : true;
		mGeoPullSupported = (source.readInt() == 0) ? false : true;
		mGeoPushSupported = (source.readInt() == 0) ? false : true;
		mSmSupported = (source.readInt() == 0) ? false : true;
		mFullSnFGroupChatSupported = (source.readInt() == 0) ? false : true;

		mRcsIpVoiceCallSupported = (source.readInt() == 0) ? false : true;
		mRcsIpVideoCallSupported = (source.readInt() == 0) ? false : true;
		mRcsIpVideoOnlyCallSupported = (source.readInt() == 0) ? false : true;

		mExts = source.createStringArray();
		mCapTimestamp = source.readLong();
		}
		}

telephony/java/com/android/ims/internal/uce/common/StatusCode.aidl

0 → 100644

+18 −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.uce.common;

		parcelable StatusCode;
		No newline at end of file