From 40baa836d2e76fb6b15950efb91b5be025f93347 Mon Sep 17 00:00:00 2001
From: Soonil Nagarkar <sooniln@google.com>
Date: Tue, 18 May 2021 15:39:26 -0700
Subject: [PATCH] Clear tags for packages with no attribution info

Packages without attribution info should allow all attribution tags. Fix
a bug in setting the user restriction to allow this.

Bug: 187421886
Test: manual
Change-Id: I1d28951094e4731fdce05278e491d1500a3c1259
---
 .../com/android/server/location/LocationManagerService.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/location/LocationManagerService.java b/services/core/java/com/android/server/location/LocationManagerService.java
index 1e8d904cb6d97..634b6aa73539d 100644
--- a/services/core/java/com/android/server/location/LocationManagerService.java
+++ b/services/core/java/com/android/server/location/LocationManagerService.java
@@ -1420,9 +1420,9 @@ public class LocationManagerService extends ILocationManager.Stub implements
             }
             for (String packageName :
                     mInjector.getSettingsHelper().getIgnoreSettingsPackageWhitelist()) {
-                packages.computeIfAbsent(packageName, k -> new ArraySet<>());
+                packages.computeIfAbsent(packageName, k -> new ArraySet<>()).clear();
             }
-            packages.computeIfAbsent(mContext.getPackageName(), k -> new ArraySet<>());
+            packages.computeIfAbsent(mContext.getPackageName(), k -> new ArraySet<>()).clear();
 
             allowedPackages = new ArrayMap<>();
             for (Map.Entry<String, ArraySet<String>> entry : packages.entrySet()) {