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

Commit e45d6f3d authored by Jing Ji's avatar Jing Ji Committed by Android (Google) Code Review
Browse files

Merge "Fix test failure in FrameworksServicesTests"

parents 1fc2ce15 593fb6b8

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

+3 −2
Original line number Diff line number Diff line
@@ -281,7 +281,8 @@ class ProcessErrorStateRecord { 
            EventLog.writeEvent(EventLogTags.AM_ANR, mApp.userId, pid, mApp.processName,

                    mApp.info.flags, annotation);



            if (mService.mTraceErrorLogger.isAddErrorIdEnabled()) {

            if (mService.mTraceErrorLogger != null

                    && mService.mTraceErrorLogger.isAddErrorIdEnabled()) {

                errorId = mService.mTraceErrorLogger.generateErrorId();

                mService.mTraceErrorLogger.addErrorIdToTrace(mApp.processName, errorId);

            } else {
@@ -427,7 +428,7 @@ class ProcessErrorStateRecord { 
        float loadingProgress = 1;

        IncrementalMetrics incrementalMetrics = null;

        final PackageManagerInternal packageManagerInternal = mService.getPackageManagerInternal();

        if (mApp.info != null && mApp.info.packageName != null) {

        if (mApp.info != null && mApp.info.packageName != null && packageManagerInternal != null) {

            IncrementalStatesInfo incrementalStatesInfo =

                    packageManagerInternal.getIncrementalStatesInfo(

                            mApp.info.packageName, mApp.uid, mApp.userId);

services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java

+3 −0
Original line number Diff line number Diff line
@@ -470,6 +470,8 @@ public class ActivityManagerTest { 
            sendCommand(COMMAND_UNBIND_SERVICE, TEST_APP2, TEST_APP1, null);

            runShellCommand("cmd deviceidle whitelist -" + TEST_APP1);

            runShellCommand("cmd deviceidle whitelist -" + TEST_APP2);

            am.forceStopPackage(TEST_APP1);

            am.forceStopPackage(TEST_APP2);

        }

    }
@@ -700,6 +702,7 @@ public class ActivityManagerTest { 
            am.removeOnUidImportanceListener(uidListener1);

            am.removeOnUidImportanceListener(uidListener2);

            am.removeOnUidImportanceListener(uidListener3);

            am.forceStopPackage(TEST_APP1);

        }

    }