commit e93ab1d3ee8d60fdf6995683ea3a4255d8ff5c95
author David Castro <logophile@google.com> Thu Nov 21 04:52:27 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Nov 21 04:52:27 2019 -0800
tree 795a4388e3899741dc26b3547d873451b8418d0c
parent 69b6876c5804f83c195ffa67f09c7a5e41ee3fd5
parent 6d62047661aedd001d602792c859f7e976038978

Merge "Removed the confusing note as per guidance from mylesgw@ in BUG:117309989." into qt-dev am: 8bd0310456
am: 6d62047661

Change-Id: I5c57f96546f33a7746013fc1ae23332d8e5014b7

core/java/android/bluetooth/le/ScanFilter.java

diff --git a/core/java/android/bluetooth/le/ScanFilter.java b/core/java/android/bluetooth/le/ScanFilter.java
index 038994f..7511fd0 100644
--- a/core/java/android/bluetooth/le/ScanFilter.java
+++ b/core/java/android/bluetooth/le/ScanFilter.java
@@ -671,8 +671,6 @@
 
         /**
          * Set filter on on manufacturerData. A negative manufacturerId is considered as invalid id.
-         * <p>
-         * Note the first two bytes of the {@code manufacturerData} is the manufacturerId.
          *
          * @throws IllegalArgumentException If the {@code manufacturerId} is invalid.
          */