Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a9b696e authored by Vincent Bourgmayer's avatar Vincent Bourgmayer
Browse files

Merge branch '4738-issue-disable-t2e' into 'master'

4738 issue disable t2e

Closes e/backlog#4739

See merge request e/tools/easy-installer!143
parents d596df04 cac4dfc1
Loading
Loading
Loading
Loading
+5 −0
Original line number Original line Diff line number Diff line
@@ -106,6 +106,11 @@ public class DeviceDetectedController extends AbstractSubController{
            return; 
            return; 
        }
        }


        if("Teracube_2e".equals(phone.getAdbDevice()) || "2e".equals(phone.getAdbDevice())){
            displayIncompatibleDeviceFound(phone.getAdbModel());
            return;
        }
        
        //If device is unauthorized
        //If device is unauthorized
        if(!phone.isAdbAuthorized()){
        if(!phone.isAdbAuthorized()){
            displayUnauthorizedDeviceFound();
            displayUnauthorizedDeviceFound();
+2 −2
Original line number Original line Diff line number Diff line
@@ -147,7 +147,7 @@ public class DeviceDetectionTask extends Task<Phone>{
                    logger.debug("  \"device\" keyword has been found");
                    logger.debug("  \"device\" keyword has been found");
                    String device = stringPart.substring("device:".length() );
                    String device = stringPart.substring("device:".length() );
                    if(device.equals("2e")) device ="Teracube_2e"; 
                    if(device.equals("2e")) device ="Teracube_2e"; 
                    //if(device.equals("k63v2_64_bsp")) device="GS290";
                    //if(device.equals("k63v2_64_bsp")) device="GS290"; //bad idea. Device not really compatible.
                    result.setAdbDevice(device);
                    result.setAdbDevice(device);
                }
                }
            }
            }