diff options
| author | 2025-02-04 03:19:21 -0800 | |
|---|---|---|
| committer | 2025-02-04 03:19:21 -0800 | |
| commit | 91c8eed77cb1ee79aa8dd21fe2b5c2febc68d799 (patch) | |
| tree | 536fa92b08f928ecd90a8c9c3da7087496a63407 | |
| parent | 14d34c1f0142ccf6eacb4eb6e46b2cd2851e7485 (diff) | |
| parent | e29c0632e111092782ce0a85f1dbf94dba949965 (diff) | |
Merge "Move ZramMaintenance to com.android.server.memory package" into main am: e29c0632e1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3472108
Change-Id: Ibac423b42a4feb4a2fbdf5b7391606376b1649ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/res/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/OWNERS | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/StorageManagerService.java | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/memory/OWNERS | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/memory/ZramMaintenance.java (renamed from services/core/java/com/android/server/ZramMaintenance.java) | 2 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/memory/OWNERS | 3 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/memory/ZramMaintenanceTest.kt (renamed from services/tests/servicestests/src/com/android/server/zram/ZramMaintenanceTest.kt) | 3 |
7 files changed, 10 insertions, 5 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 45c4ea08c09b..c084bdda5c01 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -8910,7 +8910,7 @@ android:permission="android.permission.BIND_JOB_SERVICE" > </service> - <service android:name="com.android.server.ZramMaintenance" + <service android:name="com.android.server.memory.ZramMaintenance" android:exported="false" android:permission="android.permission.BIND_JOB_SERVICE" > </service> diff --git a/services/core/java/com/android/server/OWNERS b/services/core/java/com/android/server/OWNERS index ef769cf6217c..6858e2941ff9 100644 --- a/services/core/java/com/android/server/OWNERS +++ b/services/core/java/com/android/server/OWNERS @@ -9,7 +9,6 @@ per-file DisplayThread.java = michaelwr@google.com, ogunwale@google.com # Zram writeback per-file ZramWriteback.java = minchan@google.com, rajekumar@google.com -per-file ZramMaintenance.java = kawasin@google.com # ServiceWatcher per-file ServiceWatcher.java = sooniln@google.com diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index 6045f63439f3..441fe4f7723c 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -155,6 +155,7 @@ import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.Preconditions; import com.android.modules.utils.TypedXmlPullParser; import com.android.modules.utils.TypedXmlSerializer; +import com.android.server.memory.ZramMaintenance; import com.android.server.pm.Installer; import com.android.server.pm.UserManagerInternal; import com.android.server.storage.AppFuseBridge; diff --git a/services/core/java/com/android/server/memory/OWNERS b/services/core/java/com/android/server/memory/OWNERS new file mode 100644 index 000000000000..dc0e89892e43 --- /dev/null +++ b/services/core/java/com/android/server/memory/OWNERS @@ -0,0 +1,3 @@ +include /MEMORY_OWNERS + +per-file ZramMaintenance.java = kawasin@google.com diff --git a/services/core/java/com/android/server/ZramMaintenance.java b/services/core/java/com/android/server/memory/ZramMaintenance.java index 099e5b3fe440..48358d130987 100644 --- a/services/core/java/com/android/server/ZramMaintenance.java +++ b/services/core/java/com/android/server/memory/ZramMaintenance.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server; +package com.android.server.memory; import android.app.job.JobInfo; import android.app.job.JobParameters; diff --git a/services/tests/servicestests/src/com/android/server/memory/OWNERS b/services/tests/servicestests/src/com/android/server/memory/OWNERS new file mode 100644 index 000000000000..4df08c1fbc2e --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/memory/OWNERS @@ -0,0 +1,3 @@ +include /MEMORY_OWNERS + +per-file ZramMaintenanceTest.kt = kawasin@google.com diff --git a/services/tests/servicestests/src/com/android/server/zram/ZramMaintenanceTest.kt b/services/tests/servicestests/src/com/android/server/memory/ZramMaintenanceTest.kt index 5448a05aafc3..1f59f45b05bf 100644 --- a/services/tests/servicestests/src/com/android/server/zram/ZramMaintenanceTest.kt +++ b/services/tests/servicestests/src/com/android/server/memory/ZramMaintenanceTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.zram +package com.android.server.memory import android.app.job.JobInfo import android.app.job.JobParameters @@ -26,7 +26,6 @@ import android.testing.TestableContext import androidx.test.filters.SmallTest import androidx.test.platform.app.InstrumentationRegistry -import com.android.server.ZramMaintenance import com.google.common.truth.Truth.assertThat import org.junit.Before |