Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 187615a9 authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Skip notifying configuration changed for restarting activities"

parents 05e768ce 368d86e6

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

+2 −0
Original line number Diff line number Diff line
@@ -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

+3 −1
Original line number Diff line number Diff line
@@ -5109,7 +5109,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                        deferResume);

            }



            if (!deferResume) {

                kept = ensureConfigAndVisibilityAfterUpdate(starting, changes);

            }

        } finally {

            continueWindowLayout();

        }

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

+3 −1
Original line number Diff line number Diff line
@@ -5072,7 +5072,9 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
                }

            }



            if (!deferResume) {

                kept = mAtmService.ensureConfigAndVisibilityAfterUpdate(starting, changes);

            }

        } finally {

            mAtmService.continueWindowLayout();

        }