Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e29c0632 authored by Shin Kawamura's avatar Shin Kawamura Committed by Gerrit Code Review
Browse files

Merge "Move ZramMaintenance to com.android.server.memory package" into main

parents 67dcd28a 849150a1

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

services/core/java/com/android/server/OWNERS

+0 −1
Original line number Diff line number Diff line
@@ -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

services/core/java/com/android/server/StorageManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -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;

services/core/java/com/android/server/memory/OWNERS

0 → 100644
+3 −0
Original line number Diff line number Diff line 
include /MEMORY_OWNERS



per-file ZramMaintenance.java = kawasin@google.com

services/core/java/com/android/server/ZramMaintenance.java→services/core/java/com/android/server/memory/ZramMaintenance.java

+1 −1
Original line number Diff line number Diff line
@@ -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;