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

Commit 4557ef32 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

Merge "Check permissions on getDeviceId." into mnc-dev

parents b2c51556 0b638022

telephony/java/android/telephony/TelephonyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ public class TelephonyManager { 
            IPhoneSubInfo info = getSubscriberInfo();

            if (info == null)

                return null;

            return info.getDeviceIdForPhone(slotId);

            return info.getDeviceIdForPhone(slotId, mContext.getOpPackageName());

        } catch (RemoteException ex) {

            return null;

        } catch (NullPointerException ex) {

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

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ interface IPhoneSubInfo { 
     * Retrieves the unique device ID of a phone for the device, e.g., IMEI

     * for GSM phones.

     */

    String getDeviceIdForPhone(int phoneId);

    String getDeviceIdForPhone(int phoneId, String callingPackage);



    /**

     * Retrieves the IMEI.