diff options
| -rw-r--r-- | core/java/android/app/SystemServiceRegistry.java | 8 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyFrameworkInitializer.java | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index ce21db335615..d33c8013f7af 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -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 diff --git a/telephony/java/android/telephony/TelephonyFrameworkInitializer.java b/telephony/java/android/telephony/TelephonyFrameworkInitializer.java index 407ad19b4364..0d2a8bc14bcb 100644 --- a/telephony/java/android/telephony/TelephonyFrameworkInitializer.java +++ b/telephony/java/android/telephony/TelephonyFrameworkInitializer.java @@ -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 */ |