commit ffb94e69c3fc308d6d4164e2309f74442282fc84
author Wei Wang <weiwa@google.com> Mon Jan 14 00:05:45 2019 -0800
committer Wei Wang <weiwa@google.com> Mon Jan 14 22:34:52 2019 +0000
tree 60d1459f01cffbe1a588e817e4bc77211a23e3ad
parent 6ec5ba9a6c3aaa88405b6d0a1c1ca38c92a4bb1f

Pre-grant location permisson to location extra packages.

Grant location permission to extra packages configurated in xml config
file. This is necessary as pre-grant happens right after system starts,
before location provider sets the *real* location extra package.

Bug: 119225658
Test: Manual, atest GtsPermissionTestCases:com.google.android.permission.gts.DefaultPermissionGrantPolicyTest

Change-Id: Ibbfbfb78aa062fa6dc013a1001ea3486d62f4331

services/core/java/com/android/server/LocationManagerService.java

diff --git a/services/core/java/com/android/server/LocationManagerService.java b/services/core/java/com/android/server/LocationManagerService.java
index 869d564..4c72b35 100644
--- a/services/core/java/com/android/server/LocationManagerService.java
+++ b/services/core/java/com/android/server/LocationManagerService.java
@@ -257,6 +257,9 @@
         packageManagerInternal.setLocationPackagesProvider(
                 userId -> mContext.getResources().getStringArray(
                         com.android.internal.R.array.config_locationProviderPackageNames));
+        packageManagerInternal.setLocationExtraPackagesProvider(
+                userId -> mContext.getResources().getStringArray(
+                      com.android.internal.R.array.config_locationExtraPackageNames));
 
         // most startup is deferred until systemRunning()
     }