Merge "A test api to override carrier information" am: 420ab92b0b

am: 700b21d7cd

Change-Id: Id71dd0534b784d757bde6cd8ca88f3eb35aaf007
This commit is contained in:
Chen Xu
2018-04-12 20:39:57 -07:00
committed by android-build-merger

View File

@@ -913,6 +913,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 {