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

Commit 21f8d662 authored by Eric Biggers's avatar Eric Biggers
Browse files

Move StorageManagerInternal into services 

Move StorageManagerInternal and ICeStorageLockEventListener from
android.os.storage in the core/ directory to com.android.server in the
services/ directory.  This makes these classes be built into
services.jar rather than framework.jar.  That's the way it should be,
since these classes are used only by system_server internally.  This
matches e.g. UserManagerInternal and LockSettingsInternal which are
likewise in services.jar, not framework.jar.  No functional change.

Bug: 430115876
Test: atest StorageManagerServiceTest
Flag: EXEMPT refactor
Change-Id: Idf4a6cee9a70f34dacef591799a646161f913083
parent 091ab4a9

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ import android.os.SystemClock; 
import android.os.Trace;

import android.os.UserHandle;

import android.os.WorkSource;

import android.os.storage.StorageManagerInternal;

import android.provider.DeviceConfig;

import android.text.format.DateUtils;

import android.util.ArrayMap;
@@ -116,6 +115,7 @@ import com.android.server.AppStateTracker; 
import com.android.server.AppStateTrackerImpl;

import com.android.server.DeviceIdleInternal;

import com.android.server.LocalServices;

import com.android.server.StorageManagerInternal;

import com.android.server.job.JobSchedulerServiceDumpProto.PendingJob;

import com.android.server.job.controllers.BackgroundJobsController;

import com.android.server.job.controllers.BatteryController;

core/java/android/os/storage/ICeStorageLockEventListener.java→services/core/java/com/android/server/ICeStorageLockEventListener.java

+1 −3
Original line number Diff line number Diff line
@@ -14,12 +14,10 @@ 
 * limitations under the License.

 */



package android.os.storage;



package com.android.server;



/**

 * Callback class for receiving CE storage lock events from StorageManagerService.

 * @hide

 */

public interface ICeStorageLockEventListener {

core/java/android/os/storage/StorageManagerInternal.java→services/core/java/com/android/server/StorageManagerInternal.java

+2 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.os.storage;

package com.android.server;



import android.annotation.FlaggedApi;

import android.annotation.NonNull;
@@ -31,9 +31,7 @@ import java.util.List; 
import java.util.Set;



/**

 * Mount service local interface.

 *

 * @hide Only for use within the system server.

 * Internal interface to StorageManagerService, only for use within the system server.

 */

public abstract class StorageManagerInternal {

    /**

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

+1 −3
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE; 
import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE;

import static android.content.pm.PackageManager.MATCH_UNINSTALLED_PACKAGES;

import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.mmd.flags.Flags.mmdEnabled;

import static android.os.IInstalld.IFsveritySetupAuthToken;

import static android.os.ParcelFileDescriptor.MODE_READ_WRITE;

import static android.os.storage.OnObbStateChangeListener.ERROR_ALREADY_MOUNTED;
@@ -41,7 +42,6 @@ import static android.os.storage.OnObbStateChangeListener.ERROR_NOT_MOUNTED; 
import static android.os.storage.OnObbStateChangeListener.ERROR_PERMISSION_DENIED;

import static android.os.storage.OnObbStateChangeListener.MOUNTED;

import static android.os.storage.OnObbStateChangeListener.UNMOUNTED;

import static android.mmd.flags.Flags.mmdEnabled;



import static com.android.internal.util.XmlUtils.readStringAttribute;

import static com.android.internal.util.XmlUtils.writeStringAttribute;
@@ -109,14 +109,12 @@ import android.os.Trace; 
import android.os.UserHandle;

import android.os.UserManager;

import android.os.storage.DiskInfo;

import android.os.storage.ICeStorageLockEventListener;

import android.os.storage.IObbActionListener;

import android.os.storage.IStorageEventListener;

import android.os.storage.IStorageManager;

import android.os.storage.IStorageShutdownObserver;

import android.os.storage.OnObbStateChangeListener;

import android.os.storage.StorageManager;

import android.os.storage.StorageManagerInternal;

import android.os.storage.StorageVolume;

import android.os.storage.VolumeInfo;

import android.os.storage.VolumeRecord;

services/core/java/com/android/server/am/ProcessList.java

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ import android.os.SystemClock; 
import android.os.SystemProperties;

import android.os.Trace;

import android.os.UserHandle;

import android.os.storage.StorageManagerInternal;

import android.provider.DeviceConfig;

import android.system.Os;

import android.system.OsConstants;
@@ -143,6 +142,7 @@ import com.android.internal.util.MemInfoReader; 
import com.android.server.AppStateTracker;

import com.android.server.LocalServices;

import com.android.server.ServiceThread;

import com.android.server.StorageManagerInternal;

import com.android.server.SystemConfig;

import com.android.server.Watchdog;

import com.android.server.am.ActivityManagerService.ProcessChangeItem;