From 06870a01fae27b3508025f764e585561964f386e Mon Sep 17 00:00:00 2001
From: Badhri Jagan Sridharan <badhri@google.com>
Date: Mon, 31 Jan 2022 15:57:24 -0800
Subject: [PATCH] Rename enable_usb dev node to move_data_to_usb

kernel dev attribute has now been renamed from enable_usb
to move_data_to_usb. Update the same.

Bug: 211677613
Bug: 213312081
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
Change-Id: I8e4aa0b2e09bfef807f0169eabb79e2fa2e4d2c7
---
 usb/usb/Usb.cpp                         | 8 ++++----
 usb/usb/android.hardware.usb-service.rc | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp
index ba2d5b1c..c93cdb5f 100644
--- a/usb/usb/Usb.cpp
+++ b/usb/usb/Usb.cpp
@@ -72,7 +72,7 @@ constexpr char kThermalZoneForTempReadPrimary[] = "usb_pwr_therm2";
 constexpr char kThermalZoneForTempReadSecondary1[] = "usb_pwr_therm";
 constexpr char kThermalZoneForTempReadSecondary2[] = "qi_therm";
 constexpr char kPogoUsbActive[] = "/sys/devices/platform/google,pogo/pogo_usb_active";
-constexpr char kPogoEnableUsb[] = "/sys/devices/platform/google,pogo/enable_usb";
+constexpr char KPogoMoveDataToUsb[] = "/sys/devices/platform/google,pogo/move_data_to_usb";
 constexpr char kPowerSupplyUsbType[] = "/sys/class/power_supply/usb/usb_type";
 constexpr int kSamplingIntervalSec = 5;
 void queryVersionHelper(android::hardware::usb::Usb *usb,
@@ -147,12 +147,12 @@ ScopedAStatus Usb::enableUsbDataWhileDocked(const string& in_portName,
     ALOGI("Userspace enableUsbDataWhileDocked  opID:%ld", in_transactionId);
 
     int flags = O_RDONLY;
-    ::android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(kPogoEnableUsb, flags)));
+    ::android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(KPogoMoveDataToUsb, flags)));
     if (fd != -1) {
         notSupported = false;
-        success = WriteStringToFile("1", kPogoEnableUsb);
+        success = WriteStringToFile("1", KPogoMoveDataToUsb);
         if (!success) {
-            ALOGE("Write to enable_usb failed");
+            ALOGE("Write to move_data_to_usb failed");
         }
     }
 
diff --git a/usb/usb/android.hardware.usb-service.rc b/usb/usb/android.hardware.usb-service.rc
index fd948cd8..236c67c6 100644
--- a/usb/usb/android.hardware.usb-service.rc
+++ b/usb/usb/android.hardware.usb-service.rc
@@ -17,7 +17,7 @@ on post-fs
     chown root system /sys/devices/platform/11110000.usb/dwc3_exynos_otg_b_sess
     chown root system /sys/devices/platform/11110000.usb/dwc3_exynos_otg_id
     chown root system /sys/devices/platform/11110000.usb/usb_data_enabled
-    chown root system /sys/devices/platform/google,pogo/enable_usb
+    chown root system /sys/devices/platform/google,pogo/move_data_to_usb
     chmod 664 /sys/class/typec/port0/power_role
     chmod 664 /sys/class/typec/port0/data_role
     chmod 664 /sys/class/typec/port0/port_type
@@ -30,4 +30,4 @@ on post-fs
     chmod 664 /sys/devices/platform/10d50000.hsi2c/i2c-6/i2c-max77759tcpc/usb_limit_sink_current
     chmod 664 /sys/devices/platform/10d50000.hsi2c/i2c-5/i2c-max77759tcpc/usb_limit_sink_enable
     chmod 664 /sys/devices/platform/10d50000.hsi2c/i2c-6/i2c-max77759tcpc/usb_limit_sink_enable
-    chmod 664 /sys/devices/platform/google,pogo/enable_usb
+    chmod 664 /sys/devices/platform/google,pogo/move_data_to_usb