OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'aosp/honeycomb-LTE-release' into honeycomb-mr2-x86
[android-x86/frameworks-base.git]
/
telephony
/
java
/
com
/
android
/
internal
/
telephony
/
sip
/
SipPhoneBase.java
diff --git
a/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
b/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
index
9dfc015
..
5c4b446
100755
(executable)
--- a/
telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
+++ b/
telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
@@
-264,6
+264,10
@@
abstract class SipPhoneBase extends PhoneBase {
return null;
}
+ public String getImei() {
+ return null;
+ }
+
public String getEsn() {
Log.e(LOG_TAG, "[SipPhone] getEsn() is a CDMA method");
return "0";