frameworks/base$ patch -p1 -b < ../../patch/ethernet-tethering/frameworks-base/0001-PD-76237-Implement-Ether-Tethering.patch
patching file core/java/android/net/ConnectivityManager.java
patching file core/java/android/net/IConnectivityManager.aidl
patching file core/res/res/values/config.xml
patching file services/java/com/android/server/ConnectivityService.java
patching file services/java/com/android/server/connectivity/Tethering.java
再执行一次 patch -p1 < ../../patch/ethernet-tethering/frameworks-base/0001-PD-76237-Implement-Ether-Tethering.patch 并选择y,可以恢复到以前。
frameworks/base$ patch -p1 -b < ../../patch/ethernet-tethering/frameworks-base/0002-Fix-bug-Ether-tether-fails-after-removing-and-insert.patch
patching file services/java/com/android/server/connectivity/Tethering.java
再执行一次 patch -p1 < ../../patch/ethernet-tethering/frameworks-base/0002-Fix-bug-Ether-tether-fails-after-removing-and-insert.patch ,选择y,可以恢复到以前。
vim -d file1 file2 打开两个文件并比较
diff patch文件中的@@ -2648,6 +2649,15 @@ 意义:
1
|