aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-03-28 01:57:12 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-03-28 01:57:12 +0000
commit312d692dc95988e32e4f06d7c84359b376bd5042 (patch)
treec9b9dd0a3c0bbb969d8ad37b15191624c4560f93
parent3675982bc5f835ceeeb81854ad436d889f01e1b2 (diff)
parent93cce807d213775cb72d8eae8ade88f82ffcc4b1 (diff)
downloadsl4a-312d692dc95988e32e4f06d7c84359b376bd5042.tar.gz
Merge "Fix potential null pointer exception" into main
-rw-r--r--Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothFacade.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothFacade.java b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothFacade.java
index 722b39a8..68600ebc 100644
--- a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothFacade.java
@@ -131,18 +131,17 @@ public class BluetoothFacade extends RpcReceiver {
Bundle msg = new Bundle();
if (state == BluetoothAdapter.STATE_ON) {
msg.putString("State", "ON");
- mEventFacade.postEvent("BluetoothStateChangedOn", msg);
+ mEventFacade.postEvent("BluetoothStateChangedOn", msg.clone());
if (!mIsMultiBroadcast) {
mService.unregisterReceiver(mStateReceiver);
}
} else if(state == BluetoothAdapter.STATE_OFF) {
msg.putString("State", "OFF");
- mEventFacade.postEvent("BluetoothStateChangedOff", msg);
+ mEventFacade.postEvent("BluetoothStateChangedOff", msg.clone());
if (!mIsMultiBroadcast) {
mService.unregisterReceiver(mStateReceiver);
}
}
- msg.clear();
}
}
}