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

am 60264b30: SipProfile: remove outgoingCallAllowed flag.

Browse Source 
Merge commit '60264b306453a3043442719b970f2edb3f46f51b' into gingerbread-plus-aosp

* commit '60264b306453a3043442719b970f2edb3f46f51b':
  SipProfile: remove outgoingCallAllowed flag.
This commit is contained in:
Hung-ying Tyan
2010-09-02 05:40:58 -07:00
committed by Android Git Automerger
parent 0358def776 60264b3064
commit 18dfae226b
1 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
voip/java/android/net/sip/SipProfile.java
View File

@@ -46,8 +46,7 @@ public class SipProfile implements Parcelable, Serializable, Cloneable {
private String mProfileName; private String mProfileName;
private boolean mSendKeepAlive = false; private boolean mSendKeepAlive = false;
private boolean mAutoRegistration = true; private boolean mAutoRegistration = true;
private boolean mAllowOutgoingCall = false; private transient int mCallingUid = 0;
private int mCallingUid = -1;
/** @hide */ /** @hide */
public static final Parcelable.Creator<SipProfile> CREATOR = public static final Parcelable.Creator<SipProfile> CREATOR =
@@ -244,18 +243,6 @@ public class SipProfile implements Parcelable, Serializable, Cloneable {
return this; return this;
} }
/**
* Sets the allow-outgoing-call flag.
*
* @param flag true if allowing to make outgoing call on the profile;
* false otherwise
* @return this builder object
*/
public Builder setOutgoingCallAllowed(boolean flag) {
mProfile.mAllowOutgoingCall = flag;
return this;
}
/** /**
* Builds and returns the SIP profile object. * Builds and returns the SIP profile object.
* *
@@ -293,7 +280,6 @@ public class SipProfile implements Parcelable, Serializable, Cloneable {
mProfileName = in.readString(); mProfileName = in.readString();
mSendKeepAlive = (in.readInt() == 0) ? false : true; mSendKeepAlive = (in.readInt() == 0) ? false : true;
mAutoRegistration = (in.readInt() == 0) ? false : true; mAutoRegistration = (in.readInt() == 0) ? false : true;
mAllowOutgoingCall = (in.readInt() == 0) ? false : true;
mCallingUid = in.readInt(); mCallingUid = in.readInt();
} }
@@ -307,7 +293,6 @@ public class SipProfile implements Parcelable, Serializable, Cloneable {
out.writeString(mProfileName); out.writeString(mProfileName);
out.writeInt(mSendKeepAlive ? 1 : 0); out.writeInt(mSendKeepAlive ? 1 : 0);
out.writeInt(mAutoRegistration ? 1 : 0); out.writeInt(mAutoRegistration ? 1 : 0);
out.writeInt(mAllowOutgoingCall ? 1 : 0);
out.writeInt(mCallingUid); out.writeInt(mCallingUid);
} }
@@ -434,13 +419,6 @@ public class SipProfile implements Parcelable, Serializable, Cloneable {
return mAutoRegistration; return mAutoRegistration;
} }
/**
* Returns true if allowing to make outgoing calls on this profile.
*/
public boolean isOutgoingCallAllowed() {
return mAllowOutgoingCall;
}
/** /**
* Sets the calling process's Uid in the sip service. * Sets the calling process's Uid in the sip service.
* @hide * @hide