summaryrefslogtreecommitdiff
path: root/core/java/android/util
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-13.0.0_r52' of ↵George Zacharia2023-08-023-0/+26
|\ | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/base into t13.0 Android 13.0.0 Release 52 (TQ3A.230605.012) Change-Id: Ic80f318636f1f70bbd009504352ddde511d0dead
| * Merge "Limit the number of supported v1 and v2 signers" into rvc-dev am: ↵Michael Groover2023-04-052-0/+21
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 00f3afecdb am: d8cdf2d931 am: b4784aeb00 am: 027abf1925 am: 6cc59ca486 am: 35b54f3b44 am: 7bf6db07e7 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22390145 Change-Id: I7064a04720ee730139f6be8a5e40fb192190dba2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * Merge "Limit the number of supported v1 and v2 signers" into rvc-dev am: ↵Michael Groover2023-04-052-0/+21
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00f3afecdb am: d8cdf2d931 am: b4784aeb00 am: 027abf1925 am: 6cc59ca486 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22390145 Change-Id: Ib8513a41ae205e9683989302893b1f1480f05792 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * Merge "Limit the number of supported v1 and v2 signers" into rvc-dev am: ↵Michael Groover2023-04-052-0/+21
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00f3afecdb am: d8cdf2d931 am: b4784aeb00 am: 027abf1925 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22390145 Change-Id: Ib43e3b60a80a72bc75e5199884cc098d17bcb7f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * Merge "Limit the number of supported v1 and v2 signers" into rvc-dev am: ↵Michael Groover2023-04-052-0/+21
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00f3afecdb am: d8cdf2d931 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22390145 Change-Id: I30e3a23068f4943cd3adfa293977beea9525a45e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | * Limit the number of supported v1 and v2 signersMichael Groover2023-04-032-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The v1 and v2 APK Signature Schemes support multiple signers; this was intended to allow multiple entities to sign an APK. Previously, the platform had no limits placed on the number of signers supported in an APK, but this commit sets a hard limit of 10 supported signers for these signature schemes to ensure a large number of signers does not place undue burden on the platform. Bug: 266580022 Test: Manually verified the platform only allowed an APK with the maximum number of supported signers. Change-Id: I6aa86b615b203cdc69d58a593ccf8f18474ca091
| * | | | | Snooze NMS ManagedServices per user id, not globallyMatías Hernández2023-01-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Listeners are bound and registered per user, so snoozing should be that way as well. Test: atest ManagedServicesTest (and manually) Fixes: 147075801 Fixes: 167152273 Change-Id: Ia61816518aa00f8a89f22e79ffdc048f3066541d
* | | | | | Merge tag 'android-13.0.0_r35' of ↵George Zacharia2023-04-031-0/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/base into t13.0 Android 13.0.0 release 35 Change-Id: I709958b2f015d1774b2ece25894467c3a279f93c
| * | | | | Add rotatePointF to RotationUtilsIlya Matyukhin2022-11-281-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 218374828 Test: atest RotationUtilsTest Change-Id: I877e762b1f2b96ae8da3e6b08a78ba4d066c2880
* | | | | | EventLog: Disable event writing in production buildsDanny Lin2023-01-031-10/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When opening and closing activities in Settings, a measurably significant amount of CPU time is spent writing to the EventLog, as reported by simpleperf: 0.01% /system/lib64/libandroid_runtime.so android::EventLogHelper<(log_id)2, &(android::kEventLogEventClass)>::writeEventArray(_JNIEnv*, _jobject*, int, _jobjectArray*) We have no use for EventLog events in production builds, so disable event writing entirely on non-debuggable builds. To avoid having to check ro.debuggable in native code and pay the overhead of a JNI call for every event, perform checks on the Java side and make the native method implementations private for delegation. Test: simpleperf record -a; verify that EventLogHelper no longer appears in sample hits Change-Id: I3505c460f234d9a5038bd1f9d41ce911697ca76e (cherry picked from commit 34800851c95ddb4c9f5b680225647eb3cbd4da2f)
* | | | | | DisplayUtils: Introduce getScaleFactorAnierinB2022-12-301-0/+18
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gets the display size ratio for the current resolution vs the maximum supported resolution. Start by applying this to physical_power_button_center_screen_location_y and sfpsProps so we can accurately scale them down based on the current resolution. Change-Id: Idfbf8e70664226919b603d92616104c09e94e3d1
* | | | | Clean up the Clear calling development feature flagBinyi Wu2022-09-201-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: manual Bug: 245885918 Change-Id: Ia0721c885fa26da7702acfe65e0c7b3011ee6595 Merged-In: Ia0721c885fa26da7702acfe65e0c7b3011ee6595
* | | | | [VolumePanel] Move the Settings' volume panel into a SystemUIDialogAlan Huang2022-08-291-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move most of the logic of the Settings' volume panel to a SystemUIDialog to make the dialogs consistent with other system dialog. Bug: 202262476 Test: manual build and launch the new dialog. Change-Id: Ic27dcca77072dee2b78827e1eb58c28022b47265
* | | | | Merge "[Panlingual] Removed the feature flag of per app language." into ↵Tom Hsu2022-08-291-8/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | tm-qpr-dev
| * | | | | [Panlingual] Removed the feature flag of per app language.tom hsu2022-08-241-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - App language has already landed, so this flag can be removed. Bug: b/209775925 Test: Maunal test passed. Change-Id: Ie3a03ff5d86ab40b210dd26452133b81dbe595df Merged-In: I6345bfb726234c1dd33dda02d87ca9868725c73c
* | | | | | Remove feature flag SETTINGS_GUEST_MODE_UX_CHANGESKedar Chitnis2022-08-221-6/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug b/214031645 has all IC reviews approved and the feature has been merged and tested for more than 3 months. Hence removing the feature flag. Bug: 214031645 Test: SettingsTest, SystemUITests Change-Id: I12b4d60ffc76c20e0964d8e222b13907009b0cd7 Merged-In: I12b4d60ffc76c20e0964d8e222b13907009b0cd7
* | | | | Merge "Add PbA branding to clipboard" into tm-qpr-devYi-an Chen2022-07-251-0/+53
|\ \ \ \ \
| * | | | | Add PbA branding to clipboardYi-an Chen2022-07-191-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 213357911 Test: Manually on Raven Change-Id: If9944393fe64c7f94a5be139a538833d91ae98fe
* | | | | | Create a feature flag for Clear CallingYour Name2022-07-191-1/+7
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: manual Bug: 236074207 Change-Id: I53f682fa63a6614037e966b5d8cc724d420dc065 Merged-In: I53f682fa63a6614037e966b5d8cc724d420dc065
* | | | | Merge "Replace DisplayManager.getStableDisplaySize with max Display.Mode" ↵Shawn Lin2022-05-241-5/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into tm-dev am: 15cb562bcd am: 02c07a76ba Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18485561 Change-Id: Ifab44e33ac17ab673954019236b74f1fe4bfa4e4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | Replace DisplayManager.getStableDisplaySize with max Display.ModeShawn Lin2022-05-211-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DisplayManager.getStableDisplaySize is not the right way to get the size we want for screen decorations and display team is going to get rid of it. Instead, we use the maximum display size supported by the display as the base size to define the cutout and rounded corner configs. Also fixed a bug that DisplayCutoutBaseView didn't update the shoudDrawCutout config when display change. Bug: 230227839 Test: 1. On foldable device, fold and unfold the device and check if the cutout is correctly drawn. 2. On device supporting multiple resolutions, switch resolution between FHD & QHD and check if the cutout is correctly drawn. Test: atest LocalDisplayAdapterTest DisplayCutoutTest ScreenDecorationsTest RoundedCornersTest DisplayCutoutBaseViewTest Change-Id: I7a602b5abd7d6a21d17eae4f8e99414eaf765fa5
* | | | | Merge "[SparseSetArray] optimize copy constructor" into tm-dev am: ↵TreeHugger Robot2022-05-181-4/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79286a97fd am: d014ec92b5 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18415062 Change-Id: I4980b014251db3e48abcaab916a9adf8fd60e0da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | [SparseSetArray] optimize copy constructorSongchun Fan2022-05-161-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 232347307 Test: atest android.util.SparseSetArrayTest Change-Id: Ie046f557098ddc168b86523700cc06feede97e5e
* | | | | Merge "[Panlingual] Add a flag to control opt-in/out" into tm-dev am: ↵TreeHugger Robot2022-05-061-0/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aaf912305b am: 4219739b2b Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18161842 Change-Id: If9a7264ad2373f9acb9e67cb7ef2ed20e516620b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | [Panlingual] Add a flag to control opt-in/outtom hsu2022-05-041-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 231396734 Test: local Change-Id: Ia07ff3ce3202b5017533cca39418085c1e43882e
* | | | | Merge "Reuse a same buffer per session instead of reallocating each time." ↵TreeHugger Robot2022-05-021-13/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into tm-dev am: ccf6f21ad8 am: d5009ae598 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17946676 Change-Id: Ifb9098c2a1c45772ba2358d9fd53ffff5a619d6b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | Reuse a same buffer per session instead of reallocating each time.Billy Lau2022-04-291-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, a fixed size buffer was allocated each time a call to `computeSha256DigestForLargeFile` was made. This causes undesirable performance issues. This change allocates a buffer per apex/module-update session instead. To fix this, that method is amended to take in a buffer passed in by the caller instead. To aid in the usage of this API, a new method called `createLargeFileBuffer` is introduced to help callers allocate a pre-determined buffer size to be passed into the SHA computation method based on whether the device is low RAM device or not. Subsequent RSS benchmarking shows that this helps to significantly lower the RSS high watermark (HWM) for the `system_server` process into just noise. Bug: 229137737 Test: Manual Change-Id: I6d2d17353f999bd6cfb937cd5ae6e6925f1353ac
* | | | | Merge "Enable RRS (FHD<->QHD) support for UDFPS" into tm-dev am: 559244bd5e ↵Ilya Matyukhin2022-04-211-13/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fa923feadb Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17844871 Change-Id: Ie175e9d5065f6489a854cf94a4c4f556b777cb24 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | Enable RRS (FHD<->QHD) support for UDFPSIlya Matyukhin2022-04-201-13/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UDFPS position and assets are configured in pixels in native resolution. This CL adds a mechanism to detect a runtime resolution change and scale the UDFPS coordinates accordingly. Bug: 223342274 Test: atest SystemUITests:com.android.systemui.biometrics Change-Id: Iaa1f3d633b50019d06bdecb5063490ad6eb11272
* | | | | Merge "Support scaled cutout & roundedcorners when resolution is overridden" ↵Shawn Lin2022-04-201-1/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into tm-dev am: 88ed5ca17a am: 6de716209c Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17232290 Change-Id: Ia48552185059896889298a96f14963660a755771 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | Support scaled cutout & roundedcorners when resolution is overriddenshawnlin2022-04-201-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In current desgin, the confgis for cutout and rounded corner are based on the original display size. If the display resolution is overridden, cutous and rounded corners will be drawn in incorrect places with incorrect size. We should load the cutout & rounded corners with the orignal display size and then scale the results with the display ratio which is calculated by dividing current size with original size. Bug: 209592558 Test: manual: 1. Go Settings-> Display-> Screen Resolution 2. Switch between FHD+ and QHD+ 3. Check if the cutout and rounded corner looks the same as they are in the original display size. Test: manual: 1. adb shell wm size 1080x2340 2. Check if the cutout and rounded corner looks the same as they are in the original display size. Test: atest DisplayCutoutTest LocalDisplayAdapterTest ScreenDecorationsTest RoundedCornerResDelegateTest Change-Id: Iea42b73c0276b82983c1ddbce9455355afdc164d
* | | | | Guest mode updates to resolve privacy concerns in guest modeKedar Chitnis2022-04-141-0/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add API in IUserManager to allow setting ephemeral user flag - Implement and export this API in UserManagerService and UserManager - Set guest as ephermal by default when createGuest in UserManager is called - Handle guest user switching in UserSwitcherController for the case of dynamic change of ephemeral state - Add persistant notification when in guest mode to indicate - if guest session is new or previously used. - if guest session will be cleared on exit or not - Add buttons in persistant notification to reset or exit guest - Add flags to enable/disable this feature Bug: 214031645 Screenshots: go/ephemeral-guest-b-214031645-ux Test: Manual test using sunfish, atest SystemUITests, atest SettingsRoboTests Relands ag/16545010 after resolving post submit issues Revert "Revert "Guest mode updates to resolve privacy concerns in guest mode"" This reverts commit dd5c440802078291a88e9f939e8a25348ec81315. Change-Id: I46b8ab527bab8fe665114ed0fffbb06a59d49a77 Merged-In: I46b8ab527bab8fe665114ed0fffbb06a59d49a77
* | | | Merge "Consolidate launch time change notifications." into tm-devTreeHugger Robot2022-04-081-0/+14
|\ \ \ \
| * | | | Consolidate launch time change notifications.Kweku Adams2022-04-061-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Track pending estimated launch time changes in a single Set so that we avoid sending repeat notifications for a single package. Bug: 227796747 Test: atest CtsUsageStatsTestCases:UsageStatsTest Test: atest FrameworksCoreTests:android.util.SparseSetArrayTest Test: atest FrameworksMockingServicesTests:PrefetchControllerTest Test: atest FrameworksMockingServicesTests:UserUsageStatsServiceTest Change-Id: I671c97e4e4110d0a1c76a8f6400dfe8c1e5055dc
* | | | | Merge "Revert "Revert "[AppsFilter] read-only interface for snapshots""" ↵Songchun Fan2022-04-071-1/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into tm-dev
| * | | | | Revert "Revert "[AppsFilter] read-only interface for snapshots""Songchun Fan2022-04-061-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2e06c6008e595b9b167f3463431d9dcdb16687bb. Reason for revert: fixing the boot time regression Provides a read-only interface that is used by computer and snapshots. It fixes the data conflicts when AppsFilter is changed while a snapshot is taken. Test: atest AppsFilterTest Test: atest com.android.server.utils.WatcherTest Test: m RUN_ERROR_PRONE=true framework services.core |& grep AppsFilter BUG: 218411030 Change-Id: I06624ea79ff85160488a6c7863213b0c44fe2154
* | | | | | Enable feature flag to show "Turns on at bedtime" as a Schedule in Dark ↵Vania Desmonda2022-04-071-1/+1
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | theme Settings page. Bug: 218629025 Test: manual Change-Id: I718c68f77f10015133e8b7a58ae3831ccf096ded
* | | | | Merge "Document a section of code" am: 7c37904142 am: 5859be6c51 am: 09eb6c1a4fNeil Fuller2022-04-051-0/+10
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2055047 Change-Id: Iee7b4a1a288e161a46be7e7a5b52fc318f4e868c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | Merge "Document a section of code" am: 7c37904142Neil Fuller2022-04-051-0/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2055047 Change-Id: I9b8c0c90ba6877fa509e82d502cdf660fa4020d6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | Document a section of codeNeil Fuller2022-04-051-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document a section of code that prevents an NTP-related CTS test working if the device is not connected to Wifi. The reason the code exists took a little bit of research, so here it is. Bug: 213393821 Test: Comment-only change Change-Id: I0b5d9f298ef36e861f780a29fdf74f0226fa1567
* | | | | | Revert "[AppsFilter] read-only interface for snapshots"Songchun Fan2022-03-311-18/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8cb3e6aac93147287bcb9fa41a284b1745d47c75. Reason for revert: boot time regression Change-Id: I5e6dc8e80d33256cf7dd8c0d5f1415373fba9048
* | | | | | [AppsFilter] read-only interface for snapshotsSongchun Fan2022-03-281-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provides a read-only interface that is used by computer and snapshots. It fixes the data conflicts when AppsFilter is changed while a snapshot is taken. This requires a watchable class for SparseSetArray. Test: atest AppsFilterTest Test: atest com.android.server.utils.WatcherTest Test: m RUN_ERROR_PRONE=true framework services.core |& grep AppsFilter BUG: 218411030 Change-Id: Ib9d13537b6cec911b2a189aea828e9baec650585
* | | | | | Merge changes from topic "apiFeedback" into tm-devKholoud Mohamed2022-03-191-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class RESTRICT AUTOMERGE move device policy resource APIs to a separate class RESTRICT AUTOMERGE hide device policy resources constants
| * | | | | | RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate classkholoud mohamed2022-03-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 217388602 Bug: 218875965 Test: atest EnterpriseResourcesTests Test: manual Change-Id: I8af03136e67057d171e97cb5a43187aa6c7f4fe7
* | | | | | | Merge "Add the ability to configure NTP port for tests" am: 72e04a7dc2 am: ↵Neil Fuller2022-03-181-4/+27
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53d21a8591 am: 0fa758c3b8 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030083 Change-Id: Ib22fde6cf8bfba028d286647b10b1d2885d78c9d
| * | | | | | Merge "Add the ability to configure NTP port for tests" am: 72e04a7dc2 am: ↵Neil Fuller2022-03-181-4/+27
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53d21a8591 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030083 Change-Id: Ia24fc0a73f74756a8b764961f5ac6023f478f327
| | * | | | | Merge "Add the ability to configure NTP port for tests"Neil Fuller2022-03-181-4/+27
| | |\ \ \ \ \
| | | * | | | | Add the ability to configure NTP port for testsNeil Fuller2022-03-171-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the ability to configure NTP port for tests via the command line and the associated plumbing / knock-ons. In-progress CTS tests will run a fake NTP server on the device itself. Binding to NTP's default port of 123 is restricted. Therefore, we need to be able to override the port for tests. adb shell cmd network_time_update_service set_server_config --port 9999 adb shell dumpsys network_time_update_service <observe port value> adb shell cmd network_time_update_service force_refresh <observe false> adb shell cmd network_time_update_service set_server_config adb shell dumpsys network_time_update_service <observe port value> adb shell cmd network_time_update_service force_refresh <observe true> Bug: 213393821 Test: See above Change-Id: I21e8b735fab268df0d617848b8a562f86560ad16
* | | | | | | | Merge changes from topic "presubmit-am-67f791696fed41829026111e0282dce4" ↵Felipe Leme2022-03-171-1/+1
|\| | | | | | | | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sc-v2-dev-plus-aosp am: 88bf26bf37 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17144854 Change-Id: I4a1089ed2fde054b5879bfc1ace06f4cfa719544
| * | | | | | [automerge] Changes TimingsTraceLog and TimingsTraceAndSlog to be less ↵Presubmit Automerger Backend2022-03-101-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spammy. 2p: bd3271d162 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17144854 Bug: 223642864 Change-Id: I7362998367d1a3b052eec3242eb51bff2106d421