Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4929a0d7 authored by Sahin Caliskan's avatar Sahin Caliskan Committed by Gerrit Code Review
Browse files

Merge "Move RCS APIs to android.telephony.ims"

parents cb61d10c 7719db2b

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -502,6 +502,7 @@ java_defaults { 
        "telephony/java/android/telephony/ims/aidl/IImsServiceController.aidl",

        "telephony/java/android/telephony/ims/aidl/IImsServiceControllerListener.aidl",

        "telephony/java/android/telephony/ims/aidl/IImsSmsListener.aidl",

        "telephony/java/android/telephony/ims/aidl/IRcs.aidl",

        "telephony/java/android/telephony/mbms/IMbmsDownloadSessionCallback.aidl",

        "telephony/java/android/telephony/mbms/IMbmsStreamingSessionCallback.aidl",

        "telephony/java/android/telephony/mbms/IMbmsGroupCallSessionCallback.aidl",
@@ -578,7 +579,6 @@ java_defaults { 
        "telephony/java/com/android/internal/telephony/euicc/ISetDefaultSmdpAddressCallback.aidl",

        "telephony/java/com/android/internal/telephony/euicc/ISetNicknameCallback.aidl",

        "telephony/java/com/android/internal/telephony/euicc/ISwitchToProfileCallback.aidl",

        "telephony/java/com/android/internal/telephony/rcs/IRcs.aidl",

        "wifi/java/android/net/wifi/ISoftApCallback.aidl",

        "wifi/java/android/net/wifi/IWifiManager.aidl",

        "wifi/java/android/net/wifi/aware/IWifiAwareDiscoverySessionCallback.aidl",

core/java/android/app/SystemServiceRegistry.java

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ import android.telephony.SubscriptionManager; 
import android.telephony.TelephonyManager;

import android.telephony.euicc.EuiccCardManager;

import android.telephony.euicc.EuiccManager;

import android.telephony.rcs.RcsManager;

import android.telephony.ims.RcsManager;

import android.util.Log;

import android.view.ContextThemeWrapper;

import android.view.LayoutInflater;

core/java/android/content/Context.java

+1 −1
Original line number Diff line number Diff line
@@ -4260,7 +4260,7 @@ public abstract class Context { 


    /**

     * Use with {@link #getSystemService(String)} to retrieve an

     * {@link android.telephony.rcs.RcsManager}.

     * {@link android.telephony.ims.RcsManager}.

     * @hide

     */

    public static final String TELEPHONY_RCS_SERVICE = "ircs";

telephony/java/android/telephony/ims/RcsManager.java

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package android.telephony.ims;



import android.annotation.SystemService;

import android.content.Context;



/**

 * The manager class for RCS related utilities.

 * @hide

 */

@SystemService(Context.TELEPHONY_RCS_SERVICE)

public class RcsManager {



    private static final RcsMessageStore sRcsMessageStoreInstance = new RcsMessageStore();



    /**

     * Returns an instance of RcsMessageStore.

     */

    public RcsMessageStore getRcsMessageStore() {

        return sRcsMessageStoreInstance;

    }

}

telephony/java/android/telephony/rcs/RcsManager.java→telephony/java/android/telephony/ims/RcsMessageStore.java

+5 −9
Original line number Diff line number Diff line
@@ -14,24 +14,20 @@ 
 * limitations under the License.

 */



package android.telephony.rcs;

package android.telephony.ims;



import android.annotation.SystemService;

import android.content.Context;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.telephony.Rlog;



import com.android.internal.telephony.rcs.IRcs;

import android.telephony.ims.aidl.IRcs;



/**

 * RcsManager is the application interface to RcsProvider and provides access methods to

 * RcsMessageStore is the application interface to RcsProvider and provides access methods to

 * RCS related database tables.

 * @hide - TODO make this public

 */

@SystemService(Context.TELEPHONY_RCS_SERVICE)

public class RcsManager {

    private static final String TAG = "RcsManager";

public class RcsMessageStore {

    private static final String TAG = "RcsMessageStore";

    private static final boolean VDBG = false;



    /**