Commits · 7a6ea9c040e49a5c024c195925ee1861ec11f1cd · Dhina17 / platform_frameworks_base

Sep 28, 2023

Merge "Ensure we reset reparenting when launching new splits" into udc-qpr-dev am: · 7a6ea9c0

Winson Chung authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24884879

Change-Id: Ie2e54a29c8f6399a5b64530cd19f35b1b65a1541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

7a6ea9c0

Merge "Ensure we reset reparenting when launching new splits" into udc-qpr-dev · 60d91d2d
Winson Chung authored 1 year ago

60d91d2d

Ensure we reset reparenting when launching new splits · abe2307d

Winson Chung authored 1 year ago

- Follow up to ag/24812535, there were a few cases where we don't call
  into prepareEnterSplit() but still need to reset the reparenting
  state to prevent trampolines from breaking splitscreen upon entering.

Fixes: 292454704
Test: Launch split from the menu for app that launches a trampoline
Change-Id: Ia0d825192c3ec78991a75f0501e7ece9d75cb4af

abe2307d

Merge "Run TaskDisplayArea recovery during sleep tokens" into udc-qpr-dev am: · 24fa4027

Robin Lee authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24866332

Change-Id: I809e306c26c4035ea9b5f64b6aad401c3dd587cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

24fa4027

Merge "Run TaskDisplayArea recovery during sleep tokens" into udc-qpr-dev · f6905f1c
Robin Lee authored 1 year ago

f6905f1c

Merge "Expand @FlaggedApi(Flags.FLAG) in *all* API signature files" into main... · b4c85e1a

Treehugger Robot authored 1 year ago

Merge "Expand @FlaggedApi(Flags.FLAG) in *all* API signature files" into main am: 0c787f5b am: 4f3dc01e am: 3045dc06 am: b1ea1a70

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765045

Change-Id: Ieb5c0609ee867e2f06a21f08a1d3093507246e9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

b4c85e1a

Merge "Expand @FlaggedApi(Flags.FLAG) in *all* API signature files" into main... · b1ea1a70

Treehugger Robot authored 1 year ago

Merge "Expand @FlaggedApi(Flags.FLAG) in *all* API signature files" into main am: 0c787f5b am: 4f3dc01e am: 3045dc06

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765045

Change-Id: Ib8e506d0c7e011f2ee85096464f83ffd22672f0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

b1ea1a70

Merge "Expand @FlaggedApi(Flags.FLAG) in *all* API signature files" into main... · 3045dc06

Treehugger Robot authored 1 year ago

Merge "Expand @FlaggedApi(Flags.FLAG) in *all* API signature files" into main am: 0c787f5b am: 4f3dc01e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765045

Change-Id: If8997fde967537be9d79f606936ddca90cce45b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3045dc06

Merge "Expand @FlaggedApi(Flags.FLAG) in *all* API signature files" into main am: · 4f3dc01e

Treehugger Robot authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765045

Change-Id: I588eaa0c680916c5274d25b960e83e911efcacce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

4f3dc01e

Merge "let's at least log the src mac as being the src mac, not the dst" into... · 2b2f7e42

Maciej Żenczykowski authored 1 year ago

Merge "let's at least log the src mac as being the src mac, not the dst" into main am: 9da7c8a3 am: db45188a am: dac5af6f am: cb274e1d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765669

Change-Id: Id12d08a3528091e9b481c26327ea783e45a98f99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2b2f7e42

Merge "let's at least log the src mac as being the src mac, not the dst" into... · cb274e1d

Maciej Żenczykowski authored 1 year ago

Merge "let's at least log the src mac as being the src mac, not the dst" into main am: 9da7c8a3 am: db45188a am: dac5af6f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765669

Change-Id: Ic9479a6ada86a35c2f8c3d88a4b5d808056680b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cb274e1d

Merge "Expand @FlaggedApi(Flags.FLAG) in *all* API signature files" into main · 0c787f5b
Treehugger Robot authored 1 year ago

0c787f5b

Merge "let's at least log the src mac as being the src mac, not the dst" into... · dac5af6f

Maciej Żenczykowski authored 1 year ago

Merge "let's at least log the src mac as being the src mac, not the dst" into main am: 9da7c8a3 am: db45188a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765669

Change-Id: I67288cafb33d383df4b83569a906d517ab85818f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

dac5af6f

Merge "let's at least log the src mac as being the src mac, not the dst" into main am: · db45188a

Maciej Żenczykowski authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765669

Change-Id: I8fe1adddb5540b1896cdb9a22a96fb95e8deefe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

db45188a

Merge "let's at least log the src mac as being the src mac, not the dst" into main · 9da7c8a3
Maciej Żenczykowski authored 1 year ago

9da7c8a3

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · 78539529

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 9fb566fb -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24879294



Change-Id: I7f8e4072fafb00c7487c0effa2577f71ae96e93b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

78539529

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: -s ours · 328647b2

Bill Yi authored 1 year ago

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24879294

Change-Id: Ic2c5f27e54f27af19a9037b314834dc246100c0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

328647b2

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · af509a83

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 2ac617f3 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24878951



Change-Id: I4e25c5909d40cd1ed46389856c600803a7c85c5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

af509a83

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: -s ours · 23a05d69

Bill Yi authored 1 year ago

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24878951

Change-Id: I478362f72c498f93575f269ef003844b005b9dea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

23a05d69

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · b69a91e8

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 69a0a1e3 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24878909



Change-Id: Ie0fbefbc7deb3faf16162e2ceee3c952a362f6d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

b69a91e8

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: -s ours · 269fdeb6

Bill Yi authored 1 year ago

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24878909

Change-Id: Ic5517914554ea99f1b2dbeb996ae0154ca227e63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

269fdeb6

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · dac59370

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: e3fa5843 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24878908



Change-Id: Iddf991346d5e666ec487fcb2b7a680666aeaf1d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

dac59370

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: -s ours · 053f1512

Bill Yi authored 1 year ago

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24878908

Change-Id: I5f214e98aaec15d864cb1ae1a5d7218aaa603583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

053f1512

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · 75bb8e83

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 4ae3e44f -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24878645



Change-Id: I56116f26642a5565332d358f0f6b062dbc8a786d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

75bb8e83

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: -s ours · de86e746

Bill Yi authored 1 year ago

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24878645

Change-Id: I12adc5f26cab47c6e3774bbeadfcedc947cf9034
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

de86e746

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · f72cdf48

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 3bf40012 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24878082



Change-Id: Iaa7e7b5310ee7458bb616696fad250ace8657251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

f72cdf48

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: -s ours · 9d9dc8d2

Bill Yi authored 1 year ago

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24878082

Change-Id: Ie86abfd47edd6d4968b1fe049af4642e62b476ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9d9dc8d2

Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev · 9fb566fb
Bill Yi authored 1 year ago

9fb566fb
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev · 2ac617f3
Bill Yi authored 1 year ago

2ac617f3
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev · 69a0a1e3
Bill Yi authored 1 year ago

69a0a1e3
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev · e3fa5843
Bill Yi authored 1 year ago

e3fa5843
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev · 4ae3e44f
Bill Yi authored 1 year ago

4ae3e44f
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev · 3bf40012
Bill Yi authored 1 year ago

3bf40012

Merge "OWNERS: master -> main" into main am: am: am:... · f358a8e4

Treehugger Robot authored 1 year ago

Merge "OWNERS: master -> main" into main am: 6dbe50e3 am: 90787b09 am: 7976dd0a am: 3182301e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765668

Change-Id: I1c76500f48cc38d90f5b8f995624e4d2902f44ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

f358a8e4

Merge "OWNERS: master -> main" into main am: am: am:... · 2a335576

Treehugger Robot authored 1 year ago

Merge "OWNERS: master -> main" into main am: 7da2ab97 am: e557a3b8 am: af77450f am: 63568110

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765552

Change-Id: If64d54ab585f49f6f86945b4f46d83dfa7e3ad1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2a335576

Merge "OWNERS: master -> main" into main am: am: am: · 3182301e

Treehugger Robot authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765668

Change-Id: I2a84753aaf66370990ecc9567147527888930896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3182301e

Merge "OWNERS: master -> main" into main am: am: am: · 63568110

Treehugger Robot authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765552

Change-Id: If8b0b9b5ae05cf86981fe69ec015f58018cd1e8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

63568110

Sep 27, 2023

Merge "OWNERS: master -> main" into main am: am: · 7976dd0a

Treehugger Robot authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765668

Change-Id: I031765bf94457de331705b91954e7f64dc55d681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

7976dd0a

Merge "OWNERS: master -> main" into main am: am: · af77450f

Treehugger Robot authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765552

Change-Id: Icbfc4e2a2ede782f812c099d38f727e59e4a267d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

af77450f

Merge "fix(systemui): fix perfetto_ft_systemui-missed_app_frames-mean... · 9487cb4b

Roy Chou authored 1 year ago

Merge "fix(systemui): fix perfetto_ft_systemui-missed_app_frames-mean increased" into udc-qpr-dev am: c112e91f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24847212

Change-Id: Icb359a894cdbe239411e2b8c042f52d00cc65e4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9487cb4b