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

Commit 661a05dd authored by android-build-team Robot's avatar android-build-team Robot Committed by Anis Assi
Browse files

Merge cherrypicks of [14947151, 14946920, 14946921, 14946922, 14947510,... 

Merge cherrypicks of [14947151, 14946920, 14946921, 14946922, 14947510, 14947511, 14947512, 14947530, 14947531, 14946923, 14947513] into security-aosp-rvc-release

Change-Id: I3595691745142f18d277278becff8444e8410229
parents 6ded5062 79d7528e

cmds/statsd/src/guardrail/StatsdStats.cpp

+4 −1
Original line number Diff line number Diff line
@@ -459,9 +459,12 @@ void StatsdStats::notePullExceedMaxDelay(int pullAtomId) { 
void StatsdStats::noteAtomLogged(int atomId, int32_t timeSec) {

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



    if (atomId <= kMaxPushedAtomId) {

    if (atomId >= 0 && atomId <= kMaxPushedAtomId) {

        mPushedAtomStats[atomId]++;

    } else {

        if (atomId < 0) {

            android_errorWriteLog(0x534e4554, "187957589");

        }

        if (mNonPlatformPushedAtomStats.size() < kMaxNonPlatformPushedAtoms) {

            mNonPlatformPushedAtomStats[atomId]++;

        }

packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java

+5 −0
Original line number Diff line number Diff line
@@ -322,6 +322,11 @@ public class ExternalStorageProvider extends FileSystemProvider { 
                return true;

            }



            if (TextUtils.equals(Environment.DIRECTORY_ANDROID.toLowerCase(),

                    path.toLowerCase())) {

                return true;

            }



            return false;

        } catch (IOException e) {

            throw new IllegalArgumentException(