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

Commit f8c3cd8b authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Make ImsService API @SystemApi 

Marks the ImsService API as @SystemAPI.

Bug: 63987047
Test: Build, Telephony unit tests
Change-Id: I10f8a09950be87cb166b718d1dcc2954fba872cb
parent 112c36d3

api/system-current.txt

+677 −3

File changed.

Preview size limit exceeded, changes collapsed.

telephony/java/android/telephony/CarrierConfigManager.java

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ import android.os.PersistableBundle; 
import android.os.RemoteException;

import android.os.ServiceManager;

import android.service.carrier.CarrierService;

import android.telephony.ims.ImsReasonInfo;



import com.android.ims.ImsReasonInfo;

import com.android.internal.telephony.ICarrierConfigLoader;



/**
@@ -1390,7 +1390,7 @@ public class CarrierConfigManager { 
            "allow_video_calling_fallback_bool";



    /**

     * Defines operator-specific {@link com.android.ims.ImsReasonInfo} mappings.

     * Defines operator-specific {@link ImsReasonInfo} mappings.

     *

     * Format: "ORIGINAL_CODE|MESSAGE|NEW_CODE"

     * Where {@code ORIGINAL_CODE} corresponds to a {@link ImsReasonInfo#getCode()} code,

telephony/java/com/android/ims/ImsCallForwardInfo.aidl→telephony/java/android/telephony/ims/ImsCallForwardInfo.aidl

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

 */



package com.android.ims;

package android.telephony.ims;



parcelable ImsCallForwardInfo;

telephony/java/com/android/ims/ImsCallForwardInfo.java→telephony/java/android/telephony/ims/ImsCallForwardInfo.java

+38 −4
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013 The Android Open Source Project

 * 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.
@@ -11,11 +11,12 @@ 
 * 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.

 * limitations under the License

 */



package com.android.ims;

package android.telephony.ims;



import android.annotation.SystemApi;

import android.os.Parcel;

import android.os.Parcelable;
@@ -24,23 +25,32 @@ import android.os.Parcelable; 
 *

 * @hide

 */

public class ImsCallForwardInfo implements Parcelable {

@SystemApi

public final class ImsCallForwardInfo implements Parcelable {

    // Refer to ImsUtInterface#CDIV_CF_XXX

    /** @hide */

    public int mCondition;

    // 0: disabled, 1: enabled

    /** @hide */

    public int mStatus;

    // 0x91: International, 0x81: Unknown

    /** @hide */

    public int mToA;

    // Service class

    /** @hide */

    public int mServiceClass;

    // Number (it will not include the "sip" or "tel" URI scheme)

    /** @hide */

    public String mNumber;

    // No reply timer for CF

    /** @hide */

    public int mTimeSeconds;



    /** @hide */

    public ImsCallForwardInfo() {

    }



    /** @hide */

    public ImsCallForwardInfo(Parcel in) {

        readFromParcel(in);

    }
@@ -91,4 +101,28 @@ public class ImsCallForwardInfo implements Parcelable { 
            return new ImsCallForwardInfo[size];

        }

    };



    public int getCondition() {

        return mCondition;

    }



    public int getStatus() {

        return mStatus;

    }



    public int getToA() {

        return mToA;

    }



    public int getServiceClass() {

        return mServiceClass;

    }



    public String getNumber() {

        return mNumber;

    }



    public int getTimeSeconds() {

        return mTimeSeconds;

    }

}

telephony/java/com/android/ims/ImsCallProfile.aidl→telephony/java/android/telephony/ims/ImsCallProfile.aidl

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

 */



package com.android.ims;

package android.telephony.ims;



parcelable ImsCallProfile;