Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Include the Subreason, if any, in ApplicationExitInfo.getDescription().""

Browse Source
This commit is contained in:
Sam Shen
2023-02-10 09:05:22 +00:00
committed by Android (Google) Code Review
parent 084e87ae82 9c3b68eec7
commit a621b10f7d
2 changed files with 20 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/app/ApplicationExitInfo.java
View File

@@ -734,22 +734,7 @@ public final class ApplicationExitInfo implements Parcelable {
* guarantees that the format is stable across devices or Android releases.</p>
*/
public @Nullable String getDescription() {
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();
return mDescription;
}
/**

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

@@ -711,6 +711,8 @@ public class ApplicationExitInfoTest {
null); // description
// Case 8: App1 gets "remove task"
final String app1Description = "remove task";
sleep(1);
final int app1IsolatedUidUser2 = 1099002; // isolated uid
final long app1Pss4 = 34343;
@@ -737,7 +739,7 @@ public class ApplicationExitInfoTest {
mAppExitInfoTracker.mIsolatedUidRecords.addIsolatedUid(app1IsolatedUidUser2, app1UidUser2);
noteAppKill(app, ApplicationExitInfo.REASON_OTHER,
ApplicationExitInfo.SUBREASON_REMOVE_TASK, null, now8);
ApplicationExitInfo.SUBREASON_UNKNOWN, app1Description, now8);
updateExitInfo(app, now8);
list.clear();
@@ -747,21 +749,21 @@ public class ApplicationExitInfoTest {
info = list.get(0);
verifyApplicationExitInfo(
info, // info
now8, // timestamp
app1PidUser2, // pid
app1IsolatedUidUser2, // uid
app1UidUser2, // packageUid
null, // definingUid
app1ProcessName, // processName
0, // connectionGroup
ApplicationExitInfo.REASON_OTHER, // reason
ApplicationExitInfo.SUBREASON_REMOVE_TASK, // subReason
0, // status
app1Pss4, // pss
app1Rss4, // rss
IMPORTANCE_CACHED, // importance
null); // description
info, // info
now8, // timestamp
app1PidUser2, // pid
app1IsolatedUidUser2, // uid
app1UidUser2, // packageUid
null, // definingUid
app1ProcessName, // processName
0, // connectionGroup
ApplicationExitInfo.REASON_OTHER, // reason
ApplicationExitInfo.SUBREASON_UNKNOWN, // subReason
0, // status
app1Pss4, // pss
app1Rss4, // rss
IMPORTANCE_CACHED, // importance
app1Description); // description
// App1 gets "too many empty"
final String app1Description2 = "too many empty";
@@ -1056,18 +1058,7 @@ public class ApplicationExitInfoTest {
if (importance != null) {
assertEquals(importance.intValue(), info.getImportance());
}
// 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) {
if (description != null) {
assertTrue(TextUtils.equals(description, info.getDescription()));
}
}