Merge "Revert "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm...
Ian Pedowitz [Thu, 30 Jul 2015 20:26:39 +0000 (20:26 +0000)]
1  2 
src/java/com/android/internal/telephony/SubscriptionController.java