From 06dff8184bdd585343e6a62f88aa51745d1471c0 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 18 Apr 2017 21:07:16 +0200 Subject: [PATCH] no need to catch an exception, only to throw it Just let the SecurityException be throwing where it originated. From PMD: "A catch statement that catches an exception only to wrap it in a new instance of the same type of exception and throw it should be avoided". This cleans up a little from !482. Ctrl-Alt-L and Ctrl-Alt-O before committing! :-) --- .../java/org/fdroid/fdroid/compat/PackageManagerCompat.java | 5 +---- .../org/fdroid/fdroid/installer/PrivilegedInstaller.java | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java b/app/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java index 9c625c4ac..7c02411cc 100644 --- a/app/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java +++ b/app/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java @@ -5,9 +5,8 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.Build; import android.util.Log; - -import org.fdroid.fdroid.installer.PrivilegedInstaller; import org.fdroid.fdroid.Utils; +import org.fdroid.fdroid.installer.PrivilegedInstaller; public class PackageManagerCompat { @@ -29,8 +28,6 @@ public class PackageManagerCompat { mPm.setInstallerPackageName(packageName, "org.fdroid.fdroid"); } Utils.debugLog(TAG, "Installer package name for " + packageName + " set successfully"); - } catch (SecurityException e) { - throw new SecurityException(e); } catch (Exception e) { // Many problems can occur: // * App wasn't installed due to incompatibility diff --git a/app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java b/app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java index 719b64288..93b077ec9 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java @@ -31,11 +31,8 @@ import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.util.Log; - import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.R; -import org.fdroid.fdroid.Utils; -import org.fdroid.fdroid.compat.PackageManagerCompat; import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.privileged.IPrivilegedCallback; import org.fdroid.fdroid.privileged.IPrivilegedService;