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

Merge "Fix NPE in ShutdownCheckPoints dumpDetails method." into udc-dev

Browse Source
This commit is contained in:
Lais Andrade
2023-04-12 11:18:18 +00:00
committed by Android (Google) Code Review
parent f5f12930ff 1cc9263d8f
commit b2c2f64197
2 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/power/ShutdownCheckPoints.java
View File

@@ -295,11 +295,18 @@ public final class ShutdownCheckPoints {
@Nullable
String getProcessName() {
try {
List<ActivityManager.RunningAppProcessInfo> runningProcesses =
mActivityManager.getRunningAppProcesses();
for (ActivityManager.RunningAppProcessInfo processInfo : runningProcesses) {
if (processInfo.pid == mCallerProcessId) {
return processInfo.processName;
List<ActivityManager.RunningAppProcessInfo> runningProcesses = null;
if (mActivityManager != null) {
runningProcesses = mActivityManager.getRunningAppProcesses();
} else {
Slog.v(TAG, "No ActivityManager available to find process name with pid="
+ mCallerProcessId);
}
if (runningProcesses != null) {
for (ActivityManager.RunningAppProcessInfo processInfo : runningProcesses) {
if (processInfo.pid == mCallerProcessId) {
return processInfo.processName;
}
}
}
} catch (RemoteException e) {

30
services/tests/servicestests/src/com/android/server/power/ShutdownCheckPointsTest.java
View File

@@ -103,12 +103,36 @@ public class ShutdownCheckPointsTest {
}
@Test
public void testCallerProcessBinderEntry() throws RemoteException {
public void testCallerProcessBinderEntries() throws RemoteException {
List<ActivityManager.RunningAppProcessInfo> runningAppProcessInfos = new ArrayList<>();
runningAppProcessInfos.add(
new ActivityManager.RunningAppProcessInfo("process_name", 1, new String[0]));
when(mActivityManager.getRunningAppProcesses()).thenReturn(runningAppProcessInfos);
mTestInjector.setCurrentTime(1000);
// Matching pid in getRunningAppProcesses
mInstance.recordCheckPointInternal(1, "reason1");
// Mising pid in getRunningAppProcesses
mInstance.recordCheckPointInternal(2, "reason2");
assertEquals(
"Shutdown request from BINDER for reason reason1 "
+ "at 1970-01-01 00:00:01.000 UTC (epoch=1000)\n"
+ "com.android.server.power.ShutdownCheckPointsTest"
+ ".testCallerProcessBinderEntries\n"
+ "From process process_name (pid=1)\n\n"
+ "Shutdown request from BINDER for reason reason2 "
+ "at 1970-01-01 00:00:01.000 UTC (epoch=1000)\n"
+ "com.android.server.power.ShutdownCheckPointsTest"
+ ".testCallerProcessBinderEntries\n"
+ "From process ? (pid=2)\n\n",
dumpToString());
}
@Test
public void testNullCallerProcessBinderEntries() throws RemoteException {
when(mActivityManager.getRunningAppProcesses()).thenReturn(null);
mTestInjector.setCurrentTime(1000);
mInstance.recordCheckPointInternal(1, "reason1");
@@ -116,8 +140,8 @@ public class ShutdownCheckPointsTest {
"Shutdown request from BINDER for reason reason1 "
+ "at 1970-01-01 00:00:01.000 UTC (epoch=1000)\n"
+ "com.android.server.power.ShutdownCheckPointsTest"
+ ".testCallerProcessBinderEntry\n"
+ "From process process_name (pid=1)\n\n",
+ ".testNullCallerProcessBinderEntries\n"
+ "From process ? (pid=1)\n\n",
dumpToString());
}