diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-02 09:56:04 +0800 |
|---|---|---|
| committer | Hung-ying Tyan <tyanh@google.com> | 2010-09-02 09:56:04 +0800 |
| commit | f83d4f1779eb4801275a56023c343459a95009af (patch) | |
| tree | 4add9c90e3b09babc77834b85e6dc89b5053def3 /data/etc | |
| parent | 53d7765eac58f496355147f167fb345e825d6d54 (diff) | |
| parent | 3e4975a52ccd9dade7fffc9f8c144bff0f4c3cb1 (diff) | |
| download | frameworks_base-f83d4f1779eb4801275a56023c343459a95009af.zip frameworks_base-f83d4f1779eb4801275a56023c343459a95009af.tar.gz frameworks_base-f83d4f1779eb4801275a56023c343459a95009af.tar.bz2 | |
resolved conflicts for merge of 3e4975a5 to master
Change-Id: Icd382fc43c8a1975801ab42eb184b633520149c7
Diffstat (limited to 'data/etc')
| -rw-r--r-- | data/etc/android.software.sip.voip.xml | 21 | ||||
| -rw-r--r-- | data/etc/android.software.sip.xml | 20 |
2 files changed, 41 insertions, 0 deletions
diff --git a/data/etc/android.software.sip.voip.xml b/data/etc/android.software.sip.voip.xml new file mode 100644 index 0000000..edd06c1 --- /dev/null +++ b/data/etc/android.software.sip.voip.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2009 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. +--> + +<!-- This is the standard set of features for devices that support SIP-based VoIP. --> +<permissions> + <feature name="android.software.sip" /> + <feature name="android.software.sip.voip" /> +</permissions> diff --git a/data/etc/android.software.sip.xml b/data/etc/android.software.sip.xml new file mode 100644 index 0000000..d9fcaad --- /dev/null +++ b/data/etc/android.software.sip.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2009 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. +--> + +<!-- This is the standard set of features for devices that support the SIP API. --> +<permissions> + <feature name="android.software.sip" /> +</permissions> |