am cd5cbe96: Merge "DO NOT MERGE Fix NPE in Telecom" into lmp-mr1-dev (e70f32b1) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/CallReceiver.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ public class CallReceiver extends BroadcastReceiver {
		clientExtras = intent.getBundleExtra(TelecomManager.EXTRA_OUTGOING_CALL_EXTRAS);
		}
		if (clientExtras == null) {
		clientExtras = Bundle.EMPTY;
		clientExtras = new Bundle();
		}

		final boolean isDefaultDialer = intent.getBooleanExtra(KEY_IS_DEFAULT_DIALER, false);
		@@ -113,7 +113,7 @@ public class CallReceiver extends BroadcastReceiver {
		clientExtras = intent.getBundleExtra(TelecomManager.EXTRA_INCOMING_CALL_EXTRAS);
		}
		if (clientExtras == null) {
		clientExtras = Bundle.EMPTY;
		clientExtras = new Bundle();
		}

		Log.d(TAG, "Processing incoming call from connection service [%s]",