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

Merge "Make RcsMessageStore a top level API" am: bac258f22e am: 53f6c34039

Browse Source 
am: 36cc070c24

Change-Id: Iaf09d213817a8df251e1d846bd50d7a571960b5c
This commit is contained in:
Brad Ebinger
2019-07-12 15:23:16 -07:00
committed by android-build-merger
parent 05c7ac812f 36cc070c24
commit 545a4c369e
7 changed files with 29 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,7 +172,7 @@ import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.telephony.euicc.EuiccCardManager;
import android.telephony.euicc.EuiccManager;
import android.telephony.ims.RcsManager;
import android.telephony.ims.RcsMessageManager;
import android.util.ArrayMap;
import android.util.Log;
import android.view.ContextThemeWrapper;
@@ -614,11 +614,11 @@ final class SystemServiceRegistry {
return new SubscriptionManager(ctx.getOuterContext());
}});
registerService(Context.TELEPHONY_RCS_SERVICE, RcsManager.class,
new CachedServiceFetcher<RcsManager>() {
registerService(Context.TELEPHONY_RCS_MESSAGE_SERVICE, RcsMessageManager.class,
new CachedServiceFetcher<RcsMessageManager>() {
@Override
public RcsManager createService(ContextImpl ctx) {
return new RcsManager(ctx.getOuterContext());
public RcsMessageManager createService(ContextImpl ctx) {
return new RcsMessageManager(ctx.getOuterContext());
}
});

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

@@ -4665,10 +4665,10 @@ public abstract class Context {
/**
* Use with {@link #getSystemService(String)} to retrieve an
* {@link android.telephony.ims.RcsManager}.
* {@link android.telephony.ims.RcsMessageManager}.
* @hide
*/
public static final String TELEPHONY_RCS_SERVICE = "ircs";
public static final String TELEPHONY_RCS_MESSAGE_SERVICE = "ircsmessage";
/**
* Use with {@link #getSystemService(String)} to retrieve an