Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_packages_modules_Connectivity
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

7e2f28ba

Commit 7e2f28ba authored 1 year ago by Kangping Dong Committed by Automerger Merge Worker 1 year ago

Downloads
- Plain Diff

Merge "[Thread] make Thread state customisable via resource overlay" into main am: 5ce2519a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2916726

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

parents 8d04d02b 5ce2519a

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

service/ServiceConnectivityResources/res/values/config_thread.xml 6 additions, 1 deletion

...ServiceConnectivityResources/res/values/config_thread.xml
service/ServiceConnectivityResources/res/values/overlayable.xml 1 addition, 0 deletions

...e/ServiceConnectivityResources/res/values/overlayable.xml
thread/service/java/com/android/server/thread/ThreadNetworkService.java 1 addition, 26 deletions

.../java/com/android/server/thread/ThreadNetworkService.java
thread/service/java/com/android/server/thread/ThreadPersistentSettings.java 40 additions, 4 deletions

...a/com/android/server/thread/ThreadPersistentSettings.java
thread/tests/unit/src/com/android/server/thread/ThreadPersistentSettingsTest.java 49 additions, 19 deletions

...m/android/server/thread/ThreadPersistentSettingsTest.java

with 97 additions and 50 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment