Revert "Add Local FeatureFlags client to system servier."

Revert submission 23727772-b279054964-flag-api-udc-qpr-dev

Reason for revert: b/290929382

Reverted changes: /q/submissionid:23727772-b279054964-flag-api-udc-qpr-dev

Change-Id: I696496d4ec06744756b3cc7ffe67670ff5acfcb2

2 files changed, 2 insertions, 6 deletions

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