Merge "Fixed NPE" into rvc-dev am: 65dfd4cfc2 (a819bfeb) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/MissedIncomingCallSmsFilter.java

+9 −5

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	package com.android.internal.telephony;		package com.android.internal.telephony;

			import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.content.ComponentName;		import android.content.ComponentName;
	import android.content.Context;		import android.content.Context;
	@@ -97,14 +98,17 @@ public class MissedIncomingCallSmsFilter {
	}		}

	if (mCarrierConfig != null) {		if (mCarrierConfig != null) {
	SmsMessage message = SmsMessage.createFromPdu(pdus[0], format);
	String[] originators = mCarrierConfig.getStringArray(CarrierConfigManager		String[] originators = mCarrierConfig.getStringArray(CarrierConfigManager
	.KEY_MISSED_INCOMING_CALL_SMS_ORIGINATOR_STRING_ARRAY);		.KEY_MISSED_INCOMING_CALL_SMS_ORIGINATOR_STRING_ARRAY);
	if (originators != null		if (originators != null) {
			SmsMessage message = SmsMessage.createFromPdu(pdus[0], format);
			if (message != null
			&& !TextUtils.isEmpty(message.getOriginatingAddress())
	&& Arrays.asList(originators).contains(message.getOriginatingAddress())) {		&& Arrays.asList(originators).contains(message.getOriginatingAddress())) {
	return processSms(message);		return processSms(message);
	}		}
	}		}
			}
	return false;		return false;
	}		}

	@@ -147,7 +151,7 @@ public class MissedIncomingCallSmsFilter {
	*		*
	* @return {@code true} if the SMS message has been processed as a missed incoming call SMS.		* @return {@code true} if the SMS message has been processed as a missed incoming call SMS.
	*/		*/
	private boolean processSms(SmsMessage message) {		private boolean processSms(@NonNull SmsMessage message) {
	long missedCallTime = 0;		long missedCallTime = 0;
	String callerId = null;		String callerId = null;