tree c7c5ed085c742c6ff21e1776395f2be0f8ccac6c
parent 9347e33557713af56b3ef3f83fdee4ed6c55ac90
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584373730 +0000
committer Cody Kesting <ckesting@google.com> 1584429710 -0700

Protect ConnectivityService from SecurityException in permission check.

ConnectivityService currently calls
LocationPermissionChecker#checkLocationPermission. This method call
throws a SecurityException if the given package name and UID do not
match. This permission check is made from the ConnectivityService
Thread, so any Exception being thrown will crash the SystemServer. This
is not acceptable, so surround the permission check in a try-catch in
case any SecurityExceptions are thrown.

Bug: 149119324
Test: atest ConnectivityServiceTest
Change-Id: Ibe2874f2a5249432270aa1b9eb7d004bbba35ac2
Merged-In: Ibe2874f2a5249432270aa1b9eb7d004bbba35ac2
(cherry picked from commit 9eacc855b63b36f5b937e703b20d4b0bb077ab75)