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

Commit cf8ae79e authored by Stuart Scott's avatar Stuart Scott Committed by Android Git Automerger
Browse files

am 8d702000: Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev automerge: f4e52360 

* commit '8d702000':
  Change getDeviceId to take phoneId.
parents 1cbe026b 8d702000

telephony/java/android/telephony/TelephonyManager.java

+2 −6
Original line number Diff line number Diff line
@@ -640,13 +640,9 @@ public class TelephonyManager { 
     */

    /** {@hide} */

    public String getDeviceId(int slotId) {

        // FIXME methods taking slot id should not use subscription, instead us Uicc directly

        int[] subId = SubscriptionManager.getSubId(slotId);

        if (subId == null || subId.length == 0) {

            return null;

        }

        // FIXME this assumes phoneId == slotId

        try {

            return getSubscriberInfo().getDeviceIdForSubscriber(subId[0]);

            return getSubscriberInfo().getDeviceIdForPhone(slotId);

        } catch (RemoteException ex) {

            return null;

        } catch (NullPointerException ex) {

telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl

+2 −2
Original line number Diff line number Diff line
@@ -33,10 +33,10 @@ interface IPhoneSubInfo { 
    String getNaiForSubscriber(int subId);



    /**

     * Retrieves the unique device ID of a subId for the device, e.g., IMEI

     * Retrieves the unique device ID of a phone for the device, e.g., IMEI

     * for GSM phones.

     */

    String getDeviceIdForSubscriber(int subId);

    String getDeviceIdForPhone(int phoneId);



    /**

     * Retrieves the IMEI.