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

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

resolved conflicts for merge of 2a36a778 to master 

Change-Id: Ia70adeef06afddd29c827405fb5657bf9f5a29a3
parents 747eb00e 2a36a778

cmds/servicemanager/service_manager.c

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ static struct { 
    { AID_RADIO, "radio.simphonebook" },

/* TODO: remove after phone services are updated: */

    { AID_RADIO, "phone" },

    { AID_RADIO, "sip" },

    { AID_RADIO, "isms" },

    { AID_RADIO, "iphonesubinfo" },

    { AID_RADIO, "simphonebook" },

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

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.server;



import com.android.server.am.ActivityManagerService;

import com.android.server.sip.SipService;

import com.android.internal.os.BinderInternal;

import com.android.internal.os.SamplingProfilerIntegration;

services/java/com/android/server/sip/SipService.java→voip/java/com/android/server/sip/SipService.java

+8 −5
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.os.HandlerThread; 
import android.os.Looper;

import android.os.Message;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemClock;

import android.text.TextUtils;

import android.util.Log;
@@ -90,12 +91,14 @@ public final class SipService extends ISipService.Stub { 
    private ConnectivityReceiver mConnectivityReceiver;



    /**

     * Creates a {@code SipService} instance. Returns null if SIP API is not

     * supported.

     * Starts the SIP service. Do nothing if the SIP API is not supported on the

     * device.

     */

    public static SipService create(Context context) {

        return (SipManager.isApiSupported(context) ? new SipService(context)

                                                   : null);

    public static void start(Context context) {

        if (SipManager.isApiSupported(context)) {

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

            Log.i(TAG, "SIP service started");

        }

    }



    private SipService(Context context) {