commit 345281a58a8a1a78d2a1246f2641697fa98d0aa4
author David Lin <dlinls@google.com> Mon Jun 03 02:32:50 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 03 02:32:50 2024 +0000
tree 2fc2a4c7df1be8ea237d08553aa07888becb85fa
parent 2de2792ce1423218405340aaac1cfc7dc9521d53
parent 2a86a406c225c6cbd613de810a94ce1180dd71c4

Merge "Add attribution tag for bypassing location toggle" into 24D1-dev am: 2a86a406c2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/27632735

Change-Id: I83c7ad85e4c25cc65a1794c5c83f411b0547826f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java

diff --git a/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java b/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
index 9bea4a4..d8c54eb 100644
--- a/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
+++ b/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
@@ -279,8 +279,10 @@
         if (sInstance == null) {
             HandlerThread handlerThread = new HandlerThread("SatelliteAccessController");
             handlerThread.start();
+            LocationManager lm = context.createAttributionContext("telephony")
+                    .getSystemService(LocationManager.class);
             sInstance = new SatelliteAccessController(context, featureFlags,
-                    handlerThread.getLooper(), context.getSystemService(LocationManager.class),
+                    handlerThread.getLooper(), lm,
                     context.getSystemService(TelecomManager.class), null, null);
         }
         return sInstance;