OSDN Git Service

Merge "Check AppOps bit for TelephonyManager#getForbiddenPlmns" into pi-dev
authorsqian <shuoq@google.com>
Thu, 15 Mar 2018 04:55:20 +0000 (04:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Mar 2018 04:55:20 +0000 (04:55 +0000)
commit503768d07dd58da7f653cb91e5ab1a695be0cac6
treed74324feae3970f90df239e2cf00a4d51b75863d
parentd0247a90525b8b1db758e6d312c7ac9b3858c2d7
parenta97d430aad407fa30196b660096885edb4104ef1
Merge "Check AppOps bit for TelephonyManager#getForbiddenPlmns" into pi-dev
am: a97d430aad

Change-Id: I1dac4e925743f016f4fbb11919b4f326082a4db3
telephony/java/android/telephony/TelephonyManager.java
telephony/java/com/android/internal/telephony/ITelephony.aidl