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

Commit 094b91ec authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11486370 from 9e5e6cd6 to 24Q2-release 

Change-Id: Iaae61611808df5ce0d67a4bae867321feac4c928
parents 020775ab 9e5e6cd6

AconfigFlags.bp

+14 −0
Original line number Diff line number Diff line
@@ -910,6 +910,8 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.service.notification.flags-aconfig",

    package: "android.service.notification",

    exportable: true,

    container: "system",

    srcs: ["core/java/android/service/notification/flags.aconfig"],

}
@@ -919,6 +921,18 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "android.service.notification.flags-aconfig-export-java",

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

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

    mode: "exported",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "com.android.extservices",

    ],

}



// Smartspace

aconfig_declarations {

    name: "android.app.smartspace.flags-aconfig",

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -508,7 +508,6 @@ java_library { 
    lint: {

        baseline_filename: "lint-baseline.xml",

    },

    // For jarjar repackaging

    jarjar_prefix: "com.android.internal.hidden_from_bootclasspath",

}

api/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ combined_apis { 
        "framework-nfc",

        "framework-ondevicepersonalization",

        "framework-pdf",

        "framework-pdf-v",

        "framework-permission",

        "framework-permission-s",

        "framework-profiling",

cmds/am/src/com/android/commands/am/Am.java

+2 −0
Original line number Diff line number Diff line
@@ -183,6 +183,8 @@ public class Am extends BaseCommand { 
                instrument.disableTestApiChecks = false;

            } else if (opt.equals("--no-isolated-storage")) {

                instrument.disableIsolatedStorage = true;

            } else if (opt.equals("--no-logcat")) {

                instrument.captureLogcat = false;

            } else if (opt.equals("--user")) {

                instrument.userId = parseUserArg(nextArgRequired());

            } else if (opt.equals("--abi")) {

cmds/am/src/com/android/commands/am/Instrument.java

+11 −8
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ public class Instrument { 
    public String profileFile = null;

    public boolean wait = false;

    public boolean rawMode = false;

    public boolean captureLogcat = true;

    boolean protoStd = false;  // write proto to stdout

    boolean protoFile = false;  // write proto to a file

    String logPath = null;
@@ -266,16 +267,18 @@ public class Instrument { 
            proto.write(InstrumentationData.TestStatus.RESULT_CODE, resultCode);

            writeBundle(proto, InstrumentationData.TestStatus.RESULTS, results);



            if (captureLogcat) {

                if (resultCode == STATUS_TEST_STARTED) {

                    // Logcat -T takes wall clock time (!?)

                    mTestStartMs = System.currentTimeMillis();

                } else {

                    if (mTestStartMs > 0) {

                    proto.write(InstrumentationData.TestStatus.LOGCAT, readLogcat(mTestStartMs));

                        proto.write(InstrumentationData.TestStatus.LOGCAT,

                                readLogcat(mTestStartMs));

                    }

                    mTestStartMs = 0;

                }



            }

            proto.end(testStatusToken);



            outputProto(proto);