Merge "Check permissions on getDeviceId."

telephony/java/android/telephony/TelephonyManager.java

@@ -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) {
@@ -4865,4 +4865,4 @@ public class TelephonyManager {
         }
         return null;
     }
-}
+}

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

@@ -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.