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

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

Snap for 6371019 from 6f2fc99f to mainline-release 

Change-Id: I077942e37c7aa4ca802240ecbe1b0237249b97ba
parents 2beaa14a 6f2fc99f

PREUPLOAD.cfg

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp 
               core/jni/

               libs/input/

               services/core/jni/

               services/incremental/



[Hook Scripts]

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}

apex/permission/service/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -48,5 +48,5 @@ java_library { 
    name: "service-permission-stubs",

    srcs: [":service-permission-stubs-srcs"],

    defaults: ["service-module-stubs-defaults"],

    visibility: ["//visibility:private"]

    visibility: ["//frameworks/base/services/core"]

}

api/test-current.txt

+7 −0
Original line number Diff line number Diff line
@@ -1504,6 +1504,13 @@ package android.media { 
    ctor public AudioRecordingConfiguration(int, int, int, android.media.AudioFormat, android.media.AudioFormat, int, String);

  }



  public class AudioSystem {

    method public static float getMasterBalance();

    method public static final int getNumStreamTypes();

    method public static int setMasterBalance(float);

    field public static final int STREAM_DEFAULT = -1; // 0xffffffff

  }



  public static final class AudioTrack.MetricsConstants {

    field public static final String ATTRIBUTES = "android.media.audiotrack.attributes";

    field public static final String CHANNEL_MASK = "android.media.audiotrack.channelMask";

cmds/statsd/src/logd/LogEvent.h

+0 −3
Original line number Diff line number Diff line
@@ -218,9 +218,6 @@ private: 
     * The below three variables are only valid during the execution of

     * parseBuffer. There are no guarantees about the state of these variables

     * before/after.

     *

     * TODO (b/150312423): These shouldn't be member variables. We should pass

     * them around as parameters.

     */

    uint8_t* mBuf;

    uint32_t mRemainingLen; // number of valid bytes left in the buffer being parsed

cmds/statsd/src/shell/ShellSubscriber.cpp

+0 −1
Original line number Diff line number Diff line
@@ -152,7 +152,6 @@ void ShellSubscriber::startPull(int64_t myToken) { 
                mPullerMgr->Pull(pullInfo.mPullerMatcher.atom_id(), uids, &data);

                VLOG("pulled %zu atoms with id %d", data.size(), pullInfo.mPullerMatcher.atom_id());



                // TODO(b/150969574): Don't write to a pipe while holding a lock.

                if (!writePulledAtomsLocked(data, pullInfo.mPullerMatcher)) {

                    mSubscriptionInfo->mClientAlive = false;

                    mSubscriptionShouldEnd.notify_one();