commit aefb1daf2e935c14f5be0f97bb140921702a793d
author Patrick Rohr <prohr@google.com> Thu Jan 27 10:31:02 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 27 10:31:02 2022 +0000
tree a536b868134569f2b5ac6f68f5a80bbc63edbb69
parent 6a7047aba12497a6d0f16a3490ec1ad94b560cd2
parent 977cc1078fab47209faa9c198a0ae12149a1f678

Merge "Fix add missing loadLibrary to TcUtils"

common/Android.bp

diff --git a/common/Android.bp b/common/Android.bp
index ba545ea..13c6cb0 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -248,6 +248,7 @@
         "//frameworks/libs/net/common/tests:__subpackages__",
         "//frameworks/libs/net/common/device",
         "//packages/modules/Wifi/framework/tests:__subpackages__",
+        "//packages/apps/Settings",
     ],
     lint: { strict_updatability_linting: true },
 }

common/device/com/android/net/module/util/Struct.java

diff --git a/common/device/com/android/net/module/util/Struct.java b/common/device/com/android/net/module/util/Struct.java
index f4d4163..ac9dc54 100644
--- a/common/device/com/android/net/module/util/Struct.java
+++ b/common/device/com/android/net/module/util/Struct.java
@@ -731,6 +731,16 @@
         return sb.toString();
     }
 
+    /** A simple Struct which only contains a u8 field. */
+    public static class U8 extends Struct {
+        @Struct.Field(order = 0, type = Struct.Type.U8)
+        public final short val;
+
+        public U8(final short val) {
+            this.val = val;
+        }
+    }
+
     public static class U32 extends Struct {
         @Struct.Field(order = 0, type = Struct.Type.U32)
         public final long val;