From cd3ffcdd70bc3de887c949b7a6af297167f760ef Mon Sep 17 00:00:00 2001
From: Klines Jiang <klinesjiang@google.com>
Date: Tue, 22 Aug 2023 02:59:04 +0000
Subject: [PATCH 1/2] [SELinux] Add gyotaku_app doamin to Pixel 2020.

Bug: 296836878

Test: Local build and tested pass.

Change-Id: I3c4e63fb73ea233838a5ea777a340310a18186ed
Merged-In: I3c4e63fb73ea233838a5ea777a340310a18186ed
---
 device.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device.mk b/device.mk
index eee489d8..6fdb249d 100644
--- a/device.mk
+++ b/device.mk
@@ -33,6 +33,7 @@ include device/google/gs-common/gps/dump/log.mk
 include device/google/gs-common/widevine/widevine.mk
 include device/google/gs-common/sota_app/factoryota.mk
 include device/google/gs-common/misc_writer/misc_writer.mk
+include device/google/gs-common/gyotaku_app/gyotaku.mk
 
 TARGET_BOARD_PLATFORM := gs101
 DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false)

From b6dd753059f0d2b88ad7e0bb3094cf85d3075351 Mon Sep 17 00:00:00 2001
From: Kuen-Han Tsai <khtsai@google.com>
Date: Tue, 19 Sep 2023 18:55:39 +0800
Subject: [PATCH 2/2] Usb.cpp: Fix typos when unable to disable USB data

If Usb.cpp cannot write a zero value to the USB_DATA_PATH file, display
the message of "Not able to turn off usb connection notification".

Test: refactoring CL. Existing tests still pass.
Bug: 301016122
Change-Id: I0c5b7c4dc5bfe21ba17058536b5014eb5d69d1f3
---
 usb/usb/Usb.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp
index 6993275a..7a148887 100644
--- a/usb/usb/Usb.cpp
+++ b/usb/usb/Usb.cpp
@@ -133,7 +133,7 @@ ScopedAStatus Usb::enableUsbData(const string& in_portName, bool in_enable,
         }
 
         if (!WriteStringToFile("0", USB_DATA_PATH)) {
-            ALOGE("Not able to turn on usb connection notification");
+            ALOGE("Not able to turn off usb connection notification");
             result = false;
         }
     }