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

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

Snap for 6539570 from b04b04a8 to mainline-release 

Change-Id: I03a57a5f17ac6753aba6153ceb0548dd31d017c7
parents be77996a b04b04a8

Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ java_library { 


filegroup {

    name: "framework-ike-shared-srcs",

    visibility: ["//frameworks/opt/net/ike"],

    visibility: ["//packages/modules/IPsec"],

    srcs: [

        "core/java/android/annotation/StringDef.java",

        "core/java/android/net/annotations/PolicyDirection.java",

apex/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -100,6 +100,8 @@ java_defaults { 
    // Configure framework module specific metalava options.

    droiddoc_options: [mainline_stubs_args],



    annotations_enabled: true,



    // The stub libraries must be visible to frameworks/base so they can be combined

    // into API specific libraries.

    stubs_library_visibility: [

apex/blobstore/framework/java/android/app/blob/XmlTags.java

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ public final class XmlTags { 
    public static final String ATTR_ID = "id";

    public static final String ATTR_PACKAGE = "p";

    public static final String ATTR_UID = "u";

    public static final String ATTR_CREATION_TIME_MS = "crt";



    // For BlobMetadata

    public static final String TAG_BLOB = "b";

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

+2 −1
Original line number Diff line number Diff line
@@ -45,8 +45,9 @@ class BlobStoreConfig { 
    public static final int XML_VERSION_ADD_STRING_DESC = 2;

    public static final int XML_VERSION_ADD_DESC_RES_NAME = 3;

    public static final int XML_VERSION_ADD_COMMIT_TIME = 4;

    public static final int XML_VERSION_ADD_SESSION_CREATION_TIME = 5;



    public static final int XML_VERSION_CURRENT = XML_VERSION_ADD_COMMIT_TIME;

    public static final int XML_VERSION_CURRENT = XML_VERSION_ADD_SESSION_CREATION_TIME;



    private static final String ROOT_DIR_NAME = "blobstore";

    private static final String BLOBS_DIR_NAME = "blobs";

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

+1 −3
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import static com.android.server.blob.BlobStoreConfig.LOGV; 
import static com.android.server.blob.BlobStoreConfig.TAG;

import static com.android.server.blob.BlobStoreConfig.XML_VERSION_CURRENT;

import static com.android.server.blob.BlobStoreConfig.getAdjustedCommitTimeMs;

import static com.android.server.blob.BlobStoreConfig.hasSessionExpired;

import static com.android.server.blob.BlobStoreSession.STATE_ABANDONED;

import static com.android.server.blob.BlobStoreSession.STATE_COMMITTED;

import static com.android.server.blob.BlobStoreSession.STATE_VERIFIED_INVALID;
@@ -986,9 +985,8 @@ public class BlobStoreManagerService extends SystemService { 
            userSessions.removeIf((sessionId, blobStoreSession) -> {

                boolean shouldRemove = false;



                // TODO: handle the case where no content has been written to session yet.

                // Cleanup sessions which haven't been modified in a while.

                if (hasSessionExpired(blobStoreSession.getSessionFile().lastModified())) {

                if (blobStoreSession.isExpired()) {

                    shouldRemove = true;

                }