Merge "Revert "Add WTF when a system server wrapper can't be found"" into rvc-dev am: 6d81a5f569 (ebe4eedf) · Commits · e / os / android_frameworks_base

core/java/android/app/SystemServiceRegistry.java

+4 −38

Original line number	Diff line number	Diff line
		@@ -186,7 +186,6 @@ import android.telephony.TelephonyFrameworkInitializer;
		import android.telephony.TelephonyRegistryManager;
		import android.util.ArrayMap;
		import android.util.Log;
		import android.util.Slog;
		import android.view.ContextThemeWrapper;
		import android.view.LayoutInflater;
		import android.view.WindowManager;
		@@ -223,8 +222,6 @@ import java.util.Objects;
		public final class SystemServiceRegistry {
		private static final String TAG = "SystemServiceRegistry";

		private static final boolean ENABLE_SERVICE_NOT_FOUND_WTF = true;

		// Service registry information.
		// This information is never changed once static initialization has completed.
		private static final Map<Class<?>, String> SYSTEM_SERVICE_NAMES =
		@@ -1377,29 +1374,8 @@ public final class SystemServiceRegistry {
		* @hide
		*/
		public static Object getSystemService(ContextImpl ctx, String name) {
		if (name == null) {
		return null;
		}
		final ServiceFetcher<?> fetcher = SYSTEM_SERVICE_FETCHERS.get(name);
		if (ENABLE_SERVICE_NOT_FOUND_WTF && fetcher == null) {
		// This should be a caller bug.
		Slog.wtf(TAG, "Unknown manager requested: " + name);
		return null;
		}

		final Object ret = fetcher.getService(ctx);
		if (ENABLE_SERVICE_NOT_FOUND_WTF && ret == null) {
		// Some services do return null in certain situations, so don't do WTF for them.
		switch (name) {
		case Context.CONTENT_CAPTURE_MANAGER_SERVICE:
		case Context.APP_PREDICTION_SERVICE:
		case Context.INCREMENTAL_SERVICE:
		return null;
		}
		Slog.wtf(TAG, "Manager wrapper not available: " + name);
		return null;
		}
		return ret;
		ServiceFetcher<?> fetcher = SYSTEM_SERVICE_FETCHERS.get(name);
		return fetcher != null ? fetcher.getService(ctx) : null;
		}

		/**
		@@ -1407,15 +1383,7 @@ public final class SystemServiceRegistry {
		* @hide
		*/
		public static String getSystemServiceName(Class<?> serviceClass) {
		if (serviceClass == null) {
		return null;
		}
		final String serviceName = SYSTEM_SERVICE_NAMES.get(serviceClass);
		if (ENABLE_SERVICE_NOT_FOUND_WTF && serviceName == null) {
		// This should be a caller bug.
		Slog.wtf(TAG, "Unknown manager requested: " + serviceClass.getCanonicalName());
		}
		return serviceName;
		return SYSTEM_SERVICE_NAMES.get(serviceClass);
		}

		/**
		@@ -1712,9 +1680,7 @@ public final class SystemServiceRegistry {
		try {
		cache.wait();
		} catch (InterruptedException e) {
		// This shouldn't normally happen, but if someone interrupts the
		// thread, it will.
		Slog.wtf(TAG, "getService() interrupted");
		Log.w(TAG, "getService() interrupted");
		Thread.currentThread().interrupt();
		return null;
		}