Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't crash if installerPackageName is null #1436

Browse Source 
This will instead lead users with Privileged Extension to the F-Droid
uninstall screen which will probably fail.  But that's better than crashing
in my opinion.

Introduced in c095a85c3dd3c505951bebb52e4ae010c69cc9f9
This commit is contained in:
Hans-Christoph Steiner 2018-04-25 11:12:18 +02:00
parent e6fb837af0
commit 7b66ad4920
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/fdroid/fdroid/installer/Installer.java
View File

@ -144,9 +144,10 @@ public abstract class Installer {
} }
PackageManager pm = context.getPackageManager(); PackageManager pm = context.getPackageManager();
if (Build.VERSION.SDK_INT >= 24 && ( String installerPackageName = pm.getInstallerPackageName(apk.packageName);
pm.getInstallerPackageName(apk.packageName).equals("com.android.packageinstaller") if (Build.VERSION.SDK_INT >= 24 &&
|| pm.getInstallerPackageName(apk.packageName).equals("com.google.android.packageinstaller"))) { ("com.android.packageinstaller".equals(installerPackageName)
|| "com.google.android.packageinstaller".equals(installerPackageName))) {
Utils.debugLog(TAG, "Falling back to default installer for uninstall"); Utils.debugLog(TAG, "Falling back to default installer for uninstall");
Intent intent = new Intent(context, DefaultInstallerActivity.class); Intent intent = new Intent(context, DefaultInstallerActivity.class);
intent.setAction(DefaultInstallerActivity.ACTION_UNINSTALL_PACKAGE); intent.setAction(DefaultInstallerActivity.ACTION_UNINSTALL_PACKAGE);