diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index f714af03336f7..be17921f4ebb6 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -13061,7 +13061,7 @@ public class PackageManagerService extends IPackageManager.Stub
         synchronized (mLock) {
             allPackages = mPackages.keySet().toArray(new String[mPackages.size()]);
         }
-        PackageManagerService.this.removeDistractingPackageRestrictions(allPackages, userId);
+        removeDistractingPackageRestrictions(allPackages, userId);
     }
 
     /**
@@ -20105,13 +20105,13 @@ public class PackageManagerService extends IPackageManager.Stub
             }
             synchronized (mLock) {
                 pkgSetting.setEnabled(newState, userId, callingPackage);
-                if (newState == COMPONENT_ENABLED_STATE_DISABLED_USER
-                        || newState == COMPONENT_ENABLED_STATE_DISABLED
+                if ((newState == COMPONENT_ENABLED_STATE_DISABLED_USER
+                        || newState == COMPONENT_ENABLED_STATE_DISABLED)
                         && pkgSetting.getPermissionsState().hasPermission(
                                 Manifest.permission.SUSPEND_APPS, userId)) {
                     // This app should not generally be allowed to get disabled by the UI, but if it
                     // ever does, we don't want to end up with some of the user's apps permanently
-                    // blocked
+                    // suspended.
                     unsuspendForSuspendingPackage(packageName, userId);
                     removeAllDistractingPackageRestrictions(userId);
                 }
diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java
index 24533184f5bf6..307fd11c17203 100644
--- a/services/core/java/com/android/server/pm/Settings.java
+++ b/services/core/java/com/android/server/pm/Settings.java
@@ -4835,6 +4835,8 @@ public final class Settings {
             pw.print(ps.getHidden(user.id));
             pw.print(" suspended=");
             pw.print(ps.getSuspended(user.id));
+            pw.print(" distractionFlags=");
+            pw.print(ps.getDistractionFlags(user.id));
             pw.print(" stopped=");
             pw.print(ps.getStopped(user.id));
             pw.print(" notLaunched=");