am 60264b30: SipProfile: remove outgoingCallAllowed flag.
Merge commit '60264b306453a3043442719b970f2edb3f46f51b' into gingerbread-plus-aosp * commit '60264b306453a3043442719b970f2edb3f46f51b': SipProfile: remove outgoingCallAllowed flag.
This commit is contained in:
@@ -46,8 +46,7 @@ public class SipProfile implements Parcelable, Serializable, Cloneable {
|
||||
private String mProfileName;
|
||||
private boolean mSendKeepAlive = false;
|
||||
private boolean mAutoRegistration = true;
|
||||
private boolean mAllowOutgoingCall = false;
|
||||
private int mCallingUid = -1;
|
||||
private transient int mCallingUid = 0;
|
||||
|
||||
/** @hide */
|
||||
public static final Parcelable.Creator<SipProfile> CREATOR =
|
||||
@@ -244,18 +243,6 @@ public class SipProfile implements Parcelable, Serializable, Cloneable {
|
||||
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.
|
||||
*
|
||||
@@ -293,7 +280,6 @@ public class SipProfile implements Parcelable, Serializable, Cloneable {
|
||||
mProfileName = in.readString();
|
||||
mSendKeepAlive = (in.readInt() == 0) ? false : true;
|
||||
mAutoRegistration = (in.readInt() == 0) ? false : true;
|
||||
mAllowOutgoingCall = (in.readInt() == 0) ? false : true;
|
||||
mCallingUid = in.readInt();
|
||||
}
|
||||
|
||||
@@ -307,7 +293,6 @@ public class SipProfile implements Parcelable, Serializable, Cloneable {
|
||||
out.writeString(mProfileName);
|
||||
out.writeInt(mSendKeepAlive ? 1 : 0);
|
||||
out.writeInt(mAutoRegistration ? 1 : 0);
|
||||
out.writeInt(mAllowOutgoingCall ? 1 : 0);
|
||||
out.writeInt(mCallingUid);
|
||||
}
|
||||
|
||||
@@ -434,13 +419,6 @@ public class SipProfile implements Parcelable, Serializable, Cloneable {
|
||||
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.
|
||||
* @hide
|
||||
|
||||
Reference in New Issue
Block a user