Themes: Add RequestType to ThemeChangeRequest [1/3]

Change-Id: I2c65ca8eebb3347873cbb133fc29d5ade75b258b

2 files changed, 8 insertions, 6 deletions

diff --git a/services/core/java/com/android/server/ThemeService.java b/services/core/java/com/android/server/ThemeService.java
index faf8502..86b5bfd 100644
--- a/services/core/java/com/android/server/ThemeService.java
+++ b/services/core/java/com/android/server/ThemeService.java
@@ -777,7 +777,11 @@ public class ThemeService extends IThemeService.Stub {
             }
         }
 
-        builder.setThemeChangeTimestamp(System.currentTimeMillis());
+        // When a theme is being updated the new config equal the old config so in this case we
+        // want to update the timestamp so they are no longer equal.
+        if (request.getReqeustType() == ThemeChangeRequest.RequestType.THEME_UPDATED) {
+            builder.setThemeChangeTimestamp(System.currentTimeMillis());
+        }
 
         return builder;
     }
diff --git a/services/java/com/android/server/AppsFailureReceiver.java b/services/java/com/android/server/AppsFailureReceiver.java
index 3265720..e99b7a4 100644
--- a/services/java/com/android/server/AppsFailureReceiver.java
+++ b/services/java/com/android/server/AppsFailureReceiver.java
@@ -23,13 +23,10 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ThemeUtils;
 import android.content.res.ThemeChangeRequest;
+import android.content.res.ThemeChangeRequest.RequestType;
 import android.content.res.ThemeConfig;
 import android.content.res.ThemeManager;
 import android.os.SystemClock;
-import android.provider.ThemesContract;
-
-import java.util.ArrayList;
-import java.util.List;
 
 import com.android.internal.R;
 
@@ -77,7 +74,8 @@ public class AppsFailureReceiver extends BroadcastReceiver {
                             .setLockWallpaper(themePkgName)
                             .setAlarm(themePkgName)
                             .setNotification(themePkgName)
-                            .setRingtone(themePkgName);
+                            .setRingtone(themePkgName)
+                            .setRequestType(RequestType.THEME_RESET);
                     // Since we are resetting everything to the system theme, we can have the
                     // theme service remove all per app themes without setting them explicitly :)
                     tm.requestThemeChange(builder.build(), true);