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

Commit 72b1f379 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

donut snapshot

parent ac1e59d8

Android.mk

+10 −2
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 
    -since ./frameworks/base/api/1.xml 1 \

    -since ./frameworks/base/api/2.xml 2 \

    -since ./frameworks/base/api/3.xml 3 \

    -since ./frameworks/base/api/current.xml Donut \

    -since ./frameworks/base/api/4.xml 4 \

		-error 1 -error 2 -warning 3 -error 4 -error 6 -error 8 \

		-overview $(LOCAL_PATH)/core/java/overview.html
@@ -344,10 +344,18 @@ web_docs_sample_code_flags := \ 
		-hdf android.hasSamples 1 \

		-samplecode $(sample_dir)/ApiDemos \

		            guide/samples/ApiDemos "API Demos" \

		-samplecode $(sample_dir)/Home \

		            guide/samples/Home "Home" \

		-samplecode $(sample_dir)/JetBoy \

		            guide/samples/JetBoy "JetBoy" \

		-samplecode $(sample_dir)/LunarLander \

		            guide/samples/LunarLander "Lunar Lander" \

		-samplecode $(sample_dir)/NotePad \

		            guide/samples/NotePad "Note Pad"

		            guide/samples/NotePad "Note Pad" \

		-samplecode $(sample_dir)/Snake \

		            guide/samples/Snake "Snake" \

		-samplecode $(sample_dir)/SoftKeyboard \

		            guide/samples/SoftKeyboard "Soft Keyboard"



## SDK version identifiers used in the published docs

  # major[.minor] version for current SDK. (full releases only)

api/4.xml

+32631 −14173

File changed.

Preview size limit exceeded, changes collapsed.

api/current.xml

+228 −2652

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/Activity.java

+1 −1
Original line number Diff line number Diff line
@@ -2521,7 +2521,7 @@ public class Activity extends ContextThemeWrapper 
     * no extra data is required.

     * @param globalSearch If false, this will only launch the search that has been specifically

     * defined by the application (which is usually defined as a local search).  If no default 

     * search is defined in the current application or activity, no search will be launched.

     * search is defined in the current application or activity, global search will be launched.

     * If true, this will always launch a platform-global (e.g. web-based) search instead.

     * 

     * @see android.app.SearchManager

core/java/android/app/ActivityThread.java

+8 −0
Original line number Diff line number Diff line
@@ -1701,6 +1701,14 @@ public final class ActivityThread { 
            printRow(pw, TWO_COUNT_COLUMNS, "numPagers:", stats.numPagers, "inactivePageKB:",

                    (stats.totalBytes - stats.referencedBytes) / 1024);

            printRow(pw, ONE_COUNT_COLUMN, "activePageKB:", stats.referencedBytes / 1024);

            

            // Asset details.

            String assetAlloc = AssetManager.getAssetAllocations();

            if (assetAlloc != null) {

                pw.println(" ");

                pw.println(" Asset Allocations");

                pw.print(assetAlloc);

            }

        }



        private void printRow(PrintWriter pw, String format, Object...objs) {