Merge "Return generic Binder on onBind" am: c6613f72 am: 2a71bd51

import android.annotation.SystemApi;

import android.app.Service;

import android.content.Intent;

import android.os.Binder;

import android.os.IBinder;

/**

@SystemApi

public class ImsServiceBase extends Service {

    /**

     * Binder connection that does nothing but keep the connection between this Service and the

     * framework active. If this service crashes, the framework will be notified.

     */

    private IBinder mConnection = new Binder();

    @Override

    public IBinder onBind(Intent intent) {

        return null;

        return mConnection;

    }

}