summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Zhamaitsiak <pavelz@google.com>2015-09-04 16:20:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-04 16:20:11 +0000
commitfb611846f6ca62ea248eac0b35a8d6d1fe5f5116 (patch)
treee2a67e1a3b435eb4abbaa173f160f2ad96958797
parent46b7e9e95dc1510e3720361b396de4be50ad59a5 (diff)
parent566886f7973b86196174e925f16d26975c16a09b (diff)
downloadframeworks_base-fb611846f6ca62ea248eac0b35a8d6d1fe5f5116.zip
frameworks_base-fb611846f6ca62ea248eac0b35a8d6d1fe5f5116.tar.gz
frameworks_base-fb611846f6ca62ea248eac0b35a8d6d1fe5f5116.tar.bz2
am 566886f7: Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev
* commit '566886f7973b86196174e925f16d26975c16a09b': IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL
-rw-r--r--telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl b/telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl
index a6a2658..23a69d1 100644
--- a/telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl
+++ b/telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl
@@ -71,7 +71,7 @@ interface IImsRegistrationListener {
* @param disabledFeatures features disabled as defined in com.android.ims.ImsConfig#FeatureConstants.
*/
void registrationFeatureCapabilityChanged(int serviceClass,
- out int[] enabledFeatures, out int[] disabledFeatures);
+ in int[] enabledFeatures, in int[] disabledFeatures);
/**
* Updates the application with the waiting voice message count.