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

Commit c0f6f60d authored by Amit Mahajan's avatar Amit Mahajan Committed by Gerrit Code Review
Browse files

Merge changes If4e8e87c,Ie8e48422,Iab4974f9 

* changes:
  Exposing TelephonyManager.isIccLockEnabled as a system API.
  Un-expose LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH for R.
  Un-expose ACTION_SERVICE_PROVIDERS_UPDATED.
parents f892c9a6 f360f2cf

api/system-current.txt

+1 −7
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ package android { 
    field public static final String INTERNAL_SYSTEM_WINDOW = "android.permission.INTERNAL_SYSTEM_WINDOW";

    field public static final String INVOKE_CARRIER_SETUP = "android.permission.INVOKE_CARRIER_SETUP";

    field public static final String KILL_UID = "android.permission.KILL_UID";

    field public static final String LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH = "android.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH";

    field public static final String LOCAL_MAC_ADDRESS = "android.permission.LOCAL_MAC_ADDRESS";

    field public static final String LOCK_DEVICE = "android.permission.LOCK_DEVICE";

    field public static final String LOOP_RADIO = "android.permission.LOOP_RADIO";
@@ -9129,6 +9128,7 @@ package android.telephony { 
    method public boolean isDataConnectivityPossible();

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

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

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

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle();

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

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isLteCdmaEvdoGsmWcdmaEnabled();
@@ -9193,7 +9193,6 @@ package android.telephony { 
    field public static final String ACTION_EMERGENCY_ASSISTANCE = "android.telephony.action.EMERGENCY_ASSISTANCE";

    field public static final String ACTION_EMERGENCY_CALLBACK_MODE_CHANGED = "android.intent.action.EMERGENCY_CALLBACK_MODE_CHANGED";

    field public static final String ACTION_EMERGENCY_CALL_STATE_CHANGED = "android.intent.action.EMERGENCY_CALL_STATE_CHANGED";

    field public static final String ACTION_SERVICE_PROVIDERS_UPDATED = "android.telephony.action.SERVICE_PROVIDERS_UPDATED";

    field public static final String ACTION_SIM_APPLICATION_STATE_CHANGED = "android.telephony.action.SIM_APPLICATION_STATE_CHANGED";

    field public static final String ACTION_SIM_CARD_STATE_CHANGED = "android.telephony.action.SIM_CARD_STATE_CHANGED";

    field public static final String ACTION_SIM_SLOT_STATUS_CHANGED = "android.telephony.action.SIM_SLOT_STATUS_CHANGED";
@@ -9207,19 +9206,14 @@ package android.telephony { 
    field public static final String EXTRA_APN_PROTOCOL_INT = "apnProtoInt";

    field @Deprecated public static final String EXTRA_APN_TYPE = "apnType";

    field public static final String EXTRA_APN_TYPE_INT = "apnTypeInt";

    field public static final String EXTRA_DATA_SPN = "android.telephony.extra.DATA_SPN";

    field public static final String EXTRA_DEFAULT_NETWORK_AVAILABLE = "defaultNetworkAvailable";

    field public static final String EXTRA_ERROR_CODE = "errorCode";

    field public static final String EXTRA_PCO_ID = "pcoId";

    field public static final String EXTRA_PCO_VALUE = "pcoValue";

    field public static final String EXTRA_PHONE_IN_ECM_STATE = "android.telephony.extra.PHONE_IN_ECM_STATE";

    field public static final String EXTRA_PHONE_IN_EMERGENCY_CALL = "android.telephony.extra.PHONE_IN_EMERGENCY_CALL";

    field public static final String EXTRA_PLMN = "android.telephony.extra.PLMN";

    field public static final String EXTRA_REDIRECTION_URL = "redirectionUrl";

    field public static final String EXTRA_SHOW_PLMN = "android.telephony.extra.SHOW_PLMN";

    field public static final String EXTRA_SHOW_SPN = "android.telephony.extra.SHOW_SPN";

    field public static final String EXTRA_SIM_STATE = "android.telephony.extra.SIM_STATE";

    field public static final String EXTRA_SPN = "android.telephony.extra.SPN";

    field public static final String EXTRA_VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL = "android.telephony.extra.VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL";

    field public static final String EXTRA_VOICEMAIL_SCRAMBLED_PIN_STRING = "android.telephony.extra.VOICEMAIL_SCRAMBLED_PIN_STRING";

    field public static final int INVALID_EMERGENCY_NUMBER_DB_VERSION = -1; // 0xffffffff

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -2096,7 +2096,7 @@ 
    <permission android:name="android.permission.READ_ACTIVE_EMERGENCY_SESSION"

        android:protectionLevel="signature" />



    <!-- @SystemApi Allows listen permission to always reported signal strength.

    <!-- Allows listen permission to always reported signal strength.

         @hide Used internally. -->

    <permission android:name="android.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH"

        android:protectionLevel="signature|telephony" />

telephony/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -811,6 +811,7 @@ package android.telephony { 
    method public boolean isDataConnectivityPossible();

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

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

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

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle();

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

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

telephony/java/android/telephony/TelephonyManager.java

+1 −6
Original line number Diff line number Diff line
@@ -1253,7 +1253,6 @@ public class TelephonyManager { 
     * <p>Note: this is a protected intent that can only be sent by the system.

     * @hide

     */

    @SystemApi

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_SERVICE_PROVIDERS_UPDATED =

            "android.telephony.action.SERVICE_PROVIDERS_UPDATED";
@@ -1263,7 +1262,6 @@ public class TelephonyManager { 
     * whether the PLMN should be shown.

     * @hide

     */

    @SystemApi

    public static final String EXTRA_SHOW_PLMN = "android.telephony.extra.SHOW_PLMN";



    /**
@@ -1271,7 +1269,6 @@ public class TelephonyManager { 
     * the operator name of the registered network.

     * @hide

     */

    @SystemApi

    public static final String EXTRA_PLMN = "android.telephony.extra.PLMN";



    /**
@@ -1279,7 +1276,6 @@ public class TelephonyManager { 
     * whether the PLMN should be shown.

     * @hide

     */

    @SystemApi

    public static final String EXTRA_SHOW_SPN = "android.telephony.extra.SHOW_SPN";



    /**
@@ -1287,7 +1283,6 @@ public class TelephonyManager { 
     * the service provider name.

     * @hide

     */

    @SystemApi

    public static final String EXTRA_SPN = "android.telephony.extra.SPN";



    /**
@@ -1295,7 +1290,6 @@ public class TelephonyManager { 
     * the service provider name for data service.

     * @hide

     */

    @SystemApi

    public static final String EXTRA_DATA_SPN = "android.telephony.extra.DATA_SPN";



    /**
@@ -12901,6 +12895,7 @@ public class TelephonyManager { 
     */

    @WorkerThread

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    @SystemApi

    public boolean isIccLockEnabled() {

        try {

            ITelephony telephony = getITelephony();