From 80cfdbb54dcd7fa535b29ab9000c7b98f81e1957 Mon Sep 17 00:00:00 2001
From: Al Sutton <alsutton@google.com>
Date: Wed, 29 May 2019 13:46:14 +0100
Subject: [PATCH] Report when a restored live wallpaper isn't available.

Bug: 133738847
Test: Backup from a device with a non-bundled live wallpaper, restore to a new device and confirm the error message is displayed.
Change-Id: Ia67023923a1235be850914341d2dac129e3b36c2
---
 .../com/android/wallpaperbackup/WallpaperBackupAgent.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java b/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java
index 2e40c1acfa2c9..da9018996fe72 100644
--- a/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java
+++ b/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java
@@ -238,8 +238,11 @@ public class WallpaperBackupAgent extends BackupAgent {
                     mWm.clear(FLAG_LOCK);
                 }
             } else {
-                if (DEBUG) {
-                    Slog.v(TAG, "Can't use wallpaper service " + wpService);
+                // If we've restored a live wallpaper, but the component doesn't exist,
+                // we should log it as an error so we can easily identify the problem
+                // in reports from users
+                if (wpService != null) {
+                    Slog.e(TAG, "Wallpaper service " + wpService + " isn't available.");
                 }
             }
         } catch (Exception e) {