commit a25a47f5cf7e7369cdd15bd09e6b286bf21ae52b
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 01 03:12:31 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 01 03:12:31 2019 +0000
tree 646a876e02f40bdcacd685739b0f4f046387bf67
parent a4f716556b86cd7ad50efc39898b40192bd251fc
parent 51a3a98079c9f6bd6a81825877da4f0e4cdf1f74

Merge "Don't report silence state in ACTION_SILENCE_MODE_CHANGED"

src/com/android/bluetooth/btservice/SilenceDeviceManager.java

diff --git a/src/com/android/bluetooth/btservice/SilenceDeviceManager.java b/src/com/android/bluetooth/btservice/SilenceDeviceManager.java
index 1009e34..ec01130 100644
--- a/src/com/android/bluetooth/btservice/SilenceDeviceManager.java
+++ b/src/com/android/bluetooth/btservice/SilenceDeviceManager.java
@@ -286,7 +286,6 @@
     void broadcastSilenceStateChange(BluetoothDevice device, boolean state) {
         Intent intent = new Intent(BluetoothDevice.ACTION_SILENCE_MODE_CHANGED);
         intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
-        intent.putExtra(BluetoothDevice.EXTRA_SILENCE_ENABLED, state);
         mAdapterService.sendBroadcastAsUser(intent, UserHandle.ALL, AdapterService.BLUETOOTH_PERM);
 
     }

tests/unit/src/com/android/bluetooth/btservice/SilenceDeviceManagerTest.java

diff --git a/tests/unit/src/com/android/bluetooth/btservice/SilenceDeviceManagerTest.java b/tests/unit/src/com/android/bluetooth/btservice/SilenceDeviceManagerTest.java
index de3aaed..f060d12 100644
--- a/tests/unit/src/com/android/bluetooth/btservice/SilenceDeviceManagerTest.java
+++ b/tests/unit/src/com/android/bluetooth/btservice/SilenceDeviceManagerTest.java
@@ -130,7 +130,7 @@
             verify(mAdapterService, times(++mVerifyCount)).sendBroadcastAsUser(
                     intentArgument.capture(), eq(UserHandle.ALL),
                     eq(AdapterService.BLUETOOTH_PERM));
-            verifySilenceStateIntent(enableSilence, intentArgument.getValue());
+            verifySilenceStateIntent(intentArgument.getValue());
         }
 
         // Remove test devices
@@ -160,11 +160,9 @@
                 eq(AdapterService.BLUETOOTH_PERM));
     }
 
-    void verifySilenceStateIntent(boolean expectedState, Intent intent) {
+    void verifySilenceStateIntent(Intent intent) {
         Assert.assertEquals(BluetoothDevice.ACTION_SILENCE_MODE_CHANGED, intent.getAction());
         Assert.assertEquals(mTestDevice, intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE));
-        Assert.assertEquals(expectedState,
-                intent.getBooleanExtra(BluetoothDevice.EXTRA_SILENCE_ENABLED, false));
     }
 
     /**