commit 4ec3b1c17a810800138ba756e2ee0a9c7ceda151
author Chen Xu <fionaxu@google.com> Wed Jan 23 19:38:18 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Jan 23 19:38:18 2019 -0800
tree 07a2415d7446cdb58a9cc1faecdf2bc21f0ce5e9
parent c8c1a25637099ed2100ecb5e6b96913a78788a25
parent 18aa5e76de98beb59bd593129561d623c570c151

Merge "add missing permission check in PhoneStateListener" am: feb7d14aa8 am: b102235018
am: 18aa5e76de

Change-Id: I05a42ca0faee0508ba50d73abcd3e3cb87cd6580

services/core/java/com/android/server/TelephonyRegistry.java

diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java
index aa23890..e543617 100644
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -2115,6 +2115,16 @@
                     android.Manifest.permission.READ_PRECISE_PHONE_STATE, null);
         }
 
+        if ((events & PhoneStateListener.LISTEN_RADIO_POWER_STATE_CHANGED) != 0) {
+            mContext.enforceCallingOrSelfPermission(
+                    android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, null);
+        }
+
+        if ((events & PhoneStateListener.LISTEN_VOICE_ACTIVATION_STATE) != 0) {
+            mContext.enforceCallingOrSelfPermission(
+                    android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, null);
+        }
+
         return true;
     }