| commit | e2c64094eb6d26eef7d48ff785b0178e1592e19a | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Fri May 14 07:08:58 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 14 07:08:58 2021 +0000 |
| tree | d37c153036913b2a071490ea57c97c29574c047a | |
| parent | 1564e815403fb1217ec01545da18d9b316ba7596 [diff] | |
| parent | b6084988b70fb166814013e5333b9619bd6f7133 [diff] |
Merge "Move NetIdManager, ProfileNetworkPreferences" am: e0316b6018 am: b6084988b7 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705549 Change-Id: I486b0d2759200a5a1bb9679577f5d97ea43c252b
diff --git a/services/core/java/com/android/server/NetIdManager.java b/service/src/com/android/server/NetIdManager.java similarity index 100% rename from services/core/java/com/android/server/NetIdManager.java rename to service/src/com/android/server/NetIdManager.java
diff --git a/services/core/java/com/android/server/connectivity/ProfileNetworkPreferences.java b/service/src/com/android/server/connectivity/ProfileNetworkPreferences.java similarity index 100% rename from services/core/java/com/android/server/connectivity/ProfileNetworkPreferences.java rename to service/src/com/android/server/connectivity/ProfileNetworkPreferences.java