commit 05399dcf3e9863343598c8f2611fae8f5ff1cee8
author Rubin Xu <rubinxu@google.com> Thu Apr 28 17:05:52 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 28 17:05:52 2016 +0000
tree 4a34b69ba0cea7105a75b0c069ed29f3d21943ea
parent 3cae99b12399ac2ed05378a68bc65e353e7f421d
parent da3de6ddfe6d83941f9ddde0354e6781bca24e75

Fix incorrect icon greying on pre-N system
am: da3de6d

* commit 'da3de6ddfe6d83941f9ddde0354e6781bca24e75':
  Fix incorrect icon greying on pre-N system

Change-Id: I5f2fd22cabc44ab748838a33c5cfb6495b3c6516

src/com/android/launcher3/util/PackageManagerHelper.java

diff --git a/src/com/android/launcher3/util/PackageManagerHelper.java b/src/com/android/launcher3/util/PackageManagerHelper.java
index d034572..08e8e86 100644
--- a/src/com/android/launcher3/util/PackageManagerHelper.java
+++ b/src/com/android/launcher3/util/PackageManagerHelper.java
@@ -19,6 +19,8 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 
+import com.android.launcher3.Utilities;
+
 /**
  * Utility methods using package manager
  */
@@ -57,6 +59,13 @@
     }
 
     public static boolean isAppSuspended(ApplicationInfo info) {
-        return (info.flags & FLAG_SUSPENDED) != 0;
+        // The value of FLAG_SUSPENDED was reused by a hidden constant
+        // ApplicationInfo.FLAG_PRIVILEGED prior to N, so only check for suspended flag on N
+        // or later.
+        if (Utilities.isNycOrAbove()) {
+            return (info.flags & FLAG_SUSPENDED) != 0;
+        } else {
+            return false;
+        }
     }
 }