Revert "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm."
authorSvetoslav Ganov <svetoslavganov@google.com>
Thu, 30 Jul 2015 20:04:37 +0000 (20:04 +0000)
committerThe Android Automerger <android-build@google.com>
Thu, 30 Jul 2015 20:37:48 +0000 (13:37 -0700)
commit756e0668c9afe8a09ee98c32b4df9cde35461e3f
treef226673c77be1edcde702fa6f7b17d32741de0b0
parentb0395f0857cd0cd3a6b1a9b0f4e1235f2b20cbd5
Revert "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm."

This reverts commit b872941b01c651df631b4b4700f3493b2f517f7b.

Change-Id: Idcc5c7817ab405cec136884528238b51ef762273
src/java/com/android/internal/telephony/PhoneSubInfo.java
src/java/com/android/internal/telephony/SubscriptionController.java