Commits · 01aefbf28c74f8897bfb6f3e9ff703223a90f1d8 · Dhina17 / platform_frameworks_base

Oct 31, 2023

Merge "Move aconfig-srcjars srcs into shared defaults" into main am: · 01aefbf2

Anton Hansson authored 1 year ago

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

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

01aefbf2

Merge "Move aconfig-srcjars srcs into shared defaults" into main · 0a63944d
Anton Hansson authored 1 year ago

0a63944d

Merge "[Nfc framework] API to include/exclude Other category service... · 2c978920

Treehugger Robot authored 1 year ago

Merge "[Nfc framework] API to include/exclude Other category service component" into main am: 8c7eea40

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

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

2c978920

Merge "[Nfc framework] API to include/exclude Other category service component" into main · 8c7eea40
Treehugger Robot authored 1 year ago

8c7eea40

Oct 30, 2023

Merge "Flag the android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM constant" into main am: · 47a697e6

Colin Cross authored 1 year ago

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

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

47a697e6

Merge "Flag the android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM constant" into main · 3b16630e
Colin Cross authored 1 year ago

3b16630e

Merge "activity(api): Flag nfc mainline API added for Android V" into main am: · 42431ea1

Treehugger Robot authored 1 year ago

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

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

42431ea1

Merge "activity(api): Flag nfc mainline API added for Android V" into main · 58f23a8e
Treehugger Robot authored 1 year ago

58f23a8e

Merge "Respect caller config to disable VCN safe mode" into main am: · ef43bcbe

Yan Yan authored 1 year ago

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

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

ef43bcbe

activity(api): Flag nfc mainline API added for Android V · af27dfc3

Roshan Pius authored 1 year ago

Bug: 304478767
Test: Compiles
Merged-In: If0b1432b78ec42a02446754ff6cf454fbb875048
Change-Id: If0b1432b78ec42a02446754ff6cf454fbb875048

af27dfc3

Merge "Expose APIs to disable VCN safe mode" into main am: · 3e1fe2ba

Yan Yan authored 1 year ago

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

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

3e1fe2ba

Merge "nfc(api): Expose formal APIs for APIs used by settings/sysui" into main am: · a49117c9

Roshan Pius authored 1 year ago

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

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

a49117c9

Merge "Adjust with changes in libxml2 upgrade" into main am: · ce9fbaca

Sadaf Ebrahimi authored 1 year ago

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

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

ce9fbaca

Merge "Respect caller config to disable VCN safe mode" into main · ace49e05
Yan Yan authored 1 year ago

ace49e05
Merge "Expose APIs to disable VCN safe mode" into main · a42be685
Yan Yan authored 1 year ago

a42be685
Merge "nfc(api): Expose formal APIs for APIs used by settings/sysui" into main · 7c342823
Roshan Pius authored 1 year ago

7c342823
Merge "Adjust with changes in libxml2 upgrade" into main · da32cbba
Sadaf Ebrahimi authored 1 year ago

da32cbba

Adjust with changes in libxml2 upgrade · 81a4a53e

Sadaf Ebrahimi authored 1 year ago

Bug: http://b/307806447
Test: TreeHugger
Change-Id: Ib07514426643d8682c768b87e32fff2abddcda13

81a4a53e

Move aconfig-srcjars srcs into shared defaults · dadbc58d

Anton Hansson authored 1 year ago

This ensures they're consistently added to all droidstubs modules
for the non-updatable part.

Test: presubmit
Change-Id: Ia17808572b3fa8d75cdc71e7981d562ad0036afc

dadbc58d

Merge "Revert "Revert "[BR07.2] Redirect data saver switch to Connectiv...""... · 34d41508

Junyu Lai authored 1 year ago

Merge "Revert "Revert "[BR07.2] Redirect data saver switch to Connectiv..."" into main am: c056440a

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

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

34d41508

Merge "Revert "Revert "[BR07.2] Redirect data saver switch to Connectiv..."" into main · c056440a
Junyu Lai authored 1 year ago

c056440a

Oct 28, 2023

Merge "Enable lockout timeout" into main am: · c3d2521e

Chun-Wei Wang authored 1 year ago

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

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

c3d2521e

Merge "Enable lockout timeout" into main · f9668c39
Chun-Wei Wang authored 1 year ago

f9668c39

Oct 27, 2023

Expose APIs to disable VCN safe mode · c5e079a7

Yan Yan authored 1 year ago

Bug: 276358140
Test: make update-api
API-Coverage-Bug: 308000143
Change-Id: Icf5df742a30ccdc5b53a2e3cc78f0efd38b2739a

c5e079a7

Respect caller config to disable VCN safe mode · ec86848d

Yan Yan authored 1 year ago

Update VcnGatewayConnection to support disabling safe mode

Bug: 276358140
Test: atest FrameworksVcnTests (new tests)
Test: atest CtsVcnTestCases
Change-Id: If767dbace925c7e13705db2ea6f23c890992405c

ec86848d