Commits · 731672d813d483d44dacc7d6d98b64d734707f08 · Dhina17 / platform_frameworks_base

Oct 21, 2023

Merge "nfc(api): Copy over utilities used by non-mainline API classes" into... · 731672d8

Roshan Pius authored 1 year ago

Merge "nfc(api): Copy over utilities used by non-mainline API classes" into main am: 7d0b6b0e am: 58fd4ba2

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

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

731672d8

Merge "nfc(api): Copy over utilities used by non-mainline API classes" into main am: · 58fd4ba2

Roshan Pius authored 1 year ago

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

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

58fd4ba2

Merge "nfc(api): Copy over utilities used by non-mainline API classes" into main · 7d0b6b0e
Roshan Pius authored 1 year ago

7d0b6b0e

Merge "services: Dont statically include classes in bootclasspath" into main... · 41203766

Roshan Pius authored 1 year ago

Merge "services: Dont statically include classes in bootclasspath" into main am: ce9b8fa2 am: 332ae518

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

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

41203766

Merge "services: Dont statically include classes in bootclasspath" into main... · 295efdea

Roshan Pius authored 1 year ago

Merge "services: Dont statically include classes in bootclasspath" into main am: ce9b8fa2 am: 058b2555

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

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

295efdea

Oct 20, 2023

Merge "services: Dont statically include classes in bootclasspath" into main am: · 332ae518

Roshan Pius authored 1 year ago

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

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

332ae518

Merge "services: Dont statically include classes in bootclasspath" into main am: · 058b2555

Roshan Pius authored 1 year ago

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

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

058b2555

Merge "services: Dont statically include classes in bootclasspath" into main · ce9b8fa2
Roshan Pius authored 1 year ago

ce9b8fa2

[automerger skipped] Merge "[Cherry-pick] Removes ANGLE as an intervention."... · 49f3b15e

Treehugger Robot authored 1 year ago

[automerger skipped] Merge "[Cherry-pick] Removes ANGLE as an intervention." into main am: 9ac03040 am: 55c145b1 -s ours

am skip reason: Merged-In I9fca1eab03f5804f52e09fb51e08a806b0fc9972 with SHA-1 8ca30463 is already in history

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



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

49f3b15e

Merge "Merge "Add a rust library for android.security flags" into main am:... · 9dc3ff71
Automerger Merge Worker authored 1 year ago
```
Merge "Merge "Add a rust library for android.security flags" into main am: 89aef178 am: ac76621a" into udc-qpr-dev-plus-aosp
```
9dc3ff71

Merge "Add a rust library for android.security flags" into main am: am: · 12e13606

Eric Biggers authored 1 year ago

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

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

12e13606

Merge "[Cherry-pick] Removes ANGLE as an intervention." into main am: am: · 67acc257

Treehugger Robot authored 1 year ago

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

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

67acc257

Merge "Add a rust library for android.security flags" into main am: am: · 1b23b736

Eric Biggers authored 1 year ago

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

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

1b23b736

Merge "[Cherry-pick] Removes ANGLE as an intervention." into main am: · 55c145b1

Treehugger Robot authored 1 year ago

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

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

55c145b1

Merge "[Cherry-pick] Removes ANGLE as an intervention." into main am: · cec1caa9

Treehugger Robot authored 1 year ago

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

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

cec1caa9

Merge "Add a rust library for android.security flags" into main am: · ac76621a

Eric Biggers authored 1 year ago

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

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

ac76621a

Merge "Add a rust library for android.security flags" into main am: · 32d5695e

Eric Biggers authored 1 year ago

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

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

32d5695e

Merge "DO NOT MERGE Add cc so carrier can opt to prefer an in-service sim for... · d20cee6b

Tyler Gunn authored 1 year ago

Merge "DO NOT MERGE Add cc so carrier can opt to prefer an in-service sim for normal ecc call." into udc-qpr-dev am: 744b2810

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

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

d20cee6b

DO NOT MERGE Add cc so carrier can opt to prefer an in-service sim for normal... · 0c90c1c8

Tyler Gunn authored 1 year ago

DO NOT MERGE Add cc so carrier can opt to prefer an in-service sim for normal ecc call. am: 962c19e2

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

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

0c90c1c8

Merge "[Cherry-pick] Removes ANGLE as an intervention." into main · 9ac03040
Treehugger Robot authored 1 year ago

9ac03040
Merge "DO NOT MERGE Add cc so carrier can opt to prefer an in-service sim for... · 744b2810
Tyler Gunn authored 1 year ago
```
Merge "DO NOT MERGE Add cc so carrier can opt to prefer an in-service sim for normal ecc call." into udc-qpr-dev
```
744b2810
Merge "Add a rust library for android.security flags" into main · 89aef178
Eric Biggers authored 1 year ago

89aef178

services: Dont statically include classes in bootclasspath · 9bc87046

Roshan Pius authored 1 year ago

Bug: 306695176
Test: atest CtsStrictJavaPackagesTestCases:android.compat.sjp.cts.
StrictJavaPackagesTest#testBootClasspathAndSystemServerClasspath_nonDuplicateClasses
-- --abi x86_64

Change-Id: If62cad7d5c0abede6a96d680b4df72fedcca05f0

9bc87046

Merge "Set LightRevealScrim to fullscreen in landscape mode" into main am:... · eb10ec9d

Matt Pietal authored 1 year ago

Merge "Set LightRevealScrim to fullscreen in landscape mode" into main am: 07b1e6f8 am: 38ba39bb

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

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

eb10ec9d

Merge "Fix a typo "Addresss" to "Address"" into main am: am: · 210cc719

Shunkai Yao authored 1 year ago

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

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

210cc719

Merge "[automerger skipped] Merge "Refactor the SADeviceState to... · 57fdce86

Automerger Merge Worker authored 1 year ago

Merge "[automerger skipped] Merge "Refactor the SADeviceState to AdiDeviceState" into main am: c71ac05c am: 9f99ab70 -s ours" into udc-qpr-dev-plus-aosp

57fdce86

Merge "Set LightRevealScrim to fullscreen in landscape mode" into main am:... · 3d192057

Matt Pietal authored 1 year ago

Merge "Set LightRevealScrim to fullscreen in landscape mode" into main am: 07b1e6f8 am: 5a23ea1d

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

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

3d192057

[automerger skipped] Merge "Refactor the SADeviceState to AdiDeviceState" into... · 851a0d5a

Shunkai Yao authored 1 year ago

[automerger skipped] Merge "Refactor the SADeviceState to AdiDeviceState" into main am: c71ac05c am: 9f99ab70 -s ours

am skip reason: Merged-In Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3 with SHA-1 46daed07 is already in history

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



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

851a0d5a

Merge "Fix a typo "Addresss" to "Address"" into main am: am: · 606912ed

Shunkai Yao authored 1 year ago

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

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

606912ed

Merge changes from topic "am-4747c0cec8794ee29743ec0284ab899f" into udc-qpr-dev-plus-aosp · 537cca4f

Automerger Merge Worker authored 1 year ago

* changes:
  [automerger skipped] Merge "Refactor the SADeviceState to AdiDeviceState" into main am: c71ac05c -s ours am: d4375dba -s ours
  [automerger skipped] Refactor the SADeviceState to AdiDeviceState am: 5e0fb3e4 -s ours am: 43552e9e -s ours

537cca4f

[automerger skipped] Merge "Refactor the SADeviceState to AdiDeviceState" into... · 1db9cf49

Shunkai Yao authored 1 year ago

[automerger skipped] Merge "Refactor the SADeviceState to AdiDeviceState" into main am: c71ac05c -s ours am: d4375dba -s ours

am skip reason: Merged-In Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3 with SHA-1 46daed07 is already in history

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



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

1db9cf49

[automerger skipped] Refactor the SADeviceState to AdiDeviceState am:... · 989abfca

Vlad Popa authored 1 year ago

[automerger skipped] Refactor the SADeviceState to AdiDeviceState am: 5e0fb3e4 -s ours am: 43552e9e -s ours

am skip reason: Merged-In Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3 with SHA-1 46daed07 is already in history

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



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

989abfca

[automerger skipped] Merge "[Cherry-pick] Revert^3 "Revert "Load native GLES... · 35083620

Peiyong Lin authored 1 year ago

[automerger skipped] Merge "[Cherry-pick] Revert^3 "Revert "Load native GLES driver when specified.""" into main am: 25f82c5e am: 9e91feec -s ours

am skip reason: Merged-In I70b197f7b39afa52cb63cea48db274177123980d with SHA-1 f46ee647 is already in history

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



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

35083620

Merge "[Cherry-pick] Revert^3 "Revert "Load native GLES driver when... · 5ee489b0

Peiyong Lin authored 1 year ago

Merge "[Cherry-pick] Revert^3 "Revert "Load native GLES driver when specified.""" into main am: 25f82c5e am: 17c86a59

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

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

5ee489b0

[Cherry-pick] Removes ANGLE as an intervention. · 8ca30463

Peiyong Lin authored 1 year ago

Now that ANGLE starts to become part of the platform, remove the code
that takes ANGLE as an intervention.

Bug: b/283781993
Test: atest CtsAngleDeveloperOptionHostTest -c
Change-Id: I9fca1eab03f5804f52e09fb51e08a806b0fc9972
Merged-In: I9fca1eab03f5804f52e09fb51e08a806b0fc9972

8ca30463