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

Commit 8750762c authored by Michael Groover's avatar Michael Groover
Browse files

resolve merge conflicts of 540b50bb to qt-qpr1-dev 

Bug: 173421434
Change-Id: Ie3b327c2ab900616b2137d8347d5e8560484ec40
Merged-In: I9b8786a321b1ba79d81b74c3041589f30df8e9c8
parents 6d4ff2e0 540b50bb

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ applications that come with the platform 
        <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>

        <permission name="android.permission.INTERACT_ACROSS_USERS"/>

        <permission name="android.permission.MANAGE_USERS"/>

        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>

        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>

        <permission name="android.permission.USE_RESERVED_DISK"/>

    </privapp-permissions>

telephony/java/android/telephony/SubscriptionInfo.java

+17 −2
Original line number Diff line number Diff line
@@ -652,8 +652,16 @@ public class SubscriptionInfo implements Parcelable { 
    }



    /**

     * @return the card string of the SIM card which contains the subscription. The card string is

     * the ICCID for UICCs or the EID for eUICCs.

     * Returns the card string if the calling app has been granted the READ_PRIVILEGED_PHONE_STATE

     * permission, has carrier privileges (see {@link TelephonyManager#hasCarrierPrivileges}), or

     * is a device owner or profile owner on an organization owned device that has been granted the

     * READ_PHONE_STATE permission. The profile owner is an app that owns a managed profile on the

     * device; for more details see <a href="https://developer.android.com/work/managed-profiles">

     * Work profiles</a>.

     *

     * @return the card string of the SIM card which contains the subscription or an empty string

     * if these requirements are not met. The card string is the ICCID for UICCs or the EID for

     * eUICCs.

     * @hide

     * //TODO rename usages in LPA: UiccSlotUtil.java, UiccSlotsManager.java, UiccSlotInfoTest.java

     */
@@ -661,6 +669,13 @@ public class SubscriptionInfo implements Parcelable { 
        return this.mCardString;

    }



    /**

     * @hide

     */

    public void clearCardString() {

        this.mCardString = "";

    }



    /**

     * Returns the card ID of the SIM card which contains the subscription (see

     * {@link UiccCardInfo#getCardId()}.