Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dedfcaf5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Throw an error if no package name is provided by the app when needed" into oc-dev

parents b7980a3b f7f39d4a

services/core/java/com/android/server/am/ActivityManagerService.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -18277,6 +18277,10 @@ public class ActivityManagerService extends IActivityManager.Stub 
            return record.info.isInstantApp();

            return record.info.isInstantApp();

        }

        }

        // Otherwise check with PackageManager.

        // Otherwise check with PackageManager.

        if (callerPackage == null) {

            Slog.e(TAG, "isInstantApp with an application's uid, no record, and no package name");

            throw new IllegalArgumentException("Calling application did not provide package name");

        }

        mAppOpsService.checkPackage(uid, callerPackage);

        mAppOpsService.checkPackage(uid, callerPackage);

        try {

        try {

            IPackageManager pm = AppGlobals.getPackageManager();

            IPackageManager pm = AppGlobals.getPackageManager();