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

Commit 9ae12563 authored by Chen Xu's avatar Chen Xu Committed by Gerrit Code Review
Browse files

Merge "add Nullable annotation to TelephonyAPIs"

parents d3786475 ef3d5bc2

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -6347,7 +6347,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean enableDataConnectivity();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean enableModemForSlot(int, boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void enableVideoCalling(boolean);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getAidForAppType(int);

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getAidForAppType(int);

    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<android.service.carrier.CarrierIdentifier> getAllowedCarriers(int);

    method public java.util.List<java.lang.String> getCarrierPackageNamesForIntent(android.content.Intent);

    method public java.util.List<java.lang.String> getCarrierPackageNamesForIntentAndPhone(android.content.Intent, int);
@@ -6363,7 +6363,7 @@ package android.telephony { 
    method @Deprecated public boolean getDataEnabled();

    method @Deprecated public boolean getDataEnabled(int);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean getEmergencyCallbackMode();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimDomain();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimDomain();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimIst();

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<android.util.Pair<java.lang.Integer,java.lang.Integer>> getLogicalToPhysicalSlotMapping();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getPreferredNetworkTypeBitmap();

telephony/java/android/telephony/TelephonyManager.java

+2 −0
Original line number Diff line number Diff line
@@ -4471,6 +4471,7 @@ public class TelephonyManager { 
     * {@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE READ_PRIVILEGED_PHONE_STATE}

     * @hide

     */

    @Nullable

    @SystemApi

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public String getIsimDomain() {
@@ -9046,6 +9047,7 @@ public class TelephonyManager { 
     * @return Application ID for specified app type or {@code null} if no uicc or error.

     * @hide

     */

    @Nullable

    @SystemApi

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public String getAidForAppType(@UiccAppType int appType) {