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

Commit 65736e84 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:... 

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

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



Change-Id: I05410ec240bf9a78dabd97685b741cb5e2b312e9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2228b864 d5130671

telephony/java/android/telephony/AnomalyReporter.java

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

        }





        for (ResolveInfo r : packages) {

        for (ResolveInfo r : packages) {

            if (r.activityInfo == null

            if (r.activityInfo == null) {

                    || pm.checkPermission(

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

                continue;

            } else if (pm.checkPermission(

                            android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,

                            android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,

                            r.activityInfo.packageName)

                            r.activityInfo.packageName)

                      != PackageManager.PERMISSION_GRANTED) {

                      != PackageManager.PERMISSION_GRANTED) {

                Rlog.w(TAG,

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

                        "Found package without proper permissions or no activity"

                                    + r.activityInfo.packageName);

                                    + r.activityInfo.packageName);

                continue;

                continue;

            }

            }