From afb8ca2d3d0893903efe4ddab99b445df36ee8c6 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Tue, 19 Mar 2013 11:25:47 -0400 Subject: [PATCH] Backed out changeset 9e6e38d4ae0b (bug 852246) for Android bustage. --- build/mobile/sutagent/android/DoCommand.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/build/mobile/sutagent/android/DoCommand.java b/build/mobile/sutagent/android/DoCommand.java index 75f797cee6b3..1ef13b10f565 100755 --- a/build/mobile/sutagent/android/DoCommand.java +++ b/build/mobile/sutagent/android/DoCommand.java @@ -3317,15 +3317,7 @@ private void CancelNotification() 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 {