commit 08f2a7cd60f55617cd8ded687e68c6895067040f
author Vova Sharaienko <sharaienko@google.com> Thu Feb 09 10:40:19 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 09 10:40:19 2023 +0000
tree cfbf9a7dd40e339c286282d44473ca452557be01
parent 80ba3ae55f0fd559cffd3640dd5409987458c8b3
parent 7b2567bff5f9b321234e325d716ac2002ae19d13

Merge "statsd_testdrive: added support to look for atom id among extensions"

statsd/tools/localtools/src/com/android/statsd/shelltools/testdrive/TestDrive.java

diff --git a/statsd/tools/localtools/src/com/android/statsd/shelltools/testdrive/TestDrive.java b/statsd/tools/localtools/src/com/android/statsd/shelltools/testdrive/TestDrive.java
index a223674..501dc40 100644
--- a/statsd/tools/localtools/src/com/android/statsd/shelltools/testdrive/TestDrive.java
+++ b/statsd/tools/localtools/src/com/android/statsd/shelltools/testdrive/TestDrive.java
@@ -295,7 +295,8 @@
         }
 
         void addAtom(Integer atom, List<String> protoIncludes) {
-            if (Atom.getDescriptor().findFieldByNumber(atom) == null) {
+            if (Atom.getDescriptor().findFieldByNumber(atom) == null &&
+                Atom.getDescriptor().isExtensionNumber(atom) == false) {
                 // try to look in alternative locations
                 if (protoIncludes != null) {
                     boolean isAtomDefined = false;