Commit Graph

530 Commits

Author SHA1 Message Date
Treehugger Robot
480893a301 Merge "Read from new storage in Java codegen" into main am: 70270692d0
Original change: https://android-review.googlesource.com/c/platform/build/+/3208150

Change-Id: Ibb96980bf396884677adf013319637ec7ac079b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 21:21:16 +00:00
Treehugger Robot
70270692d0 Merge "Read from new storage in Java codegen" into main 2024-08-06 21:16:42 +00:00
Treehugger Robot
3a716b42b1 Merge "change thread policy to allow read disk" into main am: 0284610ba7
Original change: https://android-review.googlesource.com/c/platform/build/+/3208534

Change-Id: I1d6d663dad4b214e9c2b3f90be623044cb7c4b56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 21:14:28 +00:00
Ted Bauer
06560bed93 Read from new storage in Java codegen
Change-Id: I8baa089f37dcc496096e124d605f08727647053c
Test: m
Bug: 312235596
2024-08-06 19:34:33 +00:00
Zhi Dou
f5f5992893 change thread policy to allow read disk
Bug: 356614910
Test: presubmit
Change-Id: I65cc2cbd5e17b1ee93e64d8b20e53c42547c985a
2024-08-06 18:58:45 +00:00
Zhi Dou
23b0cba8d6 Merge "change fileinputstream to filechannel" into main am: b7bb53d392
Original change: https://android-review.googlesource.com/c/platform/build/+/3205700

Change-Id: I6dc7fada9780a822d2b9ad891bbe0f0f6abd1736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-05 14:10:49 +00:00
Zhi Dou
8af83ccd50 change fileinputstream to filechannel
The restrict mode doesn't allow to have disk read from main thread. Some
apps enabled this check. The code in the dependencies of the
fileinputstream. This chagne switch to filechannel.

Test: presubmit
Bug: 356614910
Change-Id: Icf2175fe75ed1bfad4a048ead680b08e57d6c2ca
2024-08-03 00:08:40 +00:00
Zhi Dou
5a464e039d Merge "aconfig: make java cached indicator volatile" into main am: 3d960c5638
Original change: https://android-review.googlesource.com/c/platform/build/+/3199672

Change-Id: I476b8e6ee613342e6a03b85771bc3aaebb98ef9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-30 23:51:45 +00:00
Zhi Dou
f409df4939 Merge "close file stream" into main am: 39020e05c6
Original change: https://android-review.googlesource.com/c/platform/build/+/3199474

Change-Id: I8c40d1a77546c28e1ece9f5ae45e29ce6eb1a034
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-30 23:51:32 +00:00
Zhi Dou
3d960c5638 Merge "aconfig: make java cached indicator volatile" into main 2024-07-30 23:35:45 +00:00
Zhi Dou
97d02148b9 close file stream
Close file stream, since the in the restrict mode the runtime will check
whether all the resource is closed when it is out of scope.

Test: ABTD ImsStackJavaTests
Bug: 349874828
Change-Id: Ib297622bae730bf99e4d5d1b3adeff3fee805a93
2024-07-30 19:05:14 +00:00
Zhi Dou
36589bc318 aconfig: make java cached indicator volatile
Test: atest aconfig.test.java
Bug: 356201402
Change-Id: I1127a4092536fe199f4a7256dea0c2b289e837da
2024-07-30 18:21:43 +00:00
Zhi Dou
272a5a37b8 Merge "read new stoarge based on flag value" into main am: 5228a6f4a2
Original change: https://android-review.googlesource.com/c/platform/build/+/3194636

Change-Id: I4e18affd02bda662c7b35c04696cd462c7fb7e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-29 13:55:00 +00:00
Treehugger Robot
e4ba11c98d Merge "use smart pointer for fd" into main am: 78decbf865
Original change: https://android-review.googlesource.com/c/platform/build/+/3195552

Change-Id: I2456f7cae1669c634804b73bc78a152d3df6d880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-29 13:54:43 +00:00
Zhi Dou
5228a6f4a2 Merge "read new stoarge based on flag value" into main 2024-07-29 13:26:35 +00:00
Zhi Dou
66ff40c08a read new stoarge based on flag value
This change changes the logic to read the flag value from new storage.
Before it check the existence of a file. Not it will directly check the
flag value from DeviceConfig.

Test: m and presubmit
Bug: 349874828
Change-Id: I4a360564a3b48564057eede9bd893899136b3221
2024-07-26 22:46:47 +00:00
Zhi Dou
8add8e0c9b use smart pointer for fd
Test: presubmit
Bug: 348693143
Change-Id: Ibdb1e132a4840d0c3d82aa5f7546a0fc5f5f528b
2024-07-26 22:25:43 +00:00
Zhi Dou
e33e91c85c Merge "add sdk none version for core lib usage" into main am: 8c6ec5a33d
Original change: https://android-review.googlesource.com/c/platform/build/+/3197450

Change-Id: I8e793418263fa35a94a30f14f922a3c0b5e6ee4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-26 15:51:35 +00:00
Zhi Dou
0e5e128034 add sdk none version for core lib usage
Test: m
Bug: 349874828
Change-Id: I412bcf06ca38c862b026715a6a394350eda49b64
2024-07-26 14:03:50 +00:00
Treehugger Robot
287ec55da0 Merge "make aconfig_storage_file.test.java use library from framework" into main am: afede373c0
Original change: https://android-review.googlesource.com/c/platform/build/+/3194522

Change-Id: I68b7842830db8b8e33ec4297643e95af69d1ee51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-26 00:22:14 +00:00
Zhi Dou
d6b37c1be7 make aconfig_storage_file.test.java use library from framework
Test: atest aconfig_storage_file.test.java
Bug: 349874828
Change-Id: If6fbf086e889a2c0068a1ca22979db39f5d86448
2024-07-25 19:30:13 +00:00
Treehugger Robot
addcc154ad Merge "add hide and unsupportedadppusage annotation to read library" into main am: 33e9bc04c2
Original change: https://android-review.googlesource.com/c/platform/build/+/3194521

Change-Id: Ie73f9ee1c657ab4f6dba44d2d3dfa4f6c6f47867
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 18:56:21 +00:00
Zhi Dou
fa988f0a34 add hide and unsupportedadppusage annotation to read library
Test: presubmit
Bug: 349874828
Change-Id: I5b808d87fe7df2ba8a85c8c75ee7baa66ff22d6b
2024-07-25 16:56:48 +00:00
Zhi Dou
9cb3450ee4 Merge "make java reader library availiable for mainline" into main am: 8a9a52d140
Original change: https://android-review.googlesource.com/c/platform/build/+/3185681

Change-Id: I924cb6bdb8649f512dae9be8d33104c89f748ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-22 14:20:59 +00:00
Zhi Dou
8a9a52d140 Merge "make java reader library availiable for mainline" into main 2024-07-22 13:59:28 +00:00
Treehugger Robot
687e1fcf6e Merge "only use new storage for read write" into main am: 088443385f
Original change: https://android-review.googlesource.com/c/platform/build/+/3184560

Change-Id: I25fc5c20a4e3fab97db3c68f7ca06d9903762434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-19 21:55:27 +00:00
Zhi Dou
b88c3e638b make java reader library availiable for mainline
Test: atest aconfig.test.java
Bug: 349874828
Change-Id: I2cabfa9665e5c474ba64f5969e96e9dae2fdcb9b
2024-07-19 21:01:27 +00:00
Zhi Dou
1edd4485c6 only use new storage for read write
Test: atest aconfig.test.java
Bug: 349874828
Change-Id: I5af9fa6243b8b8a157f03242e6e5a411ced7be44
2024-07-19 20:37:53 +00:00
Treehugger Robot
02e0fd0dd8 Merge "feat: show if flag is locally overridden" into main am: ca4c83efa3
Original change: https://android-review.googlesource.com/c/platform/build/+/3184779

Change-Id: I7cf90b90cbad26b83dd1d40aa939f78c10a9287c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-19 14:33:03 +00:00
Ted Bauer
05fea28d9c feat: show if flag is locally overridden
Bug: 324436145
Test: adb shell aflags list
Change-Id: Id239a760e86e469f77d1e99f7a6f27d54cb87206
2024-07-19 13:11:42 +00:00
Ted Bauer
5b8786429a Merge "Read from new storage in aflags" into main am: 7e272b8bba
Original change: https://android-review.googlesource.com/c/platform/build/+/3180106

Change-Id: Ic0446f5b58a8cd7278d7555c396d679f396a8bbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-18 13:48:38 +00:00
Ted Bauer
7e272b8bba Merge "Read from new storage in aflags" into main 2024-07-18 13:32:59 +00:00
Ted Bauer
bbbe092496 Read from new storage in aflags
Bug: 324436145
Test: adb shell aflags list --use-new-storage
Change-Id: Ib615e25bc0bc7f2b0362e286a45ce40ebf21f92d
2024-07-17 18:39:25 +00:00
Treehugger Robot
de49b7e6c4 Merge "Change java codegen to read from new storage" into main am: bce58b3c94
Original change: https://android-review.googlesource.com/c/platform/build/+/3174140

Change-Id: Ib7fe640a084f692bb10c00ddb49f781dc8947c08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 20:13:20 +00:00
Zhi Dou
9f8ed73934 Change java codegen to read from new storage
This change adds code in java code to read from new storage. However the
generated code won't geneerate code contains code for new storage, since
the build system won't pass `allow-instrumentation` to java codegen.

Test: atest aconfig.test.java
Bug: 349874828
Change-Id: I70983fa97de6633f467d968109d134d46f895a89
2024-07-15 19:08:33 +00:00
Zhi Dou
e944856ba0 Merge "add storage java reader" into main am: 6f9f7ccfe3
Original change: https://android-review.googlesource.com/c/platform/build/+/3168961

Change-Id: If1ee86dca35afb6fcc12e8c83b1934582a28176b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-12 14:06:23 +00:00
Zhi Dou
621323cfda add storage java reader
Test: atest aconfig_storage_read_api.test.java
Bug: 349874828
Change-Id: I4b1d5ccf4d48622a88712b6e8940ffe18e980927
2024-07-12 13:34:12 +00:00
Priyanka Advani
c92444463b Merge "Revert "add storage java internal reader"" into main am: bb9f03efbe
Original change: https://android-review.googlesource.com/c/platform/build/+/3168856

Change-Id: If3cf11fa94bcfeb70fa3c30442b0ba72406be48f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 20:36:14 +00:00
Priyanka Advani
16c8d3c47a Revert "add storage java internal reader"
This reverts commit 70b9ac0ddd.

Reason for revert: Droidmonitor created revert due to build breakages in b/352582602.

Change-Id: I8a8e38ccf3e715e9b4746ac333aed0cc13d11969
2024-07-11 19:59:24 +00:00
Zhi Dou
f9c1b73113 Merge "add storage java internal reader" into main am: 657d68aee4
Original change: https://android-review.googlesource.com/c/platform/build/+/3168136

Change-Id: I742f761e6722b49c0278960a8b6705cc8becf75e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 19:24:45 +00:00
Zhi Dou
70b9ac0ddd add storage java internal reader
Test: n/a
Bug: n/a
Change-Id: I852ab4080bee9240549dc4be0c09dbe1f72d06b0
2024-07-11 18:50:46 +00:00
Treehugger Robot
68249a141d Merge "fix: make device paths function static" into main am: 0d18be30ae
Original change: https://android-review.googlesource.com/c/platform/build/+/3164421

Change-Id: I7fd3e74a9cd1923ee449a41f584fc7be65df718e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 14:07:50 +00:00
Treehugger Robot
0d18be30ae Merge "fix: make device paths function static" into main 2024-07-11 13:48:51 +00:00
Treehugger Robot
0a1b4dfdaf Merge "Implement storage files in Java" into main am: 33118a7e83
Original change: https://android-review.googlesource.com/c/platform/build/+/3165076

Change-Id: I07259027a8305e11d7bb00cfe1d88d5c9e435c55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-10 23:47:51 +00:00
Ted Bauer
ba67436d0d fix: make device paths function static
Bug: 342636474
Test: m
Change-Id: Iea745c39f8ef90543015c365ead4c02ee4ff6653
2024-07-10 23:15:08 +00:00
Zhi Dou
af8a16adf0 Implement storage files in Java
This change implements storage files in java to remove the dependencies
on JNI.

Bug: 352078117
Test: atest aconfig_storage_file.test.java

Change-Id: I34438576d09d0aa31eabc60f472e71cebf1552a0
2024-07-10 22:29:47 +00:00
Liana Kazanova
d94b32d8dc Merge "Revert "Mark FeatureFlags impl member as final"" into main am: d7343203b6
Original change: https://android-review.googlesource.com/c/platform/build/+/3159800

Change-Id: Ic55f83c4dd7c438289adf612a454ca39278dff36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 18:35:36 +00:00
Liana Kazanova
d7343203b6 Merge "Revert "Mark FeatureFlags impl member as final"" into main 2024-07-03 18:15:27 +00:00
Liana Kazanova
8450f57c3e Revert "Mark FeatureFlags impl member as final"
This reverts commit fca73bcad3.

Reason for revert: Droidmonitor triggered revert due to build breakage in b/350978649. Will be verifying through ABTD before submission.

Change-Id: I65de159518597289f1e0e3902080f35970842afc
2024-07-03 17:56:12 +00:00
Treehugger Robot
4488b9762b Merge "Mark FeatureFlags impl member as final" into main am: 8d3b98e1ca
Original change: https://android-review.googlesource.com/c/platform/build/+/2832886

Change-Id: I6608de0fa79d2719ab50b83f7aab9ca3ca9da8ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 16:25:26 +00:00