| commit | 83d8bfd6caf6ae816cd6ec5adeead6b7a4384bbe | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue May 21 10:24:53 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 21 10:24:53 2024 +0000 |
| tree | 9b41da8fc3636de8092814ed8f42010b40bbed5c | |
| parent | 37db31bd044a219ecd2921d8da5a0e937a17a195 [diff] | |
| parent | 95fcaf9a01c19499ea5f3f717478db06a849f501 [diff] |
Merge "Add comment for per-app preference priority" into main am: 1243420eb1 am: 95fcaf9a01 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3064023 Change-Id: I8c4ae7065eddc94575885add80435483074e9ed6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index 39ea286..fff809e 100755 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java
@@ -554,6 +554,8 @@ * default network for each app. * Order ints passed to netd must be in the 0~999 range. Larger values code for * a lower priority, see {@link NativeUidRangeConfig}. + * Note that only the highest priority preference is applied if the uid is the target of + * multiple preferences. * * Requests that don't code for a per-app preference use PREFERENCE_ORDER_INVALID. * The default request uses PREFERENCE_ORDER_DEFAULT.