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

Commit f1f9d411 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "[BugFix] Fix NPE in AnomalyReporter.initialize" into main am: b3acd622 

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



Change-Id: I82c086b276678b11717808336ed59c2b38d6fe41
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 055cd7ec b3acd622

telephony/java/android/telephony/AnomalyReporter.java

+7 −6
Original line number Diff line number Diff line
@@ -187,13 +187,14 @@ public final class AnomalyReporter { 
        }



        for (ResolveInfo r : packages) {

            if (r.activityInfo == null

                    || pm.checkPermission(

            if (r.activityInfo == null) {

                Rlog.w(TAG, "Found package without activity");

                continue;

            } else if (pm.checkPermission(

                            android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,

                            r.activityInfo.packageName)

                      != PackageManager.PERMISSION_GRANTED) {

                Rlog.w(TAG,

                        "Found package without proper permissions or no activity"

                Rlog.w(TAG, "Found package without proper permissions"

                                    + r.activityInfo.packageName);

                continue;

            }