Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 259b4c86: Merge "SIP: clean up unused class and fields." into gingerbread

Browse Source 
Merge commit '259b4c860212dd528b25d1cce6e74be01afed85c' into gingerbread-plus-aosp

* commit '259b4c860212dd528b25d1cce6e74be01afed85c':
  SIP: clean up unused class and fields.
This commit is contained in:
Hung-ying Tyan
2010-08-09 22:37:46 -07:00
committed by Android Git Automerger
parent 4a671a7452 259b4c8602
commit f13542f2eb
3 changed files with 0 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/com/android/internal/telephony/sip/SipPhone.java
View File

@@ -74,8 +74,6 @@ public class SipPhone extends SipPhoneBase {
private static final String LOG_TAG = "SipPhone";
private static final boolean LOCAL_DEBUG = true;
//private List<SipConnection> connections = new ArrayList<SipConnection>();
// A call that is ringing or (call) waiting
private SipCall ringingCall = new SipCall();
private SipCall foregroundCall = new SipCall();

79
voip/java/android/net/sip/BinderHelper.java
View File

@@ -1,79 +0,0 @@
/*
* Copyright (C) 2010 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.net.sip;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
import android.os.ConditionVariable;
import android.os.IBinder;
import android.os.IInterface;
import android.os.Looper;
import android.util.Log;
// TODO: throw away this class after moving SIP classes to framework
// This class helps to get IBinder instance of a service in a blocking call.
// The method cannot be called in app's main thread as the ServiceConnection
// callback will.
class BinderHelper<T extends IInterface> {
private Context mContext;
private IBinder mBinder;
private Class<T> mClass;
BinderHelper(Context context, Class<T> klass) {
mContext = context;
mClass = klass;
}
void startService() {
mContext.startService(new Intent(mClass.getName()));
}
void stopService() {
mContext.stopService(new Intent(mClass.getName()));
}
IBinder getBinder() {
// cannot call this method in app's main thread
if (Looper.getMainLooper().getThread() == Thread.currentThread()) {
throw new RuntimeException(
"This method cannot be called in app's main thread");
}
final ConditionVariable cv = new ConditionVariable();
cv.close();
ServiceConnection c = new ServiceConnection() {
public synchronized void onServiceConnected(
ComponentName className, IBinder binder) {
Log.v("BinderHelper", "service connected!");
mBinder = binder;
cv.open();
mContext.unbindService(this);
}
public void onServiceDisconnected(ComponentName className) {
cv.open();
mContext.unbindService(this);
}
};
if (mContext.bindService(new Intent(mClass.getName()), c, 0)) {
cv.block(4500);
}
return mBinder;
}
}

3
voip/java/android/net/sip/SipManager.java
View File

@@ -68,9 +68,6 @@ public class SipManager {
private ISipService mSipService;
// Will be removed once the SIP service is integrated into framework
private BinderHelper<ISipService> mBinderHelper;
/**
* Creates a manager instance and initializes the background SIP service.
* Will be removed once the SIP service is integrated into framework.