DO NOT MERGE Fix NPE in Telecom
Use empty bundle instead of Bundle.EMPTY which is non mutable.
Bug: 19486064
Change-Id: Ia015a695c4e7849cb37b66c2ac73d8b1f58ac344
diff --git a/src/com/android/server/telecom/CallReceiver.java b/src/com/android/server/telecom/CallReceiver.java
index 27d4f51..bdae582 100644
--- a/src/com/android/server/telecom/CallReceiver.java
+++ b/src/com/android/server/telecom/CallReceiver.java
@@ -70,7 +70,7 @@
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 @@
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]",