From c14ac728a89bf124fec0a1d5bcf34dfdec2c52cd Mon Sep 17 00:00:00 2001 From: Treehugger Robot Date: Fri, 15 May 2020 09:54:29 +0000 Subject: Fix dumpVersion for IpMemoryStore on Q IpMemoryStore was considered part of the system server AIDLs in Q, so its version must be part of the system server versions set. This fixes a regression on testDumpVersion_Q. Bug: 137328719 Test: atest NetworkStackTests:NetworkStackServiceTest on a Q device Change-Id: I86cb5af059fe81fe9f10555d57096164665205db Merged-In: I86cb5af059fe81fe9f10555d57096164665205db (cherry picked from commit 8b5cead3df4489a0fd8d9950761a387d2c8d02b4) --- src/com/android/server/NetworkStackService.java | 1 + 1 file changed, 1 insertion(+) (limited to 'src/com/android/server/NetworkStackService.java') diff --git a/src/com/android/server/NetworkStackService.java b/src/com/android/server/NetworkStackService.java index c001f80..3d57134 100644 --- a/src/com/android/server/NetworkStackService.java +++ b/src/com/android/server/NetworkStackService.java @@ -503,6 +503,7 @@ public class NetworkStackService extends Service { synchronized (mAidlVersions) { for (AidlVersion version : mAidlVersions) { switch (version.mKey) { + case AIDL_KEY_IPMEMORYSTORE: case AIDL_KEY_NETWORKSTACK: systemServerVersions.add(version.mVersion); break; -- cgit v1.2.3