commit 572af2dd8148fd6b24b1c8a0bf2ff769015ba2db
author Robert Greenwalt <rgreenwalt@google.com> Fri Dec 04 15:09:47 2015 -0800
committer The Android Automerger <android-build@google.com> Fri Jan 22 14:44:20 2016 -0800
tree 5b7ba91d03de0ad3d674e0144234226354a208a2
parent 1d714a763d4c690e8096b4a3d1daebb543522ac4

Check permissions on getDeviceId.

bug:25778215
Change-Id: Ie27d69e558a8132f6e0c5058aaad1a4ae02bf82f

src/java/com/android/internal/telephony/PhoneSubInfoController.java

diff --git a/src/java/com/android/internal/telephony/PhoneSubInfoController.java b/src/java/com/android/internal/telephony/PhoneSubInfoController.java
index 7ff70ff..3394d20 100644
--- a/src/java/com/android/internal/telephony/PhoneSubInfoController.java
+++ b/src/java/com/android/internal/telephony/PhoneSubInfoController.java
@@ -50,6 +50,9 @@
     public String getDeviceIdForPhone(int phoneId) {
         Phone phone = getPhone(phoneId);
         if (phone != null) {
+            phone.getContext().enforceCallingOrSelfPermission(
+                    android.Manifest.permission.READ_PHONE_STATE,
+                    "Requires READ_PHONE_STATE");
             return phone.getDeviceId();
         } else {
             Rlog.e(TAG,"getDeviceIdForPhone phone " + phoneId + " is null");