Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move ImsManager registery to TelephonyFrameworkInitializer"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-12-20 03:54:42 +00:00
committed by Android (Google) Code Review
parent 43b5abeec2 e80ab40f70
commit 741a368bb0
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/SystemServiceRegistry.java
View File

@@ -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
telephony/java/android/telephony/TelephonyFrameworkInitializer.java
View File

@@ -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 */