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

Commit 170c3827 authored by Sahin Caliskan's avatar Sahin Caliskan Committed by Gerrit Code Review
Browse files

Merge "Fix RcsManager and add empty RcsThread class"

parents 80186231 1256486a

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -546,7 +546,6 @@ java_defaults { 
        "telephony/java/com/android/internal/telephony/IOnSubscriptionsChangedListener.aidl",

        "telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl",

        "telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl",

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

        "telephony/java/com/android/internal/telephony/ISms.aidl",

        "telephony/java/com/android/internal/telephony/ISub.aidl",

        "telephony/java/com/android/internal/telephony/IAns.aidl",
@@ -577,6 +576,7 @@ 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

+9 −0
Original line number Diff line number Diff line
@@ -143,6 +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.util.Log;

import android.view.ContextThemeWrapper;

import android.view.LayoutInflater;
@@ -514,6 +515,14 @@ final class SystemServiceRegistry { 
                return new SubscriptionManager(ctx.getOuterContext());

            }});



        registerService(Context.TELEPHONY_RCS_SERVICE, RcsManager.class,

                new CachedServiceFetcher<RcsManager>() {

                    @Override

                    public RcsManager createService(ContextImpl ctx) {

                        return new RcsManager();

                    }

                });



        registerService(Context.CARRIER_CONFIG_SERVICE, CarrierConfigManager.class,

                new CachedServiceFetcher<CarrierConfigManager>() {

            @Override

core/java/android/content/Context.java

+7 −0
Original line number Diff line number Diff line
@@ -4249,6 +4249,13 @@ public abstract class Context { 
     */

    public static final String TIME_ZONE_DETECTOR_SERVICE = "time_zone_detector";



    /**

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

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

     * @hide

     */

    public static final String TELEPHONY_RCS_SERVICE = "ircs";



    /**

     * Determine whether the given permission is allowed for a particular

     * process and user ID running in the system.

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

+6 −2
Original line number Diff line number Diff line
@@ -14,18 +14,22 @@ 
 * limitations under the License.

 */



package android.telephony;

package android.telephony.rcs;



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.IRcs;

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



/**

 * RcsManager 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";

    private static final boolean VDBG = false;

telephony/java/android/telephony/rcs/RcsThread.aidl

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

**

** Copyright 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;



parcelable RcsThread;
 
 No newline at end of file