Merge branch 'main' of https://github.com/LSPosed/MagiskOnWSA

.github/workflows/magisk.yml

@@ -30,6 +30,7 @@ on:
                     - stable
                     - beta
                     - canary
+                    - debug
             gapps_variant:
                 description: "Variants of GApps"
                 required: true
@@ -154,9 +155,13 @@ jobs:
                                   print(f"unzipping to {zip_name}", flush=True)
                                   zip.extract(f)
                                   ver_no = zip_name.split("_")
-                          ver = ver_no[1]
+                                  long_ver = ver_no[1]
+                                  ver=long_ver.split(".")
+                                  main_ver=ver[0]
                                   with open(os.environ['GITHUB_ENV'], 'a') as g:
-                              g.write(f'WSA_VER={ver}\n')
+                                      g.write(f'WSA_VER={long_ver}\n')
+                                  with open(os.environ['GITHUB_ENV'], 'a') as g:
+                                      g.write(f'WSA_MAIN_VER={main_ver}\n')
                                   rel = ver_no[3].split(".")
                                   rell = str(rel[0])
                                   with open(os.environ['GITHUB_ENV'], 'a') as g:
@@ -193,7 +198,7 @@ jobs:
 
                   if not magisk_apk:
                       magisk_apk = "stable"
-          if magisk_apk == "stable" or magisk_apk == "beta" or magisk_apk == "canary":
+                  if magisk_apk == "stable" or magisk_apk == "beta" or magisk_apk == "canary" or magisk_apk == "debug":
                       magisk_apk = json.loads(requests.get(f"https://github.com/topjohnwu/magisk-files/raw/master/{magisk_apk}.json").content)['magisk']['link']
 
                   out_file = "magisk.zip"
@@ -648,9 +653,8 @@ jobs:
             - name: Compress
               run: |
                   zip -qrv ${{ env.artifact_name }}.zip ./${{ matrix.arch }}/*
-          echo "git_hash=${GITHUB_SHA:0:7}" >> $GITHUB_ENV
             - name: Upload WSA
               uses: softprops/action-gh-release@v1
               with:
                   files: ./${{ env.artifact_name }}.zip
-          tag_name: ${{ env.git_hash }}
+                  tag_name: WSA

README.md

@@ -37,27 +37,35 @@
 ## Help
 
 How can I get a logcat?
+
 -   `adb logcat`
 
 or
+
 -   `%LOCALAPPDATA%\Packages\MicrosoftCorporationII.WindowsSubsystemForAndroid_8wekyb3d8bbwe\LocalState\diagnostics\logcat`
 
 How can I update Magisk?
+
 -   Wait for a new MagiskOnWSA release that includes the newer Magisk version, then follow the [Installation instructions](#installation) to update
 
 Can I pass SafetyNet/Play Integrity?
+
 -   No. Virtual machines like WSA cannot pass these mechanisms on their own due to the lack of signing by Google. Passing requires more exotic (and untested) solutions: https://github.com/kdrag0n/safetynet-fix/discussions/145#discussioncomment-2170917
 
 Virtualization?
+
 -   Virtualization is required to run virtual machines like WSA. `Install.ps1` helps you enable it. After rebooting, re-run `Install.ps1` to install WSA. If it's still not working, you have to enable virtualization in your BIOS/UEFI. Instructions vary by PC vendor, look for help online
 
 Can I remount system partition as read-write?
+
 -   No. WSA is mounted as read-only by Hyper-V. You can, however, modify the system partition by creating a Magisk module, or by directly modifying the system.img file
 
 How can I uninstall Magisk?
+
 -   Download a WSA version that doesn't include Magisk from the [Releases page](https://github.com/PeterNjeim/MagiskOnWSA/releases). Then follow the [Installation instructions](#installation)
 
 ## Credits
+
 -   [Magisk](https://github.com/topjohnwu/Magisk): The Magic Mask for Android
 -   [The Open Google Apps Project](https://opengapps.org): Script the automatic generation of up-to-date Google Apps packages
 -   [WSA-Kernel-SU](https://github.com/LSPosed/WSA-Kernel-SU): A kernel module to provide /system/xbin/su to Android Kernel

arm64/system/system/etc/permissions/android.software.device_admin.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<permissions>
+    <feature name="android.software.device_admin" />
+</permissions>

x64/system/system/etc/permissions/android.software.device_admin.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<permissions>
+    <feature name="android.software.device_admin" />
+</permissions>