[WifiCoex] Calculate UnsafeChannels on cell DL and override

Register CoexManager to listen on PhysicalChannelConfig changes and run
the coex algorithms on the DL channels and override list. UL channels
are not yet supported in PhysicalChannelConfig and will be added in a
later CL. This will only affect neighboring UnsafeChannels since
harmonic/intermod depend on the UL.

Bug: 153651001
Test: atest CoexManagerTest
Change-Id: If34e63393f4b0c1f05d8abc2094df8a77e9675c1

2 files changed, 43 insertions, 43 deletions

diff --git a/service/coex-table-parser/Android.bp b/service/coex-table-parser/Android.bp
index 2e4d6559fd..15c4f31789 100644
--- a/service/coex-table-parser/Android.bp
+++ b/service/coex-table-parser/Android.bp
@@ -16,5 +16,5 @@
 xsd_config {
     name: "coex-table-parser",
     srcs: ["coex_table.xsd"],
-    package_name: "com.android.server.wifi.coex.table",
+    package_name: "com.android.server.wifi.coex",
 }
diff --git a/service/coex-table-parser/api/current.txt b/service/coex-table-parser/api/current.txt
index 1226f290ec..0b0d787f7c 100644
--- a/service/coex-table-parser/api/current.txt
+++ b/service/coex-table-parser/api/current.txt
@@ -1,5 +1,5 @@
 // Signature format: 2.0
-package com.android.server.wifi.coex.table {
+package com.android.server.wifi.coex {
 
   public class DefaultChannels {
     ctor public DefaultChannels();
@@ -12,15 +12,15 @@ package com.android.server.wifi.coex.table {
   public class Entry {
     ctor public Entry();
     method public int getBand();
-    method public com.android.server.wifi.coex.table.Override getOverride();
-    method public com.android.server.wifi.coex.table.Params getParams();
+    method public com.android.server.wifi.coex.Override getOverride();
+    method public com.android.server.wifi.coex.Params getParams();
     method public int getPowerCapDbm();
-    method public com.android.server.wifi.coex.table.RatType getRat();
+    method public com.android.server.wifi.coex.RatType getRat();
     method public void setBand(int);
-    method public void setOverride(com.android.server.wifi.coex.table.Override);
-    method public void setParams(com.android.server.wifi.coex.table.Params);
+    method public void setOverride(com.android.server.wifi.coex.Override);
+    method public void setParams(com.android.server.wifi.coex.Params);
     method public void setPowerCapDbm(int);
-    method public void setRat(com.android.server.wifi.coex.table.RatType);
+    method public void setRat(com.android.server.wifi.coex.RatType);
   }
 
   public class HarmonicParams {
@@ -51,75 +51,75 @@ package com.android.server.wifi.coex.table {
 
   public class Override {
     ctor public Override();
-    method public com.android.server.wifi.coex.table.Override2g getOverride2g();
-    method public com.android.server.wifi.coex.table.Override5g getOverride5g();
-    method public void setOverride2g(com.android.server.wifi.coex.table.Override2g);
-    method public void setOverride5g(com.android.server.wifi.coex.table.Override5g);
+    method public com.android.server.wifi.coex.Override2g getOverride2g();
+    method public com.android.server.wifi.coex.Override5g getOverride5g();
+    method public void setOverride2g(com.android.server.wifi.coex.Override2g);
+    method public void setOverride5g(com.android.server.wifi.coex.Override5g);
   }
 
   public class Override2g {
     ctor public Override2g();
-    method public java.util.List<com.android.server.wifi.coex.table.OverrideCategory2g> getCategory();
+    method public java.util.List<com.android.server.wifi.coex.OverrideCategory2g> getCategory();
     method public java.util.List<java.lang.Integer> getChannel();
   }
 
   public class Override5g {
     ctor public Override5g();
-    method public java.util.List<com.android.server.wifi.coex.table.OverrideCategory5g> getCategory();
+    method public java.util.List<com.android.server.wifi.coex.OverrideCategory5g> getCategory();
     method public java.util.List<java.lang.Integer> getChannel();
   }
 
   public enum OverrideCategory2g {
     method public String getRawName();
-    enum_constant public static final com.android.server.wifi.coex.table.OverrideCategory2g all;
+    enum_constant public static final com.android.server.wifi.coex.OverrideCategory2g all;
   }
 
   public enum OverrideCategory5g {
     method public String getRawName();
-    enum_constant public static final com.android.server.wifi.coex.table.OverrideCategory5g _160Mhz;
-    enum_constant public static final com.android.server.wifi.coex.table.OverrideCategory5g _20Mhz;
-    enum_constant public static final com.android.server.wifi.coex.table.OverrideCategory5g _40Mhz;
-    enum_constant public static final com.android.server.wifi.coex.table.OverrideCategory5g _80Mhz;
-    enum_constant public static final com.android.server.wifi.coex.table.OverrideCategory5g all;
+    enum_constant public static final com.android.server.wifi.coex.OverrideCategory5g _160Mhz;
+    enum_constant public static final com.android.server.wifi.coex.OverrideCategory5g _20Mhz;
+    enum_constant public static final com.android.server.wifi.coex.OverrideCategory5g _40Mhz;
+    enum_constant public static final com.android.server.wifi.coex.OverrideCategory5g _80Mhz;
+    enum_constant public static final com.android.server.wifi.coex.OverrideCategory5g all;
   }
 
   public class Params {
     ctor public Params();
-    method public com.android.server.wifi.coex.table.DefaultChannels getDefaultChannels();
-    method public com.android.server.wifi.coex.table.HarmonicParams getHarmonicParams2g();
-    method public com.android.server.wifi.coex.table.HarmonicParams getHarmonicParams5g();
-    method public com.android.server.wifi.coex.table.IntermodParams getIntermodParams2g();
-    method public com.android.server.wifi.coex.table.IntermodParams getIntermodParams5g();
-    method public com.android.server.wifi.coex.table.NeighborThresholds getNeighborThresholds();
-    method public void setDefaultChannels(com.android.server.wifi.coex.table.DefaultChannels);
-    method public void setHarmonicParams2g(com.android.server.wifi.coex.table.HarmonicParams);
-    method public void setHarmonicParams5g(com.android.server.wifi.coex.table.HarmonicParams);
-    method public void setIntermodParams2g(com.android.server.wifi.coex.table.IntermodParams);
-    method public void setIntermodParams5g(com.android.server.wifi.coex.table.IntermodParams);
-    method public void setNeighborThresholds(com.android.server.wifi.coex.table.NeighborThresholds);
+    method public com.android.server.wifi.coex.DefaultChannels getDefaultChannels();
+    method public com.android.server.wifi.coex.HarmonicParams getHarmonicParams2g();
+    method public com.android.server.wifi.coex.HarmonicParams getHarmonicParams5g();
+    method public com.android.server.wifi.coex.IntermodParams getIntermodParams2g();
+    method public com.android.server.wifi.coex.IntermodParams getIntermodParams5g();
+    method public com.android.server.wifi.coex.NeighborThresholds getNeighborThresholds();
+    method public void setDefaultChannels(com.android.server.wifi.coex.DefaultChannels);
+    method public void setHarmonicParams2g(com.android.server.wifi.coex.HarmonicParams);
+    method public void setHarmonicParams5g(com.android.server.wifi.coex.HarmonicParams);
+    method public void setIntermodParams2g(com.android.server.wifi.coex.IntermodParams);
+    method public void setIntermodParams5g(com.android.server.wifi.coex.IntermodParams);
+    method public void setNeighborThresholds(com.android.server.wifi.coex.NeighborThresholds);
   }
 
   public enum RatType {
     method public String getRawName();
-    enum_constant public static final com.android.server.wifi.coex.table.RatType LTE;
-    enum_constant public static final com.android.server.wifi.coex.table.RatType NR;
+    enum_constant public static final com.android.server.wifi.coex.RatType LTE;
+    enum_constant public static final com.android.server.wifi.coex.RatType NR;
   }
 
   public class Table {
     ctor public Table();
-    method public java.util.List<com.android.server.wifi.coex.table.Entry> getEntry();
+    method public java.util.List<com.android.server.wifi.coex.Entry> getEntry();
   }
 
   public class XmlParser {
     ctor public XmlParser();
-    method public static com.android.server.wifi.coex.table.DefaultChannels readDefaultChannels(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;
-    method public static com.android.server.wifi.coex.table.Entry readEntry(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;
-    method public static com.android.server.wifi.coex.table.NeighborThresholds readNeighborThresholds(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;
-    method public static com.android.server.wifi.coex.table.Override readOverride(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;
-    method public static com.android.server.wifi.coex.table.Override2g readOverride2g(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;
-    method public static com.android.server.wifi.coex.table.Override5g readOverride5g(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;
-    method public static com.android.server.wifi.coex.table.Params readParams(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;
-    method public static com.android.server.wifi.coex.table.Table readTable(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+    method public static com.android.server.wifi.coex.DefaultChannels readDefaultChannels(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+    method public static com.android.server.wifi.coex.Entry readEntry(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+    method public static com.android.server.wifi.coex.NeighborThresholds readNeighborThresholds(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+    method public static com.android.server.wifi.coex.Override readOverride(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+    method public static com.android.server.wifi.coex.Override2g readOverride2g(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+    method public static com.android.server.wifi.coex.Override5g readOverride5g(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+    method public static com.android.server.wifi.coex.Params readParams(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+    method public static com.android.server.wifi.coex.Table readTable(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;
     method public static String readText(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
     method public static void skip(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
   }