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

Commit 4e53e755 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10942032 from 9efcb17a to 24Q1-release 

Change-Id: Ie50bf90a3b211c7ddb8be1237155bd4cf265b6c1
parents 638d8256 9efcb17a

AconfigFlags.bp

+27 −1
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 




aconfig_srcjars = [

aconfig_srcjars = [

    ":android.app.usage.flags-aconfig-java{.generated_srcjars}",

    ":android.app.usage.flags-aconfig-java{.generated_srcjars}",

    ":android.companion.flags-aconfig-java{.generated_srcjars}",

    ":android.content.pm.flags-aconfig-java{.generated_srcjars}",

    ":android.content.pm.flags-aconfig-java{.generated_srcjars}",

    ":android.hardware.radio.flags-aconfig-java{.generated_srcjars}",

    ":android.hardware.radio.flags-aconfig-java{.generated_srcjars}",

    ":android.nfc.flags-aconfig-java{.generated_srcjars}",

    ":android.nfc.flags-aconfig-java{.generated_srcjars}",
@@ -293,6 +294,13 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}

}





java_aconfig_library {

    name: "android.content.pm.flags-aconfig-java-host",

    aconfig_declarations: "android.content.pm.flags-aconfig",

    host_supported: true,

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Media BetterTogether

// Media BetterTogether

aconfig_declarations {

aconfig_declarations {

    name: "com.android.media.flags.bettertogether-aconfig",

    name: "com.android.media.flags.bettertogether-aconfig",
@@ -317,6 +325,11 @@ java_aconfig_library { 
    name: "android.permission.flags-aconfig-java",

    name: "android.permission.flags-aconfig-java",

    aconfig_declarations: "android.permission.flags-aconfig",

    aconfig_declarations: "android.permission.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

    min_sdk_version: "30",

    apex_available: [

        "com.android.permission",

    ],



}

}





// Biometrics

// Biometrics
@@ -436,7 +449,7 @@ aconfig_declarations { 
    package: "android.service.autofill",

    package: "android.service.autofill",

    srcs: [

    srcs: [

        "services/autofill/bugfixes.aconfig",

        "services/autofill/bugfixes.aconfig",

        "services/autofill/features.aconfig"

        "services/autofill/features.aconfig",

    ],

    ],

}

}
@@ -445,3 +458,16 @@ java_aconfig_library { 
    aconfig_declarations: "android.service.autofill.flags-aconfig",

    aconfig_declarations: "android.service.autofill.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}

}



// Companion

aconfig_declarations {

    name: "android.companion.flags-aconfig",

    package: "android.companion",

    srcs: ["core/java/android/companion/*.aconfig"],

}



java_aconfig_library {

    name: "android.companion.flags-aconfig-java",

    aconfig_declarations: "android.companion.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}

Android.mk

+0 −3
Original line number Original line Diff line number Diff line
@@ -69,9 +69,6 @@ $(SDK_METADATA): $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stub 
.PHONY: framework-doc-stubs

.PHONY: framework-doc-stubs

framework-doc-stubs: $(SDK_METADATA)

framework-doc-stubs: $(SDK_METADATA)





# Run this for checkbuild

checkbuild: doc-comment-check-docs



# Include subdirectory makefiles

# Include subdirectory makefiles

# ============================================================

# ============================================================

PREUPLOAD.cfg

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,6 +25,6 @@ hidden_api_txt_checksorted_hook = ${REPO_ROOT}/tools/platform-compat/hiddenapi/c 




hidden_api_txt_exclude_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/exclude.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}

hidden_api_txt_exclude_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/exclude.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}





ktfmt_hook = ${REPO_ROOT}/external/ktfmt/ktfmt.py --check -i ${REPO_ROOT}/frameworks/base/packages/SystemUI/ktfmt_includes.txt ${PREUPLOAD_FILES}

ktfmt_hook = ${REPO_ROOT}/external/ktfmt/ktfmt.py --check -i ${REPO_ROOT}/frameworks/base/ktfmt_includes.txt ${PREUPLOAD_FILES}





ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py --no-verify-format -f ${PREUPLOAD_FILES}
 
ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py --no-verify-format -f ${PREUPLOAD_FILES}

apex/jobscheduler/service/java/com/android/server/job/controllers/PrefetchController.java

+6 −3
Original line number Original line Diff line number Diff line
@@ -536,10 +536,13 @@ public class PrefetchController extends StateController { 
        static final String KEY_LAUNCH_TIME_ALLOWANCE_MS =

        static final String KEY_LAUNCH_TIME_ALLOWANCE_MS =

                PC_CONSTANT_PREFIX + "launch_time_allowance_ms";

                PC_CONSTANT_PREFIX + "launch_time_allowance_ms";





        private static final long DEFAULT_LAUNCH_TIME_THRESHOLD_MS = 7 * HOUR_IN_MILLIS;

        private static final long DEFAULT_LAUNCH_TIME_THRESHOLD_MS = HOUR_IN_MILLIS;

        private static final long DEFAULT_LAUNCH_TIME_ALLOWANCE_MS = 20 * MINUTE_IN_MILLIS;

        private static final long DEFAULT_LAUNCH_TIME_ALLOWANCE_MS = 30 * MINUTE_IN_MILLIS;





        /** How much time each app will have to run jobs within their standby bucket window. */

        /**

         * The earliest amount of time before the next estimated app launch time that we may choose

         * to run a prefetch job for the app.

         */

        public long LAUNCH_TIME_THRESHOLD_MS = DEFAULT_LAUNCH_TIME_THRESHOLD_MS;

        public long LAUNCH_TIME_THRESHOLD_MS = DEFAULT_LAUNCH_TIME_THRESHOLD_MS;





        /**

        /**

api/ApiDocs.bp

+1 −157
Original line number Original line Diff line number Diff line
@@ -20,41 +20,6 @@ 
// The API doc generation is done by the various droiddoc modules each of which

// The API doc generation is done by the various droiddoc modules each of which

// is for different format.

// is for different format.





/////////////////////////////////////////////////////////////////////

// stub source files are generated using metalava

/////////////////////////////////////////////////////////////////////



framework_docs_only_libs = [

    "voip-common",

    "android.test.mock",

    "android-support-annotations",

    "android-support-compat",

    "android-support-core-ui",

    "android-support-core-utils",

    "android-support-design",

    "android-support-dynamic-animation",

    "android-support-exifinterface",

    "android-support-fragment",

    "android-support-media-compat",

    "android-support-percent",

    "android-support-transition",

    "android-support-v7-cardview",

    "android-support-v7-gridlayout",

    "android-support-v7-mediarouter",

    "android-support-v7-palette",

    "android-support-v7-preference",

    "android-support-v13",

    "android-support-v14-preference",

    "android-support-v17-leanback",

    "android-support-vectordrawable",

    "android-support-animatedvectordrawable",

    "android-support-v7-appcompat",

    "android-support-v7-recyclerview",

    "android-support-v8-renderscript",

    "android-support-multidex",

    "android-support-multidex-instrumentation",

]



// These defaults enable doc-stub generation, api lint database generation and sdk value generation.

// These defaults enable doc-stub generation, api lint database generation and sdk value generation.

stubs_defaults {

stubs_defaults {

    name: "android-non-updatable-doc-stubs-defaults",

    name: "android-non-updatable-doc-stubs-defaults",
@@ -65,7 +30,6 @@ stubs_defaults { 
        ":android-test-mock-sources",

        ":android-test-mock-sources",

        ":android-test-runner-sources",

        ":android-test-runner-sources",

    ],

    ],

    libs: framework_docs_only_libs,

    create_doc_stubs: true,

    create_doc_stubs: true,

    write_sdk_values: true,

    write_sdk_values: true,

}

}
@@ -197,7 +161,7 @@ doc_defaults { 
    name: "framework-docs-default",

    name: "framework-docs-default",

    sdk_version: "none",

    sdk_version: "none",

    system_modules: "none",

    system_modules: "none",

    libs: framework_docs_only_libs + [

    libs: [

        "stub-annotations",

        "stub-annotations",

        "unsupportedappusage",

        "unsupportedappusage",

    ],

    ],
@@ -236,20 +200,6 @@ doc_defaults { 
    },

    },

}

}





doc_defaults {

    name: "framework-dokka-docs-default",

}



droiddoc {

    name: "doc-comment-check-docs",

    defaults: ["framework-docs-default"],

    srcs: [

        ":framework-doc-stubs",

    ],

    args: framework_docs_only_args + " -referenceonly -parsecomments",

    installable: false,

}



droiddoc {

droiddoc {

    name: "offline-sdk-docs",

    name: "offline-sdk-docs",

    defaults: ["framework-docs-default"],

    defaults: ["framework-docs-default"],
@@ -302,70 +252,6 @@ droiddoc { 
    static_doc_properties: "docs/source.properties",

    static_doc_properties: "docs/source.properties",

}

}





droiddoc {

    name: "online-sdk-docs",

    defaults: ["framework-docs-default"],

    srcs: [

        ":framework-doc-stubs",

    ],

    hdf: [

        "android.whichdoc online",

        "android.hasSamples true",

    ],

    proofread_file: "online-sdk-docs-proofread.txt",

    args: framework_docs_only_args +

        " -toroot / -samplegroup Admin " +

        " -samplegroup Background " +

        " -samplegroup Connectivity " +

        " -samplegroup Content " +

        " -samplegroup Input " +

        " -samplegroup Media " +

        " -samplegroup Notification " +

        " -samplegroup RenderScript " +

        " -samplegroup Security " +

        " -samplegroup Sensors " +

        " -samplegroup System " +

        " -samplegroup Testing " +

        " -samplegroup UI " +

        " -samplegroup Views " +

        " -samplegroup Wearable -samplesdir development/samples/browseable ",

}



droiddoc {

    name: "online-system-api-sdk-docs",

    defaults: ["framework-docs-default"],

    srcs: [

        ":framework-doc-system-stubs",

    ],

    hdf: [

        "android.whichdoc online",

        "android.hasSamples true",

    ],

    proofread_file: "online-system-api-sdk-docs-proofread.txt",

    args: framework_docs_only_args +

        " -referenceonly " +

        " -title \"Android SDK - Including system APIs.\" " +

        " -hide 101 " +

        " -hide 104 " +

        " -hide 108 " +

        " -toroot / -samplegroup Admin " +

        " -samplegroup Background " +

        " -samplegroup Connectivity " +

        " -samplegroup Content " +

        " -samplegroup Input " +

        " -samplegroup Media " +

        " -samplegroup Notification " +

        " -samplegroup RenderScript " +

        " -samplegroup Security " +

        " -samplegroup Sensors " +

        " -samplegroup System " +

        " -samplegroup Testing " +

        " -samplegroup UI " +

        " -samplegroup Views " +

        " -samplegroup Wearable -samplesdir development/samples/browseable ",

    installable: false,

}



droiddoc {

droiddoc {

    name: "ds-docs-java",

    name: "ds-docs-java",

    defaults: ["framework-docs-default"],

    defaults: ["framework-docs-default"],
@@ -397,7 +283,6 @@ droiddoc { 




droiddoc {

droiddoc {

    name: "ds-docs-kt",

    name: "ds-docs-kt",

    defaults: ["framework-dokka-docs-default"],

    srcs: [

    srcs: [

        ":framework-doc-stubs",

        ":framework-doc-stubs",

    ],

    ],
@@ -476,44 +361,3 @@ droiddoc { 
        " -atLinksNavtree " +

        " -atLinksNavtree " +

        " -navtreeonly ",

        " -navtreeonly ",

}
 
}
 


droiddoc {

    name: "online-sdk-dev-docs",

    defaults: ["framework-docs-default"],

    srcs: [

        ":framework-doc-stubs",

    ],

    hdf: [

        "android.whichdoc online",

        "android.hasSamples true",

    ],

    proofread_file: "online-sdk-dev-docs-proofread.txt",

    args: framework_docs_only_args +

        " -toroot / -samplegroup Admin " +

        " -samplegroup Background " +

        " -samplegroup Connectivity " +

        " -samplegroup Content " +

        " -samplegroup Input " +

        " -samplegroup Media " +

        " -samplegroup Notification " +

        " -samplegroup RenderScript " +

        " -samplegroup Security " +

        " -samplegroup Sensors " +

        " -samplegroup System " +

        " -samplegroup Testing " +

        " -samplegroup UI " +

        " -samplegroup Views " +

        " -samplegroup Wearable -samplesdir development/samples/browseable ",

}



droiddoc {

    name: "hidden-docs",

    defaults: ["framework-docs-default"],

    srcs: [

        ":framework-doc-stubs",

    ],

    proofread_file: "hidden-docs-proofread.txt",

    args: framework_docs_only_args +

        " -referenceonly " +

        " -title \"Android SDK - Including hidden APIs.\"",

}