Commits · f3d825f0e1e962ae3e057510fae003f74aee300f · Farzin Kazemzadeh / platform_frameworks_base-old

Jun 03, 2024

Merge "Ensure device_owners2.xml is always written." into udc-dev · f3d825f0
Treehugger Robot authored 9 months ago

f3d825f0
Merge "Hide SAW subwindows" into udc-dev · ca0c29f0
Linus Tufvesson authored 9 months ago

ca0c29f0

[automerger skipped] Merge "Add the protection to avoid data overflow in... · 7d418779

Peter Li authored 9 months ago

[automerger skipped] Merge "Add the protection to avoid data overflow in BinaryXmlSerializer.java" into sc-dev am: 039660c4 am: 20643002 am: 0b21dd3c am: 56703728 am: 01aac2c5 -s ours

am skip reason: Merged-In I4e3f4881742f0e865eaefabb8ee134c67c6b53d9 with SHA-1 eebe3b8b is already in history

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



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

7d418779

Merge "Add the protection to avoid data overflow in BinaryXmlSerializer.java"... · 01aac2c5

Peter Li authored 9 months ago

Merge "Add the protection to avoid data overflow in BinaryXmlSerializer.java" into sc-dev am: 039660c4 am: 20643002 am: 0b21dd3c am: 56703728

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

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

01aac2c5

Merge "Add the protection to avoid data overflow in BinaryXmlSerializer.java"... · 56703728

Peter Li authored 9 months ago

Merge "Add the protection to avoid data overflow in BinaryXmlSerializer.java" into sc-dev am: 039660c4 am: 20643002 am: 0b21dd3c

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

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

56703728

Merge "Add the protection to avoid data overflow in BinaryXmlSerializer.java"... · 0b21dd3c

Peter Li authored 9 months ago

Merge "Add the protection to avoid data overflow in BinaryXmlSerializer.java" into sc-dev am: 039660c4 am: 20643002

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

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

0b21dd3c

Merge "Add the protection to avoid data overflow in BinaryXmlSerializer.java"... · 20643002

Peter Li authored 9 months ago

Merge "Add the protection to avoid data overflow in BinaryXmlSerializer.java" into sc-dev am: 039660c4

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

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

20643002

Merge "Add the protection to avoid data overflow in BinaryXmlSerializer.java" into sc-dev · 039660c4
Peter Li authored 9 months ago

039660c4
Merge "Add unit test to test data overflow when using BinaryXmlSerializer" into udc-dev · 1a6f5550
Peter Li authored 9 months ago

1a6f5550

Jun 02, 2024

[automerger skipped] Security fix for VPN app killable via lockscreen. am:... · ee8f9d77

Faye Yan authored 9 months ago

[automerger skipped] Security fix for VPN app killable via lockscreen. am: 0fddfa03 am: adbb6b6d -s ours

am skip reason: Merged-In I384699d478e5abcee3a165afc45211b9ed96334a with SHA-1 598d7a18 is already in history

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



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

ee8f9d77

Security fix for VPN app killable via lockscreen. am: · adbb6b6d

Faye Yan authored 9 months ago

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

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

adbb6b6d

Security fix for VPN app killable via lockscreen. · 0fddfa03

Faye Yan authored 10 months ago

Do not show the active apps dialog when the screen is locked.
Instead prompt the user to unlock directly if clicked and only open the dialog on
successsful unlock.

Merged-In: I384699d478e5abcee3a165afc45211b9ed96334a
Change-Id: I071cd9b7d0e779a156795d6af481231c5347101d
Flag: NONE
Bug: 304772709
Test: manually, locked and unlocked
Test: atest com.android.systemui.qs.FooterActionsControllerTest

0fddfa03

Hide SAW subwindows · 55d02153

Linus Tufvesson authored 10 months ago

.. when top window is hidden through Window#setHideOverlayWindows

Bug: 318683640
Test: atest CtsWindowManagerDeviceWindow:HideOverlayWindowsTest
Flag: EXEMPT securityfix
Merged-In: If19240f5aec2e048de80d75cbbdc00be47622d7f
Change-Id: If19240f5aec2e048de80d75cbbdc00be47622d7f
(cherry picked from commit c37bc914)

55d02153

May 24, 2024

Add the protection to avoid data overflow in BinaryXmlSerializer.java · 2f049633

lpeter authored 10 months ago

Add an integer overflow check in the writeShort in these two methods:
1.BinaryXmlSerializer#attributeBytesHex
2.BinaryXmlSerializer#attributeBytesBase64

Bug: 307288067
Test: atest BinaryXmlTest
Merged-In: I4e3f4881742f0e865eaefabb8ee134c67c6b53d9
Change-Id: I81f5ed43342d5b906f36f3733c2115232da90ac1

2f049633

Add unit test to test data overflow when using BinaryXmlSerializer · eebe3b8b

lpeter authored 10 months ago

Add the unit tests to test data overflow when calling:
1.BinaryXmlSerializer#attributeBytesHex
2.BinaryXmlSerializer#attributeBytesBase64

Bug: 307288067
Test: atest BinaryXmlTest
Change-Id: I4e3f4881742f0e865eaefabb8ee134c67c6b53d9

eebe3b8b

May 22, 2024

[automerger skipped] Merge "Restrict USB poups while setup is in progress"... · 0660af96

Kiran S authored 10 months ago

[automerger skipped] Merge "Restrict USB poups while setup is in progress" into sc-dev am: bcfd8ebd -s ours am: 1ecab6ee -s ours am: abd3331d -s ours am: 85435f92 -s ours am: 2ab45c00 -s ours am: 853ca019 -s ours

am skip reason: Merged-In I7d54534696fd73f3b94c5b4250142eed9341c5d8 with SHA-1 df4ca2dd is already in history

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



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

0660af96

[automerger skipped] Restrict USB poups while setup is in progress am:... · 568f2de4

Kiran S authored 10 months ago

[automerger skipped] Restrict USB poups while setup is in progress am: ec96cc3e -s ours am: f0af3edb -s ours am: f1fea109 -s ours am: 67522a0d -s ours am: ec7fcb18 -s ours am: d05a0599 -s ours

am skip reason: Merged-In I7d54534696fd73f3b94c5b4250142eed9341c5d8 with SHA-1 df4ca2dd is already in history

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



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

568f2de4

[automerger skipped] Merge "Restrict USB poups while setup is in progress"... · aad517c4

Kiran S authored 10 months ago

[automerger skipped] Merge "Restrict USB poups while setup is in progress" into sc-qpr1-dev am: c199fc3a -s ours am: 0abd45ca -s ours am: b6a02180 -s ours am: 189b0736 -s ours am: 449c0184 -s ours

am skip reason: Merged-In I7d54534696fd73f3b94c5b4250142eed9341c5d8 with SHA-1 68363246 is already in history

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



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

aad517c4

[automerger skipped] Restrict USB poups while setup is in progress am:... · d0a068de

Kiran S authored 10 months ago

[automerger skipped] Restrict USB poups while setup is in progress am: df4ca2dd -s ours am: 170b3ad6 -s ours am: e16e8144 -s ours am: d694b2b0 -s ours am: 4636ceef -s ours

am skip reason: Merged-In I7d54534696fd73f3b94c5b4250142eed9341c5d8 with SHA-1 68363246 is already in history

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



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

d0a068de

[automerger skipped] Merge "Restrict USB poups while setup is in progress"... · 6533908b

Kiran S authored 10 months ago

[automerger skipped] Merge "Restrict USB poups while setup is in progress" into sc-v2-dev am: 5428b1a1 -s ours am: 32db39c3 -s ours am: 6a2d0d36 -s ours am: 6ea510ab -s ours

am skip reason: Merged-In I7d54534696fd73f3b94c5b4250142eed9341c5d8 with SHA-1 b459bcaa is already in history

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



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

6533908b

[automerger skipped] Restrict USB poups while setup is in progress am:... · e7571563

Kiran S authored 10 months ago

[automerger skipped] Restrict USB poups while setup is in progress am: 68363246 -s ours am: 4f3d2a6c -s ours am: 1e865c93 -s ours am: abe6a8d9 -s ours

am skip reason: Merged-In I7d54534696fd73f3b94c5b4250142eed9341c5d8 with SHA-1 b459bcaa is already in history

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



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

e7571563

[automerger skipped] Merge "Restrict USB poups while setup is in progress"... · 1a11f03a

Kiran S authored 10 months ago

[automerger skipped] Merge "Restrict USB poups while setup is in progress" into tm-dev am: 2ea770c6 am: 299e8d17 -s ours am: 1d4f8cb0 -s ours

am skip reason: Merged-In I7d54534696fd73f3b94c5b4250142eed9341c5d8 with SHA-1 b72b3bae is already in history

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



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

1a11f03a

[automerger skipped] Merge "Rate limiting PiP aspect ratio change request"... · a2ccaedd

Hongwei Wang authored 10 months ago

[automerger skipped] Merge "Rate limiting PiP aspect ratio change request" into sc-dev am: 902b5b1d -s ours am: 6503057f -s ours am: ed9f5e70 -s ours am: 82d623a2 -s ours am: 1f534956 -s ours am: ed215a47 -s ours

am skip reason: Merged-In Icb7dd17bbf7df573a9bb28f3dc56e90e78384f4f with SHA-1 c3f4dd07 is already in history

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



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

a2ccaedd

[automerger skipped] Rate limiting PiP aspect ratio change request am:... · 68413f94

Hongwei Wang authored 10 months ago

[automerger skipped] Rate limiting PiP aspect ratio change request am: add219bc -s ours am: e1f26025 -s ours am: a36954a7 -s ours am: 0c17a2b4 -s ours am: 670f2f70 -s ours am: dd1c2912 -s ours

am skip reason: Merged-In Icb7dd17bbf7df573a9bb28f3dc56e90e78384f4f with SHA-1 c3f4dd07 is already in history

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



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

68413f94

[automerger skipped] Merge "Rate limiting PiP aspect ratio change request"... · a893f1b9

Hongwei Wang authored 10 months ago

[automerger skipped] Merge "Rate limiting PiP aspect ratio change request" into sc-qpr1-dev am: 19b654c1 am: a8eefa3b -s ours am: 1e570c5d -s ours am: c045d867 -s ours am: b3263b59 -s ours

am skip reason: Merged-In Icb7dd17bbf7df573a9bb28f3dc56e90e78384f4f with SHA-1 8d814cc3 is already in history

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



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

a893f1b9

[automerger skipped] Merge "Rate limiting PiP aspect ratio change request"... · e078af98

Hongwei Wang authored 10 months ago

[automerger skipped] Merge "Rate limiting PiP aspect ratio change request" into tm-dev am: 4734d183 am: e2c60028 am: 32d1f40a -s ours

am skip reason: Merged-In Icb7dd17bbf7df573a9bb28f3dc56e90e78384f4f with SHA-1 add219bc is already in history

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



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

e078af98

[automerger skipped] RESTRICT AUTOMERGE Backport preventing BAL bypass via... · f3aff10c

Nan Wu authored 10 months ago

[automerger skipped] RESTRICT AUTOMERGE Backport preventing BAL bypass via bound service am: 8fdf4a34 am: 006c1570 -s ours am: 16eaa314 -s ours am: 91e1a125 -s ours am: 67338e02 -s ours am: 8e8bdcbb -s ours

am skip reason: contains skip directive

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



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

f3aff10c

[automerger skipped] Merge "RESTRICT AUTOMERGE Backport preventing BAL bypass... · 7de8de73

Nan Wu authored 10 months ago

[automerger skipped] Merge "RESTRICT AUTOMERGE Backport preventing BAL bypass via bound service" into tm-dev am: 2b572ea7 am: 6342d6ad am: 99065322 -s ours

am skip reason: contains skip directive

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



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

7de8de73

[automerger skipped] Merge "[conflict] RESTRICT AUTOMERGE Backport preventing... · 215d35b3

Nan Wu authored 10 months ago

[automerger skipped] Merge "[conflict] RESTRICT AUTOMERGE Backport preventing BAL bypass via bound service am: 95b71ad8 am: 0876fa03" into tm-qpr-dev am: 72025bb3 -s ours

am skip reason: contains skip directive

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



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

215d35b3

[automerger skipped] [conflict] RESTRICT AUTOMERGE Backport preventing BAL... · 62364de1

Nan Wu authored 10 months ago

[automerger skipped] [conflict] RESTRICT AUTOMERGE Backport preventing BAL bypass via bound service am: 95b71ad8 am: 0876fa03 am: fb7f9058 -s ours

am skip reason: contains skip directive

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



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

62364de1

[automerger skipped] Merge "Restrict USB poups while setup is in progress"... · 853ca019

Kiran S authored 10 months ago

[automerger skipped] Merge "Restrict USB poups while setup is in progress" into sc-dev am: bcfd8ebd -s ours am: 1ecab6ee -s ours am: abd3331d -s ours am: 85435f92 -s ours am: 2ab45c00 -s ours

am skip reason: Merged-In I7d54534696fd73f3b94c5b4250142eed9341c5d8 with SHA-1 df4ca2dd is already in history

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



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

853ca019

[automerger skipped] Restrict USB poups while setup is in progress am:... · d05a0599

Kiran S authored 10 months ago

[automerger skipped] Restrict USB poups while setup is in progress am: ec96cc3e -s ours am: f0af3edb -s ours am: f1fea109 -s ours am: 67522a0d -s ours am: ec7fcb18 -s ours

am skip reason: Merged-In I7d54534696fd73f3b94c5b4250142eed9341c5d8 with SHA-1 df4ca2dd is already in history

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



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

d05a0599

[automerger skipped] Merge "Restrict USB poups while setup is in progress"... · 449c0184

Kiran S authored 10 months ago

[automerger skipped] Merge "Restrict USB poups while setup is in progress" into sc-qpr1-dev am: c199fc3a -s ours am: 0abd45ca -s ours am: b6a02180 -s ours am: 189b0736 -s ours

am skip reason: Merged-In I7d54534696fd73f3b94c5b4250142eed9341c5d8 with SHA-1 68363246 is already in history

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



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

449c0184

[automerger skipped] Restrict USB poups while setup is in progress am:... · 4636ceef

Kiran S authored 10 months ago

[automerger skipped] Restrict USB poups while setup is in progress am: df4ca2dd -s ours am: 170b3ad6 -s ours am: e16e8144 -s ours am: d694b2b0 -s ours

am skip reason: Merged-In I7d54534696fd73f3b94c5b4250142eed9341c5d8 with SHA-1 68363246 is already in history

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



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

4636ceef

[automerger skipped] Merge "Restrict USB poups while setup is in progress"... · 6ea510ab

Kiran S authored 10 months ago

[automerger skipped] Merge "Restrict USB poups while setup is in progress" into sc-v2-dev am: 5428b1a1 -s ours am: 32db39c3 -s ours am: 6a2d0d36 -s ours

am skip reason: Merged-In I7d54534696fd73f3b94c5b4250142eed9341c5d8 with SHA-1 b459bcaa is already in history

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



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

6ea510ab

[automerger skipped] Restrict USB poups while setup is in progress am:... · abe6a8d9

Kiran S authored 10 months ago

[automerger skipped] Restrict USB poups while setup is in progress am: 68363246 -s ours am: 4f3d2a6c -s ours am: 1e865c93 -s ours

am skip reason: Merged-In I7d54534696fd73f3b94c5b4250142eed9341c5d8 with SHA-1 b459bcaa is already in history

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



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

abe6a8d9

[automerger skipped] Merge "Restrict USB poups while setup is in progress"... · 1d4f8cb0

Kiran S authored 10 months ago

[automerger skipped] Merge "Restrict USB poups while setup is in progress" into tm-dev am: 2ea770c6 am: 299e8d17 -s ours

am skip reason: Merged-In I7d54534696fd73f3b94c5b4250142eed9341c5d8 with SHA-1 b72b3bae is already in history

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



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

1d4f8cb0

[automerger skipped] Merge "Rate limiting PiP aspect ratio change request"... · ed215a47

Hongwei Wang authored 10 months ago

[automerger skipped] Merge "Rate limiting PiP aspect ratio change request" into sc-dev am: 902b5b1d -s ours am: 6503057f -s ours am: ed9f5e70 -s ours am: 82d623a2 -s ours am: 1f534956 -s ours

am skip reason: Merged-In Icb7dd17bbf7df573a9bb28f3dc56e90e78384f4f with SHA-1 c3f4dd07 is already in history

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



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

ed215a47

[automerger skipped] Rate limiting PiP aspect ratio change request am:... · dd1c2912

Hongwei Wang authored 10 months ago

[automerger skipped] Rate limiting PiP aspect ratio change request am: add219bc -s ours am: e1f26025 -s ours am: a36954a7 -s ours am: 0c17a2b4 -s ours am: 670f2f70 -s ours

am skip reason: Merged-In Icb7dd17bbf7df573a9bb28f3dc56e90e78384f4f with SHA-1 c3f4dd07 is already in history

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



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

dd1c2912

[automerger skipped] Merge "Rate limiting PiP aspect ratio change request"... · b3263b59

Hongwei Wang authored 10 months ago

[automerger skipped] Merge "Rate limiting PiP aspect ratio change request" into sc-qpr1-dev am: 19b654c1 am: a8eefa3b -s ours am: 1e570c5d -s ours am: c045d867 -s ours

am skip reason: Merged-In Icb7dd17bbf7df573a9bb28f3dc56e90e78384f4f with SHA-1 8d814cc3 is already in history

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



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

b3263b59