Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc31380a authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am ff363aa9: am 2a3e1ffd: Merge "More on issue #7318666: hide developer... 

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

* commit 'ff363aa9':
  More on issue #7318666: hide developer options from user build
parents 95189b92 ff363aa9

core/java/android/app/LauncherActivity.java

+9 −2
Original line number Diff line number Diff line
@@ -440,13 +440,20 @@ public abstract class LauncherActivity extends ListActivity { 
        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

+3 −4
Original line number Diff line number Diff line
@@ -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>