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

Commit a614e596 authored by Xin Li's avatar Xin Li
Browse files

Merge Android10 QPR1 into AOSP master 

Bug: 145570283
Change-Id: I557701733b49b0f231c89165239ba07c0fa288d2
parents 39083517 6b30bf8a

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
@@ -2368,6 +2368,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";

  }
@@ -2391,7 +2392,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 −37
Original line number Diff line number Diff line
@@ -324,8 +324,6 @@ message Atom { 


        AppCompatibilityChangeReported app_compatibility_change_reported =

            228 [(allow_from_any_uid) = true];

        PerfettoUploaded perfetto_uploaded =

            229 [(log_from_module) = "perfetto"];

    }



    // Pulled events will start at field 10000.
@@ -5929,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];

}



/**
@@ -6859,37 +6858,3 @@ message AppCompatibilityChangeReported { 
    optional Source source = 4;



}
 


/**

 * Logged from

 *     external/perfetto/src/perfetto_cmd/perfetto_cmd.cc

 */

message PerfettoUploaded {

    enum Event {

        PERFETTO_UNDEFINED = 0;

        PERFETTO_TRACE_BEGIN = 1;

        PERFETTO_BACKGROUND_TRACE_BEGIN = 2;

        PERFETTO_ON_CONNECT = 3;

        PERFETTO_ON_TRACING_DISABLED = 4;

        PERFETTO_UPLOAD_DROPBOX_BEGIN = 5;

        PERFETTO_UPLOAD_DROPBOX_SUCCESS = 6;

        PERFETTO_UPLOAD_DROPBOX_FAILURE = 7;

        PERFETTO_UPLOAD_INCIDENT_BEGIN = 8;

        PERFETTO_UPLOAD_INCIDENT_SUCCESS = 9;

        PERFETTO_UPLOAD_INCIDENT_FAILURE = 10;

        PERFETTO_FINALIZE_TRACE_AND_EXIT = 11;

        PERFETTO_TRIGGER_BEGIN = 12;

        PERFETTO_TRIGGER_SUCCESS = 13;

        PERFETTO_TRIGGER_FAILURE = 14;

        PERFETTO_HIT_GUARDRAILS = 15;

        PERFETTO_ON_TIMEOUT = 16;

        PERFETTO_NOT_UPLOADING_EMPTY_TRACE = 17;

    }



    // Which stage of the pipeline we are reporting from.

    optional Event event = 1;



    // UUID matching the one set inside the SystemInfo trace packet.

    optional int64 trace_uuid_lsb = 2;

    optional int64 trace_uuid_msb = 3;

}

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*/);