Merge \\"Disallow user to block notification from OobConfig\\" into nyc-mr1-dev am: 080f794b6e

am: 67cf3e6a88 Change-Id: I635850140226144c67737689e8312aa935d2d589
2016-07-15 17:55:57 +00:00
parent af250e18c2 67cf3e6a88
commit cd4b145d80
2 changed files with 3 additions and 13 deletions
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -59,7 +59,7 @@ public class NotificationBackend {

    public AppRow loadAppRow(Context context, PackageManager pm, PackageInfo app) {
        final AppRow row = loadAppRow(context, pm, app.applicationInfo);
-        row.systemApp = Utils.isSystemPackage(pm, app);
+        row.systemApp = Utils.isSystemPackage(context.getResources(), pm, app);
        return row;
    }