aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcos Marado <mmarado@cyngn.com>2016-10-12 16:28:56 +0100
committerMarcos Marado <mmarado@cyngn.com>2016-10-26 04:09:49 -0700
commit6ac081027f188b0e8d858e33d08fde08ed8905c8 (patch)
tree8e5881e496b1b68fa5c542e89d6768982d8bcee2
parent440f9880bb15fe704f04250eb97d7e0094c6ac34 (diff)
downloadandroid_frameworks_opt_telephony-6ac081027f188b0e8d858e33d08fde08ed8905c8.tar.gz
android_frameworks_opt_telephony-6ac081027f188b0e8d858e33d08fde08ed8905c8.tar.bz2
android_frameworks_opt_telephony-6ac081027f188b0e8d858e33d08fde08ed8905c8.zip
properly check empty string
Also, remove no-op "else" clause. Change-Id: I0146d6aaefab1c4700738f8cf1bcb0e016e37368
-rw-r--r--src/java/com/android/internal/telephony/InboundSmsHandler.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/java/com/android/internal/telephony/InboundSmsHandler.java b/src/java/com/android/internal/telephony/InboundSmsHandler.java
index c8e870ddf..6877c2e42 100644
--- a/src/java/com/android/internal/telephony/InboundSmsHandler.java
+++ b/src/java/com/android/internal/telephony/InboundSmsHandler.java
@@ -868,10 +868,8 @@ public abstract class InboundSmsHandler extends StateMachine {
if (!tracker.is3gpp2()) {
SmsMessage msg = SmsMessage.createFromPdu(pdu, SmsConstants.FORMAT_3GPP);
pdu = msg.getUserData();
- if (address == "") {
+ if (TextUtils.isEmpty(address)) {
address = msg.getOriginatingAddress();
- } else if(address == ""){
- address = tracker.getAddress();
}
}
output.write(pdu, 0, pdu.length);