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

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

Merge cherrypicks of [14988379, 14988380, 14984749, 14988513, 14988333,... 

Merge cherrypicks of [14988379, 14988380, 14984749, 14988513, 14988333, 14988334, 14988398, 14985920, 14988097, 14988381, 14985921, 14988891, 14987186, 14988382, 14989110, 14988514, 14988515, 14988652, 14988653, 14988654, 14988399, 14988400, 14988401, 14984579, 14987188, 14988532, 14988533, 14988402, 14983067, 14983068, 14974447, 14974448, 14988656, 14988535, 14988536, 14988537, 14988538, 14988539, 14988540, 14988541] into rvc-qpr3-release

Change-Id: Idd585049e2143a8f672920e1099c5f081649d0c0
parents 5d3dfbad f968bde0

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(

services/core/java/com/android/server/am/ActiveServices.java

+12 −1
Original line number Diff line number Diff line
@@ -935,7 +935,18 @@ public final class ActiveServices { 
    void killMisbehavingService(ServiceRecord r,

            int appUid, int appPid, String localPackageName) {

        synchronized (mAm) {

            if (!r.destroying) {

                // This service is still alive, stop it.

                stopServiceLocked(r);

            } else {

                // Check if there is another instance of it being started in parallel,

                // if so, stop that too to avoid spamming the system.

                final ServiceMap smap = getServiceMapLocked(r.userId);

                final ServiceRecord found = smap.mServicesByInstanceName.remove(r.instanceName);

                if (found != null) {

                    stopServiceLocked(found);

                }

            }

            mAm.crashApplication(appUid, appPid, localPackageName, -1,

                    "Bad notification for startForeground", true /*force*/);

        }

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

+5 −1
Original line number Diff line number Diff line
@@ -3362,7 +3362,11 @@ public class StatsPullAtomService extends SystemService { 
    int pullFaceSettingsLocked(int atomTag, List<StatsEvent> pulledData) {

        final long callingToken = Binder.clearCallingIdentity();

        try {

            List<UserInfo> users = mContext.getSystemService(UserManager.class).getUsers();

            UserManager manager = mContext.getSystemService(UserManager.class);

            if (manager == null) {

                return StatsManager.PULL_SKIP;

            }

            List<UserInfo> users = manager.getUsers();

            int numUsers = users.size();

            FaceManager faceManager = mContext.getSystemService(FaceManager.class);

telephony/java/android/telephony/SubscriptionInfo.java

+7 −0
Original line number Diff line number Diff line
@@ -566,6 +566,13 @@ public class SubscriptionInfo implements Parcelable { 
        return mGroupUUID;

    }



    /**

     * @hide

     */

    public void clearGroupUuid() {

        this.mGroupUUID = null;

    }



    /**

     * @hide

     */