Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f83d4f17 authored by Hung-ying Tyan's avatar Hung-ying Tyan
Browse files

resolved conflicts for merge of 3e4975a5 to master 

Change-Id: Icd382fc43c8a1975801ab42eb184b633520149c7
parents 53d7765e 3e4975a5

api/current.xml

+22 −0
Original line number Diff line number Diff line
@@ -55641,6 +55641,28 @@ 
 visibility="public"

>

</field>

<field name="FEATURE_SIP"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.software.sip&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FEATURE_SIP_VOIP"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.software.sip.voip&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FEATURE_TELEPHONY"

 type="java.lang.String"

 transient="false"

core/java/android/content/pm/PackageManager.java

+15 −1
Original line number Diff line number Diff line
@@ -761,6 +761,20 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_TELEPHONY_GSM = "android.hardware.telephony.gsm";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The SIP API is enabled on the device.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_SIP = "android.software.sip";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports SIP-based VOIP.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_SIP_VOIP = "android.software.sip.voip";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device's display has a touch screen.

data/etc/android.software.sip.voip.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?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>

data/etc/android.software.sip.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?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>

services/java/com/android/server/SystemServer.java

+5 −2
Original line number Diff line number Diff line
@@ -431,8 +431,11 @@ class ServerThread extends Thread { 
            }



            try {

                SipService sipService = SipService.create(context);

                if (sipService != null) {

                    Slog.i(TAG, "Sip Service");

                ServiceManager.addService("sip", new SipService(context));

                    ServiceManager.addService("sip", sipService);

                }

            } catch (Throwable e) {

                Slog.e(TAG, "Failure starting SIP Service", e);

            }