Merge branch 'cm-13.0' of https://github.com/LineageOS/android_packages_apps_PackageInstaller into mm6.0mm6.0

Conflicts:
	res/values-ast-rES/strings.xml

Change-Id: Id1dd1b6c728b8238be8db57d06dae4da937daeae

1 files changed, 2 insertions, 0 deletions

diff --git a/src/com/android/packageinstaller/permission/utils/Utils.java b/src/com/android/packageinstaller/permission/utils/Utils.java
index 21830378e..fb2ba6540 100644
--- a/src/com/android/packageinstaller/permission/utils/Utils.java
+++ b/src/com/android/packageinstaller/permission/utils/Utils.java
@@ -26,6 +26,7 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.Resources.Theme;
 import android.graphics.drawable.Drawable;
+import android.graphics.PorterDuff;
 import android.util.ArraySet;
 import android.util.Log;
 import android.util.TypedValue;
@@ -113,6 +114,7 @@ public class Utils {
         theme.resolveAttribute(attr, typedValue, true);
         icon = icon.mutate();
         icon.setTint(context.getColor(typedValue.resourceId));
+        icon.setTintMode(PorterDuff.Mode.SRC_ATOP);
         return icon;
     }