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

Commit abc01549 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into... 

Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master
parents 8059c8ea 6f48900f

api/Android.bp

0 → 100644
+7 −0
Original line number Diff line number Diff line 
genrule {

    name: "current-api-xml",

    tools: ["metalava"],

    srcs: ["current.txt"],

    out: ["current.api"],

    cmd: "$(location metalava) --no-banner -convert2xmlnostrip $(in) $(out)",

}

api/test-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -2347,6 +2347,7 @@ package android.provider { 
    field public static final String LOCATION_IGNORE_SETTINGS_PACKAGE_WHITELIST = "location_ignore_settings_package_whitelist";

    field public static final String LOW_POWER_MODE = "low_power";

    field public static final String LOW_POWER_MODE_STICKY = "low_power_sticky";

    field public static final String NOTIFICATION_BUBBLES = "notification_bubbles";

    field public static final String OVERLAY_DISPLAY_DEVICES = "overlay_display_devices";

    field public static final String USE_OPEN_WIFI_PACKAGE = "use_open_wifi_package";

  }
@@ -2370,7 +2371,7 @@ package android.provider { 
    field public static final String LOCATION_ACCESS_CHECK_DELAY_MILLIS = "location_access_check_delay_millis";

    field public static final String LOCATION_ACCESS_CHECK_INTERVAL_MILLIS = "location_access_check_interval_millis";

    field public static final String NOTIFICATION_BADGING = "notification_badging";

    field public static final String NOTIFICATION_BUBBLES = "notification_bubbles";

    field @Deprecated public static final String NOTIFICATION_BUBBLES = "notification_bubbles";

    field @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static final String SYNC_PARENT_SOUNDS = "sync_parent_sounds";

    field public static final String USER_SETUP_COMPLETE = "user_setup_complete";

    field public static final String VOICE_INTERACTION_SERVICE = "voice_interaction_service";

cmds/incidentd/src/WorkDirectory.cpp

+1 −1
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ int64_t WorkDirectory::make_timestamp_ns_locked() { 
            nanosleep(&spec, nullptr);

        }

        clock_gettime(CLOCK_REALTIME, &spec);

        timestampNs = (spec.tv_sec) * 1000 + spec.tv_nsec;

        timestampNs = int64_t(spec.tv_sec) * 1000 + spec.tv_nsec;

    } while (file_exists_locked(timestampNs));

    return timestampNs;

}

cmds/statsd/src/atoms.proto

+2 −1
Original line number Diff line number Diff line
@@ -5927,7 +5927,8 @@ message BubbleUIChanged { 
    optional bool is_ongoing = 10;



    // Whether the bubble is produced by an app running in foreground.

    optional bool is_foreground = 11;

    // This is deprecated and the value should be ignored.

    optional bool is_foreground = 11 [deprecated = true];

}



/**

cmds/statsd/src/main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ int main(int /*argc*/, char** /*argv*/) { 
    ps->giveThreadPoolName();

    IPCThreadState::self()->disableBackgroundScheduling(true);



    ::android::hardware::configureRpcThreadpool(1 /*threads*/, false /*willJoin*/);

    ::android::hardware::configureRpcThreadpool(4 /*threads*/, false /*willJoin*/);



    std::shared_ptr<LogEventQueue> eventQueue =

            std::make_shared<LogEventQueue>(2000 /*buffer limit. Buffer is NOT pre-allocated*/);