- Oct 13, 2023
-
-
Victor Hsieh authored
Merge "Add OWNERS for JNI and test of PersistentDataBlockService" into main am: 3a5825e5 am: 6cdbd5de am: 7aae71e1 am: a058f78c Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2787037 Change-Id: I0a7233e0124a8c4defac51baa1a001fdbefeb4eb Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Victor Hsieh authored
Merge "Add OWNERS for JNI and test of PersistentDataBlockService" into main am: 3a5825e5 am: 6cdbd5de am: 7aae71e1 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2787037 Change-Id: I790d4424a2b776477dc89543572b06302d4abd37 Signed-off-by:
-
Victor Hsieh authored
Merge "Add OWNERS for JNI and test of PersistentDataBlockService" into main am: 3a5825e5 am: 6cdbd5de Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2787037 Change-Id: I82616319cf4a204eb8ea993224d25e7543c9c014 Signed-off-by:
-
Victor Hsieh authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2787037 Change-Id: I4e6c6c6098396bd4c0af6e54d797c00814dd7d00 Signed-off-by:
-
Victor Hsieh authored
-
Victor Hsieh authored
Test: N/A Bug: 303523453 Change-Id: Ib861153b6bec91c612f55c21ee6bbf339240f15f
-
Achim Thesmann authored
Merge "Update OWNERS for BAL logic Change-Id: I04fe3ac8f7d49d3b59395269d000817d59452d22 Test: presubmit (owners change only) Bug: 305115571" into main am: ca63bf60 am: 8948a769 am: 7eeb67fe am: 04a5e625 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786097 Change-Id: I7c33fd7297c3eba49f3cef9708ea89225780d78b Signed-off-by:
-
Victor Hsieh authored
-
Matt Buckley authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25032861 Change-Id: Ic4cd92bca5561cceb3160bdead75283574317bfa Signed-off-by:
-
Matt Buckley authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25032861 Change-Id: Ice8f504512c04b1295a125d7a5198f2a93f9b8fd Signed-off-by:
-
Achim Thesmann authored
Merge "Update OWNERS for BAL logic Change-Id: I04fe3ac8f7d49d3b59395269d000817d59452d22 Test: presubmit (owners change only) Bug: 305115571" into main am: ca63bf60 am: 8948a769 am: 7eeb67fe Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786097 Change-Id: Ic1e0b2d008ab0bf0476e4270f93984fcaec65a36 Signed-off-by:
-
Matt Buckley authored
* changes: [DO NOT MERGE] Revert "Mitigation for mass GC deletion" [DO NOT MERGE] Revert "Send cached target duration when creating sessions"
-
Achim Thesmann authored
Merge "Update OWNERS for BAL logic Change-Id: I04fe3ac8f7d49d3b59395269d000817d59452d22 Test: presubmit (owners change only) Bug: 305115571" into main am: ca63bf60 am: 8948a769 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786097 Change-Id: Ie4d40059f06021251fdb119de6db2dbd84cfc001 Signed-off-by:
-
Achim Thesmann authored
Merge "Update OWNERS for BAL logic Change-Id: I04fe3ac8f7d49d3b59395269d000817d59452d22 Test: presubmit (owners change only) Bug: 305115571" into main am: ca63bf60 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786097 Change-Id: Iba88152a8062679642ea4ed962cf3acc09bfea81 Signed-off-by:
-
Achim Thesmann authored
Merge "Update OWNERS for BAL logic Change-Id: I04fe3ac8f7d49d3b59395269d000817d59452d22 Test: presubmit (owners change only) Bug: 305115571" into main
-
John Stiles authored
Merge "Avoid accidental shadowing in AGSL code." into main am: d053371e am: 976a9062 am: 9fce1b42 am: 2cce29e6 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2783534 Change-Id: I4a5ce5487fe24d1d2f34ec0f386a0f55a69427d9 Signed-off-by:
-
Peiyong Lin authored
[automerger skipped] Merge "Avoid setup ANGLE again when determine whether to show toast." into main am: 781101ec am: 6dc82990 am: 7056ff60 am: 58ab4b3e -s ours am skip reason: Merged-In I91f59c17100ac43ee8eea4f3fa8c86602c26a416 with SHA-1 b27fecd0 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786747 Change-Id: I0fb17e32bab148ca31495ee4735ec6120ffc30b6 Signed-off-by:
-
Matt Buckley authored
Revert submission 24828717 Reason for revert: performance concerns Reverted changes: /q/submissionid:24828717 Bug: 300360668 Bug: 302620048 Change-Id: Iefb7488f6e100ca7cbb0d43337e5830860ebebe5
-
John Stiles authored
Merge "Avoid accidental shadowing in AGSL code." into main am: d053371e am: 976a9062 am: 9fce1b42 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2783534 Change-Id: Ia8641e789c625fd55c50783bb9dbcf3ba5c90b73 Signed-off-by:
-
Peiyong Lin authored
Merge "Avoid setup ANGLE again when determine whether to show toast." into main am: 781101ec am: 6dc82990 am: 7056ff60 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786747 Change-Id: I4fce8a8246b236d07faa61172122518706e731e7 Signed-off-by:
-
Jiakai Zhang authored
Merge changes from topic "dm-profile-validation" into main am: 7e72104d am: f0643a6b am: b16d9905 am: 028f33fd Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786343 Change-Id: I4212f5f54fc0613ab8e6cd14f334557a3a5821f1 Signed-off-by:
-
Jiakai Zhang authored
Revert^2 "Fail adb install on external profile errors." am: 1dde3e7f am: b785772c am: af206077 am: 99b6b234 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786681 Change-Id: I112486ff1d18be16a5e03362bf3371e9c34d45bf Signed-off-by:
-
Shunkai Yao authored
Merge "Update AudioFormat setChannelMask comment" into main am: 250365da am: 709f2a47 am: 63d05511 am: 2b8ba491 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2787114 Change-Id: Ida6f4c4e799ba009550958708a91331e0f99825e Signed-off-by:
-
Olivier Gaillard authored
Merge "Fix NPE of NativeTombstoneManager.TombstoneWatcher" into main am: 8bbd22b4 am: 154710d4 am: 3b84abda am: 0e75a926 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2758848 Change-Id: Id564c2f275439ea2d6cc8b90f7314435f959a36a Signed-off-by:
-
John Stiles authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2783534 Change-Id: I45deb21cc081f0d0853692685ad036138828fe5d Signed-off-by:
-
Peiyong Lin authored
Merge "Avoid setup ANGLE again when determine whether to show toast." into main am: 781101ec am: 6dc82990 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786747 Change-Id: I6d9cdb4571a9de6ffada5f36cc271d87e9d0a2e6 Signed-off-by:
-
Robin Lee authored
Merge "Global scale must always be updated when size compat scale is changed" into main am: 7b5463ab am: 42ee836e am: e5315e34 am: 3c971c3b Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2750502 Change-Id: I734039ab5c0b95efd2f886ce14ca25f58dad3710 Signed-off-by:
-
John Stiles authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2783534 Change-Id: I7a975e917be21494006bc7a9de71ee46d520902c Signed-off-by:
-
Victor Hsieh authored
Previous automerge was skipped by mistake Also add OWNERS. Bug: 303523453 Test: m Test: mma in services/devicepolicy/ services/tests/servicestests/ (cherry picked from https://android-review.googlesource.com/q/commit:d34869871fe5df392d97a80ffb34d52b9bda7384) Change-Id: I5c63ba2e56a7d104c0f7b5758058730aed0a237c
-
John Stiles authored
-
Jiakai Zhang authored
Merge changes from topic "dm-profile-validation" into main am: 7e72104d am: f0643a6b am: b16d9905 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786343 Change-Id: I338fc316172c608954f0b9aa58967ef11b766460 Signed-off-by:
-
Jiakai Zhang authored
Revert^2 "Fail adb install on external profile errors." am: 1dde3e7f am: b785772c am: af206077 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786681 Change-Id: I1de12add26c3aad75ff214e787ed97c4872c26a9 Signed-off-by:
-
Shunkai Yao authored
Merge "Update AudioFormat setChannelMask comment" into main am: 250365da am: 709f2a47 am: 63d05511 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2787114 Change-Id: I0fe67bc176d540ec3cff7021241935d34b9c74c0 Signed-off-by:
-
Olivier Gaillard authored
Merge "Fix NPE of NativeTombstoneManager.TombstoneWatcher" into main am: 8bbd22b4 am: 154710d4 am: 3b84abda Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2758848 Change-Id: I261e362aed917eec7bde42cb712a36046006fef6 Signed-off-by:
-
Robin Lee authored
Merge "Global scale must always be updated when size compat scale is changed" into main am: 7b5463ab am: 42ee836e am: e5315e34 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2750502 Change-Id: I5e56adb7ca84ae2e3cfd5b02f56e71c9303e0d55 Signed-off-by:
-
Peiyong Lin authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786747 Change-Id: Ic9fa91dbf4d22c0310ce482dbb0f8bd718ad858f Signed-off-by:
-
Jiakai Zhang authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786343 Change-Id: If032da35feb70086cde2b69d80ae56cbb5c1a805 Signed-off-by:
-
Jiakai Zhang authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786681 Change-Id: Ied817ae91df1b9b6ce4b541e2210075f3e2c4b38 Signed-off-by:
-
Shunkai Yao authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2787114 Change-Id: I3deafd04643360a9be4f58ececfc4dd022eaaa27 Signed-off-by:
-
Olivier Gaillard authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2758848 Change-Id: I83d6bc4636517ab4df14f87e756be603cff6ebe3 Signed-off-by:
-
