diff options
5 files changed, 8 insertions, 8 deletions
diff --git a/services/core/java/com/android/server/search/SearchManagerService.java b/services/core/java/com/android/server/search/SearchManagerService.java index 04b2f6087d48..4c7f88888adf 100644 --- a/services/core/java/com/android/server/search/SearchManagerService.java +++ b/services/core/java/com/android/server/search/SearchManagerService.java @@ -106,7 +106,7 @@ public class SearchManagerService extends ISearchManager.Stub { } private void onUserRemoved(int userId) { - if (userId != UserHandle.USER_OWNER) { + if (userId != UserHandle.USER_NULL) { synchronized (mSearchables) { mSearchables.remove(userId); } @@ -133,7 +133,7 @@ public class SearchManagerService extends ISearchManager.Stub { private final class UserReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - onUserRemoved(intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_OWNER)); + onUserRemoved(intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL)); } } diff --git a/services/core/java/com/android/server/tv/TvInputManagerService.java b/services/core/java/com/android/server/tv/TvInputManagerService.java index a5344b421172..ee2353f1a1e8 100644 --- a/services/core/java/com/android/server/tv/TvInputManagerService.java +++ b/services/core/java/com/android/server/tv/TvInputManagerService.java @@ -117,7 +117,7 @@ public final class TvInputManagerService extends SystemService { private final Object mLock = new Object(); // ID of the current user. - private int mCurrentUserId = UserHandle.USER_OWNER; + private int mCurrentUserId = UserHandle.USER_SYSTEM; // A map from user id to UserState. private final SparseArray<UserState> mUserStates = new SparseArray<>(); diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java index 7784884b6944..87d070026577 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java @@ -484,8 +484,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub { mAppOpsManager = (AppOpsManager) mContext.getSystemService(Context.APP_OPS_SERVICE); mMonitor = new MyPackageMonitor(); mMonitor.register(context, null, UserHandle.ALL, true); - getWallpaperDir(UserHandle.USER_OWNER).mkdirs(); - loadSettingsLocked(UserHandle.USER_OWNER); + getWallpaperDir(UserHandle.USER_SYSTEM).mkdirs(); + loadSettingsLocked(UserHandle.USER_SYSTEM); } private static File getWallpaperDir(int userId) { @@ -503,7 +503,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub { public void systemRunning() { if (DEBUG) Slog.v(TAG, "systemReady"); - WallpaperData wallpaper = mWallpaperMap.get(UserHandle.USER_OWNER); + WallpaperData wallpaper = mWallpaperMap.get(UserHandle.USER_SYSTEM); switchWallpaper(wallpaper, null); wallpaper.wallpaperObserver = new WallpaperObserver(wallpaper); wallpaper.wallpaperObserver.startWatching(); diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java index a433ec45191c..eba9e1e5c0ae 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsService.java +++ b/services/usage/java/com/android/server/usage/UsageStatsService.java @@ -451,7 +451,7 @@ public class UsageStatsService extends SystemService implements } private File getScreenOnTimeFile() { - return new File(mUsageStatsDir, UserHandle.USER_OWNER + "/screen_on_time"); + return new File(mUsageStatsDir, UserHandle.USER_SYSTEM + "/screen_on_time"); } private long readScreenOnTimeLocked() { diff --git a/services/usb/java/com/android/server/usb/UsbService.java b/services/usb/java/com/android/server/usb/UsbService.java index f93a2ef1adce..dbaf7def6169 100644 --- a/services/usb/java/com/android/server/usb/UsbService.java +++ b/services/usb/java/com/android/server/usb/UsbService.java @@ -119,7 +119,7 @@ public class UsbService extends IUsbManager.Stub { mPortManager = new UsbPortManager(context); } - setCurrentUser(UserHandle.USER_OWNER); + setCurrentUser(UserHandle.USER_SYSTEM); final IntentFilter filter = new IntentFilter(); filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY); |