OSDN Git Service

Merge changes from topics "nw-scan-cts", "nw-scan-changes"
authorHall Liu <hallliu@google.com>
Mon, 1 Apr 2019 20:31:10 +0000 (20:31 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 1 Apr 2019 20:31:10 +0000 (20:31 +0000)
commitf276a56215a643f104a73f29ee704abae916561c
tree22baadd19dee0033040f4586254fe9dba292e687
parent1423684d1afbc5bb9b15d270ba5f87f5544d8ac7
parent64fbe76fba23a9f2ef3efced9a3c30993188bad9
Merge changes from topics "nw-scan-cts", "nw-scan-changes"

* changes:
  Add shell permissions for CTS testing
  Allow requestNetworkScan to return sanitized info
data/etc/privapp-permissions-platform.xml
packages/Shell/AndroidManifest.xml
telephony/java/android/telephony/TelephonyManager.java