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

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

Snap for 6410067 from 23b52c4f to mainline-release 

Change-Id: Ic8cf0fcd7ffdfd54385982bb890d0ebd3c485181
parents 146ec916 23b52c4f

api/test-current.txt

+28 −0
Original line number Diff line number Diff line
@@ -1320,6 +1320,34 @@ package android.hardware.lights { 


}



package android.hardware.soundtrigger {



  public class KeyphraseEnrollmentInfo {

    ctor public KeyphraseEnrollmentInfo(@NonNull android.content.pm.PackageManager);

    method @Nullable public android.hardware.soundtrigger.KeyphraseMetadata getKeyphraseMetadata(@NonNull String, @NonNull java.util.Locale);

    method @Nullable public android.content.Intent getManageKeyphraseIntent(int, @NonNull String, @NonNull java.util.Locale);

    method @NonNull public String getParseError();

    method @NonNull public java.util.Collection<android.hardware.soundtrigger.KeyphraseMetadata> listKeyphraseMetadata();

    field public static final int MANAGE_ACTION_ENROLL = 0; // 0x0

    field public static final int MANAGE_ACTION_RE_ENROLL = 1; // 0x1

    field public static final int MANAGE_ACTION_UN_ENROLL = 2; // 0x2

  }



  public final class KeyphraseMetadata implements android.os.Parcelable {

    ctor public KeyphraseMetadata(int, @NonNull String, @NonNull java.util.Set<java.util.Locale>, int);

    method public int describeContents();

    method public int getId();

    method @NonNull public String getKeyphrase();

    method public int getRecognitionModeFlags();

    method @NonNull public java.util.Set<java.util.Locale> getSupportedLocales();

    method public boolean supportsLocale(@Nullable java.util.Locale);

    method public boolean supportsPhrase(@Nullable String);

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.hardware.soundtrigger.KeyphraseMetadata> CREATOR;

  }



}



package android.location {



  public final class GnssClock implements android.os.Parcelable {

cmds/statsd/Android.bp

+2 −5
Original line number Diff line number Diff line
@@ -295,10 +295,7 @@ cc_test { 


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

    //32bit and 64bit architectures.

    multilib: {

        lib32: { suffix: "32", },

        lib64: { suffix: "64", },

    },

    compile_multilib: "prefer32",



    cflags: [

        "-Wall",

cmds/statsd/src/atoms.proto

+3 −0
Original line number Diff line number Diff line
@@ -424,6 +424,9 @@ message Atom { 
        UserLifecycleJourneyReported user_lifecycle_journey_reported = 264 [(module) = "framework"];

        UserLifecycleEventOccurred user_lifecycle_event_occurred = 265 [(module) = "framework"];

        SdkExtensionStatus sdk_extension_status = 354;



        // StatsdStats tracks platform atoms with ids upto 500.

        // Update StatsdStats::kMaxPushedAtomId when atom ids here approach that value.

    }



    // Pulled events will start at field 10000.

cmds/statsd/src/guardrail/StatsdStats.cpp

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ const std::map<int, std::pair<size_t, size_t>> StatsdStats::kAtomDimensionKeySiz 
};



StatsdStats::StatsdStats() {

    mPushedAtomStats.resize(android::util::kMaxPushedAtomId + 1);

    mPushedAtomStats.resize(kMaxPushedAtomId + 1);

    mStartTimeSec = getWallClockSec();

}
@@ -448,7 +448,7 @@ void StatsdStats::notePullExceedMaxDelay(int pullAtomId) { 
void StatsdStats::noteAtomLogged(int atomId, int32_t timeSec) {

    lock_guard<std::mutex> lock(mLock);



    if (atomId <= android::util::kMaxPushedAtomId) {

    if (atomId <= kMaxPushedAtomId) {

        mPushedAtomStats[atomId]++;

    } else {

        if (mNonPlatformPushedAtomStats.size() < kMaxNonPlatformPushedAtoms) {

cmds/statsd/src/guardrail/StatsdStats.h

+4 −0
Original line number Diff line number Diff line
@@ -166,6 +166,10 @@ public: 
    // Maximum number of pushed atoms statsd stats will track above kMaxPushedAtomId.

    static const int kMaxNonPlatformPushedAtoms = 100;



    // Maximum atom id value that we consider a platform pushed atom.

    // This should be updated once highest pushed atom id in atoms.proto approaches this value.

    static const int kMaxPushedAtomId = 500;



    // Atom id that is the start of the pulled atoms.

    static const int kPullAtomStartTag = 10000;