From fabdb42a9dd85d91139c55c7439faf6e464157c5 Mon Sep 17 00:00:00 2001 From: lohithbb Date: Mon, 5 Aug 2024 18:01:00 +0100 Subject: [PATCH] wiki: Add OEM unlock toggle mention to fastboot_sony And hide it for all fastboot_sony devices released prior to 2018. Co-authored-by: LuK1337 Change-Id: I3148fb95f953e6b9c490d6a036243e373ebd443a --- _data/devices/castor.yml | 1 + _data/devices/castor_windy.yml | 1 + _data/devices/dogo.yml | 1 + _data/devices/hayabusa.yml | 1 + _data/devices/huashan.yml | 1 + _data/devices/ivy.yml | 1 + _data/devices/karin.yml | 1 + _data/devices/karin_windy.yml | 1 + _data/devices/kugo.yml | 1 + _data/devices/mint.yml | 1 + _data/devices/nicki.yml | 1 + _data/devices/odin.yml | 1 + _data/devices/pollux.yml | 1 + _data/devices/pollux_windy.yml | 1 + _data/devices/sirius.yml | 1 + _data/devices/sumire.yml | 1 + _data/devices/suzu.yml | 1 + _data/devices/suzuran.yml | 1 + _data/devices/taoshan.yml | 1 + _data/devices/tsubasa.yml | 1 + _data/devices/yuga.yml | 1 + _data/devices/z3.yml | 1 + _data/devices/z3c.yml | 1 + .../templates/recovery_install_fastboot_sony.md | 15 +++++++++------ 24 files changed, 32 insertions(+), 6 deletions(-) diff --git a/_data/devices/castor.yml b/_data/devices/castor.yml index ee01f5ff64..2f73c545c5 100644 --- a/_data/devices/castor.yml +++ b/_data/devices/castor.yml @@ -21,6 +21,7 @@ maintainers: [] models: [SGP521, SGP541, SGP551] name: Xperia Tablet Z2 LTE network: [2G GSM, 3G UMTS, 4G LTE] +no_oem_unlock_switch: true peripherals: [A-GPS, Accelerometer, Compass, Dual front speakers, FM radio, GLONASS, GPS, Gyroscope, MHL, NFC, USB OTG] ram: 3 GB recovery_boot: With the device powered off, hold Volume Down + Power. Keep holding both buttons until the device vibrates, then release. diff --git a/_data/devices/castor_windy.yml b/_data/devices/castor_windy.yml index 3ee91a3241..e1048137d4 100644 --- a/_data/devices/castor_windy.yml +++ b/_data/devices/castor_windy.yml @@ -21,6 +21,7 @@ maintainers: [] models: [SGP511, SGP512] name: Xperia Tablet Z2 Wi-Fi network: None +no_oem_unlock_switch: true peripherals: [A-GPS, Accelerometer, Compass, Dual front speakers, FM radio, GLONASS, GPS, Gyroscope, MHL, NFC, USB OTG] ram: 3 GB recovery_boot: With the device powered off, hold Volume Down + Power. Keep holding both buttons until the device vibrates, then release. diff --git a/_data/devices/dogo.yml b/_data/devices/dogo.yml index 7a7662acd0..f99bd96296 100644 --- a/_data/devices/dogo.yml +++ b/_data/devices/dogo.yml @@ -19,6 +19,7 @@ kernel: {repo: android_kernel_sony_apq8064, version: '3.4'} maintainers: [] name: Xperia ZR network: [2G GSM, 3G UMTS, 4G LTE] +no_oem_unlock_switch: true peripherals: [MHL, HDMI, GPS, NFC, Accelerometer, Compass, Gyroscope, Light sensor, Proximity sensor] ram: 2 GB LPDDR2 recovery_boot: On boot, press Volume Down when the LEDs start lighting up.
Second Recovery: To boot the FOTA Recovery, press Volume Up instead. diff --git a/_data/devices/hayabusa.yml b/_data/devices/hayabusa.yml index 53512e1869..bb7c31f635 100644 --- a/_data/devices/hayabusa.yml +++ b/_data/devices/hayabusa.yml @@ -20,6 +20,7 @@ kernel: {repo: android_kernel_sony_msm8x60, version: '3.4'} maintainers: [] name: Xperia TX network: [2G GSM, 3G UMTS] +no_oem_unlock_switch: true peripherals: [MHL, HDMI, GPS, NFC, Accelerometer, Compass, Gyroscope, Light sensor, Proximity sensor] ram: 1 GB recovery_boot: On boot, press Volume Down when the LEDs start lighting up.
Second Recovery: To boot the FOTA Recovery, press Volume Up instead. diff --git a/_data/devices/huashan.yml b/_data/devices/huashan.yml index 34fca00157..0018403744 100644 --- a/_data/devices/huashan.yml +++ b/_data/devices/huashan.yml @@ -19,6 +19,7 @@ kernel: {repo: android_kernel_sony_msm8960t, version: '3.4'} maintainers: [] name: Xperia SP network: [2G GSM, 3G UMTS, 4G LTE] +no_oem_unlock_switch: true peripherals: [MHL, HDMI, GPS, NFC, Accelerometer, Compass, Gyroscope, Light sensor, Proximity sensor] ram: 1 GB recovery_boot: On boot, press Volume Down when the LEDs start lighting up.
Second Recovery: To boot the FOTA Recovery, press Volume Up instead. diff --git a/_data/devices/ivy.yml b/_data/devices/ivy.yml index 779a315d3b..7989fc8bde 100644 --- a/_data/devices/ivy.yml +++ b/_data/devices/ivy.yml @@ -18,6 +18,7 @@ kernel: {repo: android_kernel_sony_msm8994, version: '3.10'} maintainers: [] name: Xperia Z3+ network: [2G GSM, 3G UMTS, 4G LTE] +no_oem_unlock_switch: true peripherals: [Accelerometer, Gyroscope, Proximity sensor, Light sensor, GPS] ram: 3 GB recovery_boot: With the device powered off, hold Volume Down + Power. diff --git a/_data/devices/karin.yml b/_data/devices/karin.yml index ac55783014..de9e179a6a 100644 --- a/_data/devices/karin.yml +++ b/_data/devices/karin.yml @@ -19,6 +19,7 @@ kernel: {repo: android_kernel_sony_msm8994, version: '3.10'} maintainers: [] name: Xperia Z4 Tablet LTE network: [2G GSM, 3G UMTS, 4G LTE] +no_oem_unlock_switch: true peripherals: [Accelerometer, Gyroscope, Proximity sensor, Light sensor, GPS] ram: 3 GB recovery_boot: With the device powered off, hold Volume Down + Power. diff --git a/_data/devices/karin_windy.yml b/_data/devices/karin_windy.yml index 814ad4fc69..46f07f8f3a 100644 --- a/_data/devices/karin_windy.yml +++ b/_data/devices/karin_windy.yml @@ -19,6 +19,7 @@ kernel: {repo: android_kernel_sony_msm8994, version: '3.10'} maintainers: [] name: Xperia Z4 Tablet WiFi network: None +no_oem_unlock_switch: true peripherals: [Accelerometer, Gyroscope, Proximity sensor, Light sensor, GPS] ram: 3 GB recovery_boot: With the device powered off, hold Volume Down + Power. diff --git a/_data/devices/kugo.yml b/_data/devices/kugo.yml index 424d817834..f77b455aff 100644 --- a/_data/devices/kugo.yml +++ b/_data/devices/kugo.yml @@ -20,6 +20,7 @@ maintainers: [] models: [SO-02J, F5321] name: Xperia X Compact network: [2G GSM, 3G UMTS, 4G LTE] +no_oem_unlock_switch: true peripherals: [A-GPS, Accelerometer, Barometer, Color spectrum sensor, Compass, Dual front speakers, GLONASS, GPS, Gyroscope, Light sensor, NFC, Proximity sensor, USB OTG] ram: 3 GB recovery_boot: With the device powered off, hold Volume Down + Power. Keep holding both buttons until the device vibrates, then release. diff --git a/_data/devices/mint.yml b/_data/devices/mint.yml index 55fe62d58e..c7d2e8eba3 100644 --- a/_data/devices/mint.yml +++ b/_data/devices/mint.yml @@ -20,6 +20,7 @@ kernel: {repo: android_kernel_sony_msm8x60, version: '3.4'} maintainers: [] name: Xperia T network: [2G GSM, 3G UMTS] +no_oem_unlock_switch: true peripherals: [MHL, HDMI, GPS, NFC, Accelerometer, Compass, Gyroscope, Light sensor, Proximity sensor] ram: 1 GB recovery_boot: On boot, press Volume Down when the LEDs start lighting up.
Second Recovery: To boot the FOTA Recovery, press Volume Up instead. diff --git a/_data/devices/nicki.yml b/_data/devices/nicki.yml index c60d0cbd2e..c063e7789b 100644 --- a/_data/devices/nicki.yml +++ b/_data/devices/nicki.yml @@ -19,6 +19,7 @@ kernel: {repo: android_kernel_sony_msm8x27, version: '3.4'} maintainers: [] name: Xperia M network: [2G GSM, 3G UMTS] +no_oem_unlock_switch: true peripherals: [Accelerometer, Proximity sensor, Compass] ram: 1 GB recovery_boot: With the device powered off, boot the device and press Volume Up when the notification light is pink. diff --git a/_data/devices/odin.yml b/_data/devices/odin.yml index c428094168..c20a6b6f31 100644 --- a/_data/devices/odin.yml +++ b/_data/devices/odin.yml @@ -19,6 +19,7 @@ kernel: {repo: android_kernel_sony_apq8064, version: '3.4'} maintainers: [] name: Xperia ZL network: [2G GSM, 3G UMTS, 4G LTE] +no_oem_unlock_switch: true peripherals: [MHL, HDMI, GPS, NFC, Accelerometer, Compass, Gyroscope, Light sensor, Proximity sensor] ram: 2 GB LPDDR2 recovery_boot: With the device powered off, boot the device and press Volume Down when the LEDs start lighting up.
Second Recovery: To boot the FOTA Recovery, press Volume Up instead. diff --git a/_data/devices/pollux.yml b/_data/devices/pollux.yml index 38af17c5f7..2bf266a235 100644 --- a/_data/devices/pollux.yml +++ b/_data/devices/pollux.yml @@ -19,6 +19,7 @@ kernel: {repo: android_kernel_sony_apq8064, version: '3.4'} maintainers: [] name: Xperia Tablet Z LTE network: [2G GSM, 3G UMTS, 4G LTE] +no_oem_unlock_switch: true peripherals: [MHL, HDMI, GPS, NFC, Accelerometer, Compass, Gyroscope, Light sensor, Proximity sensor] ram: 2 GB LPDDR2 recovery_boot: On boot, press Volume Down when the LEDs start lighting up.
Second Recovery: To boot the FOTA Recovery, press Volume Up instead. diff --git a/_data/devices/pollux_windy.yml b/_data/devices/pollux_windy.yml index 3fc0393f9f..7995075234 100644 --- a/_data/devices/pollux_windy.yml +++ b/_data/devices/pollux_windy.yml @@ -19,6 +19,7 @@ kernel: {repo: android_kernel_sony_apq8064, version: '3.4'} maintainers: [] name: Xperia Tablet Z Wi-Fi network: None +no_oem_unlock_switch: true peripherals: [MHL, HDMI, GPS, NFC, Accelerometer, Compass, Gyroscope, Light sensor, Proximity sensor] ram: 2 GB LPDDR2 recovery_boot: On boot, press Volume Down when the LEDs start lighting up.
Second Recovery: To boot the FOTA Recovery, press Volume Up instead. diff --git a/_data/devices/sirius.yml b/_data/devices/sirius.yml index 8b63bdbb74..9a0b237ec5 100644 --- a/_data/devices/sirius.yml +++ b/_data/devices/sirius.yml @@ -21,6 +21,7 @@ maintainers: [] models: [D6502, D6503] name: Xperia Z2 network: [2G GSM, 3G UMTS, 4G LTE] +no_oem_unlock_switch: true peripherals: [A-GPS, Accelerometer, Barometer, Compass, Dual front speakers, FM radio, GLONASS, GPS, Gyroscope, Light sensor, MHL, NFC, Pedometer, Proximity sensor, USB OTG] ram: 3 GB recovery_boot: With the device powered off, hold Volume Down + Power. Keep holding both buttons until the device vibrates, then release. diff --git a/_data/devices/sumire.yml b/_data/devices/sumire.yml index 78d5f8e764..77010abd10 100644 --- a/_data/devices/sumire.yml +++ b/_data/devices/sumire.yml @@ -20,6 +20,7 @@ maintainers: [] models: [E6653, E6683, E6633] name: Xperia Z5 network: [2G GSM, 3G UMTS, 4G LTE] +no_oem_unlock_switch: true peripherals: [MHL HDMI, GPS, NFC, Accelerometer, Compass, Gyroscope, Light sensor, Proximity sensor, Fingerprint reader] ram: 3 GB recovery_boot: With the device powered down, hold the Volume Down and Power buttons. diff --git a/_data/devices/suzu.yml b/_data/devices/suzu.yml index 2afc1a2121..44bb3f3dcc 100644 --- a/_data/devices/suzu.yml +++ b/_data/devices/suzu.yml @@ -20,6 +20,7 @@ maintainers: [] models: [F5122, F5121] name: Xperia X network: [2G GSM, 3G UMTS, 4G LTE] +no_oem_unlock_switch: true peripherals: [A-GPS, Accelerometer, Barometer, Compass, Dual front speakers, GLONASS, GPS, Gyroscope, Light sensor, NFC, Proximity sensor, USB OTG] ram: 3 GB recovery_boot: With the device powered off, hold Volume Down + Power. Keep holding both buttons until the device vibrates, then release. diff --git a/_data/devices/suzuran.yml b/_data/devices/suzuran.yml index adcc45af74..ca59ab9cb2 100644 --- a/_data/devices/suzuran.yml +++ b/_data/devices/suzuran.yml @@ -20,6 +20,7 @@ maintainers: [] models: [E5803, E5823] name: Xperia Z5 Compact network: [2G GSM, 3G UMTS, 4G LTE] +no_oem_unlock_switch: true peripherals: [Accelerometer, Fingerprint reader, Gyroscope, Proximity sensor, Light sensor, GPS, NFC] ram: 2 GB recovery_boot: With the device powered off, hold Volume Down + Power. diff --git a/_data/devices/taoshan.yml b/_data/devices/taoshan.yml index c60692ee7d..59d7f21af6 100644 --- a/_data/devices/taoshan.yml +++ b/_data/devices/taoshan.yml @@ -19,6 +19,7 @@ kernel: {repo: android_kernel_sony_msm8930, version: '3.4'} maintainers: [] name: Xperia L network: [2G GSM, 3G UMTS] +no_oem_unlock_switch: true peripherals: [GPS, NFC, Accelerometer, Compass, Light sensor, Proximity sensor] ram: 1 GB recovery_boot: On boot, press Volume Down when the LEDs start lighting up.
Second Recovery: To boot the FOTA Recovery, press Volume Up instead. diff --git a/_data/devices/tsubasa.yml b/_data/devices/tsubasa.yml index 0afb1cf9f1..cfe9cef3cd 100644 --- a/_data/devices/tsubasa.yml +++ b/_data/devices/tsubasa.yml @@ -20,6 +20,7 @@ kernel: {repo: android_kernel_sony_msm8x60, version: '3.4'} maintainers: [] name: Xperia V network: [2G GSM, 3G UMTS, 4G LTE] +no_oem_unlock_switch: true peripherals: [MHL, HDMI, GPS, NFC, Accelerometer, Compass, Gyroscope, Light sensor, Proximity sensor] ram: 1 GB recovery_boot: On boot, press Volume Down when the LEDs start lighting up.
Second Recovery: To boot the FOTA Recovery, press Volume Up instead. diff --git a/_data/devices/yuga.yml b/_data/devices/yuga.yml index 84e2b645ed..b1f44a90e6 100644 --- a/_data/devices/yuga.yml +++ b/_data/devices/yuga.yml @@ -19,6 +19,7 @@ kernel: {repo: android_kernel_sony_apq8064, version: '3.4'} maintainers: [] name: Xperia Z network: [2G GSM, 3G UMTS, 4G LTE] +no_oem_unlock_switch: true peripherals: [MHL, HDMI, GPS, NFC, Accelerometer, Compass, Gyroscope, Light sensor, Proximity sensor] ram: 2 GB LPDDR2 recovery_boot: On boot, press Volume Down when the LEDs start lighting up.
Second Recovery: To boot the FOTA Recovery, press Volume Up instead. diff --git a/_data/devices/z3.yml b/_data/devices/z3.yml index f6c63f13c1..a3baed980a 100644 --- a/_data/devices/z3.yml +++ b/_data/devices/z3.yml @@ -22,6 +22,7 @@ maintainers: [] models: [D6603] name: Xperia Z3 network: [2G GSM, 3G UMTS, 4G LTE] +no_oem_unlock_switch: true peripherals: [A-GPS, Accelerometer, Barometer, Compass, Dual front speakers, FM radio, GLONASS, GPS, Gyroscope, Light sensor, MHL, NFC, Pedometer, Proximity sensor, USB OTG] ram: 3 GB recovery_boot: With the device powered off, hold Volume Down + Power. Keep holding both buttons until the device vibrates, then release. diff --git a/_data/devices/z3c.yml b/_data/devices/z3c.yml index 2c121a41f1..83c7c792b5 100644 --- a/_data/devices/z3c.yml +++ b/_data/devices/z3c.yml @@ -22,6 +22,7 @@ maintainers: [] models: [D5803, D5833] name: Xperia Z3 Compact network: [2G GSM, 3G UMTS, 4G LTE] +no_oem_unlock_switch: true peripherals: [A-GPS, Accelerometer, Barometer, Compass, Dual front speakers, FM radio, GLONASS, GPS, Gyroscope, Light sensor, MHL, NFC, Pedometer, Proximity sensor, USB OTG] ram: 2 GB recovery_boot: With the device powered off, hold Volume Down + Power. Keep holding both buttons until the device vibrates, then release. diff --git a/_includes/templates/recovery_install_fastboot_sony.md b/_includes/templates/recovery_install_fastboot_sony.md index d2cb0b7d8d..f3ef23cc11 100644 --- a/_includes/templates/recovery_install_fastboot_sony.md +++ b/_includes/templates/recovery_install_fastboot_sony.md @@ -18,8 +18,11 @@ If you wish to backup the TA partition first, you can find tutorials related to 1. On the device, dial `*#*#7378423#*#*` (`*#*#SERVICE#*#*`) to launch the service menu. 2. Go to `service info` > `configuration` and check `rooting status` - you can only continue if it says `Bootloader unlock allowed: Yes`. 3. Go to `System Settings` > `About Phone` and record the first IMEI number, which is necessary to get an unlock code from Sony in a later step. -4. Connect the device to your PC via USB. -5. On the computer, open a command prompt (on Windows) or terminal (on Linux or macOS) window, and type: +{%- unless device.no_oem_unlock_switch %} +4. Enable OEM unlock in the Developer options under device Settings, if present. +{%- endunless %} +5. Connect the device to your PC via USB. +6. On the computer, open a command prompt (on Windows) or terminal (on Linux or macOS) window, and type: ``` adb -d reboot bootloader ``` @@ -28,17 +31,17 @@ adb -d reboot bootloader * {{ device.download_boot }} {% endif %} -6. Once the device is in fastboot mode, verify your PC finds it by typing: +7. Once the device is in fastboot mode, verify your PC finds it by typing: ``` fastboot devices ``` {% include alerts/tip.html content="If you see `no permissions fastboot` while on Linux or macOS, try running `fastboot` as root." %} -7. Follow the instructions on [Sony's official unlocking website](https://developer.sony.com/open-source/aosp-on-xperia-open-devices/get-started/unlock-bootloader/) to generate an unlock code for your bootloader. -8. Use your code to unlock the bootloader of your device: +8. Follow the instructions on [Sony's official unlocking website](https://developer.sony.com/open-source/aosp-on-xperia-open-devices/get-started/unlock-bootloader/) to generate an unlock code for your bootloader. +9. Use your code to unlock the bootloader of your device: ``` fastboot oem unlock ``` -8. Since the device resets completely, you will need to re-enable USB debugging to continue. +10. Since the device resets completely, you will need to re-enable USB debugging to continue. {% include snippets/before_recovery_install.md %}