From 882189c984ec370da222f0b95c16d30d11bc0ad5 Mon Sep 17 00:00:00 2001
From: Jimmy Chen <jimmycmchen@google.com>
Date: Fri, 27 Sep 2019 14:49:46 +0800
Subject: wifi: move wpa_supplicant VINTF definition to wpa_supplicant module

Bug: 36505680
Test: builds
Change-Id: I6bd560f813f8160fef6031775cfdeb0dae4c88ff
---
 manifest.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index d2d3477..24ec658 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -97,15 +97,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.wifi.supplicant</name>
-        <transport>hwbinder</transport>
-        <version>1.2</version>
-        <interface>
-            <name>ISupplicant</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.wifi.hostapd</name>
         <transport>hwbinder</transport>
-- 
cgit v1.2.3


From 0a3f037b1c421a319b555b7cf9890ccae415d620 Mon Sep 17 00:00:00 2001
From: lesl <lesl@google.com>
Date: Fri, 6 Dec 2019 19:05:27 +0800
Subject: Wifi: Remove hostapd hidl entry from manifest.xml

This CL removes the definition for the hostapd hidl interface from
manifest.xml and rely on vint-fragements entry.
This is to avoid the need to modify the revision in future

Bug: 145780363
Test: builds and wifi softap works
Change-Id: I557402949bd473efb0d2645265376fb30b4d8e74
---
 manifest.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 24ec658..1375db4 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -97,15 +97,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.wifi.hostapd</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>IHostapd</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.keymaster</name>
         <transport>hwbinder</transport>
-- 
cgit v1.2.3


From 6418bdeb46f640a5a6d1e190b7d65c8869911316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
Date: Fri, 24 Jan 2020 05:26:30 -0800
Subject: netd does not require and should not have module loading privs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Any required functionally should be built into the kernel.

Test: NA
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I500d0079ebd0a49a5be5419bad48502c19b4b7df
---
 sepolicy/netd.te | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 sepolicy/netd.te

diff --git a/sepolicy/netd.te b/sepolicy/netd.te
deleted file mode 100644
index 2e954bb..0000000
--- a/sepolicy/netd.te
+++ /dev/null
@@ -1,3 +0,0 @@
-# audit2allow
-allow netd kernel:system module_request;
-allow netd self:capability sys_module;
-- 
cgit v1.2.3


From 0cf8ff03bbdacd49e65519bb088e5c9f3a7d6082 Mon Sep 17 00:00:00 2001
From: John Stultz <john.stultz@linaro.org>
Date: Wed, 26 Feb 2020 22:34:32 +0000
Subject: db845c: Sort manifest.xml entries

Sort the manifest.xml entries to make it easier to diff
against other devices.

Change-Id: I4a8dfd4a17aa5d8ea343e851b50f0d7da49de033
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
 manifest.xml | 70 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 897f183..632f81e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,28 +1,28 @@
 <manifest version="1.0" type="device" target-level="2">
     <hal format="hidl">
-        <name>android.hardware.graphics.allocator</name>
+        <name>android.hardware.audio</name>
         <transport>hwbinder</transport>
-        <version>2.0</version>
+        <version>4.0</version>
         <interface>
-            <name>IAllocator</name>
+            <name>IDevicesFactory</name>
             <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.graphics.composer</name>
+        <name>android.hardware.audio.effect</name>
         <transport>hwbinder</transport>
-        <version>2.2</version>
+        <version>4.0</version>
         <interface>
-            <name>IComposer</name>
+            <name>IEffectsFactory</name>
             <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.graphics.mapper</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>2.1</version>
+        <name>android.hardware.bluetooth</name>
+        <transport>hwbinder</transport>
+        <version>1.1</version>
         <interface>
-            <name>IMapper</name>
+            <name>IBluetoothHci</name>
             <instance>default</instance>
         </interface>
     </hal>
@@ -49,60 +49,60 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.media.omx</name>
+        <name>android.hardware.graphics.allocator</name>
         <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IOmx</name>
-            <instance>default</instance>
-        </interface>
+        <version>2.0</version>
         <interface>
-            <name>IOmxStore</name>
+            <name>IAllocator</name>
             <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.soundtrigger</name>
+        <name>android.hardware.graphics.composer</name>
         <transport>hwbinder</transport>
-        <version>2.0</version>
+        <version>2.2</version>
         <interface>
-            <name>ISoundTriggerHw</name>
+            <name>IComposer</name>
             <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.audio</name>
-        <transport>hwbinder</transport>
-        <version>4.0</version>
+        <name>android.hardware.graphics.mapper</name>
+        <transport arch="32+64">passthrough</transport>
+        <version>2.1</version>
         <interface>
-            <name>IDevicesFactory</name>
+            <name>IMapper</name>
             <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.audio.effect</name>
+        <name>android.hardware.health</name>
         <transport>hwbinder</transport>
-        <version>4.0</version>
+        <version>2.0</version>
         <interface>
-            <name>IEffectsFactory</name>
+            <name>IHealth</name>
             <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.bluetooth</name>
+        <name>android.hardware.keymaster</name>
         <transport>hwbinder</transport>
-        <version>1.1</version>
+        <version>3.0</version>
         <interface>
-            <name>IBluetoothHci</name>
+            <name>IKeymasterDevice</name>
             <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.keymaster</name>
+        <name>android.hardware.media.omx</name>
         <transport>hwbinder</transport>
-        <version>3.0</version>
+        <version>1.0</version>
         <interface>
-            <name>IKeymasterDevice</name>
+            <name>IOmx</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IOmxStore</name>
             <instance>default</instance>
         </interface>
     </hal>
@@ -116,11 +116,11 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.health</name>
+        <name>android.hardware.soundtrigger</name>
         <transport>hwbinder</transport>
         <version>2.0</version>
         <interface>
-            <name>IHealth</name>
+            <name>ISoundTriggerHw</name>
             <instance>default</instance>
         </interface>
     </hal>
-- 
cgit v1.2.3