dump_gti: fix I/O error when touch fails to resume am: 476373ef30 am: 2ae11ae84f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/24023803
Change-Id: I433a1986cb7a754f589f25c9e8d888ad26b16b31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/touch/gti/dump_gti0.sh b/touch/gti/dump_gti0.sh
index 69293dd..a3af3d7 100644
--- a/touch/gti/dump_gti0.sh
+++ b/touch/gti/dump_gti0.sh
@@ -9,7 +9,26 @@
fi
echo "------ Force Touch Active ------"
-echo 1 > $path/force_active
+result=$( cat "$path/force_active" 2>&1 )
+if [ $? -eq 0 ]; then
+ state=$( echo "$result" |cut -d " " -f 2 )
+ if [ "$state" = "locked" ]; then
+ echo "The force_active is already locked!"
+ else
+ echo 1 > $path/force_active
+ if [ $? -ne 0 ]; then
+ echo "Failed to active touch device"
+ exit 1
+ fi
+ fi
+else
+ if [[ $result == *Operation\ not\ supported* ]]; then
+ echo "force_active is not support, skip it"
+ else
+ echo "Failed to read the state of force_force"
+ exit 1
+ fi
+fi
echo "------ Touch Firmware Version ------"
cat $path/fw_ver
diff --git a/touch/gti/dump_gti1.sh b/touch/gti/dump_gti1.sh
index 8cc69cf..297ad44 100644
--- a/touch/gti/dump_gti1.sh
+++ b/touch/gti/dump_gti1.sh
@@ -9,7 +9,26 @@
fi
echo "------ Force Touch Active ------"
-echo 1 > $path/force_active
+result=$( cat "$path/force_active" 2>&1 )
+if [ $? -eq 0 ]; then
+ state=$( echo "$result" |cut -d " " -f 2 )
+ if [ "$state" = "locked" ]; then
+ echo "The force_active is already locked!"
+ else
+ echo 1 > $path/force_active
+ if [ $? -ne 0 ]; then
+ echo "Failed to active touch device"
+ exit 1
+ fi
+ fi
+else
+ if [[ $result == *Operation\ not\ supported* ]]; then
+ echo "force_active is not support, skip it"
+ else
+ echo "Failed to read the state of force_force"
+ exit 1
+ fi
+fi
echo "------ Touch Firmware Version ------"
cat $path/fw_ver