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

Commit d8db7e4b authored by Carmen Jackson's avatar Carmen Jackson Committed by Android (Google) Code Review
Browse files

Re-submitting "Include the Subreason, if any, in ApplicationExitInfo.getDescription()."" 

This reverts commit 9c3b68ee.

Reason for revert: Included update to failed CTS test in topic.

Change-Id: Iea6a5345ef97ea6b3d302b3729236f4ee7b7ccd2
parent 9c3b68ee

core/java/android/app/ApplicationExitInfo.java

+16 −1
Original line number Original line Diff line number Diff line
@@ -706,7 +706,22 @@ public final class ApplicationExitInfo implements Parcelable { 
     * guarantees that the format is stable across devices or Android releases.</p>

     * guarantees that the format is stable across devices or Android releases.</p>

     */

     */

    public @Nullable String getDescription() {

    public @Nullable String getDescription() {

        return mDescription;

        final StringBuilder sb = new StringBuilder();



        if (mSubReason != SUBREASON_UNKNOWN) {

            sb.append("[");

            sb.append(subreasonToString(mSubReason));

            sb.append("]");

        }



        if (!TextUtils.isEmpty(mDescription)) {

            if (sb.length() > 0) {

                sb.append(" ");

            }

            sb.append(mDescription);

        }



        return sb.toString();

    }

    }





    /**

    /**

services/tests/mockingservicestests/src/com/android/server/am/ApplicationExitInfoTest.java

+28 −19
Original line number Original line Diff line number Diff line
@@ -711,8 +711,6 @@ public class ApplicationExitInfoTest { 
                null);                                // description

                null);                                // description





        // Case 8: App1 gets "remove task"

        // Case 8: App1 gets "remove task"

        final String app1Description = "remove task";



        sleep(1);

        sleep(1);

        final int app1IsolatedUidUser2 = 1099002; // isolated uid

        final int app1IsolatedUidUser2 = 1099002; // isolated uid

        final long app1Pss4 = 34343;

        final long app1Pss4 = 34343;
@@ -739,7 +737,7 @@ public class ApplicationExitInfoTest { 




        mAppExitInfoTracker.mIsolatedUidRecords.addIsolatedUid(app1IsolatedUidUser2, app1UidUser2);

        mAppExitInfoTracker.mIsolatedUidRecords.addIsolatedUid(app1IsolatedUidUser2, app1UidUser2);

        noteAppKill(app, ApplicationExitInfo.REASON_OTHER,

        noteAppKill(app, ApplicationExitInfo.REASON_OTHER,

                ApplicationExitInfo.SUBREASON_UNKNOWN, app1Description, now8);

                ApplicationExitInfo.SUBREASON_REMOVE_TASK, null, now8);





        updateExitInfo(app, now8);

        updateExitInfo(app, now8);

        list.clear();

        list.clear();
@@ -758,12 +756,12 @@ public class ApplicationExitInfoTest { 
                app1ProcessName,                            // processName

                app1ProcessName,                            // processName

                0,                                          // connectionGroup

                0,                                          // connectionGroup

                ApplicationExitInfo.REASON_OTHER,           // reason

                ApplicationExitInfo.REASON_OTHER,           // reason

                ApplicationExitInfo.SUBREASON_UNKNOWN,    // subReason

                ApplicationExitInfo.SUBREASON_REMOVE_TASK,  // subReason

                0,                                          // status

                0,                                          // status

                app1Pss4,                                   // pss

                app1Pss4,                                   // pss

                app1Rss4,                                   // rss

                app1Rss4,                                   // rss

                IMPORTANCE_CACHED,                          // importance

                IMPORTANCE_CACHED,                          // importance

                app1Description);                         // description

                null);                                      // description





        // App1 gets "too many empty"

        // App1 gets "too many empty"

        final String app1Description2 = "too many empty";

        final String app1Description2 = "too many empty";
@@ -1058,7 +1056,18 @@ public class ApplicationExitInfoTest { 
        if (importance != null) {

        if (importance != null) {

            assertEquals(importance.intValue(), info.getImportance());

            assertEquals(importance.intValue(), info.getImportance());

        }

        }

        if (description != null) {



        // info.getDescription returns a combination of subReason & description

        if ((subReason != null) && (subReason != ApplicationExitInfo.SUBREASON_UNKNOWN)

                && (description != null)) {

            assertTrue(TextUtils.equals(

                    "[" + info.subreasonToString(subReason) + "] " + description,

                    info.getDescription()));

        } else if ((subReason != null) && (subReason != ApplicationExitInfo.SUBREASON_UNKNOWN)) {

            assertTrue(TextUtils.equals(

                    "[" + info.subreasonToString(subReason) + "]",

                    info.getDescription()));

        } else if (description != null) {

            assertTrue(TextUtils.equals(description, info.getDescription()));

            assertTrue(TextUtils.equals(description, info.getDescription()));

        }

        }

    }

    }