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

Commit e94b365d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Ignore null action in AlarmManagerService$UninstallReceiver." into main... 

Merge "Ignore null action in AlarmManagerService$UninstallReceiver." into main am: cd682f63 am: 47f8c0df

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3275932



Change-Id: If02e8746c312282acc95e5045085ba771255ec3b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a0811c0e 47f8c0df

apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java

+5 −1
Original line number Diff line number Diff line
@@ -4944,10 +4944,14 @@ public class AlarmManagerService extends SystemService { 


        @Override

        public void onReceive(Context context, Intent intent) {

            final String action = intent.getAction();

            if (action == null) {

                return;

            }

            final int uid = intent.getIntExtra(Intent.EXTRA_UID, -1);

            synchronized (mLock) {

                String pkgList[] = null;

                switch (intent.getAction()) {

                switch (action) {

                    case Intent.ACTION_QUERY_PACKAGE_RESTART:

                        pkgList = intent.getStringArrayExtra(Intent.EXTRA_PACKAGES);

                        for (String packageName : pkgList) {