Backed out changeset 9e6e38d4ae0b (bug 852246) for Android bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 19 Mar 2013 11:25:47 -0400
changeset 125419 7c8f36acc3a3e9a8e728a6e36f4b243e5c79dddc
parent 125418 ccb23fd0cfd7ba11e821b5e333a8d800e8a6d7a5
child 125420 1cad363e90aea7afa1009acf8d410fa2da0177bf
push id24926
push userryanvm@gmail.com
push dateTue, 19 Mar 2013 15:25:46 +0000
treeherdermozilla-inbound@7c8f36acc3a3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs852246
milestone22.0a1
backs out9e6e38d4ae0bb948df7c8d837e10bbaab15f6d2a
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 9e6e38d4ae0b (bug 852246) for Android bustage.
build/mobile/sutagent/android/DoCommand.java
--- a/build/mobile/sutagent/android/DoCommand.java
+++ b/build/mobile/sutagent/android/DoCommand.java
@@ -3312,25 +3312,17 @@ private void CancelNotification()
 
     public String InstallApp(String sApp, OutputStream out)
         {
         String sRet = "";
         File    srcFile = new File(sApp);
 
         try
             {
-            // on android 4.2 and above, we want to pass the "-d" argument to pm so that version
-            // downgrades are allowed... (option unsupported in earlier versions)
-            String sPmCmd;
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                sPmCmd = "pm install -r -d " + sApp + " Cleanup;exit";
-            } else {
-                sPmCmd = "pm install -r " + sApp + " Cleanup;exit";
-            }
-            pProc = Runtime.getRuntime().exec(this.getSuArgs(sPmCmd));
+            pProc = Runtime.getRuntime().exec(this.getSuArgs("pm install -r " + sApp + " Cleanup;exit"));
             RedirOutputThread outThrd3 = new RedirOutputThread(pProc, out);
             outThrd3.start();
             try {
                 outThrd3.joinAndStopRedirect(60000);
                 int nRet3 = pProc.exitValue();
                 sRet = "\ninstallation complete [" + nRet3 + "]";
                 }
             catch (IllegalThreadStateException itse) {