From eda5d30035fb24e5260b189bd51115acf8e58b8b Mon Sep 17 00:00:00 2001
From: markchien <markchien@google.com>
Date: Wed, 18 Dec 2019 17:47:26 +0800
Subject: [PATCH] Change Tethering package name

".apex" is easy to confuse.
Rename as below:
apex: com.android.tethering.apex -> com.android.tethering
apk: com.android.tethering -> com.android.networkstack.tethering

Bug: 146471733
Test: build

Change-Id: I2c7647abb996539a3af6cfe0e0214a5e8927c0d6
---
 Tethering/AndroidManifest.xml                 |   2 +-
 Tethering/AndroidManifestBase.xml             |   2 +-
 Tethering/AndroidManifest_InProcess.xml       |   2 +-
 Tethering/apex/Android.bp                     |  14 ++---
 Tethering/apex/AndroidManifest.xml            |   2 +-
 .../apex/com.android.tethering.apex.avbpubkey | Bin 1032 -> 0 bytes
 Tethering/apex/com.android.tethering.apex.pem |  51 ------------------
 Tethering/apex/com.android.tethering.apex.pk8 | Bin 2375 -> 0 bytes
 .../apex/com.android.tethering.apex.x509.pem  |  36 -------------
 .../apex/com.android.tethering.avbpubkey      | Bin 0 -> 1032 bytes
 Tethering/apex/com.android.tethering.pem      |  51 ++++++++++++++++++
 Tethering/apex/com.android.tethering.pk8      | Bin 0 -> 2375 bytes
 Tethering/apex/com.android.tethering.x509.pem |  35 ++++++++++++
 Tethering/apex/manifest.json                  |   2 +-
 .../connectivity/tethering/Tethering.java     |   2 +-
 Tethering/tests/unit/AndroidManifest.xml      |   4 +-
 16 files changed, 101 insertions(+), 102 deletions(-)
 delete mode 100644 Tethering/apex/com.android.tethering.apex.avbpubkey
 delete mode 100644 Tethering/apex/com.android.tethering.apex.pem
 delete mode 100644 Tethering/apex/com.android.tethering.apex.pk8
 delete mode 100644 Tethering/apex/com.android.tethering.apex.x509.pem
 create mode 100644 Tethering/apex/com.android.tethering.avbpubkey
 create mode 100644 Tethering/apex/com.android.tethering.pem
 create mode 100644 Tethering/apex/com.android.tethering.pk8
 create mode 100644 Tethering/apex/com.android.tethering.x509.pem

diff --git a/Tethering/AndroidManifest.xml b/Tethering/AndroidManifest.xml
index 1430ed00aa..8ba05df99e 100644
--- a/Tethering/AndroidManifest.xml
+++ b/Tethering/AndroidManifest.xml
@@ -17,7 +17,7 @@
  */
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.tethering"
+          package="com.android.networkstack.tethering"
           android:sharedUserId="android.uid.networkstack">
     <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" />
 
diff --git a/Tethering/AndroidManifestBase.xml b/Tethering/AndroidManifestBase.xml
index dc013da338..fa85f66489 100644
--- a/Tethering/AndroidManifestBase.xml
+++ b/Tethering/AndroidManifestBase.xml
@@ -17,7 +17,7 @@
  */
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.tethering"
+          package="com.android.networkstack.tethering"
           android:versionCode="1"
           android:versionName="R-initial">
     <application
diff --git a/Tethering/AndroidManifest_InProcess.xml b/Tethering/AndroidManifest_InProcess.xml
index 28d405c313..029b6c3313 100644
--- a/Tethering/AndroidManifest_InProcess.xml
+++ b/Tethering/AndroidManifest_InProcess.xml
@@ -17,7 +17,7 @@
  */
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.tethering.inprocess"
+          package="com.android.networkstack.tethering.inprocess"
           android:sharedUserId="android.uid.system"
           android:process="system">
     <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" />
diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index bca01ebdf8..af6af93650 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -15,21 +15,21 @@
 //
 
 apex {
-    name: "com.android.tethering.apex",
+    name: "com.android.tethering",
     apps: ["Tethering"],
     manifest: "manifest.json",
-    key: "com.android.tethering.apex.key",
+    key: "com.android.tethering.key",
 
     androidManifest: "AndroidManifest.xml",
 }
 
 apex_key {
-    name: "com.android.tethering.apex.key",
-    public_key: "com.android.tethering.apex.avbpubkey",
-    private_key: "com.android.tethering.apex.pem",
+    name: "com.android.tethering.key",
+    public_key: "com.android.tethering.avbpubkey",
+    private_key: "com.android.tethering.pem",
 }
 
 android_app_certificate {
-    name: "com.android.tethering.apex.certificate",
-    certificate: "com.android.tethering.apex",
+    name: "com.android.tethering.certificate",
+    certificate: "com.android.tethering",
 }
diff --git a/Tethering/apex/AndroidManifest.xml b/Tethering/apex/AndroidManifest.xml
index 7769b799b6..5c35c51dc7 100644
--- a/Tethering/apex/AndroidManifest.xml
+++ b/Tethering/apex/AndroidManifest.xml
@@ -15,7 +15,7 @@
  * limitations under the License.
  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.android.tethering.apex">
+  package="com.android.tethering">
   <!-- APEX does not have classes.dex -->
   <application android:hasCode="false" />
   <!-- b/145383354: Current minSdk is locked to Q for development cycle, lock it to next version
diff --git a/Tethering/apex/com.android.tethering.apex.avbpubkey b/Tethering/apex/com.android.tethering.apex.avbpubkey
deleted file mode 100644
index 9c8711161547d86c04112a6b5f09e48b6ed0c1d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1032
zcmV+j1o!&@01yDNke`pjS_h=bu(LBk5(O2CiS^@9Q@mg3Czv@7R0v=jW`^D^N|!h3
z=~i9eorKKA#sATh6pcp3K6ViG)x*jfpJ!2o5E`+>e|$tM00$(bOsj5_ke%q&JPtd(
z6KN8P1BBr=BR5n~*V_EGiZCmMkjMowl_Vu4^mB)Z@0lcSLnthFDR$05Z1;2G+ornp
zFTS0?izVhur~q6b8$y2c7GWGr$QxNzq+z>767h4#gCi47{(_T$_5pD0MPj3b2%&)n
z@g;wwF?AdI#BSiCfD2=9#|*|4i~>?Riyy-`vYO}u%*aZ6?t)1$8WHs~xmIs6&8nT<
zWy`$jE{}2fGo2rj#8sM7!l|y>ep{-wCrCgEQu8xOEHq)e3s{zJP9)XtSDZ+M;Ht^6
zxtxQ05av=q&<Y&uPAqIeUXt?rA^cXSjcOvy8Bd+%{6oLXFiqjae2Z?jo5g)IS}ddT
zBRz-z7~*P9{K&+bX0L)&z(0a~&a#6P8z;0X9EZ|4^om#p<GMBSu+|>HQj*{D01*N)
zV@DW?Rm7kfkJh)3=?5}-?LJ_{`|8E|PeA<+17MTzx~k2R5%M+c^YrSv{0ovsHjxxh
zUmu#y-e^-`G`flFQH}Kl&1h};mOkMO&(_ZVEjke~?pXJDMkNhsA1V@P*tnu!hW_?o
z*Ac=Rz+jPn+gU%4G{Qy(PubN?e?Y1tZbc@;;-CF0jq=yZsji(WR|l^l?0|wGL}6AC
z=U{Of;cDA+gr(un{pDhdfVE{<!?x5x(mh7=qXEHAuKj&+a@rx(4mXO?HHUBrr;3l7
z3Phe|TZTjYa)XISY5nzT#9Iu#g}gx!e)O2_`fha`bo0dJo=^a8f-JX3=}GfxbgQH+
zg7b7*c$|)C)l>NOPI+z^{qPMVvyPhRo;}3gT`G%<7s`Xm#U@z$1<$KTc~$HM@5l?A
z#$LnrjAaLbVguy3ZC1C)D`L=9MPT3NOZxVA48{{LWCqyhiW4-MBX$e_;#3gF?lOR4
zM6u&-el3CD$9|n5JWLP6Qld)liTO#aF7dfi_3dlBWd3>+v#IiMTu0==Cxl!N45WM+
zw9qeEb2v~>_x3uIP|+0%ZHX+z=us<m3!H7vAV|);F+6_-#$Ud^5DI4*vV^e$`!Q7$
zz;}HnddJCSA~5TCeDBM?2x;LPYOEZ6<u{H$V+!Mf<|Uw@;K-3qYijq&{HmCJ0wbJ|
zv=;qF1ncYF<{=^UYuy;>SGosC5ogP|{P%vpImR60R8fBvu+8W1g40}${3MAb$aGN6
zP@m%oMyA}zHtv7y9MpiEI9?9`AnM`DBOEDAG}UU;#dz6W6>YRI$)zalu=9Kpn144v
C!vYup

diff --git a/Tethering/apex/com.android.tethering.apex.pem b/Tethering/apex/com.android.tethering.apex.pem
deleted file mode 100644
index a8cd12e92e..0000000000
--- a/Tethering/apex/com.android.tethering.apex.pem
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
diff --git a/Tethering/apex/com.android.tethering.apex.pk8 b/Tethering/apex/com.android.tethering.apex.pk8
deleted file mode 100644
index 56632462941f80f59b44df5d69820c617f1e7b5b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2375
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

diff --git a/Tethering/apex/com.android.tethering.apex.x509.pem b/Tethering/apex/com.android.tethering.apex.x509.pem
deleted file mode 100644
index a5e94011f7..0000000000
--- a/Tethering/apex/com.android.tethering.apex.x509.pem
+++ /dev/null
@@ -1,36 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGMzCCBBugAwIBAgIUXVtoDaXanhs7ma8VIICambMkj5UwDQYJKoZIhvcNAQEL
-BQAwgacxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQH
-DA1Nb3VudGFpbiBWaWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAwDgYDVQQLDAdBbmRy
-b2lkMSMwIQYDVQQDDBpjb20uYW5kcm9pZC50ZXRoZXJpbmcuYXBleDEiMCAGCSqG
-SIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAgFw0xOTExMjgwNjU4MTRaGA80
-NzU3MTAyNDA2NTgxNFowgacxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9y
-bmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAw
-DgYDVQQLDAdBbmRyb2lkMSMwIQYDVQQDDBpjb20uYW5kcm9pZC50ZXRoZXJpbmcu
-YXBleDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBANwzufMBdOj9XlNwiX+bXl/94G0DklWW
-nzob0jPlubCFfRqYkjCf2eOd28Mu/O1pOBcvobnrs9OTpGzcHkz2h58L5/0UMVTS
-tBugwCE49XF5FHawqVHNZE+s5tDmnp2cufhNc5HXHY4oZKh80/WVdbcKxiLjSY2T
-PgRAfB6E6XByKD3t1cSsc3liRVKADoJOVDvmF+xnyvSV/SN38bvTQk9aVs95mj0W
-yov6gzXBnqN7iQlvkhcijZBnFWxvoNbJ5KFy1abYOrm+ueXje4BcNhVOeRMb4E9N
-eo7+9k1GEI7TYG7laNNcp7UJ1IXCJzv/wBFKRg3f1HB3unKfx2rtKerDnVsr3o7V
-KProkgRNKNhhQ6opNguiH1YMzKpWMaC988n4AQPryPdIOmVIxIC5jJrixdxgzDXT
-qeiwFiXis291uyls08B03PQFlY9oWaY9P8s+4hIUjB6rLl+XZXsLDtDFxXeJ97NB
-8XZN1gBJoBoLknFs0C4LKpmJZB/EBao9tXV9dL/5lydRo6HzQDpjW8QX06CTUM6z
-Lr3LVelhqbsuZsV42yBKl+/LfrvNjBLEPdSevt2oMrlJW7m4iSNaMtDtJ2Oy8fA5
-WSIgLWuMbkaFDza3JzwiMzxbtbJHYiy6rY7aVywo3Vqwr1+KO3cq4eLQq62zUjRY
-e6KJwvgE2YmpAgMBAAGjUzBRMB0GA1UdDgQWBBQ8h1oF5JfKFmJCN8nfimbUK+IR
-wjAfBgNVHSMEGDAWgBQ8h1oF5JfKFmJCN8nfimbUK+IRwjAPBgNVHRMBAf8EBTAD
-AQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAP5hIkAxSyt9hRafMKiFlmXcL277bgoxNd
-qGZYbdcCFjfvM2r0QQcM/K7x2ZslFe7mJSzcyMifpm4YQTEo2yYbzKItXQV+eV1K
-9RNksRGFG9umsdWaSHhfQmcmxtr2nu9rGAgxy5OQFtyXmJPUPEM2cb/YeILwYhuQ
-Ux3kaj/fxGltX1JBag7HnMzCTZK++fRo5nqFVOJQgJH8ZpuzGeM9kZvP1+b55046
-PhSnlqmZoKhG4i5POPvvZvaakh/lM3x/N7lIlSaQpCGf7jmldni4L0/GenULVKzH
-iN73aBfh4GEvE0HRcOoH3L7V6kc3WMMLve0chZBHpoVYbzUJEJOUL4yrmwEehqtf
-xm4vlYg3vqtcE3UnU/UGdMb16t77Nz88LlpBY5ierIt0jZMU0M81ppRhr1uiD2Lj
-091sEA0Bxcw/6Q8QNF2eR7SG7Qwipnms+lw6Vcxve+7DdTrdEA0k3XgpdXp8Ya+2
-PAp9SLVp1UHiGq3qD9Jvm34QmlUWAIUTHZs3DSgs1y3K5eyw/cnzTvUUOljc/n2y
-VF0FFZtJ1dVLrzQ80Ik7apEXpBqkgBGV04/L3QYk4C0/sP+1yk6zjeeeAvDtUcHS
-gLtjAfacQl/kwfVQWfrF7VByLcivApC6EUdvT3cURM5DfZRQ4RcKr1D61VYPnNRH
-+/NVbMObwQ==
------END CERTIFICATE-----
diff --git a/Tethering/apex/com.android.tethering.avbpubkey b/Tethering/apex/com.android.tethering.avbpubkey
new file mode 100644
index 0000000000000000000000000000000000000000..9a2c0174e4965ecab2061accfe7ca9fa7075d888
GIT binary patch
literal 1032
zcmV+j1o!&@01yC431g}F1(T;u&jk|(w~3WByLmi11r;ae6y;Mhxb5TuSDgb04!{i6
z%$6BsYl+c_rh&j{APZInxoI4df-f>xoKNEo7#+f!ejiNek7&<?RHK2A1((<QQAio0
z<8Pujv_f${>}j)$7TcmI>v*BTIm&o!fDCs>8DP}2)s)c5enC6Rt=RIYEjKeqUWJ9o
zENFoCZ<JpGs4Ey&f$-FYV&M!GEi97HFNL0{r#-N5Vf#GQs875vGHiaj9V!&lth!b?
zc)DP;Q<KMYvg7mo+r9F_UDplY9o@7JxumMhRfYp~hw0?a!|BH%m>~YDVOBzzg~Gv>
zO|<u$?=S5-&wA}q=x2l@?wzd@K!8|N85C&1{+Ai;___+hE->Z+ZazN28A-yCwS%0}
zBoL#{8~b&dd`p@an6#lagN$HDY(4gwZf!i?m00>u16BUwb-)c=+%=TXtUa+dhMrZp
zOO>RroNJtXgo7zgqI}~3z>aXWkSr!&Y+p9^4=B-j@hj?-(2qC8`-KSTd7&Hc4Y<4~
zSuq-(7#XhAV^F*-vuqQzhU6xHkdQvMV?D{}B56<azg0gLIA9*F0y_ZxlH$3)Rdqdd
z@=&91n*4IOjLwq)1Mm<wqzhP5H#3d#J?Vx8IEaGe*n*T`8OKp&{@1xU6JwgQL6&Z0
z#csi>k`HG}I7rP_7!39&qN)vdrEJae1QWvjn>VqKx>3I>N=t+p75C}}W2(@9bo7%Q
z=g?^os-BK{h@+mfP%;q}@OLtI%)^(3JH9_o&lZsIUVhX+Z{k$4H_c4rGvn%6h_{pK
zikRq0xy8Mq*NxuYV={kIG`VMTk%)=p_JZK@w#UuFjt?H`!KrJE8OQPv>1aslU;fQ#
zTK&y4ie{H&z!R<nYVTTzIGG35hqLWhS6^23Hsu<|pH6c5Aqt1=;Op>$z#n(2^KwD7
z>Q!m8_qtHl2W+w!-}R;TgAHzS?d3!Lzgmc+7&t_4K)Z_`lKdYH`1cs%B7Ai1K7w^7
zgb?T;;N>Pj62U1L7FY*VYS$tgPP2anx`qNnwkS3vC!RY0O3MEBCMO&vSr-gS?S*Cv
z_7Jg=vb9O4D+4e6e&8~(W}bRI=4&qOb3-Elkum!i0?Azej5io!C5B?cL@=HhZMo0)
z+g*$ufJb0u!U!2R0AA)Jvr)1W|56OAjRhnQom3r{dX`cIbuQ`5lN&!<o*_%A{c0jI
z(x^#lJzL;lJ~AeCGV?5g*Qif@-%O<M_c6$lMt%RGS><#TZMFHFnlt=a^WUR800!w>
zF`&X%6cIY_)5}8)N2QgMDaMNIJ*{b6d$!;&&6L{^^|FR)f8K{yow|QfHGo-$L)=r$
CV)||X

literal 0
HcmV?d00001

diff --git a/Tethering/apex/com.android.tethering.pem b/Tethering/apex/com.android.tethering.pem
new file mode 100644
index 0000000000..d4f39abd3b
--- /dev/null
+++ b/Tethering/apex/com.android.tethering.pem
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
diff --git a/Tethering/apex/com.android.tethering.pk8 b/Tethering/apex/com.android.tethering.pk8
new file mode 100644
index 0000000000000000000000000000000000000000..3b94405945cb586956fdd12a15b4d6746fcd021c
GIT binary patch
literal 2375
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

literal 0
HcmV?d00001

diff --git a/Tethering/apex/com.android.tethering.x509.pem b/Tethering/apex/com.android.tethering.x509.pem
new file mode 100644
index 0000000000..a1786e35e8
--- /dev/null
+++ b/Tethering/apex/com.android.tethering.x509.pem
@@ -0,0 +1,35 @@
+-----BEGIN CERTIFICATE-----
+MIIGKTCCBBGgAwIBAgIUNiSs5EMqxCZ31gWWCcRJVp9HffAwDQYJKoZIhvcNAQEL
+BQAwgaIxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQH
+DA1Nb3VudGFpbiBWaWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAwDgYDVQQLDAdBbmRy
+b2lkMR4wHAYDVQQDDBVjb20uYW5kcm9pZC50ZXRoZXJpbmcxIjAgBgkqhkiG9w0B
+CQEWE2FuZHJvaWRAYW5kcm9pZC5jb20wIBcNMTkxMjE4MDcwMDQ4WhgPNDc1NzEx
+MTMwNzAwNDhaMIGiMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW
+MBQGA1UEBwwNTW91bnRhaW4gVmlldzEQMA4GA1UECgwHQW5kcm9pZDEQMA4GA1UE
+CwwHQW5kcm9pZDEeMBwGA1UEAwwVY29tLmFuZHJvaWQudGV0aGVyaW5nMSIwIAYJ
+KoZIhvcNAQkBFhNhbmRyb2lkQGFuZHJvaWQuY29tMIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEAxvTUA4seblYjZLfTVNwZuJH914QVNFTj+vD94pWmt5Aq
+sH1DVTpBvpXXegc/P5HI2XF/71poSBib1WaQSuXG0fU5K75T18bOGL0qF+fhMtBO
+wUyvulcjO0h4XE/xf0txY54exUjAA4JS9ERGJOgb4GOwSbPyzekfmzIyCZ2Yawwu
++oGwD2ZNzZRaPOoWxjwohBWQ6mySuvF9RRRb300qmxxUGFM9Ki3aqrWlYlHEOwOC
+M+gIXxYFO7S+yUzf6/gMZLOz2YqfcTOup4hAxtExR7niutxJSsRLPBL237exAJoz
+OupoXjtWAlPK4ZwZ/Nl1jdTWauJ+Kv3WqzhHGEb2gn3ZpeO3IdOjJhDgFJ6m1OT/
+kjRbW1LCuKGrKaoqsEDT2X3a7Izfripn65hSNTfR5gNLtgELaI3/vXi8Fmzw1AfH
++qi6ulElZvSwx0qm+S0QiPyGFlxrsdnHoGJl1tzjJW8KdNZRvzRLUQtbphPp+VkL
+5i0bNKum+AwbfdUkLkNLfw9XdbujgBkZTZDQbZGsNjgrvyXcPO2KiJee0hVCZRs0
+rhDi5Pfm7BnN/I2vaTRz/W4mdct9H2RWMuqlSH90JvmKtWcND8ahmOJ3sggrvzfO
+QNs3k4JTRecamMzqIkylhlnEC4FjWc6Bx4wsEpwBMZOkF/tGGMZYf2C09a8tpP0C
+AwEAAaNTMFEwHQYDVR0OBBYEFNP5gIpNWmq0xa411M1GaRPbEijvMB8GA1UdIwQY
+MBaAFNP5gIpNWmq0xa411M1GaRPbEijvMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADggIBADJGmU3QP4EGbt6eBhVPeo/efsqrHsuB2fvFzvIobJbfkSob
+cmvjbzIikOlPAgFWj8lT5SDcIWRorFf1u2JylClJ0nSDcqJMHVKmT7wseV/KtX//
+1yUyJFRQVzmjC89dp8OIc00GmItivKLer3NbJdkR3rTUjg7+bNUO27Qp3AFREmiJ
+P+M7ouvcQRvByUWbp/LOrJpMdJLysRBO562RwrtwTjltdvufyYswbBZOKEiUh1Jc
+Ged+3+SJdhwq3Wy+R3Uj7YE7mUMu1QNbANIMrwF8W93EA53eoL2+cKmuaVU6ZURL
+xgSJaY6TrunnSI9XTROLtjsFlJorYWy2tvG7Q5Hw3OkO2Xdz/mm85VTkiusg9DMB
+WWTv607YtsIO0FhKmcV4bp3q/EkRj3t/zLvL9uFJrWDGkuShZq6fQvqbCvaokOPY
++M0ZRIwgwa9UpEE0BMklVWqR6BGyap614gOgcOjYM70WRNl59Qne+g128ZN7g9nz
+61F70i7kUngV0ZUz1/Fu/NCG+6wGF85ZbFmQl60YHPDw1FtjVUuKyBblaDzdJunx
+yQr2t9RUokzFBFK0lGW3+yf0WDQ5fqTMs5h8bz1FCq8/HzWmpdOfqePLe4zsld3b
+1nFuSohaIfbn/HDdTNtTBGQPgz8ZswQ6ejJJqTLz9D/odbqn9LeIhDZXcQTf
+-----END CERTIFICATE-----
diff --git a/Tethering/apex/manifest.json b/Tethering/apex/manifest.json
index 078302ac51..538ffb3ad6 100644
--- a/Tethering/apex/manifest.json
+++ b/Tethering/apex/manifest.json
@@ -1,4 +1,4 @@
 {
-  "name": "com.android.tethering.apex",
+  "name": "com.android.tethering",
   "version": 300000000
 }
diff --git a/Tethering/src/com/android/server/connectivity/tethering/Tethering.java b/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
index 743fd6a632..c4b360d929 100644
--- a/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
+++ b/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
@@ -109,7 +109,7 @@ import com.android.internal.util.MessageUtils;
 import com.android.internal.util.Protocol;
 import com.android.internal.util.State;
 import com.android.internal.util.StateMachine;
-import com.android.tethering.R;
+import com.android.networkstack.tethering.R;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
diff --git a/Tethering/tests/unit/AndroidManifest.xml b/Tethering/tests/unit/AndroidManifest.xml
index 049ff6d415..0a1cdd35b1 100644
--- a/Tethering/tests/unit/AndroidManifest.xml
+++ b/Tethering/tests/unit/AndroidManifest.xml
@@ -14,13 +14,13 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.tethering.tests.unit">
+          package="com.android.networkstack.tethering.tests.unit">
 
     <application android:debuggable="true">
         <uses-library android:name="android.test.runner" />
     </application>
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
-        android:targetPackage="com.android.tethering.tests.unit"
+        android:targetPackage="com.android.networkstack.tethering.tests.unit"
         android:label="Tethering service tests">
     </instrumentation>
 </manifest>