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

Merge "[RCS] Create AIDL layer for RcsUceAdapter, create RCS UCE controller implementation in Telephony." am: 303c5dc0fb am: b815ee2bb9

Browse Source 
am: 35a357814c

Change-Id: I6790023bd43b6787e2e9a46e6ec4f645a69b95ee
This commit is contained in:
James Lin
2019-11-06 19:47:30 -08:00
committed by android-build-merger
parent e9647a7dbf 35a357814c
commit 5da87df5bb
7 changed files with 338 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -170,6 +170,7 @@ import android.telephony.TelephonyManager;
import android.telephony.TelephonyRegistryManager;
import android.telephony.euicc.EuiccCardManager;
import android.telephony.euicc.EuiccManager;
import android.telephony.ims.ImsManager;
import android.telephony.ims.RcsMessageManager;
import android.util.ArrayMap;
import android.util.Log;
@@ -631,6 +632,14 @@ public final class SystemServiceRegistry {
}
});
registerService(Context.TELEPHONY_IMS_SERVICE, ImsManager.class,
new CachedServiceFetcher<ImsManager>() {
@Override
public ImsManager createService(ContextImpl ctx) {
return new ImsManager(ctx.getOuterContext());
}
});
registerService(Context.CARRIER_CONFIG_SERVICE, CarrierConfigManager.class,
new CachedServiceFetcher<CarrierConfigManager>() {
@Override

7
core/java/android/content/Context.java
View File

@@ -4760,6 +4760,13 @@ public abstract class Context {
*/
public static final String APP_BINDING_SERVICE = "app_binding";
/**
* Use with {@link #getSystemService(String)} to retrieve an
* {@link android.telephony.ims.ImsManager}.
* @hide
*/
public static final String TELEPHONY_IMS_SERVICE = "telephony_ims";
/**
* Use with {@link #getSystemService(String)} to retrieve an
* {@link android.telephony.ims.RcsMessageManager}.