Revert "Remove pre-installed check for LivePicker"

am: 0805f179ca

Change-Id: I3161226182f86252e29f1b299c6b27bf7c70ca02

1 files changed, 12 insertions, 1 deletions

diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperChange.java b/src/com/android/wallpaper/livepicker/LiveWallpaperChange.java
index c25875f..5dc3f53 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperChange.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperChange.java
@@ -20,6 +20,7 @@ import android.app.WallpaperInfo;
 import android.app.WallpaperManager;
 import android.content.ComponentName;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
@@ -87,7 +88,10 @@ public class LiveWallpaperChange extends LiveWallpaperPreview {
     @Nullable
     private String getDeleteAction(@NonNull ServiceInfo serviceInfo,
         @Nullable ServiceInfo currentService) {
-        // STOPSHIP: Check this wallpaper is pre-installed before providing delete action.
+        if (!isPackagePreInstalled(serviceInfo.applicationInfo)) {
+            Log.d(TAG, "This wallpaper is not pre-installed: " + serviceInfo.name);
+            return null;
+        }
 
         // A currently set Live wallpaper should not be deleted.
         if (currentService != null && TextUtils.equals(serviceInfo.name, currentService.name)) {
@@ -100,4 +104,11 @@ public class LiveWallpaperChange extends LiveWallpaperPreview {
         }
         return null;
     }
+
+    private boolean isPackagePreInstalled(ApplicationInfo info) {
+        if (info != null && (info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
+            return true;
+        }
+        return false;
+    }
 }