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

Commit 8376ff2d authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6421724 from 91368648 to mainline-release 

Change-Id: I7b5f3c4e53b45dbf0fa0fac2ef65292a53f0e73f
parents 1a3307e7 91368648

Android.bp

+4 −3
Original line number Diff line number Diff line
@@ -708,11 +708,9 @@ filegroup { 
    name: "framework-services-net-module-wifi-shared-srcs",

    srcs: [

        "core/java/android/net/DhcpResults.java",

        "core/java/android/net/shared/Inet4AddressUtils.java",

        "core/java/android/net/shared/InetAddressUtils.java",

        "core/java/android/net/util/IpUtils.java",

        "core/java/android/util/LocalLog.java",

        "core/java/com/android/internal/util/Preconditions.java",

    ],

}
@@ -1175,7 +1173,10 @@ java_library { 
        "framework-annotations-lib",

        "unsupportedappusage",

    ],

    visibility: ["//frameworks/base/wifi"],

    visibility: [

        "//frameworks/base/wifi",

        "//frameworks/base/services/net",

    ],

}



filegroup {

StubLibraries.bp

+0 −1
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ droidstubs { 
    api_tag_name: "SYSTEM",

    api_filename: "system-api.txt",

    private_api_filename: "system-private.txt",

    private_dex_api_filename: "system-private-dex.txt",

    removed_api_filename: "system-removed.txt",

    removed_dex_api_filename: "system-removed-dex.txt",

    arg_files: [

apex/blobstore/service/java/com/android/server/blob/BlobStoreConfig.java

+7 −0
Original line number Diff line number Diff line
@@ -131,6 +131,10 @@ class BlobStoreConfig { 
                        LEASE_ACQUISITION_WAIT_DURATION_MS = properties.getLong(key,

                                DEFAULT_LEASE_ACQUISITION_WAIT_DURATION_MS);

                        break;

                    case KEY_COMMIT_COOL_OFF_DURATION_MS:

                        COMMIT_COOL_OFF_DURATION_MS = properties.getLong(key,

                                DEFAULT_COMMIT_COOL_OFF_DURATION_MS);

                        break;

                    default:

                        Slog.wtf(TAG, "Unknown key in device config properties: " + key);

                }
@@ -149,6 +153,9 @@ class BlobStoreConfig { 
            fout.println(String.format(dumpFormat, KEY_LEASE_ACQUISITION_WAIT_DURATION_MS,

                    TimeUtils.formatDuration(LEASE_ACQUISITION_WAIT_DURATION_MS),

                    TimeUtils.formatDuration(DEFAULT_LEASE_ACQUISITION_WAIT_DURATION_MS)));

            fout.println(String.format(dumpFormat, KEY_COMMIT_COOL_OFF_DURATION_MS,

                    TimeUtils.formatDuration(COMMIT_COOL_OFF_DURATION_MS),

                    TimeUtils.formatDuration(DEFAULT_COMMIT_COOL_OFF_DURATION_MS)));

        }

    }

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -4984,6 +4984,7 @@ package android.view.accessibility { 


  public class AccessibilityNodeInfo implements android.os.Parcelable {

    method public void addChild(@NonNull android.os.IBinder);

    method public long getSourceNodeId();

    method public void setLeashedParent(@Nullable android.os.IBinder, int);

    method public static void setNumInstancesInUseCounter(java.util.concurrent.atomic.AtomicInteger);

    method public void writeToParcelNoRecycle(android.os.Parcel, int);

cmds/statsd/Android.bp

+6 −1
Original line number Diff line number Diff line
@@ -295,7 +295,12 @@ cc_test { 


    //TODO(b/153588990): Remove when the build system properly separates

    //32bit and 64bit architectures.

    compile_multilib: "prefer32",

    compile_multilib: "both",

    multilib: {

        lib64: {

            suffix: "64",

        }

    },



    cflags: [

        "-Wall",