Merge "Ignore any summary provided for injected settings"

1 files changed, 3 insertions, 4 deletions

diff --git a/src/com/android/settings/location/SettingsInjector.java b/src/com/android/settings/location/SettingsInjector.java
index b9190802e..76b3103db 100644
--- a/src/com/android/settings/location/SettingsInjector.java
+++ b/src/com/android/settings/location/SettingsInjector.java
@@ -244,12 +244,12 @@ class SettingsInjector {
     }
 
     /**
-     * Adds an injected setting to the root with status "Loading...".
+     * Adds an injected setting to the root.
      */
     private Preference addServiceSetting(List<Preference> prefs, InjectedSetting info) {
         Preference pref = new Preference(mContext);
         pref.setTitle(info.title);
-        pref.setSummary(R.string.location_loading_injected_setting);
+        pref.setSummary(null);
         PackageManager pm = mContext.getPackageManager();
         Drawable icon = pm.getDrawable(info.packageName, info.iconId, null);
         pref.setIcon(icon);
@@ -425,12 +425,11 @@ class SettingsInjector {
                 @Override
                 public void handleMessage(Message msg) {
                     Bundle bundle = msg.getData();
-                    String summary = bundle.getString(SettingInjectorService.SUMMARY_KEY);
                     boolean enabled = bundle.getBoolean(SettingInjectorService.ENABLED_KEY, true);
                     if (Log.isLoggable(TAG, Log.DEBUG)) {
                         Log.d(TAG, setting + ": received " + msg + ", bundle: " + bundle);
                     }
-                    preference.setSummary(summary);
+                    preference.setSummary(null);
                     preference.setEnabled(enabled);
                     mHandler.sendMessage(
                             mHandler.obtainMessage(WHAT_RECEIVED_STATUS, Setting.this));