From becd7bf4f5eaa44f17bb2a30726ea6fe1909f9a0 Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Mon, 5 Oct 2020 12:07:04 -0400
Subject: [PATCH] Update how PeopleService is published

To match notifications and other services.

Test: IPeopleManager.Stub.asInterface(
                ServiceManager.getService(Context.PEOPLE_SERVICE)) does
		not return null
Bug: 169783793
Change-Id: Ib3956af71a0c02478c3f91aa5b20eb2628ce93a4
---
 .../java/com/android/server/people/PeopleService.java      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/services/people/java/com/android/server/people/PeopleService.java b/services/people/java/com/android/server/people/PeopleService.java
index 8b1e9c52ec581..91cb481a3b230 100644
--- a/services/people/java/com/android/server/people/PeopleService.java
+++ b/services/people/java/com/android/server/people/PeopleService.java
@@ -30,6 +30,7 @@ import android.content.Context;
 import android.content.pm.ParceledListSlice;
 import android.os.Binder;
 import android.os.CancellationSignal;
+import android.os.IBinder;
 import android.os.Process;
 import android.os.RemoteException;
 import android.os.UserHandle;
@@ -73,7 +74,7 @@ public class PeopleService extends SystemService {
 
     @Override
     public void onStart() {
-        publishBinderService(Context.PEOPLE_SERVICE, new BinderService());
+        publishBinderService(Context.PEOPLE_SERVICE, mService);
         publishLocalService(PeopleServiceInternal.class, new LocalService());
     }
 
@@ -117,7 +118,7 @@ public class PeopleService extends SystemService {
                 message);
     }
 
-    private final class BinderService extends IPeopleManager.Stub {
+    final IBinder mService = new IPeopleManager.Stub() {
 
         @Override
         public ParceledListSlice<ConversationChannel> getRecentConversations() {
@@ -146,7 +147,7 @@ public class PeopleService extends SystemService {
             enforceSystemRootOrSystemUI(getContext(), "get last interaction");
             return mDataManager.getLastInteraction(packageName, userId, shortcutId);
         }
-    }
+    };
 
     @VisibleForTesting
     final class LocalService extends PeopleServiceInternal {