Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5eaebb7 authored by Chris Manton's avatar Chris Manton Committed by android-build-merger
Browse files

Merge "Unify log tag for shim layer" am: 67957174 am: f33a7486 

am: 22c6e0c0

Change-Id: I66e180202e6dab313a552674c3987ecbaa1ffb7e
parents 72384292 22c6e0c0

system/gd/shim/connectability.cc

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#define LOG_TAG "gd_shim"

#define LOG_TAG "bt_gd_shim"



#include <memory>

system/gd/shim/controller.cc

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#define LOG_TAG "gd_shim"

#define LOG_TAG "bt_gd_shim"



#include <memory>

system/gd/shim/discoverability.cc

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#define LOG_TAG "gd_shim"

#define LOG_TAG "bt_gd_shim"



#include <memory>

system/main/shim/controller.cc

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#define LOG_TAG "bt_gd_controller"

#define LOG_TAG "bt_shim_controller"



#include "main/shim/controller.h"

#include "btcore/include/module.h"

system/main/shim/hci_layer.cc

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#define LOG_TAG "bt_gd_hci"

#define LOG_TAG "bt_shim_hci"



#include <base/bind.h>

#include <frameworks/base/core/proto/android/bluetooth/hci/enums.pb.h>