Revert^2 "Add Local FeatureFlags client to system servier."

c44e351a789e269038e771163e9e0a4a3f109253

Bug: 279054964
Change-Id: Ie2db80c85948d879c6330dd1f2463a2e8659cb6b

2 files changed, 6 insertions, 2 deletions

diff --git a/core/java/android/flags/FeatureFlags.java b/core/java/android/flags/FeatureFlags.java
index 2c722a486e81..93e56b172434 100644
--- a/core/java/android/flags/FeatureFlags.java
+++ b/core/java/android/flags/FeatureFlags.java
@@ -110,7 +110,8 @@ public class FeatureFlags {
             try {
                 mIFeatureFlags.registerCallback(mIFeatureFlagsCallback);
             } catch (RemoteException e) {
-                // Won't happen in tests.
+                // Shouldn't happen with things passed into tests.
+                Log.e(TAG, "Could not register callbacks!", e);
             }
         }
     }
diff --git a/services/flags/java/com/android/server/flags/FeatureFlagsService.java b/services/flags/java/com/android/server/flags/FeatureFlagsService.java
index 111fad0ce3b0..a9de17348639 100644
--- a/services/flags/java/com/android/server/flags/FeatureFlagsService.java
+++ b/services/flags/java/com/android/server/flags/FeatureFlagsService.java
@@ -16,6 +16,7 @@
 package com.android.server.flags;
 
 import android.content.Context;
+import android.flags.FeatureFlags;
 import android.util.Slog;
 
 import com.android.server.SystemService;
@@ -52,8 +53,10 @@ public class FeatureFlagsService extends SystemService {
     @Override
     public void onStart() {
         Slog.d(TAG, "Started Feature Flag Service");
+        FeatureFlagsBinder service = new FeatureFlagsBinder(mFlagStore, mShellCommand);
         publishBinderService(
-                Context.FEATURE_FLAGS_SERVICE, new FeatureFlagsBinder(mFlagStore, mShellCommand));
+                Context.FEATURE_FLAGS_SERVICE, service);
+        publishLocalService(FeatureFlags.class, new FeatureFlags(service));
     }
 
 }