Merge "bt: add dumpstate for bluetooth common hal" into main
diff --git a/gcam_app/sepolicy/product/public/debug_camera_app.te b/gcam_app/sepolicy/product/public/debug_camera_app.te
deleted file mode 100644
index 0572eee..0000000
--- a/gcam_app/sepolicy/product/public/debug_camera_app.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# GCA-Eng and GCA-Next
-type debug_camera_app, domain;
diff --git a/gcam_app/sepolicy/product/public/google_camera_app.te b/gcam_app/sepolicy/product/public/google_camera_app.te
deleted file mode 100644
index a8d6512..0000000
--- a/gcam_app/sepolicy/product/public/google_camera_app.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# GCA-Release and GCA-Dogfood
-type google_camera_app, domain;
diff --git a/gxp/sepolicy/dump_gxp.te b/gxp/sepolicy/dump_gxp.te
index 8d285c5..322a01f 100644
--- a/gxp/sepolicy/dump_gxp.te
+++ b/gxp/sepolicy/dump_gxp.te
@@ -1,3 +1,4 @@
+# Dump GXP logs to bugreport.
pixel_bugreport(dump_gxp)
userdebug_or_eng(`
@@ -7,7 +8,5 @@
allow dump_gxp sscoredump_vendor_data_coredump_file:file r_file_perms;
allow dump_gxp sscoredump_vendor_data_crashinfo_file:dir r_dir_perms;
allow dump_gxp sscoredump_vendor_data_crashinfo_file:file r_file_perms;
- # Allow dump_gxp to access gxp properties.
- get_prop(google_camera_app, vendor_gxp_prop)
')
diff --git a/insmod/insmod.sh b/insmod/insmod.sh
index 8cac37e..dfc4fdd 100755
--- a/insmod/insmod.sh
+++ b/insmod/insmod.sh
@@ -1,11 +1,11 @@
#!/vendor/bin/sh
-#############################################################
-### init.insmod.cfg format: ###
-### ----------------------------------------------------- ###
-### [insmod|setprop|enable/moprobe|wait] [path|prop name] ###
-### ... ###
-#############################################################
+###################################################################
+### init.insmod.cfg format: ###
+### ----------------------------------------------------------- ###
+### [insmod|setprop|enable|moprobe|rmmod|wait] [path|prop name] ###
+### ... ###
+###################################################################
modules_dir=
system_modules_dir=
@@ -96,6 +96,7 @@
modprobe -a -d "${modules_dir}" $arg
fi
;;
+ "rmmod") rmmod $arg ;;
"wait") wait_for_file $arg ;;
esac
done < $cfg_file
diff --git a/mte/OWNERS b/mte/OWNERS
index 929e941..57da09d 100644
--- a/mte/OWNERS
+++ b/mte/OWNERS
@@ -1,4 +1,4 @@
eugenis@google.com
pcc@google.com
-mitchp@google.com
fmayer@google.com
+nnk@google.com