Merge "Remove unused services code" into main
diff --git a/services/core/java/com/android/server/ambientcontext/AmbientContextManagerService.java b/services/core/java/com/android/server/ambientcontext/AmbientContextManagerService.java
index 9f31f37..7417585 100644
--- a/services/core/java/com/android/server/ambientcontext/AmbientContextManagerService.java
+++ b/services/core/java/com/android/server/ambientcontext/AmbientContextManagerService.java
@@ -31,7 +31,6 @@
import android.app.ambientcontext.IAmbientContextObserver;
import android.content.ComponentName;
import android.content.Context;
-import android.content.pm.PackageManagerInternal;
import android.os.RemoteCallback;
import android.os.RemoteException;
import android.os.ResultReceiver;
@@ -43,12 +42,10 @@
import com.android.internal.R;
import com.android.internal.util.DumpUtils;
-import com.android.server.LocalServices;
import com.android.server.SystemService;
import com.android.server.ambientcontext.AmbientContextManagerPerUserService.ServiceType;
import com.android.server.infra.AbstractMasterSystemService;
import com.android.server.infra.FrameworkResourcesServiceNameResolver;
-import com.android.server.pm.KnownPackages;
import com.google.android.collect.Sets;
@@ -299,16 +296,6 @@
return MAX_TEMPORARY_SERVICE_DURATION_MS;
}
- /** Returns {@code true} if the detection service is configured on this device. */
- public static boolean isDetectionServiceConfigured() {
- final PackageManagerInternal pmi = LocalServices.getService(PackageManagerInternal.class);
- final String[] packageNames = pmi.getKnownPackageNames(
- KnownPackages.PACKAGE_AMBIENT_CONTEXT_DETECTION, UserHandle.USER_SYSTEM);
- boolean isServiceConfigured = (packageNames.length != 0);
- Slog.i(TAG, "Detection service configured: " + isServiceConfigured);
- return isServiceConfigured;
- }
-
/**
* Send request to the remote AmbientContextDetectionService impl to start detecting the
* specified events. Intended for use by shell command for testing.
diff --git a/services/core/java/com/android/server/pm/Installer.java b/services/core/java/com/android/server/pm/Installer.java
index 8038c9a..6d79139 100644
--- a/services/core/java/com/android/server/pm/Installer.java
+++ b/services/core/java/com/android/server/pm/Installer.java
@@ -408,16 +408,6 @@
}
}
- public void restoreconAppData(String uuid, String packageName, int userId, int flags, int appId,
- String seInfo) throws InstallerException {
- if (!checkBeforeRemote()) return;
- try {
- mInstalld.restoreconAppData(uuid, packageName, userId, flags, appId, seInfo);
- } catch (Exception e) {
- throw InstallerException.from(e);
- }
- }
-
public void migrateAppData(String uuid, String packageName, int userId, int flags)
throws InstallerException {
if (!checkBeforeRemote()) return;
diff --git a/services/core/java/com/android/server/uri/UriGrantsManagerService.java b/services/core/java/com/android/server/uri/UriGrantsManagerService.java
index 4af8c61..a581b08 100644
--- a/services/core/java/com/android/server/uri/UriGrantsManagerService.java
+++ b/services/core/java/com/android/server/uri/UriGrantsManagerService.java
@@ -218,10 +218,6 @@
mService.mMetricsHelper.registerPuller();
}
}
-
- public UriGrantsManagerService getService() {
- return mService;
- }
}
@VisibleForTesting
diff --git a/services/core/java/com/android/server/wearable/WearableSensingManagerService.java b/services/core/java/com/android/server/wearable/WearableSensingManagerService.java
index 8d14c1d..ac419a5 100644
--- a/services/core/java/com/android/server/wearable/WearableSensingManagerService.java
+++ b/services/core/java/com/android/server/wearable/WearableSensingManagerService.java
@@ -33,7 +33,6 @@
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
-import android.content.pm.PackageManagerInternal;
import android.os.Binder;
import android.os.Build;
import android.os.ParcelFileDescriptor;
@@ -50,11 +49,9 @@
import com.android.internal.R;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.server.LocalServices;
import com.android.server.SystemService;
import com.android.server.infra.AbstractMasterSystemService;
import com.android.server.infra.FrameworkResourcesServiceNameResolver;
-import com.android.server.pm.KnownPackages;
import com.android.server.utils.quota.MultiRateLimiter;
import java.io.FileDescriptor;
@@ -196,16 +193,6 @@
return MAX_TEMPORARY_SERVICE_DURATION_MS;
}
- /** Returns {@code true} if the detection service is configured on this device. */
- public static boolean isDetectionServiceConfigured() {
- final PackageManagerInternal pmi = LocalServices.getService(PackageManagerInternal.class);
- final String[] packageNames = pmi.getKnownPackageNames(
- KnownPackages.PACKAGE_WEARABLE_SENSING, UserHandle.USER_SYSTEM);
- boolean isServiceConfigured = (packageNames.length != 0);
- Slog.i(TAG, "Wearable sensing service configured: " + isServiceConfigured);
- return isServiceConfigured;
- }
-
/**
* Returns the AmbientContextManagerPerUserService component for this user.
*/