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

Commit 40455876 authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "A test api to override carrier information" am: 420ab92b am: 700b21d7 

am: f3c9cb2a

Change-Id: I28cd884a6184fa7a9c3f8fc733195b5672745bcb
parents 578cb329 f3c9cb2a

api/test-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -958,6 +958,12 @@ package android.telephony { 
    field public static final int UNKNOWN_CARRIER_ID_LIST_VERSION = -1; // 0xffffffff

  }



  public class TelephonyManager {

    method public int getCarrierIdListVersion();

    method public void setCarrierTestOverride(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);

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

  }



}



package android.telephony.mbms {