Skip to content

Commit 7e63188

Browse files
committed
[Installer] Ensure package name before making (un)install attempts
Signed-off-by: Muntashir Al-Islam <muntashirakon@riseup.net>
1 parent f788888 commit 7e63188

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

app/src/main/java/io/github/muntashirakon/AppManager/apk/installer/PackageInstallerCompat.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ public boolean install(@NonNull ApkFile apkFile, @NonNull List<String> selectedS
590590
ThreadUtils.ensureWorkerThread();
591591
try {
592592
mApkFile = apkFile;
593-
mPackageName = apkFile.getPackageName();
593+
mPackageName = Objects.requireNonNull(apkFile.getPackageName());
594594
initBroadcastReceiver();
595595
int userId = options.getUserId();
596596
int installFlags = getInstallFlags(userId);
@@ -670,7 +670,7 @@ public boolean install(@NonNull Path[] apkFiles, @NonNull String packageName, @N
670670
ThreadUtils.ensureWorkerThread();
671671
try {
672672
mApkFile = null;
673-
mPackageName = packageName;
673+
mPackageName = Objects.requireNonNull(packageName);
674674
initBroadcastReceiver();
675675
int userId = options.getUserId();
676676
int installFlags = getInstallFlags(userId);
@@ -847,6 +847,7 @@ private static int getInstallFlags(@UserIdInt int userId) {
847847

848848
public boolean installExisting(@NonNull String packageName, @UserIdInt int userId) {
849849
ThreadUtils.ensureWorkerThread();
850+
mPackageName = Objects.requireNonNull(packageName);
850851
if (mOnInstallListener != null) {
851852
mOnInstallListener.onStartInstall(mSessionId, packageName);
852853
}
@@ -1033,7 +1034,7 @@ private void installCompleted(int sessionId,
10331034
public boolean uninstall(String packageName, @UserIdInt int userId, boolean keepData) {
10341035
ThreadUtils.ensureWorkerThread();
10351036
boolean hasDeletePackagesPermission = SelfPermissions.checkSelfOrRemotePermission(Manifest.permission.DELETE_PACKAGES);
1036-
mPackageName = packageName;
1037+
mPackageName = Objects.requireNonNull(packageName);
10371038
String callerPackageName = SelfPermissions.getCallingPackage(Users.getSelfOrRemoteUid());
10381039
initBroadcastReceiver();
10391040
try {

0 commit comments

Comments
 (0)