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

Commit 3a9e1c2b authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Grant carrier privileges if package has carrier config... 

Merge "DO NOT MERGE Grant carrier privileges if package has carrier config access." into rvc-qpr-dev
parents 8c3d465b 7f266ec1

telephony/java/android/telephony/SubscriptionInfo.java

+10 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




package android.telephony;

package android.telephony;





import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.SystemApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;
@@ -693,6 +694,15 @@ public class SubscriptionInfo implements Parcelable { 
        return merged.isEmpty() ? null : merged;

        return merged.isEmpty() ? null : merged;

    }

    }





    /**

     * @hide

     * @return mCarrierConfigAccessRules associated with this subscription.

     */

    public @NonNull List<UiccAccessRule> getCarrierConfigAccessRules() {

        return mCarrierConfigAccessRules == null ? Collections.emptyList() :

            Arrays.asList(mCarrierConfigAccessRules);

    }



    /**

    /**

     * Returns the card string of the SIM card which contains the subscription.

     * Returns the card string of the SIM card which contains the subscription.

     *

     *