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

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

Merge "Always run the intent filter verifier in USER_SYSTEM"

parents 8f7ff0d6 f291e638

services/core/java/com/android/server/pm/PackageManagerService.java

+4 −7
Original line number Diff line number Diff line
@@ -1057,14 +1057,12 @@ public class PackageManagerService extends IPackageManager.Stub 
                        scheduleWriteSettingsLocked();

                    }

                }

                sendVerificationRequest(userId, verificationId, ivs);

                sendVerificationRequest(verificationId, ivs);

            }

            mCurrentIntentFilterVerifications.clear();

        }













        private void sendVerificationRequest(int userId, int verificationId,













                IntentFilterVerificationState ivs) {

























        private void sendVerificationRequest(int verificationId, IntentFilterVerificationState ivs) {















            Intent verificationIntent = new Intent(Intent.ACTION_INTENT_FILTER_NEEDS_VERIFICATION);















            verificationIntent.putExtra(















                    PackageManager.EXTRA_INTENT_FILTER_VERIFICATION_ID,









@@ -1084,10 +1082,9 @@ public class PackageManagerService extends IPackageManager.Stub













            DeviceIdleController.LocalService idleController = getDeviceIdleController();















            idleController.addPowerSaveTempWhitelistApp(Process.myUid(),















                    mIntentFilterVerifierComponent.getPackageName(), getVerificationTimeout(),













                    userId, false, "intent filter verifier");













                    UserHandle.USER_SYSTEM, true, "intent filter verifier");



























            UserHandle user = new UserHandle(userId);













            mContext.sendBroadcastAsUser(verificationIntent, user);













            mContext.sendBroadcastAsUser(verificationIntent, UserHandle.SYSTEM);















            if (DEBUG_DOMAIN_VERIFICATION) Slog.d(TAG,















                    "Sending IntentFilter verification broadcast");















        }