Android12 MTK平台 禁用adb

frameworks/base/services/core/java/com/android/server/adb/AdbService.java

@@ -165,11 +165,10 @@ public class AdbService extends IAdbManager.Stub {
              * Use the normal bootmode persistent prop to maintain state of adb across
              * all boot modes.
              */
-            mIsAdbUsbEnabled = containsFunction(
-                    SystemProperties.get(USB_PERSISTENT_CONFIG_PROPERTY, ""),
-                    UsbManager.USB_FUNCTION_ADB);
-            mIsAdbWifiEnabled = "1".equals(
-                    SystemProperties.get(WIFI_PERSISTENT_CONFIG_PROPERTY, "0"));
+                       //yanhb modify for Disable adb start
+            mIsAdbUsbEnabled = false;
+            mIsAdbWifiEnabled = false;
+                       //yanhb modify end
 
             // register observer to listen for settings changes
             mObserver = new AdbSettingsObserver();
@@ -257,10 +256,11 @@ public class AdbService extends IAdbManager.Stub {
 
         // make sure the ADB_ENABLED setting value matches the current state
         try {
+                       //yanhb modify for Disable adb
             Settings.Global.putInt(mContentResolver,
-                    Settings.Global.ADB_ENABLED, mIsAdbUsbEnabled ? 1 : 0);
+                    Settings.Global.ADB_ENABLED, 0);
             Settings.Global.putInt(mContentResolver,
-                    Settings.Global.ADB_WIFI_ENABLED, mIsAdbWifiEnabled ? 1 : 0);
+                    Settings.Global.ADB_WIFI_ENABLED, 0);
         } catch (SecurityException e) {
             // If UserManager.DISALLOW_DEBUGGING_FEATURES is on, that this setting can't be changed.
             Slog.d(TAG, "ADB_ENABLED is restricted.");
@@ -273,8 +273,9 @@ public class AdbService extends IAdbManager.Stub {
     public void bootCompleted() {
         if (DEBUG) Slog.d(TAG, "boot completed");
         if (mDebuggingManager != null) {
-            mDebuggingManager.setAdbEnabled(mIsAdbUsbEnabled, AdbTransportType.USB);
-            mDebuggingManager.setAdbEnabled(mIsAdbWifiEnabled, AdbTransportType.WIFI);
+                       //yanhb modify for Disable adb
+            mDebuggingManager.setAdbEnabled(false, AdbTransportType.USB);
+            mDebuggingManager.setAdbEnabled(false, AdbTransportType.WIFI);
         }
     }
 
@@ -447,7 +448,8 @@ public class AdbService extends IAdbManager.Stub {
 
     private void setAdbdEnabledForTransport(boolean enable, byte transportType) {
         if (transportType == AdbTransportType.USB) {
-            mIsAdbUsbEnabled = enable;
+                       //yanhb modify for Disable adb start
+            mIsAdbUsbEnabled = false;
         } else if (transportType == AdbTransportType.WIFI) {
             mIsAdbWifiEnabled = enable;
         }
@@ -466,7 +468,8 @@ public class AdbService extends IAdbManager.Stub {
         }
 
         if (transportType == AdbTransportType.USB && enable != mIsAdbUsbEnabled) {
-            mIsAdbUsbEnabled = enable;
+                       //yanhb modify for Disable adb start
+            mIsAdbUsbEnabled = false;
         } else if (transportType == AdbTransportType.WIFI && enable != mIsAdbWifiEnabled) {
             mIsAdbWifiEnabled = enable;
             if (mIsAdbWifiEnabled) {

build/make/target/product/base_system.mk

 # Host tools to install
 PRODUCT_HOST_PACKAGES += \
     BugReport \
-    adb \
     art-tools \
     atest \
     bcc \

build/make/core/main.mk

@@ -368,7 +368,7 @@ endif
 ## user/userdebug ##
 
 user_variant := $(filter user userdebug,$(TARGET_BUILD_VARIANT))
-enable_target_debugging := true
+enable_target_debugging := false
 tags_to_install :=
 ifneq (,$(user_variant))
   # Target is secure in user builds.

device/mediatek/mt6761/factory_init.rc

@@ -842,7 +842,7 @@ on property:vendor.usb.clear=1 && property:sys.usb.configfs=1
 
 #mass_storage,adb,acm
 on property:ro.boot.usbconfig=0 && property:sys.usb.configfs=1
-    start adbd
+    #start adbd
 
 on property:sys.usb.ffs.ready=1 && property:ro.boot.usbconfig=0 && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/UDC "none"
@@ -865,7 +865,7 @@ on property:ro.boot.usbconfig=1 && property:sys.usb.configfs=1
 
 #singloe modem comport for factory mode
 on property:sys.usb.config=gs3,dual_acm && property:sys.usb.configfs=1
-    start adbd
+    #start adbd
     setprop vendor.usb.clear 1
 
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=gs3,dual_acm && \
@@ -882,7 +882,7 @@ property:vendor.usb.clear=2 && property:sys.usb.configfs=1
     setprop vendor.usb.clear 0
 
 on property:sys.usb.config=gs1gs3,dual_acm && property:sys.usb.configfs=1
-    start adbd
+    #start adbd
     setprop vendor.usb.clear 1
 
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=gs1gs3,dual_acm && \
@@ -899,7 +899,7 @@ property:vendor.usb.clear=2 && property:sys.usb.configfs=1
     setprop vendor.usb.clear 0
 
 on property:sys.usb.config=gs1gs3 && property:sys.usb.configfs=1
-    start adbd
+    #start adbd
     setprop vendor.usb.clear 1

device/mediatek/mt6761/init.mt6761.usb.kernel-4.19.rc

@@ -445,7 +445,7 @@ property:sys.usb.configfs=1
     setprop vendor.usb.pid 0x2050
 
 on property:sys.usb.config=via_bypass,adb && property:sys.usb.configfs=1
-    start adbd
+    #start adbd
 
 ##via_modem,via_ets,via_atc,adb,acm
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=via_bypass,adb && \
@@ -532,7 +532,7 @@ property:sys.usb.configfs=1
     setprop vendor.usb.pid 0x2029
 
 on property:sys.usb.config=mass_storage,adb && property:sys.usb.configfs=1
-    start adbd
+    #start adbd
 
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=mass_storage,adb && \
 property:vendor.usb.acm_enable=1 && property:sys.usb.configfs=1
@@ -602,7 +602,7 @@ property:sys.usb.configfs=1
     setprop vendor.usb.pid 0x2029
 
 on property:sys.usb.config=bicr,adb && property:sys.usb.configfs=1
-    start adbd
+    #start adbd
 
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=bicr,adb && \
 property:vendor.usb.acm_enable=1 && property:sys.usb.configfs=1
@@ -768,13 +768,13 @@ on property:sys.usb.ffs.ready=1
    setprop vendor.usb.ffs.ready 1
 
 on property:sys.usb.config=atm_gs0 && property:sys.usb.configfs=1
-    stop adbd
+    #stop adbd
     setprop vendor.usb.ffs.ready 0
     setprop vendor.usb.clear 1
 
 on property:vendor.usb.ffs.ready=0 && property:sys.usb.config=atm_gs0 && \
 property:vendor.usb.clear=2 && property:sys.usb.configfs=1
-    start adbd
+    #start adbd
 
 on property:vendor.usb.ffs.ready=1 && property:sys.usb.config=atm_gs0 && \
 property:vendor.usb.clear=2 && property:sys.usb.configfs=1
@@ -795,13 +795,13 @@ property:vendor.usb.clear=2 && property:sys.usb.configfs=1
     setprop vendor.usb.acm_idx "1"
 
 on property:sys.usb.config=atm_gs0gs3 && property:sys.usb.configfs=1
-    stop adbd
+    #stop adbd
     setprop vendor.usb.ffs.ready 0
     setprop vendor.usb.clear 1
 
 on property:vendor.usb.ffs.ready=0 && property:sys.usb.config=atm_gs0gs3 && \
 property:vendor.usb.clear=2 && property:sys.usb.configfs=1
-    start adbd
+    #start adbd

device/mediatek/mt6761/init.recovery.mt6761.rc

@@ -7,7 +7,7 @@ on fs && property:ro.debuggable=0
     # distinguish USB shoulde connect or not, i.e. CDP vs SDP
     write /sys/class/udc/musb-hdrc/device/cmode 2
     # set charging free due to it wait for USB activation
-    start adbd
+    #start adbd
 
 on post-fs
     # Support A/B feature for emmc boot region

device/mediatek/mt6761/meta_init.rc

@@ -367,7 +367,7 @@ on property:ro.vendor.mtklog_internal=1
 #META+ADB
 on property:ro.boot.usbconfig=0 && property:sys.usb.configfs=1
     write /proc/bootprof "INIT:start adbd"
-    start adbd
+    #start adbd
 
 on property:sys.usb.ffs.ready=1 && property:ro.boot.usbconfig=0 && property:sys.usb.configfs=1 && \
 property:vendor.usb.feature=0
@@ -407,7 +407,7 @@ on property:ro.boot.usbconfig=2 && property:sys.usb.configfs=1
 #META+ELT+ADB
 on property:ro.boot.usbconfig=3 && property:sys.usb.configfs=1
     write /proc/bootprof "INIT:start adbd"
-    start adbd
+    #start adbd

device/mediateksample/k61v1_32_bsp_2g_ago/factory_init.project.rc

@@ -31,7 +31,7 @@ on property:sys.usb.config=gs1gs3
       write /sys/devices/platform/mt_usb/saving 1
       write /sys/class/android_usb/android0/functions mass_storage,adb,acm
       write /sys/class/android_usb/android0/enable 1
-      start adbd
+      #start adbd
       setprop sys.usb.state ${sys.usb.config}
       setprop sys.usb.acm_idx 2,4
 

system/core/rootdir/init.usb.configfs.rc

@@ -1,6 +1,6 @@
 on property:sys.usb.config=none && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/UDC "none"
-    stop adbd
+    #stop adbd
     setprop sys.usb.ffs.ready 0
     write /config/usb_gadget/g1/bDeviceClass 0
     write /config/usb_gadget/g1/bDeviceSubClass 0
@@ -15,7 +15,7 @@ on property:init.svc.adbd=stopped
     setprop sys.usb.ffs.ready 0
 
 on property:sys.usb.config=adb && property:sys.usb.configfs=1
-    start adbd
+    #start adbd
 
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=adb && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "adb"
@@ -30,7 +30,7 @@ on property:sys.usb.config=mtp && property:sys.usb.configfs=1
     setprop sys.usb.state ${sys.usb.config}
 
 on property:sys.usb.config=mtp,adb && property:sys.usb.configfs=1
-    start adbd
+    #start adbd
 
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=mtp,adb && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "mtp_adb"
@@ -46,7 +46,7 @@ on property:sys.usb.config=ptp && property:sys.usb.configfs=1
     setprop sys.usb.state ${sys.usb.config}
 
 on property:sys.usb.config=ptp,adb && property:sys.usb.configfs=1
-    start adbd
+    #start adbd
 
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=ptp,adb && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "ptp_adb"
@@ -62,7 +62,7 @@ on property:sys.usb.config=accessory && property:sys.usb.configfs=1
     setprop sys.usb.state ${sys.usb.config}
 
 on property:sys.usb.config=accessory,adb && property:sys.usb.configfs=1
-    start adbd
+    #start adbd
 
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=accessory,adb && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "accessory_adb"
@@ -78,7 +78,7 @@ on property:sys.usb.config=audio_source && property:sys.usb.configfs=1
     setprop sys.usb.state ${sys.usb.config}
 
 on property:sys.usb.config=audio_source,adb && property:sys.usb.configfs=1
-    start adbd
+    #start adbd
 
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=audio_source,adb && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "audiosource_adb"
@@ -95,7 +95,7 @@ on property:sys.usb.config=accessory,audio_source && property:sys.usb.configfs=1
     setprop sys.usb.state ${sys.usb.config}
 
 on property:sys.usb.config=accessory,audio_source,adb && property:sys.usb.configfs=1
-    start adbd
+    #start adbd
 
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=accessory,audio_source,adb && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "accessory_audiosource_adb"
@@ -112,7 +112,7 @@ on property:sys.usb.config=midi && property:sys.usb.configfs=1
     setprop sys.usb.state ${sys.usb.config}
 
 on property:sys.usb.config=midi,adb && property:sys.usb.configfs=1
-    start adbd
+    #start adbd
 
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=midi,adb && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "midi_adb"
@@ -129,7 +129,7 @@ on property:sys.usb.config=rndis && property:sys.usb.configfs=1
     setprop sys.usb.state ${sys.usb.config}
 
 on property:sys.usb.config=rndis,adb && property:sys.usb.configfs=1
-    start adbd
+    #start adbd
 
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=rndis,adb && property:sys.usb.configfs=1
     mkdir /config/usb_gadget/g1/functions/rndis.gs4

system/core/rootdir/init.usb.rc

@@ -29,7 +29,7 @@ on init
 
 # Used to disable USB when switching states
 on property:sys.usb.config=none && property:sys.usb.configfs=0
-    stop adbd
+    #stop adbd
     write /sys/class/android_usb/android0/enable 0
     write /sys/class/android_usb/android0/bDeviceClass 0
     setprop sys.usb.state ${sys.usb.config}
@@ -43,7 +43,7 @@ on property:sys.usb.config=adb && property:sys.usb.configfs=0
     write /sys/class/android_usb/android0/idProduct 4EE7
     write /sys/class/android_usb/android0/functions ${sys.usb.config}
     write /sys/class/android_usb/android0/enable 1
-    start adbd
+    #start adbd
     setprop sys.usb.state ${sys.usb.config}
 
 # USB accessory configuration
@@ -62,7 +62,7 @@ on property:sys.usb.config=accessory,adb && property:sys.usb.configfs=0
     write /sys/class/android_usb/android0/idProduct 2d01
     write /sys/class/android_usb/android0/functions ${sys.usb.config}
     write /sys/class/android_usb/android0/enable 1
-    start adbd
+    #start adbd
     setprop sys.usb.state ${sys.usb.config}
 
 # audio accessory configuration
@@ -81,7 +81,7 @@ on property:sys.usb.config=audio_source,adb && property:sys.usb.configfs=0
     write /sys/class/android_usb/android0/idProduct 2d03
     write /sys/class/android_usb/android0/functions ${sys.usb.config}
     write /sys/class/android_usb/android0/enable 1
-    start adbd
+    #start adbd
     setprop sys.usb.state ${sys.usb.config}
 
 # USB and audio accessory configuration
@@ -100,7 +100,7 @@ on property:sys.usb.config=accessory,audio_source,adb && property:sys.usb.config
     write /sys/class/android_usb/android0/idProduct 2d05
     write /sys/class/android_usb/android0/functions ${sys.usb.config}
     write /sys/class/android_usb/android0/enable 1
-    start adbd
+    #start adbd
     setprop sys.usb.state ${sys.usb.config}