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

Commit 08daf329 authored by Jeff Davidson's avatar Jeff Davidson Committed by android-build-merger
Browse files

Merge "Merge "Define a meta-data attribute for a carrier icon." into... 

Merge "Merge "Define a meta-data attribute for a carrier icon." into oc-dr1-dev am: 963a2077" into oc-dr1-dev-plus-aosp
am: 3806a1d4

Change-Id: I0af40ca1281103c1b82a8046339a42bb0cf3dc33
parents f84d2598 3806a1d4

telephony/java/android/telephony/euicc/EuiccManager.java

+6 −0
Original line number Diff line number Diff line
@@ -153,6 +153,12 @@ public class EuiccManager { 
    public static final String EXTRA_EMBEDDED_SUBSCRIPTION_RESOLUTION_CALLBACK_INTENT =

            "android.telephony.euicc.extra.EMBEDDED_SUBSCRIPTION_RESOLUTION_CALLBACK_INTENT";



    /**

     * Optional meta-data attribute for a carrier app providing an icon to use to represent the

     * carrier. If not provided, the app's launcher icon will be used as a fallback.

     */

    public static final String META_DATA_CARRIER_ICON = "android.telephony.euicc.carriericon";



    private final Context mContext;

    private final IEuiccController mController;