Merge "More on issue #7318666: hide developer options from user build" into jb-mr1-dev

core/java/android/app/LauncherActivity.java

@@ -439,14 +439,21 @@ public abstract class LauncherActivity extends ListActivity {
     protected List<ResolveInfo> onQueryPackageManager(Intent queryIntent) {
         return mPackageManager.queryIntentActivities(queryIntent, /* no flags */ 0);
     }
-    
+
+    /**
+     * @hide
+     */
+    protected void onSortResultList(List<ResolveInfo> results) {
+        Collections.sort(results, new ResolveInfo.DisplayNameComparator(mPackageManager));
+    }
+
     /**
      * Perform the query to determine which results to show and return a list of them.
      */
     public List<ListItem> makeListItems() {
         // Load all matching activities and sort correctly
         List<ResolveInfo> list = onQueryPackageManager(mIntent);
-        Collections.sort(list, new ResolveInfo.DisplayNameComparator(mPackageManager));
+        onSortResultList(list);
 
         ArrayList<ListItem> result = new ArrayList<ListItem>(list.size());
         int listSize = list.size();

core/java/android/provider/Settings.java

@@ -386,10 +386,9 @@ public final class Settings {
 
     /**
      * Activity Action: Show settings to allow configuration of application
-     * development-related settings.
-     * <p>
-     * In some cases, a matching Activity may not exist, so ensure you safeguard
-     * against this.
+     * development-related settings.  As of
+     * {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} this action is
+     * a required part of the platform.
      * <p>
      * Input: Nothing.
      * <p>