diff --git a/src/com/android/settings/applications/appinfo/ExtraAppInfoFeatureProvider.java b/src/com/android/settings/applications/appinfo/ExtraAppInfoFeatureProvider.java
index 4de1c2c..ec70f57 100644
--- a/src/com/android/settings/applications/appinfo/ExtraAppInfoFeatureProvider.java
+++ b/src/com/android/settings/applications/appinfo/ExtraAppInfoFeatureProvider.java
@@ -36,7 +36,12 @@
     void setPackageName(String packageName);
 
     /**
-     * gets the summary name
+     * Checks if enabled
+     */
+    boolean isEnabled(Context context);
+
+    /**
+     * Gets the summary name
      */
     String getSummary(Context context);
 }
diff --git a/src/com/android/settings/applications/appinfo/ExtraAppInfoFeatureProviderImpl.java b/src/com/android/settings/applications/appinfo/ExtraAppInfoFeatureProviderImpl.java
index 55b9bf0..7d800e6 100644
--- a/src/com/android/settings/applications/appinfo/ExtraAppInfoFeatureProviderImpl.java
+++ b/src/com/android/settings/applications/appinfo/ExtraAppInfoFeatureProviderImpl.java
@@ -39,6 +39,11 @@
     }
 
     @Override
+    public boolean isEnabled(Context context) {
+        return false;
+    }
+
+    @Override
     public String getSummary(Context context) {
         return "";
     }
diff --git a/src/com/android/settings/applications/appinfo/ExtraAppInfoPreferenceController.java b/src/com/android/settings/applications/appinfo/ExtraAppInfoPreferenceController.java
index 0d72b74..43796d0 100644
--- a/src/com/android/settings/applications/appinfo/ExtraAppInfoPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/ExtraAppInfoPreferenceController.java
@@ -20,6 +20,7 @@
 import android.text.TextUtils;
 
 import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
 
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.overlay.FeatureFactory;
@@ -55,6 +56,16 @@
         return mExtraAppInfoFeatureProvider.getSummary(mContext);
     }
 
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        if (mExtraAppInfoFeatureProvider != null) {
+            final Preference preference = screen.findPreference(getPreferenceKey());
+            preference.setEnabled(mExtraAppInfoFeatureProvider.isEnabled(preference.getContext()));
+        }
+    }
+
     /**
      * Set the local package name
      */
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ExtraAppInfoFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ExtraAppInfoFeatureProviderImplTest.java
new file mode 100644
index 0000000..d8ba073
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/ExtraAppInfoFeatureProviderImplTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class ExtraAppInfoFeatureProviderImplTest {
+    private Context mContext;
+    private ExtraAppInfoFeatureProviderImpl mController;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mController = new ExtraAppInfoFeatureProviderImpl();
+    }
+
+    @Test
+    public void isSupported_notSupportedByDefault() {
+        assertThat(mController.isSupported(mContext)).isEqualTo(false);
+    }
+
+    @Test
+    public void isEnabled_notEnabledByDefault() {
+        assertThat(mController.isEnabled(mContext)).isEqualTo(false);
+    }
+
+    @Test
+    public void getSummary_emptyByDefault() {
+        assertThat(mController.getSummary(mContext)).isEqualTo("");
+    }
+}
