Merge "Move ImsManager registery to TelephonyFrameworkInitializer" (741a368b) · Commits · e / os / android_frameworks_base

core/java/android/app/SystemServiceRegistry.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -1147,14 +1147,6 @@ public final class SystemServiceRegistry {
		return new TimeZoneDetector();
		}});

		registerService(Context.TELEPHONY_IMS_SERVICE, android.telephony.ims.ImsManager.class,
		new CachedServiceFetcher<android.telephony.ims.ImsManager>() {
		@Override
		public android.telephony.ims.ImsManager createService(ContextImpl ctx) {
		return new android.telephony.ims.ImsManager(ctx.getOuterContext());
		}
		});

		registerService(Context.PERMISSION_SERVICE, PermissionManager.class,
		new CachedServiceFetcher<PermissionManager>() {
		@Override

+6 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.content.Context;
		import android.os.TelephonyServiceManager;
		import android.telephony.euicc.EuiccCardManager;
		import android.telephony.euicc.EuiccManager;
		import android.telephony.ims.ImsManager;

		import com.android.internal.util.Preconditions;

		@@ -88,6 +89,11 @@ public class TelephonyFrameworkInitializer {
		EuiccCardManager.class,
		context -> new EuiccCardManager(context)
		);
		SystemServiceRegistry.registerContextAwareService(
		Context.TELEPHONY_IMS_SERVICE,
		ImsManager.class,
		context -> new ImsManager(context)
		);
		}

		/** @hide */