diff options
author | Wink Saville <wink@google.com> | 2014-06-12 17:02:31 -0700 |
---|---|---|
committer | Wink Saville <wink@google.com> | 2014-06-13 13:30:57 +0000 |
commit | fb40dd4d00bd3361b2535bc866e6c21eadc52558 (patch) | |
tree | 01786f3e2bc9c803801f43fb8bc942e55a06e859 /telephony/java/android/telephony/VoLteServiceState.aidl | |
parent | 6dfa6e2a9be08a3a0f152a7b772efc8ce2469bce (diff) | |
download | frameworks_base-fb40dd4d00bd3361b2535bc866e6c21eadc52558.zip frameworks_base-fb40dd4d00bd3361b2535bc866e6c21eadc52558.tar.gz frameworks_base-fb40dd4d00bd3361b2535bc866e6c21eadc52558.tar.bz2 |
Merge kwd to master
Add initial IMS and MSIM support from klp-wireless-dev-mirror
Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
Diffstat (limited to 'telephony/java/android/telephony/VoLteServiceState.aidl')
-rw-r--r-- | telephony/java/android/telephony/VoLteServiceState.aidl | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/VoLteServiceState.aidl b/telephony/java/android/telephony/VoLteServiceState.aidl new file mode 100644 index 0000000..59dd04f --- /dev/null +++ b/telephony/java/android/telephony/VoLteServiceState.aidl @@ -0,0 +1,21 @@ +/* +** +** Copyright (C) 2014 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 android.telephony; + +parcelable VoLteServiceState; + |