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

Commit afa16001 authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Check permissions on getDeviceId. 

This needs the package name passed in, so the aidl changes.

bug:25778215
Change-Id: I9e5ff24c630e11a047f884e52b0b39f870c18e1d
parent 389a3069

telephony/java/android/telephony/TelephonyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -766,7 +766,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.