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

Commit 961f7375 authored by Adam Bookatz's avatar Adam Bookatz Committed by Android (Google) Code Review
Browse files

Merge "Move UserManagerInternal out of android.os"

parents 9ad68d28 e5140cc8

apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ import android.os.Process; 
import android.os.RemoteCallback;

import android.os.SystemClock;

import android.os.UserHandle;

import android.os.UserManagerInternal;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.AtomicFile;
@@ -106,6 +105,7 @@ import com.android.server.ServiceThread; 
import com.android.server.SystemService;

import com.android.server.Watchdog;

import com.android.server.blob.BlobMetadata.Committer;

import com.android.server.pm.UserManagerInternal;

import com.android.server.usage.StorageStatsManagerInternal;

import com.android.server.usage.StorageStatsManagerInternal.StorageStatsAugmenter;

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

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ import android.os.RemoteException; 
import android.os.ServiceManager;

import android.os.SystemClock;

import android.os.UserHandle;

import android.os.UserManagerInternal;

import android.os.WorkSource;

import android.provider.DeviceConfig;

import android.text.format.DateUtils;
@@ -104,6 +103,7 @@ import com.android.server.job.controllers.StorageController; 
import com.android.server.job.controllers.TimeController;

import com.android.server.job.restrictions.JobRestriction;

import com.android.server.job.restrictions.ThermalStatusRestriction;

import com.android.server.pm.UserManagerInternal;

import com.android.server.usage.AppStandbyInternal;

import com.android.server.usage.AppStandbyInternal.AppIdleStateChangeListener;

import com.android.server.utils.quota.Categorizer;

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

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

import android.os.UserHandle;

import android.os.UserManager;

import android.os.UserManagerInternal;

import android.provider.Settings;

import android.provider.SettingsStringUtil.SettingStringHelper;

import android.text.TextUtils;
@@ -122,6 +121,7 @@ import com.android.server.accessibility.magnification.FullScreenMagnificationCon 
import com.android.server.accessibility.magnification.MagnificationController;

import com.android.server.accessibility.magnification.MagnificationGestureHandler;

import com.android.server.accessibility.magnification.WindowMagnificationManager;

import com.android.server.pm.UserManagerInternal;

import com.android.server.wm.ActivityTaskManagerInternal;

import com.android.server.wm.WindowManagerInternal;

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ import android.os.ServiceManager; 
import android.os.ShellCallback;

import android.os.ShellCommand;

import android.os.UserHandle;

import android.os.UserManagerInternal;

import android.provider.Settings;

import android.provider.SettingsStringUtil.ComponentNameSet;

import android.text.BidiFormatter;
@@ -88,6 +87,7 @@ import com.android.internal.util.function.pooled.PooledLambda; 
import com.android.server.FgThread;

import com.android.server.LocalServices;

import com.android.server.SystemService;

import com.android.server.pm.UserManagerInternal;

import com.android.server.wm.ActivityTaskManagerInternal;



import org.xmlpull.v1.XmlPullParser;

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

+2 −2
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ import android.os.SystemClock; 
import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.UserManagerInternal;

import android.os.UserManagerInternal.UserRestrictionsListener;

import android.provider.Settings;

import android.provider.Settings.SettingNotFoundException;

import android.text.TextUtils;
@@ -77,6 +75,8 @@ import com.android.internal.R; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.DumpUtils;

import com.android.internal.util.FrameworkStatsLog;

import com.android.server.pm.UserManagerInternal;

import com.android.server.pm.UserManagerInternal.UserRestrictionsListener;

import com.android.server.pm.UserRestrictionsUtils;



import java.io.FileDescriptor;