diff options
3 files changed, 7 insertions, 5 deletions
diff --git a/core/java/android/service/watchdog/ExplicitHealthCheckService.java b/core/java/android/service/watchdog/ExplicitHealthCheckService.java index 49e00d6f6328..7befbfb0f370 100644 --- a/core/java/android/service/watchdog/ExplicitHealthCheckService.java +++ b/core/java/android/service/watchdog/ExplicitHealthCheckService.java @@ -151,7 +151,7 @@ public abstract class ExplicitHealthCheckService extends Service { */ @NonNull public abstract List<String> onGetRequestedPackages(); - private final Handler mHandler = new Handler(Looper.getMainLooper(), null, true); + private final Handler mHandler = Handler.createAsync(Looper.getMainLooper()); @Nullable private RemoteCallback mCallback; @Override diff --git a/services/core/java/com/android/server/ExplicitHealthCheckController.java b/services/core/java/com/android/server/ExplicitHealthCheckController.java index 77059d918052..81db70ade63b 100644 --- a/services/core/java/com/android/server/ExplicitHealthCheckController.java +++ b/services/core/java/com/android/server/ExplicitHealthCheckController.java @@ -343,7 +343,7 @@ class ExplicitHealthCheckController { }; mContext.bindServiceAsUser(intent, mConnection, - Context.BIND_AUTO_CREATE, UserHandle.of(UserHandle.USER_SYSTEM)); + Context.BIND_AUTO_CREATE, UserHandle.SYSTEM); Slog.i(TAG, "Explicit health check service is bound"); } } diff --git a/services/core/java/com/android/server/RescueParty.java b/services/core/java/com/android/server/RescueParty.java index c1c9fbb121a8..97f65dd736c2 100644 --- a/services/core/java/com/android/server/RescueParty.java +++ b/services/core/java/com/android/server/RescueParty.java @@ -500,7 +500,8 @@ public class RescueParty { Exception res = null; final ContentResolver resolver = context.getContentResolver(); try { - Settings.Global.resetToDefaultsAsUser(resolver, null, mode, UserHandle.USER_SYSTEM); + Settings.Global.resetToDefaultsAsUser(resolver, null, mode, + UserHandle.SYSTEM.getIdentifier()); } catch (Exception e) { res = new RuntimeException("Failed to reset global settings", e); } @@ -741,12 +742,13 @@ public class RescueParty { } private static int[] getAllUserIds() { - int[] userIds = { UserHandle.USER_SYSTEM }; + int systemUserId = UserHandle.SYSTEM.getIdentifier(); + int[] userIds = { systemUserId }; try { for (File file : FileUtils.listFilesOrEmpty(Environment.getDataSystemDeDirectory())) { try { final int userId = Integer.parseInt(file.getName()); - if (userId != UserHandle.USER_SYSTEM) { + if (userId != systemUserId) { userIds = ArrayUtils.appendInt(userIds, userId); } } catch (NumberFormatException ignored) { |