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

Commit 431910e0 authored by Will Harmon's avatar Will Harmon Committed by android-build-merger
Browse files

Merge \"Allow system apps to have disabled QS tiles.\" into nyc-mr1-dev

am: 611093b1

Change-Id: Ie3f832621d982f45af7d0e4d1b786f429cef9f2c
parents 7e784b7b 611093b1
Loading
Loading
Loading
Loading
+9 −2
Original line number Diff line number Diff line
@@ -82,8 +82,11 @@ public class CustomTile extends QSTile<QSTile.State> implements TileChangeListen
    private void setTileIcon() {
        try {
            PackageManager pm = mContext.getPackageManager();
            ServiceInfo info = pm.getServiceInfo(mComponent,
                    PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE);
            int flags = PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE;
            if (isSystemApp(pm)) {
                flags |= PackageManager.MATCH_DISABLED_COMPONENTS;
            }
            ServiceInfo info = pm.getServiceInfo(mComponent, flags);
            int icon = info.icon != 0 ? info.icon
                    : info.applicationInfo.icon;
            // Update the icon if its not set or is the default icon.
@@ -103,6 +106,10 @@ public class CustomTile extends QSTile<QSTile.State> implements TileChangeListen
        }
    }

    private boolean isSystemApp(PackageManager pm) throws PackageManager.NameNotFoundException {
        return pm.getApplicationInfo(mComponent.getPackageName(), 0).isSystemApp();
    }

    /**
     * Compare two icons, only works for resources.
     */