Merge "Skip notifying configuration changed for restarting activities"

core/java/android/app/servertransaction/ClientTransaction.java

@@ -241,6 +241,8 @@ public class ClientTransaction implements Parcelable, ObjectPoolItem {
         int result = 17;
         result = 31 * result + Objects.hashCode(mActivityCallbacks);
         result = 31 * result + Objects.hashCode(mLifecycleStateRequest);
+        result = 31 * result + Objects.hashCode(mClient);
+        result = 31 * result + Objects.hashCode(mActivityToken);
         return result;
     }
 

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

@@ -5109,7 +5109,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
                         deferResume);
             }
 
-            kept = ensureConfigAndVisibilityAfterUpdate(starting, changes);
+            if (!deferResume) {
+                kept = ensureConfigAndVisibilityAfterUpdate(starting, changes);
+            }
         } finally {
             continueWindowLayout();
         }

services/core/java/com/android/server/wm/DisplayContent.java

@@ -5072,7 +5072,9 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
                 }
             }
 
-            kept = mAtmService.ensureConfigAndVisibilityAfterUpdate(starting, changes);
+            if (!deferResume) {
+                kept = mAtmService.ensureConfigAndVisibilityAfterUpdate(starting, changes);
+            }
         } finally {
             mAtmService.continueWindowLayout();
         }