/home/dev/.local/bin/diffoscope --output-empty --progress --exclude-command ^readelf.*\s--symbols --exclude-command ^readelf.*\s--relocs --exclude-command ^readelf.*\s--hex-dump= --exclude-command ^readelf.*\s--debug-dump= --exclude-command ^readelf.*\s--string-dump= --exclude-command ^strings\s --exclude-command ^objdump.*\s--disassemble --exclude original/META-INF/CERT.RSA --exclude META-INF/CERT.RSA --exclude apex_pubkey --exclude apex_payload.img --exclude system/etc/update_engine/update-payload-key.pub.pem --exclude releasekey.x509.pem --exclude testkey.x509.pem --json /home/dev/aosp/diff/android-11.0.0_r28_crosshatch-user_Google__android-11.0.0_r28_aosp_crosshatch-user_Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.diffoscope.json --html-dir /home/dev/aosp/diff/android-11.0.0_r28_crosshatch-user_Google__android-11.0.0_r28_aosp_crosshatch-user_Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.diffoscope.html-dir /home/dev/aosp/build/android-11.0.0_r28/crosshatch-user/Google/system.img.apexes/com.google.android.tethering.apex-apex_payload.img.mount /home/dev/aosp/build/android-11.0.0_r28/aosp_crosshatch-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex

⊟

1.04 MB

/home/dev/aosp/build/android-11.0.0_r28/crosshatch-user/Google/system.img.apexes/com.google.android.tethering.apex-apex_payload.img.mount vs.

/home/dev/aosp/build/android-11.0.0_r28/aosp_crosshatch-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.mount ¶

⊟

242 B

file list ¶

⊟

528 B

/home/dev/aosp/build/android-11.0.0_r28/crosshatch-user/Google/system.img.apexes/com.google.android.tethering.apex-apex_payload.img.mount/apex_manifest.pb vs.

/home/dev/aosp/build/android-11.0.0_r28/aosp_crosshatch-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.mount/apex_manifest.pb ¶

⊟

3.69 KB

/home/dev/aosp/build/android-11.0.0_r28/crosshatch-user/Google/system.img.apexes/com.google.android.tethering.apex-apex_payload.img.mount/javalib vs.

/home/dev/aosp/build/android-11.0.0_r28/aosp_crosshatch-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.mount/javalib ¶

⊟

3.41 KB

/home/dev/aosp/build/android-11.0.0_r28/crosshatch-user/Google/system.img.apexes/com.google.android.tethering.apex-apex_payload.img.mount/javalib/framework-tethering.jar vs.

/home/dev/aosp/build/android-11.0.0_r28/aosp_crosshatch-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.mount/javalib/framework-tethering.jar ¶

⊟

1.01 KB

zipinfo -v {} ¶

⊟

2.06 KB

classes.dex ¶

Format-specific differences are supported for Dalvik .dex files but no file-specific differences were detected; falling back to a binary diff. file(1) reports: Dalvik dex file version 039

⊟

1.03 MB

/home/dev/aosp/build/android-11.0.0_r28/crosshatch-user/Google/system.img.apexes/com.google.android.tethering.apex-apex_payload.img.mount/priv-app vs.

/home/dev/aosp/build/android-11.0.0_r28/aosp_crosshatch-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.mount/priv-app ¶

⊟

124 B

file list ¶

⊟

1.03 MB

/home/dev/aosp/build/android-11.0.0_r28/crosshatch-user/Google/system.img.apexes/com.google.android.tethering.apex-apex_payload.img.mount/priv-app/TetheringGoogle vs.

/home/dev/aosp/build/android-11.0.0_r28/aosp_crosshatch-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.mount/priv-app/Tethering ¶

⊟

66.0 B

file list ¶

⊟

1.03 MB

/home/dev/aosp/build/android-11.0.0_r28/crosshatch-user/Google/system.img.apexes/com.google.android.tethering.apex-apex_payload.img.mount/priv-app/TetheringGoogle/TetheringGoogle.apk vs.

/home/dev/aosp/build/android-11.0.0_r28/aosp_crosshatch-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.mount/priv-app/Tethering/Tethering.apk ¶

⊟

3.36 KB

zipinfo {} ¶

⊟

2.11 KB

AndroidManifest.xml (decoded) ¶

⊟

2.05 KB

AndroidManifest.xml ¶

⊟

843 B

APK metadata ¶

⊟

24.2 KB

classes.dex ¶

⊟

24.1 KB

classes.jar ¶

⊟

10.2 KB

zipinfo {} ¶

⊟

718 B

zipnote «TEMP»/diffoscope_7zefxgll/tmp5tws3sur.zip ¶

⊟

5.84 KB

com/android/networkstack/tethering/PrivateAddressCoordinator.class ¶

⊟

5.72 KB

procyon -ec {} ¶

⊟

786 B

com/android/networkstack/tethering/R$bool.class ¶

⊟

692 B

procyon -ec {} ¶

⊟

1.34 KB

com/android/networkstack/tethering/Tethering.class ¶

⊟

1.24 KB

procyon -ec {} ¶

⊟

3.62 KB

com/android/networkstack/tethering/TetheringConfiguration.class ¶

⊟

3.5 KB

procyon -ec {} ¶

⊟

878 B

com/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState.class ¶

⊟

706 B

procyon -ec {} ¶

⊟

795 B

android/net/ip/IpServer$DhcpServerCallbacksImpl.class ¶

⊟

689 B

procyon -ec {} ¶

⊟

567 KB

resources.arsc ¶

⊟

4.99 KB

smali/android/net/ip/IpServer$InitialState.smali ¶

⊟

14.7 KB

smali/android/net/ip/IpServer$TetheredState.smali ¶

⊟

2.88 KB

smali/android/net/ip/IpServer$LocalHotspotState.smali ¶

⊟

2.46 KB

smali/android/net/ip/IpServer$DhcpServerCallbacksImpl$1.smali ¶

⊟

53.8 KB

smali/android/net/ip/IpServer.smali ¶

⊟

5.98 KB

smali/android/net/ip/IpServer$DhcpEventCallback.smali ¶

⊟

1.44 KB

smali/android/net/ip/IpServer$UnavailableState.smali ¶

⊟

4.18 KB

smali/android/net/ip/IpServer$WaitingForRestartState.smali ¶

⊟

987 B

smali/android/net/ip/IpServer$2.smali ¶

⊟

2.08 KB

smali/android/net/ip/IpServer$1.smali ¶

⊟

7.28 KB

smali/android/net/ip/IpServer$DhcpServerCallbacksImpl.smali ¶

⊟

10.0 KB

smali/android/net/ip/IpServer$BaseServingState.smali ¶

⊟

1.89 KB

smali/com/android/networkstack/tethering/Tethering$TetherMasterSM$StopTetheringErrorState.smali ¶

⊟

3.38 KB

smali/com/android/networkstack/tethering/Tethering$TetherMasterSM$InitialState.smali ¶

⊟

1.17 KB

smali/com/android/networkstack/tethering/Tethering$TetherMasterSM$SetIpForwardingDisabledErrorState.smali ¶

⊟

1.26 KB

smali/com/android/networkstack/tethering/Tethering$TetheringThreadExecutor.smali ¶

⊟

1.17 KB

smali/com/android/networkstack/tethering/Tethering$TetherMasterSM$SetIpForwardingEnabledErrorState.smali ¶

⊟

5.01 KB

smali/com/android/networkstack/tethering/Tethering$NetdCallback.smali ¶

⊟

3.74 KB

smali/com/android/networkstack/tethering/Tethering$UserRestrictionActionListener.smali ¶

⊟

49.3 KB

smali/com/android/networkstack/tethering/Tethering$TetherMasterSM.smali ¶

⊟

11.2 KB

smali/com/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper.smali ¶

⊟

21.7 KB

smali/com/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState.smali ¶

⊟

23.8 KB

smali/com/android/networkstack/tethering/PrivateAddressCoordinator.smali ¶

⊟

116 KB

smali/com/android/networkstack/tethering/Tethering.smali ¶

⊟

1.55 KB

smali/com/android/networkstack/tethering/Tethering$TetheringSoftApCallback.smali ¶

⊟

2.99 KB

smali/com/android/networkstack/tethering/Tethering$3.smali ¶

⊟

2.4 KB

smali/com/android/networkstack/tethering/Tethering$4.smali ¶

⊟

25.4 KB

smali/com/android/networkstack/tethering/Tethering$StateReceiver.smali ¶

⊟

3.25 KB

smali/com/android/networkstack/tethering/Tethering$TetherMasterSM$ErrorState.smali ¶

⊟

4.99 KB

smali/com/android/networkstack/tethering/Tethering$ActiveDataSubIdListener.smali ¶

⊟

1.89 KB

smali/com/android/networkstack/tethering/Tethering$TetherMasterSM$StartTetheringErrorState.smali ¶

⊟

3.01 KB

smali/com/android/networkstack/tethering/Tethering$2.smali ¶

⊟

4.53 KB

smali/com/android/networkstack/tethering/Tethering$EthernetCallback.smali ¶

⊟

2.7 KB

smali/com/android/networkstack/tethering/Tethering$TetherMasterSM$SetDnsForwardersErrorState.smali ¶

⊟

717 B

smali/com/android/networkstack/tethering/R$bool.smali ¶

⊟

47.0 KB

smali/com/android/networkstack/tethering/TetheringConfiguration.smali ¶

⊟

1.6 KB

original/META-INF/MANIFEST.MF ¶

⊟

1.77 KB

original/META-INF/CERT.SF ¶

⊟

499 B

res/values/bools.xml ¶

⊟

459 B

res/values/bools.xml ¶

⊟

1.64 KB

res/values/public.xml ¶

⊟

1.6 KB

res/values/public.xml ¶

⊟

305 B

stat {} ¶


Offset 1, 2 lines modified		Offset 1, 2 lines modified
00000000:·0a15·636f·6d2e·616e·6472·6f69·642e·7465··..com.android.te		00000000:·0a15·636f·6d2e·616e·6472·6f69·642e·7465··..com.android.te
00000010:·7468·6572·696e·6710·e0c9·bd8f·01·········thering......		00000010:·7468·6572·696e·6710·80c6·868f·01·········thering......


Offset 1, 2 lines modified		Offset 1, 2 lines modified
1	Tethering~~Google~~	1	Tethering
2	Tethering~~Google~~/Tetherin~~gGoo~~gle.apk	2	Tethering/Tethering.apk


Offset 1, 1 lines modified		Offset 1, 1 lines modified
1	Tethering~~Google~~.apk	1	Tethering.apk


Offset 1, 7 lines modified		Offset 1, 7 lines modified
1	apex_manifest.pb	1	apex_manifest.pb
2	javalib	2	javalib
3	javalib/framework-tethering.jar	3	javalib/framework-tethering.jar
4	lost+found	4	lost+found
5	priv-app	5	priv-app
6	priv-app/Tethering~~Google~~	6	priv-app/Tethering
7	priv-app/Tethering~~Google~~/Tetherin~~gGoo~~gle.apk	7	priv-app/Tethering/Tethering.apk


Offset 26, 15 lines modified		Offset 26, 15 lines modified
26	··version·of·encoding·software:···················2.0	26	··version·of·encoding·software:···················2.0
27	··minimum·file·system·compatibility·required:·····MS-DOS,·OS/2·or·NT·FAT	27	··minimum·file·system·compatibility·required:·····MS-DOS,·OS/2·or·NT·FAT
28	··minimum·software·version·required·to·extract:···2.0	28	··minimum·software·version·required·to·extract:···2.0
29	··compression·method:·····························none·(stored)	29	··compression·method:·····························none·(stored)
30	··file·security·status:···························not·encrypted	30	··file·security·status:···························not·encrypted
31	··extended·local·header:··························no	31	··extended·local·header:··························no
32	··file·last·modified·on·(DOS·date/time):··········2008·Jan·1·00:00:00	32	··file·last·modified·on·(DOS·date/time):··········2008·Jan·1·00:00:00
33	··32-bit·CRC·value·(hex):·························~~6968b92d~~	33	··32-bit·CRC·value·(hex):·························4045acc4
34	··compressed·size:································56552·bytes	34	··compressed·size:································56552·bytes
35	··uncompressed·size:······························56552·bytes	35	··uncompressed·size:······························56552·bytes
36	··length·of·filename:·····························11·characters	36	··length·of·filename:·····························11·characters
37	··length·of·extra·field:··························0·bytes	37	··length·of·extra·field:··························0·bytes
38	··length·of·file·comment:·························0·characters	38	··length·of·file·comment:·························0·characters
39	··disk·number·on·which·file·begins:···············disk·1	39	··disk·number·on·which·file·begins:···············disk·1
40	··apparent·file·type:·····························binary	40	··apparent·file·type:·····························binary


Offset 1, 9 lines modified		Offset 1, 9 lines modified
00000000:·6465·780a·3033·3900·ad9b·~~01c3~~·c924·~~bb22~~··dex.039......$."		00000000:·6465·780a·3033·3900·039c·eb76·9348·d90d··dex.039....v.H..
00000010:·~~1bb2~~·~~3f8f~~·~~7a1f~~·~~344d~~·dc6f·~~999d~~·aa45·~~41d5~~··..?.z.4~~M.o.~~..~~EA.~~		00000010:·be1e·2d75·c231·ecc9·3c71·4ab9·8a74·8e36··..-u.1..<qJ..t.6
00000020:·e8dc·0000·7000·0000·7856·3412·0000·0000··....p...xV4.....		00000020:·e8dc·0000·7000·0000·7856·3412·0000·0000··....p...xV4.....
00000030:·0000·0000·0cdc·0000·8302·0000·7000·0000··............p...		00000030:·0000·0000·0cdc·0000·8302·0000·7000·0000··............p...
00000040:·8900·0000·7c0a·0000·9600·0000·a00c·0000··....\|...........		00000040:·8900·0000·7c0a·0000·9600·0000·a00c·0000··....\|...........
00000050:·c700·0000·a813·0000·b901·0000·e019·0000··................		00000050:·c700·0000·a813·0000·b901·0000·e019·0000··................
00000060:·4500·0000·a827·0000·a0ac·0000·4830·0000··E....'......H0..		00000060:·4500·0000·a827·0000·a0ac·0000·4830·0000··E....'......H0..
00000070:·7486·0000·7686·0000·7a86·0000·7d86·0000··t...v...z...}...		00000070:·7486·0000·7686·0000·7a86·0000·7d86·0000··t...v...z...}...
00000080:·8186·0000·8f86·0000·af86·0000·bc86·0000··................		00000080:·8186·0000·8f86·0000·af86·0000·bc86·0000··................
Offset 3095, 15 lines modified		Offset 3095, 15 lines modified
0000c160:·7269·7465·5479·7065·644c·6973·7400·0377··riteTypedList..w		0000c160:·7269·7465·5479·7065·644c·6973·7400·0377··riteTypedList..w
0000c170:·7466·0002·7830·0002·7831·0001·7d00·587e··tf..x0..x1..}.X~		0000c170:·7466·0002·7830·0002·7831·0001·7d00·587e··tf..x0..x1..}.X~
0000c180:·7e44·387b·2263·6f6d·7069·6c61·7469·6f6e··~D8{"compilation		0000c180:·7e44·387b·2263·6f6d·7069·6c61·7469·6f6e··~D8{"compilation
0000c190:·2d6d·6f64·6522·3a22·6465·6275·6722·2c22··-mode":"debug","		0000c190:·2d6d·6f64·6522·3a22·6465·6275·6722·2c22··-mode":"debug","
0000c1a0:·6861·732d·6368·6563·6b73·756d·7322·3a66··has-checksums":f		0000c1a0:·6861·732d·6368·6563·6b73·756d·7322·3a66··has-checksums":f
0000c1b0:·616c·7365·2c22·6d69·6e2d·6170·6922·3a33··alse,"min-api":3		0000c1b0:·616c·7365·2c22·6d69·6e2d·6170·6922·3a33··alse,"min-api":3
0000c1c0:·302c·2276·6572·7369·6f6e·223a·2232·2e31··0,"version":"2.1		0000c1c0:·302c·2276·6572·7369·6f6e·223a·2232·2e31··0,"version":"2.1
0000c1d0:·2e37·2d72·3122·7d00·0261·01f0·041c·0118··.7-r1"}..a......		0000c1d0:·2e37·2d72·3322·7d00·0261·01f0·041c·0118··.7-r3"}..a......
0000c1e0:·5802·5f01·f004·1c02·181e·181c·025f·01f0··X._.........._..		0000c1e0:·5802·5f01·f004·1c02·181e·181c·025f·01f0··X._.........._..
0000c1f0:·041c·0218·2218·2002·6001·f004·1c04·1702··....".·.`.......		0000c1f0:·041c·0218·2218·2002·6001·f004·1c04·1702··....".·.`.......
0000c200:·17b9·1768·170e·025f·01f0·041c·0218·2618··...h..._......&.		0000c200:·17b9·1768·170e·025f·01f0·041c·0218·2618··...h..._......&.
0000c210:·2402·5c01·f004·182d·025e·02c2·0204·00f9··$.\....-.^......		0000c210:·2402·5c01·f004·182d·025e·02c2·0204·00f9··$.\....-.^......
0000c220:·031e·0260·01f0·041c·0417·a217·8e17·6417··...`..........d.		0000c220:·031e·0260·01f0·041c·0417·a217·8e17·6417··...`..........d.
0000c230:·0d02·6001·f004·1c03·178e·1764·170d·025c··..`........d...\		0000c230:·0d02·6001·f004·1c03·178e·1764·170d·025c··..`........d...\
0000c240:·01f0·0418·3102·6001·f004·1c04·17a2·178e··....1.`.........		0000c240:·01f0·0418·3102·6001·f004·1c04·17a2·178e··....1.`.........


Offset 1, 10 lines modified		Offset 1, 9 lines modified
1	Zip·file·size:·~~824698~~·bytes,·number·of·entries:·32	1	Zip·file·size:·763789·bytes,·number·of·entries:·30
2	-rw----·····1.0·fat···~~·5753~~0·bx·stor·09-Jan-01·00:00·assets~~/NOTICE~~.~~html.gz~~	2	-rw----·····1.0·fat···303720·bx·stor·09-Jan-01·00:00·classes.dex
3	-rw----·····1.0·fat···304144·bx·stor·09-Jan-01·00:00·classes.dex
4	-rw----·····1.0·fat···278544·bx·stor·09-Jan-01·00:00·lib/arm64-v8a/libnativehelper_compat_libc++.so	3	-rw----·····1.0·fat···278544·bx·stor·09-Jan-01·00:00·lib/arm64-v8a/libnativehelper_compat_libc++.so
5	-rw----·····1.0·fat····11320·bx·stor·09-Jan-01·00:00·lib/arm64-v8a/libtetherutilsjni.so	4	-rw----·····1.0·fat····11320·bx·stor·09-Jan-01·00:00·lib/arm64-v8a/libtetherutilsjni.so
6	-rw----·····1.0·fat······661·bx·stor·09-Jan-01·00:00·res/drawable-hdpi-v4/stat_sys_tether_bluetooth.png	5	-rw----·····1.0·fat······661·bx·stor·09-Jan-01·00:00·res/drawable-hdpi-v4/stat_sys_tether_bluetooth.png
7	-rw----·····1.0·fat······728·bx·stor·09-Jan-01·00:00·res/drawable-hdpi-v4/stat_sys_tether_general.png	6	-rw----·····1.0·fat······728·bx·stor·09-Jan-01·00:00·res/drawable-hdpi-v4/stat_sys_tether_general.png
8	-rw----·····1.0·fat······684·bx·stor·09-Jan-01·00:00·res/drawable-hdpi-v4/stat_sys_tether_usb.png	7	-rw----·····1.0·fat······684·bx·stor·09-Jan-01·00:00·res/drawable-hdpi-v4/stat_sys_tether_usb.png
9	-rw----·····1.0·fat······337·bx·stor·09-Jan-01·00:00·res/drawable-ldpi-v4/stat_sys_tether_bluetooth.png	8	-rw----·····1.0·fat······337·bx·stor·09-Jan-01·00:00·res/drawable-ldpi-v4/stat_sys_tether_bluetooth.png
10	-rw----·····1.0·fat······356·bx·stor·09-Jan-01·00:00·res/drawable-ldpi-v4/stat_sys_tether_general.png	9	-rw----·····1.0·fat······356·bx·stor·09-Jan-01·00:00·res/drawable-ldpi-v4/stat_sys_tether_general.png
Offset 14, 21 lines modified		Offset 13, 20 lines modified
14	-rw----·····1.0·fat······472·bx·stor·09-Jan-01·00:00·res/drawable-mdpi-v4/stat_sys_tether_usb.png	13	-rw----·····1.0·fat······472·bx·stor·09-Jan-01·00:00·res/drawable-mdpi-v4/stat_sys_tether_usb.png
15	-rw----·····1.0·fat······875·bx·stor·09-Jan-01·00:00·res/drawable-xhdpi-v4/stat_sys_tether_bluetooth.png	14	-rw----·····1.0·fat······875·bx·stor·09-Jan-01·00:00·res/drawable-xhdpi-v4/stat_sys_tether_bluetooth.png
16	-rw----·····1.0·fat·····1029·bx·stor·09-Jan-01·00:00·res/drawable-xhdpi-v4/stat_sys_tether_general.png	15	-rw----·····1.0·fat·····1029·bx·stor·09-Jan-01·00:00·res/drawable-xhdpi-v4/stat_sys_tether_general.png
17	-rw----·····1.0·fat······944·bx·stor·09-Jan-01·00:00·res/drawable-xhdpi-v4/stat_sys_tether_usb.png	16	-rw----·····1.0·fat······944·bx·stor·09-Jan-01·00:00·res/drawable-xhdpi-v4/stat_sys_tether_usb.png
18	-rw----·····1.0·fat······604·bx·stor·09-Jan-01·00:00·res/drawable-xxhdpi-v4/stat_sys_tether_bluetooth.png	17	-rw----·····1.0·fat······604·bx·stor·09-Jan-01·00:00·res/drawable-xxhdpi-v4/stat_sys_tether_bluetooth.png
19	-rw----·····1.0·fat······725·bx·stor·09-Jan-01·00:00·res/drawable-xxhdpi-v4/stat_sys_tether_general.png	18	-rw----·····1.0·fat······725·bx·stor·09-Jan-01·00:00·res/drawable-xxhdpi-v4/stat_sys_tether_general.png
20	-rw----·····1.0·fat······651·bx·stor·09-Jan-01·00:00·res/drawable-xxhdpi-v4/stat_sys_tether_usb.png	19	-rw----·····1.0·fat······651·bx·stor·09-Jan-01·00:00·res/drawable-xxhdpi-v4/stat_sys_tether_usb.png
21	-rw----·····1.0·fat···121~~828~~·bx·stor·09-Jan-01·00:00·resources.arsc	20	-rw----·····1.0·fat···121736·bx·stor·09-Jan-01·00:00·resources.arsc
22	-rw----·····2.0·fat·····~~5260~~·bl·defN·09-Jan-01·00:00·AndroidManifest.xml	21	-rw----·····2.0·fat·····4924·bl·defN·09-Jan-01·00:00·AndroidManifest.xml
23	-rw----·····2.0·fat······339·bl·defN·09-Jan-01·00:00·META-INF/proguard/androidx-annotations.pro	22	-rw----·····2.0·fat······339·bl·defN·09-Jan-01·00:00·META-INF/proguard/androidx-annotations.pro
24	-rw----·····2.0·fat······241·bl·defN·09-Jan-01·00:00·android/util/LocalLog.ReadOnlyLocalLog.uau	23	-rw----·····2.0·fat······241·bl·defN·09-Jan-01·00:00·android/util/LocalLog.ReadOnlyLocalLog.uau
25	-rw----·····2.0·fat······589·bl·defN·09-Jan-01·00:00·android/util/LocalLog.uau	24	-rw----·····2.0·fat······589·bl·defN·09-Jan-01·00:00·android/util/LocalLog.uau
26	-rw----·····2.0·fat······200·bl·defN·09-Jan-01·00:00·com/android/networkstack/tethering/util/IState.uau	25	-rw----·····2.0·fat······200·bl·defN·09-Jan-01·00:00·com/android/networkstack/tethering/util/IState.uau
27	-rw----·····2.0·fat······654·bl·defN·09-Jan-01·00:00·com/android/networkstack/tethering/util/IndentingPrintWriter.uau	26	-rw----·····2.0·fat······654·bl·defN·09-Jan-01·00:00·com/android/networkstack/tethering/util/IndentingPrintWriter.uau
28	-rw----·····2.0·fat······703·bl·defN·09-Jan-01·00:00·com/android/networkstack/tethering/util/State.uau	27	-rw----·····2.0·fat······703·bl·defN·09-Jan-01·00:00·com/android/networkstack/tethering/util/State.uau
29	-rw----·····2.0·fat·····2565·bl·defN·09-Jan-01·00:00·com/android/networkstack/tethering/util/StateMachine.uau	28	-rw----·····2.0·fat·····2565·bl·defN·09-Jan-01·00:00·com/android/networkstack/tethering/util/StateMachine.uau
30	-rw----·····2.0·fat·····~~··32~~·bl·defN·09-Jan-01·00:00·s~~tamp~~-~~cert-sha256~~	29	-rw----·····2.0·fat·····3275·bl·defN·09-Jan-01·00:00·META-INF/CERT.SF
31	-rw----·····2.0·fat·····~~345~~7·bl·defN·09-Jan-01·00:00·META-INF/CERT.SF	30	-rw----·····2.0·fat·····2267·bl·defN·09-Jan-01·00:00·META-INF/CERT.RSA
32	-rw----·····2.0·fat·····~~2244~~·bl·defN·09-Jan-01·00:00·META-INF/CERT.RSA	31	-rw----·····2.0·fat·····3163·bl·defN·09-Jan-01·00:00·META-INF/MANIFEST.MF
33	~~-rw----··~~·~~··2.~~0·fat····~~·3345·bl·d~~efN·~~09-Jan-01~~·~~00:00~~·~~META-INF/MANIFEST~~.MF	32	30·files,·743507·bytes·uncompressed,·732087·bytes·compressed:··1.5%
34	32·files,·802262·bytes·uncompressed,·790501·bytes·compressed:··1.5%


Offset 1, 9 lines modified		Offset 1, 9 lines modified
1	<?xml·version="1.0"·encoding="utf-8"?>	1	<?xml·version="1.0"·encoding="utf-8"?>
2	<manifest·android:compileSdkVersion="30"·android:compileSdkVersionCodename="11"·android:sharedUserId="android.uid.networkstack"·android:versionCode="30"·android:versionName="11~~-6834107~~"·package="com~~.google~~.android.networkstack.tethering"·platformBuildVersionCode="30"·platformBuildVersionName="11"·xmlns:android="http://schemas.android.com/apk/res/android">	2	<manifest·android:compileSdkVersion="30"·android:compileSdkVersionCodename="11"·android:sharedUserId="android.uid.networkstack"·android:versionCode="30"·android:versionName="11"·package="com.android.networkstack.tethering"·platformBuildVersionCode="30"·platformBuildVersionName="11"·xmlns:android="http://schemas.android.com/apk/res/android">
3	··<uses-sdk·android:minSdkVersion="30"·android:targetSdkVersion="29"/>	3	··<uses-sdk·android:minSdkVersion="30"·android:targetSdkVersion="29"/>
4	··<uses-permission·android:name="android.permission.ACCESS_NETWORK_STATE"/>	4	··<uses-permission·android:name="android.permission.ACCESS_NETWORK_STATE"/>
5	··<uses-permission·android:name="android.permission.BLUETOOTH"/>	5	··<uses-permission·android:name="android.permission.BLUETOOTH"/>
6	··<uses-permission·android:name="android.permission.BLUETOOTH_PRIVILEGED"/>	6	··<uses-permission·android:name="android.permission.BLUETOOTH_PRIVILEGED"/>
7	··<uses-permission·android:name="android.permission.BROADCAST_STICKY"/>	7	··<uses-permission·android:name="android.permission.BROADCAST_STICKY"/>
8	··<uses-permission·android:name="android.permission.CHANGE_NETWORK_STATE"/>	8	··<uses-permission·android:name="android.permission.CHANGE_NETWORK_STATE"/>
9	··<uses-permission·android:name="android.permission.MANAGE_USB"/>	9	··<uses-permission·android:name="android.permission.MANAGE_USB"/>
Offset 18, 10 lines modified		Offset 18, 9 lines modified
18	··<protected-broadcast·android:name="com.android.server.connectivity.tethering.DISABLE_TETHERING"/>	18	··<protected-broadcast·android:name="com.android.server.connectivity.tethering.DISABLE_TETHERING"/>
19	··<application·android:defaultToDeviceProtectedStorage="true"·android:directBootAware="true"·android:extractNativeLibs="false"·android:label="Tethering"·android:persistent="true"·android:process="com.android.networkstack.process">	19	··<application·android:defaultToDeviceProtectedStorage="true"·android:directBootAware="true"·android:extractNativeLibs="false"·android:label="Tethering"·android:persistent="true"·android:process="com.android.networkstack.process">
20	····<service·android:exported="true"·android:name="com.android.networkstack.tethering.TetheringService"·android:permission="android.permission.MAINLINE_NETWORK_STACK">	20	····<service·android:exported="true"·android:name="com.android.networkstack.tethering.TetheringService"·android:permission="android.permission.MAINLINE_NETWORK_STACK">
21	······<intent-filter>	21	······<intent-filter>
22	········<action·android:name="android.net.ITetheringConnector"/>	22	········<action·android:name="android.net.ITetheringConnector"/>
23	······</intent-filter>	23	······</intent-filter>
24	····</service>	24	····</service>
25	····<meta-data·android:name="android.content.pm.LOGGING_PARENT"·android:value="com.google.android.modulemetadata"/>
26	··</application>	25	··</application>
27	</manifest>	26	</manifest>


Offset 1, 31 lines modified		Offset 1, 29 lines modified
1	!!brut.androlib.meta.MetaInfo	1	!!brut.androlib.meta.MetaInfo
2	compressionType:·false	2	compressionType:·false
3	doNotCompress:	3	doNotCompress:
4	-·dex	4	-·dex
5	-·arsc	5	-·arsc
6	-·assets/NOTICE.html.gz
7	-·so	6	-·so
8	-·png	7	-·png
9	isFrameworkApk:·false	8	isFrameworkApk:·false
10	packageInfo:·null	9	packageInfo:·null
11	sdkInfo:	10	sdkInfo:
12	··minSdkVersion:·'30'	11	··minSdkVersion:·'30'
13	··targetSdkVersion:·'29'	12	··targetSdkVersion:·'29'
14	sharedLibrary:·false	13	sharedLibrary:·false
15	sparseResources:·false	14	sparseResources:·false
16	unknownFiles:	15	unknownFiles:
17	··stamp-cert-sha256:·'8'
18	··android/util/LocalLog.ReadOnlyLocalLog.uau:·'8'	16	··android/util/LocalLog.ReadOnlyLocalLog.uau:·'8'
19	··android/util/LocalLog.uau:·'8'	17	··android/util/LocalLog.uau:·'8'
20	··com/android/networkstack/tethering/util/IState.uau:·'8'	18	··com/android/networkstack/tethering/util/IState.uau:·'8'
21	··com/android/networkstack/tethering/util/IndentingPrintWriter.uau:·'8'	19	··com/android/networkstack/tethering/util/IndentingPrintWriter.uau:·'8'
22	··com/android/networkstack/tethering/util/State.uau:·'8'	20	··com/android/networkstack/tethering/util/State.uau:·'8'
23	··com/android/networkstack/tethering/util/StateMachine.uau:·'8'	21	··com/android/networkstack/tethering/util/StateMachine.uau:·'8'
24	usesFramework:	22	usesFramework:
25	··ids:	23	··ids:
26	··-·1	24	··-·1
27	··tag:·null	25	··tag:·null
28	version:·2.3.4-dirty	26	version:·2.3.4-dirty
29	versionInfo:	27	versionInfo:
30	··versionCode:·'30'	28	··versionCode:·'30'
31	··versionName:·11~~-6834~~107	29	··versionName:·'11'


Offset 195, 15 lines modified		Offset 195, 15 lines modified

195	Filename:·android/net/dhcp/IDhcpServerCallbacks.class	195	Filename:·android/net/dhcp/IDhcpServerCallbacks.class
196	Comment:·	196	Comment:·

197	Filename:·android/net/ip/-$$Lambda$IpServer$DhcpEventCallback$7aH9Sw9af63oN_b5UeJcSHs2dCA.class	197	Filename:·android/net/ip/-$$Lambda$IpServer$DhcpEventCallback$7aH9Sw9af63oN_b5UeJcSHs2dCA.class
198	Comment:·	198	Comment:·

199	Filename:·android/net/ip/-$$Lambda$IpServer$DhcpServerCallbacksImpl$~~jOx3aMVF_QeZp19IuEPKpIgN6u~~4.class	199	Filename:·android/net/ip/-$$Lambda$IpServer$DhcpServerCallbacksImpl$nBlfeyPZEu2j0KBs4BJklDJTve4.class
200	Comment:·	200	Comment:·

201	Filename:·android/net/ip/-$$Lambda$IpServer$OnHandlerStatusCallback$czoKoFz-ZQJY8J5O14qT9czTIoo.class	201	Filename:·android/net/ip/-$$Lambda$IpServer$OnHandlerStatusCallback$czoKoFz-ZQJY8J5O14qT9czTIoo.class
202	Comment:·	202	Comment:·

203	Filename:·android/net/ip/-$$Lambda$VnCe_2ytttPRhxeMpr6qsJseAAg.class	203	Filename:·android/net/ip/-$$Lambda$VnCe_2ytttPRhxeMpr6qsJseAAg.class
204	Comment:·	204	Comment:·


Offset 2, 46 lines modified		Offset 2, 43 lines modified
2	package·com.android.networkstack.tethering;	2	package·com.android.networkstack.tethering;

3	import·java.io.PrintWriter;	3	import·java.io.PrintWriter;
4	import·com.android.networkstack.tethering.util.StateMachine;	4	import·com.android.networkstack.tethering.util.StateMachine;
5	import·android.net.LinkProperties;	5	import·android.net.LinkProperties;
6	import·java.net.UnknownHostException;	6	import·java.net.UnknownHostException;
7	import·java.net.InetAddress;	7	import·java.net.InetAddress;
8	import·android.net.Network;
9	import·java.util.Arrays;
10	import·java.util.Collection;
11	import·java.util.HashSet;
12	import·java.util.Random;	8	import·java.util.Random;
13	import·com.android.networkstack.tethering.util.IndentingPrintWriter;	9	import·com.android.networkstack.tethering.util.IndentingPrintWriter;
		10	import·java.util.Collection;
		11	import·java.util.Arrays;
		12	import·android.net.Network;
14	import·java.util.Iterator;	13	import·java.util.Iterator;
15	import·java.util.ArrayList;	14	import·java.util.ArrayList;
16	import·java.util.List;	15	import·java.util.List;
17	import·android.net.LinkAddress;	16	import·android.net.LinkAddress;
18	import·android.net.util.PrefixUtils;	17	import·android.net.util.PrefixUtils;
19	import·android.net.ip.IpServer;	18	import·android.net.ip.IpServer;
20	import·android.content.Context;	19	import·android.content.Context;
21	import·android.util.ArrayMap;	20	import·android.util.ArrayMap;
22	import·android.net.IpPrefix;	21	import·android.net.IpPrefix;
23	import·android.util.ArraySet;	22	import·android.util.ArraySet;
24	import·android.net.ConnectivityManager;	23	import·android.net.ConnectivityManager;

25	public·class·PrivateAddressCoordinator	24	public·class·PrivateAddressCoordinator
26	{	25	{
27	····private·final·TetheringConfiguration·mConfig;
28	····private·final·ConnectivityManager·mConnectivityMgr;	26	····private·final·ConnectivityManager·mConnectivityMgr;
29	····private·final·ArraySet·mDownstreams;	27	····private·final·ArraySet·mDownstreams;
30	····private·final·IpPrefix·mTetheringPrefix;	28	····private·final·IpPrefix·mTetheringPrefix;
31	····private·final·ArrayMap·mUpstreamPrefixMap;	29	····private·final·ArrayMap·mUpstreamPrefixMap;
32	····	30	····
33	····public·PrivateAddressCoordinator(final·Context·context~~,·final·TetheringConfiguration·mConfig~~)·{	31	····public·PrivateAddressCoordinator(final·Context·context)·{
34	········this.mDownstreams·=·new·ArraySet();	32	········this.mDownstreams·=·new·ArraySet();
35	········this.mUpstreamPrefixMap·=·new·ArrayMap();	33	········this.mUpstreamPrefixMap·=·new·ArrayMap();
36	········this.mTetheringPrefix·=·new·IpPrefix("192.168.0.0/16");	34	········this.mTetheringPrefix·=·new·IpPrefix("192.168.0.0/16");
37	········this.mConnectivityMgr·=·(ConnectivityManager)context.getSystemService("connectivity");	35	········this.mConnectivityMgr·=·(ConnectivityManager)context.getSystemService("connectivity");
38	········this.mConfig·=·mConfig;
39	····}	36	····}
40	····	37	····
41	····private·IpPrefix·getDownstreamPrefix(final·IpServer·ipServer)·{	38	····private·IpPrefix·getDownstreamPrefix(final·IpServer·ipServer)·{
42	········final·LinkAddress·address·=·ipServer.getAddress();	39	········final·LinkAddress·address·=·ipServer.getAddress();
43	········if·(address·==·null)·{	40	········if·(address·==·null)·{
44	············return·null;	41	············return·null;
45	········}	42	········}
Offset 111, 19 lines modified		Offset 108, 32 lines modified
111	············if·(ipPrefix.equals((Object)this.getDownstreamPrefix(iterator.next())))·{	108	············if·(ipPrefix.equals((Object)this.getDownstreamPrefix(iterator.next())))·{
112	················return·true;	109	················return·true;
113	············}	110	············}
114	········}	111	········}
115	········return·false;	112	········return·false;
116	····}	113	····}
117	····	114	····
118	····private·bo~~olean·is~~Reserve~~dSubne~~t~~(final·int·n~~)·{	115	····private·void·maybeRemoveDeprectedUpstreams()·{
119	········return~~·n·==·44·\|\|·n·==·49;~~	116	········if·(this.mDownstreams.isEmpty())·{
		117	············if·(!this.mUpstreamPrefixMap.isEmpty())·{
		118	················final·ArrayList<Network>·list·=·new·ArrayList<Network>();
		119	················final·List<Network>·list2·=·Arrays.asList(this.mConnectivityMgr.getAllNetworks());
		120	················for·(int·i·=·0;·i·<·this.mUpstreamPrefixMap.size();·++i)·{
		121	····················final·Network·network·=·(Network)this.mUpstreamPrefixMap.keyAt(i);
		122	····················if·(!list2.contains(network))·{
		123	························list.add(network);
		124	····················}
		125	················}
		126	················this.mUpstreamPrefixMap.removeAll((Collection)list);
		127	············}
		128	········}
120	····}	129	····}
121	····	130	····
122	····void·dump(final·IndentingPrintWriter·indentingPrintWriter)·{	131	····void·dump(final·IndentingPrintWriter·indentingPrintWriter)·{
		132	········indentingPrintWriter.decreaseIndent();
123	········((PrintWriter)indentingPrintWriter).println("mUpstreamPrefixMap:");	133	········((PrintWriter)indentingPrintWriter).println("mUpstreamPrefixMap:");
124	········indentingPrintWriter.increaseIndent();	134	········indentingPrintWriter.increaseIndent();
125	········int·n·=·0;	135	········int·n·=·0;
126	········String·s;	136	········String·s;
127	········while·(true)·{	137	········while·(true)·{
128	············final·int·size·=·this.mUpstreamPrefixMap.size();	138	············final·int·size·=·this.mUpstreamPrefixMap.size();
129	············s·=·"·-·";	139	············s·=·"·-·";
Offset 150, 52 lines modified		Offset 160, 40 lines modified
150	········indentingPrintWriter.decreaseIndent();	160	········indentingPrintWriter.decreaseIndent();
151	····}	161	····}
152	····	162	····
153	····public·int·getRandomSubAddr()·{	163	····public·int·getRandomSubAddr()·{
154	········return·new·Random().nextInt()·&·(char)(-1);	164	········return·new·Random().nextInt()·&·(char)(-1);
155	····}	165	····}
156	····	166	····
157	····public·void·maybeRemoveDeprecatedUpstreams()·{
158	········if·(this.mUpstreamPrefixMap.isEmpty())·{
159	············return;
160	········}
161	········final·HashSet·set·=·new·HashSet(this.mUpstreamPrefixMap.keySet());
162	········set.removeAll(Arrays.asList(this.mConnectivityMgr.getAllNetworks()));
163	········this.mUpstreamPrefixMap.removeAll((Collection)set);
164	····}
165	····
166	····public·void·releaseDownstream(final·IpServer·ipServer)·{	167	····public·void·releaseDownstream(final·IpServer·ipServer)·{
167	········this.mDownstreams.remove((Object)ipServer);	168	········this.mDownstreams.remove((Object)ipServer);
168	····}	169	····}
169	····	170	····
170	····public·void·removeUpstreamPrefix(final·Network·network)·{	171	····public·void·removeUpstreamPrefix(final·Network·network)·{
171	········this.mUpstreamPrefixMap.remove((Object)network);	172	········this.mUpstreamPrefixMap.remove((Object)network);
172	····}	173	····}
173	····	174	····
174	····public·LinkAddress·requestDownstreamAddress(final·IpServer·ipServer)·{	175	····public·LinkAddress·requestDownstreamAddress(final·IpServer·ipServer)·{
175	········f~~inal·bool~~ean~~·sh~~o~~uldEnab~~le~~Wifi~~P2pDedicatedIp~~·=·this.mConfig.~~s~~houldEnableWifiP2~~pDe~~dic~~a~~ted~~Ip();	176	········this.maybeRemoveDeprectedUpstreams();
176	········final·int·n·=·3;
177	········if·(shouldEnableWifiP2pDedicatedIp·&&·ipServer.interfaceType()·==·n)·{
178	············return·new·LinkAddress("192.168.49.1/24");
179	········}
180	········final·byte[]·rawAddress·=·this.mTetheringPrefix.getRawAddress();	177	········final·byte[]·rawAddress·=·this.mTetheringPrefix.getRawAddress();
181	········final·int·randomSubAddr·=·this.getRandomSubAddr();	178	········final·int·randomSubAddr·=·this.getRandomSubAddr();
182	········final·int·n2·=·randomSubAddr·>>·8·&·0xFF;	179	········final·int·n·=·randomSubAddr·>>·8·&·0xFF;
		180	········final·int·n2·=·3;
183	········final·byte[]·array2;	181	········final·byte[]·array2;
184	········final·byte[]·array·=·array2·=·new·byte[n];	182	········final·byte[]·array·=·array2·=·new·byte[n2];
185	········array2[0]·=·0;	183	········array2[0]·=·0;
186	········array2[1]·=·1;	184	········array2[1]·=·1;
187	········array2[2]·=·-1;	185	········array2[2]·=·-1;
188	········rawAddress[n]·=·this.getSanitizedAddressSuffix(randomSubAddr,·array);	186	········rawAddress[n2]·=·this.getSanitizedAddressSuffix(randomSubAddr,·array);
189	········int·i·=·0;	187	········int·i·=·0;
190	········while·(i·<·256)·{	188	········while·(i·<·256)·{
191	············final·int·n3·=·n2·+·i·&·0xFF;	189	············final·int·n3·=·n·+·i·&·0xFF;
192	············Label_0~~209~~:·{	190	············Label_0166:·{
... Open expanded diff ...


Offset 1, 11 lines modified		Offset 1, 10 lines modified

1	package·com.android.networkstack.tethering;	1	package·com.android.networkstack.tethering;

2	public·final·class·R$bool	2	public·final·class·R$bool
3	{	3	{
4	····public·static·final·int·config_tether_enable_bpf_offload·=·2130837504;	4	····public·static·final·int·config_tether_enable_bpf_offload·=·2130837504;
5	····public·static·final·int·config_tether_enable_legacy_dhcp_server·=·2130837505;	5	····public·static·final·int·config_tether_enable_legacy_dhcp_server·=·2130837505;
6	····public·static·final·int·config_tether_~~enable_l~~ega~~cy_wifi_p2~~p_~~dedic~~at~~ed_~~ip·=·2130837506;	6	····public·static·final·int·config_tether_upstream_automatic·=·2130837506;
7	····public·static·final·int·config_tethe~~r_upstream~~_automatic·=·2130837507;	7	····public·static·final·int·config_upstream_roaming_notification·=·2130837507;
8	····public·static·final·int·config_upstream_roaming_notification·=·2130837508;
9	}	8	}


Offset 149, 16 lines modified		Offset 149, 16 lines modified
149	········this.mStateReceiver·=·(BroadcastReceiver)new·Tethering$StateReceiver(this,·(Tethering$1)null);	149	········this.mStateReceiver·=·(BroadcastReceiver)new·Tethering$StateReceiver(this,·(Tethering$1)null);
150	········final·UserManager·mUserManager·=·(UserManager)this.mContext.getSystemService("user");	150	········final·UserManager·mUserManager·=·(UserManager)this.mContext.getSystemService("user");
151	········this.mUserManager·=·mUserManager;	151	········this.mUserManager·=·mUserManager;
152	········this.mTetheringRestriction·=·new·Tethering$UserRestrictionActionListener(mUserManager,·this,·this.mNotificationUpdater);	152	········this.mTetheringRestriction·=·new·Tethering$UserRestrictionActionListener(mUserManager,·this,·this.mNotificationUpdater);
153	········this.mExecutor·=·new·Tethering$TetheringThreadExecutor(this,·this.mHandler);	153	········this.mExecutor·=·new·Tethering$TetheringThreadExecutor(this,·this.mHandler);
154	········this.mActiveDataSubIdListener·=·new·Tethering$ActiveDataSubIdListener(this,·(Executor)this.mExecutor);	154	········this.mActiveDataSubIdListener·=·new·Tethering$ActiveDataSubIdListener(this,·(Executor)this.mExecutor);
155	········this.mNetdCallback·=·new·Tethering$NetdCallback(this,·(Tethering$1)null);	155	········this.mNetdCallback·=·new·Tethering$NetdCallback(this,·(Tethering$1)null);
		156	········this.mPrivateAddressCoordinator·=·new·PrivateAddressCoordinator(this.mContext);
156	········this.updateConfiguration();	157	········this.updateConfiguration();
157	········this.mPrivateAddressCoordinator·=·new·PrivateAddressCoordinator(this.mContext,·this.mConfig);
158	········mDeps·=·this.mDeps;	158	········mDeps·=·this.mDeps;
159	········this.mBpfCoordinator·=·mDeps.getBpfCoordinator((BpfCoordinator$Dependencies)new·Tethering$2(this));	159	········this.mBpfCoordinator·=·mDeps.getBpfCoordinator((BpfCoordinator$Dependencies)new·Tethering$2(this));
160	········this.startStateMachineUpdaters();	160	········this.startStateMachineUpdaters();
161	····}	161	····}
162	····	162	····
163	····private·static·boolean·argsContain(final·String[]·array,·final·String·s)·{	163	····private·static·boolean·argsContain(final·String[]·array,·final·String·s)·{
164	········for·(int·length·=·array.length,·i·=·0;·i·<·length;·++i)·{	164	········for·(int·length·=·array.length,·i·=·0;·i·<·length;·++i)·{


Offset 1, 8 lines modified		Offset 1, 8 lines modified
1	Zip·file·size:·498452·bytes,·number·of·entries:·282	1	Zip·file·size:·497485·bytes,·number·of·entries:·282
2	?rwxrwxr-x··2.0·unx······172·b-·stor·80-Jan-01·00:00·android/hardware/tetheroffload/config/V1_0/IOffloadConfig$setHandlesCallback.class	2	?rwxrwxr-x··2.0·unx······172·b-·stor·80-Jan-01·00:00·android/hardware/tetheroffload/config/V1_0/IOffloadConfig$setHandlesCallback.class
3	?rwxrwxr-x··2.0·unx·····1541·b-·stor·80-Jan-01·00:00·android/hardware/tetheroffload/config/V1_0/IOffloadConfig.class	3	?rwxrwxr-x··2.0·unx·····1541·b-·stor·80-Jan-01·00:00·android/hardware/tetheroffload/config/V1_0/IOffloadConfig.class
4	?rwxrwxr-x··2.0·unx······177·b-·stor·80-Jan-01·00:00·android/hardware/tetheroffload/control/V1_0/IOffloadControl$addDownstreamCallback.class	4	?rwxrwxr-x··2.0·unx······177·b-·stor·80-Jan-01·00:00·android/hardware/tetheroffload/control/V1_0/IOffloadControl$addDownstreamCallback.class
5	?rwxrwxr-x··2.0·unx······164·b-·stor·80-Jan-01·00:00·android/hardware/tetheroffload/control/V1_0/IOffloadControl$getForwardedStatsCallback.class	5	?rwxrwxr-x··2.0·unx······164·b-·stor·80-Jan-01·00:00·android/hardware/tetheroffload/control/V1_0/IOffloadControl$getForwardedStatsCallback.class
6	?rwxrwxr-x··2.0·unx······175·b-·stor·80-Jan-01·00:00·android/hardware/tetheroffload/control/V1_0/IOffloadControl$initOffloadCallback.class	6	?rwxrwxr-x··2.0·unx······175·b-·stor·80-Jan-01·00:00·android/hardware/tetheroffload/control/V1_0/IOffloadControl$initOffloadCallback.class
7	?rwxrwxr-x··2.0·unx······180·b-·stor·80-Jan-01·00:00·android/hardware/tetheroffload/control/V1_0/IOffloadControl$removeDownstreamCallback.class	7	?rwxrwxr-x··2.0·unx······180·b-·stor·80-Jan-01·00:00·android/hardware/tetheroffload/control/V1_0/IOffloadControl$removeDownstreamCallback.class
8	?rwxrwxr-x··2.0·unx······176·b-·stor·80-Jan-01·00:00·android/hardware/tetheroffload/control/V1_0/IOffloadControl$setDataLimitCallback.class	8	?rwxrwxr-x··2.0·unx······176·b-·stor·80-Jan-01·00:00·android/hardware/tetheroffload/control/V1_0/IOffloadControl$setDataLimitCallback.class
Offset 62, 15 lines modified		Offset 62, 15 lines modified
62	?rwxrwxr-x··2.0·unx·····1548·b-·stor·80-Jan-01·00:00·android/net/dhcp/DhcpLeaseParcelable.class	62	?rwxrwxr-x··2.0·unx·····1548·b-·stor·80-Jan-01·00:00·android/net/dhcp/DhcpLeaseParcelable.class
63	?rwxrwxr-x··2.0·unx······665·b-·stor·80-Jan-01·00:00·android/net/dhcp/DhcpServingParamsParcel$1.class	63	?rwxrwxr-x··2.0·unx······665·b-·stor·80-Jan-01·00:00·android/net/dhcp/DhcpServingParamsParcel$1.class
64	?rwxrwxr-x··2.0·unx·····1919·b-·stor·80-Jan-01·00:00·android/net/dhcp/DhcpServingParamsParcel.class	64	?rwxrwxr-x··2.0·unx·····1919·b-·stor·80-Jan-01·00:00·android/net/dhcp/DhcpServingParamsParcel.class
65	?rwxrwxr-x··2.0·unx······308·b-·stor·80-Jan-01·00:00·android/net/dhcp/IDhcpEventCallbacks.class	65	?rwxrwxr-x··2.0·unx······308·b-·stor·80-Jan-01·00:00·android/net/dhcp/IDhcpEventCallbacks.class
66	?rwxrwxr-x··2.0·unx······397·b-·stor·80-Jan-01·00:00·android/net/dhcp/IDhcpServer.class	66	?rwxrwxr-x··2.0·unx······397·b-·stor·80-Jan-01·00:00·android/net/dhcp/IDhcpServer.class
67	?rwxrwxr-x··2.0·unx······271·b-·stor·80-Jan-01·00:00·android/net/dhcp/IDhcpServerCallbacks.class	67	?rwxrwxr-x··2.0·unx······271·b-·stor·80-Jan-01·00:00·android/net/dhcp/IDhcpServerCallbacks.class
68	?rwxrwxr-x··2.0·unx······604·b-·stor·80-Jan-01·00:00·android/net/ip/-$$Lambda$IpServer$DhcpEventCallback$7aH9Sw9af63oN_b5UeJcSHs2dCA.class	68	?rwxrwxr-x··2.0·unx······604·b-·stor·80-Jan-01·00:00·android/net/ip/-$$Lambda$IpServer$DhcpEventCallback$7aH9Sw9af63oN_b5UeJcSHs2dCA.class
69	?rwxrwxr-x··2.0·unx······706·b-·stor·80-Jan-01·00:00·android/net/ip/-$$Lambda$IpServer$DhcpServerCallbacksImpl$~~jOx3aMVF_QeZp19IuEPKpIgN6u~~4.class	69	?rwxrwxr-x··2.0·unx······706·b-·stor·80-Jan-01·00:00·android/net/ip/-$$Lambda$IpServer$DhcpServerCallbacksImpl$nBlfeyPZEu2j0KBs4BJklDJTve4.class
70	?rwxrwxr-x··2.0·unx······576·b-·stor·80-Jan-01·00:00·android/net/ip/-$$Lambda$IpServer$OnHandlerStatusCallback$czoKoFz-ZQJY8J5O14qT9czTIoo.class	70	?rwxrwxr-x··2.0·unx······576·b-·stor·80-Jan-01·00:00·android/net/ip/-$$Lambda$IpServer$OnHandlerStatusCallback$czoKoFz-ZQJY8J5O14qT9czTIoo.class
71	?rwxrwxr-x··2.0·unx······407·b-·stor·80-Jan-01·00:00·android/net/ip/-$$Lambda$VnCe_2ytttPRhxeMpr6qsJseAAg.class	71	?rwxrwxr-x··2.0·unx······407·b-·stor·80-Jan-01·00:00·android/net/ip/-$$Lambda$VnCe_2ytttPRhxeMpr6qsJseAAg.class
72	?rwxrwxr-x··2.0·unx·····2607·b-·stor·80-Jan-01·00:00·android/net/ip/InterfaceController.class	72	?rwxrwxr-x··2.0·unx·····2607·b-·stor·80-Jan-01·00:00·android/net/ip/InterfaceController.class
73	?rwxrwxr-x··2.0·unx·····1565·b-·stor·80-Jan-01·00:00·android/net/ip/IpNeighborMonitor$NeighborEvent.class	73	?rwxrwxr-x··2.0·unx·····1565·b-·stor·80-Jan-01·00:00·android/net/ip/IpNeighborMonitor$NeighborEvent.class
74	?rwxrwxr-x··2.0·unx······177·b-·stor·80-Jan-01·00:00·android/net/ip/IpNeighborMonitor$NeighborEventConsumer.class	74	?rwxrwxr-x··2.0·unx······177·b-·stor·80-Jan-01·00:00·android/net/ip/IpNeighborMonitor$NeighborEventConsumer.class
75	?rwxrwxr-x··2.0·unx······370·b-·stor·80-Jan-01·00:00·android/net/ip/IpServer$Callback.class	75	?rwxrwxr-x··2.0·unx······370·b-·stor·80-Jan-01·00:00·android/net/ip/IpServer$Callback.class
76	?rwxrwxr-x··2.0·unx·····1666·b-·stor·80-Jan-01·00:00·android/net/ip/IpServer$Dependencies.class	76	?rwxrwxr-x··2.0·unx·····1666·b-·stor·80-Jan-01·00:00·android/net/ip/IpServer$Dependencies.class
Offset 160, 32 lines modified		Offset 160, 32 lines modified
160	?rwxrwxr-x··2.0·unx····15732·b-·defN·80-Jan-01·00:00·com/android/networkstack/tethering/OffloadController.class	160	?rwxrwxr-x··2.0·unx····15732·b-·defN·80-Jan-01·00:00·com/android/networkstack/tethering/OffloadController.class
161	?rwxrwxr-x··2.0·unx······113·b-·stor·80-Jan-01·00:00·com/android/networkstack/tethering/OffloadHardwareInterface$1.class	161	?rwxrwxr-x··2.0·unx······113·b-·stor·80-Jan-01·00:00·com/android/networkstack/tethering/OffloadHardwareInterface$1.class
162	?rwxrwxr-x··2.0·unx······605·b-·stor·80-Jan-01·00:00·com/android/networkstack/tethering/OffloadHardwareInterface$CbResults.class	162	?rwxrwxr-x··2.0·unx······605·b-·stor·80-Jan-01·00:00·com/android/networkstack/tethering/OffloadHardwareInterface$CbResults.class
163	?rwxrwxr-x··2.0·unx······401·b-·stor·80-Jan-01·00:00·com/android/networkstack/tethering/OffloadHardwareInterface$ControlCallback.class	163	?rwxrwxr-x··2.0·unx······401·b-·stor·80-Jan-01·00:00·com/android/networkstack/tethering/OffloadHardwareInterface$ControlCallback.class
164	?rwxrwxr-x··2.0·unx·····2500·b-·stor·80-Jan-01·00:00·com/android/networkstack/tethering/OffloadHardwareInterface$Dependencies.class	164	?rwxrwxr-x··2.0·unx·····2500·b-·stor·80-Jan-01·00:00·com/android/networkstack/tethering/OffloadHardwareInterface$Dependencies.class
165	?rwxrwxr-x··2.0·unx······753·b-·stor·80-Jan-01·00:00·com/android/networkstack/tethering/OffloadHardwareInterface$ForwardedStats.class	165	?rwxrwxr-x··2.0·unx······753·b-·stor·80-Jan-01·00:00·com/android/networkstack/tethering/OffloadHardwareInterface$ForwardedStats.class
166	?rwxrwxr-x··2.0·unx····11004·b-·defN·80-Jan-01·00:00·com/android/networkstack/tethering/OffloadHardwareInterface.class	166	?rwxrwxr-x··2.0·unx····11004·b-·defN·80-Jan-01·00:00·com/android/networkstack/tethering/OffloadHardwareInterface.class
167	?rwxrwxr-x··2.0·unx·····5~~770~~·b-·stor·80-Jan-01·00:00·com/android/networkstack/tethering/PrivateAddressCoordinator.class	167	?rwxrwxr-x··2.0·unx·····5342·b-·stor·80-Jan-01·00:00·com/android/networkstack/tethering/PrivateAddressCoordinator.class
168	?rwxrwxr-x··2.0·unx······575·b-·stor·80-Jan-01·00:00·com/android/networkstack/tethering/R$array.class	168	?rwxrwxr-x··2.0·unx······575·b-·stor·80-Jan-01·00:00·com/android/networkstack/tethering/R$array.class
169	?rwxrwxr-x··2.0·unx······~~421~~·b-·stor·80-Jan-01·00:00·com/android/networkstack/tethering/R$bool.class	169	?rwxrwxr-x··2.0·unx······348·b-·stor·80-Jan-01·00:00·com/android/networkstack/tethering/R$bool.class
170	?rwxrwxr-x··2.0·unx······164·b-·stor·80-Jan-01·00:00·com/android/networkstack/tethering/R$drawable.class	170	?rwxrwxr-x··2.0·unx······164·b-·stor·80-Jan-01·00:00·com/android/networkstack/tethering/R$drawable.class
171	?rwxrwxr-x··2.0·unx······310·b-·stor·80-Jan-01·00:00·com/android/networkstack/tethering/R$integer.class	171	?rwxrwxr-x··2.0·unx······310·b-·stor·80-Jan-01·00:00·com/android/networkstack/tethering/R$integer.class
172	?rwxrwxr-x··2.0·unx······763·b-·stor·80-Jan-01·00:00·com/android/networkstack/tethering/R$string.class	172	?rwxrwxr-x··2.0·unx······763·b-·stor·80-Jan-01·00:00·com/android/networkstack/tethering/R$string.class


Offset 25, 15 lines modified		Offset 25, 14 lines modified
25	····public·final·int·activeDataSubId;	25	····public·final·int·activeDataSubId;
26	····public·final·boolean·chooseUpstreamAutomatically;	26	····public·final·boolean·chooseUpstreamAutomatically;
27	····public·final·String[]·defaultIPv4DNS;	27	····public·final·String[]·defaultIPv4DNS;
28	····public·final·boolean·enableLegacyDhcpServer;	28	····public·final·boolean·enableLegacyDhcpServer;
29	····public·final·boolean·isDunRequired;	29	····public·final·boolean·isDunRequired;
30	····public·final·String[]·legacyDhcpRanges;	30	····public·final·String[]·legacyDhcpRanges;
31	····private·final·boolean·mEnableBpfOffload;	31	····private·final·boolean·mEnableBpfOffload;
32	····private·final·boolean·mEnableWifiP2pDedicatedIp;
33	····private·final·int·mOffloadPollInterval;	32	····private·final·int·mOffloadPollInterval;
34	····public·final·Collection·preferredUpstreamIfaceTypes;	33	····public·final·Collection·preferredUpstreamIfaceTypes;
35	····public·final·String[]·provisioningApp;	34	····public·final·String[]·provisioningApp;
36	····public·final·String·provisioningAppNoUi;	35	····public·final·String·provisioningAppNoUi;
37	····public·final·int·provisioningCheckPeriod;	36	····public·final·int·provisioningCheckPeriod;
38	····public·final·String·provisioningResponse;	37	····public·final·String·provisioningResponse;
39	····public·final·String[]·tetherableBluetoothRegexs;	38	····public·final·String[]·tetherableBluetoothRegexs;
Offset 67, 15 lines modified		Offset 66, 14 lines modified
67	········this.mEnableBpfOffload·=·this.getEnableBpfOffload(resources);	66	········this.mEnableBpfOffload·=·this.getEnableBpfOffload(resources);
68	········this.enableLegacyDhcpServer·=·this.getEnableLegacyDhcpServer(resources);	67	········this.enableLegacyDhcpServer·=·this.getEnableLegacyDhcpServer(resources);
69	········this.provisioningApp·=·getResourceStringArray(resources,·R$array.config_mobile_hotspot_provision_app);	68	········this.provisioningApp·=·getResourceStringArray(resources,·R$array.config_mobile_hotspot_provision_app);
70	········this.provisioningAppNoUi·=·getResourceString(resources,·R$string.config_mobile_hotspot_provision_app_no_ui);	69	········this.provisioningAppNoUi·=·getResourceString(resources,·R$string.config_mobile_hotspot_provision_app_no_ui);
71	········this.provisioningCheckPeriod·=·getResourceInteger(resources,·R$integer.config_mobile_hotspot_provision_check_period,·0);	70	········this.provisioningCheckPeriod·=·getResourceInteger(resources,·R$integer.config_mobile_hotspot_provision_check_period,·0);
72	········this.provisioningResponse·=·getResourceString(resources,·R$string.config_mobile_hotspot_provision_response);	71	········this.provisioningResponse·=·getResourceString(resources,·R$string.config_mobile_hotspot_provision_response);
73	········this.mOffloadPollInterval·=·getResourceInteger(resources,·R$integer.config_tether_offload_poll_interval,·5000);	72	········this.mOffloadPollInterval·=·getResourceInteger(resources,·R$integer.config_tether_offload_poll_interval,·5000);
74	········this.mEnableWifiP2pDedicatedIp·=·getResourceBoolean(resources,·R$bool.config_tether_enable_legacy_wifi_p2p_dedicated_ip,·false);
75	········forSubComponent.log(this.toString());	73	········forSubComponent.log(this.toString());
76	····}	74	····}
77	····	75	····
78	····private·static·void·appendIfNotPresent(final·ArrayList·list,·final·int·n)·{	76	····private·static·void·appendIfNotPresent(final·ArrayList·list,·final·int·n)·{
79	········if·(list.contains(n))·{	77	········if·(list.contains(n))·{
80	············return;	78	············return;
81	········}	79	········}
Offset 306, 16 lines modified		Offset 304, 14 lines modified
306	········dumpStringArray(printWriter,·"provisioningApp",·this.provisioningApp);	304	········dumpStringArray(printWriter,·"provisioningApp",·this.provisioningApp);
307	········printWriter.print("provisioningAppNoUi:·");	305	········printWriter.print("provisioningAppNoUi:·");
308	········printWriter.println(this.provisioningAppNoUi);	306	········printWriter.println(this.provisioningAppNoUi);
309	········printWriter.print("enableBpfOffload:·");	307	········printWriter.print("enableBpfOffload:·");
310	········printWriter.println(this.mEnableBpfOffload);	308	········printWriter.println(this.mEnableBpfOffload);
311	········printWriter.print("enableLegacyDhcpServer:·");	309	········printWriter.print("enableLegacyDhcpServer:·");


Offset 36, 15 lines modified		Offset 36, 14 lines modified
36	········return·mUpstreamWanted;	36	········return·mUpstreamWanted;
37	····}	37	····}
38	····	38	····
39	····public·void·enter()·{	39	····public·void·enter()·{
40	········if·(!this.this$1.turnOnMasterTetherSettings())·{	40	········if·(!this.this$1.turnOnMasterTetherSettings())·{
41	············return;	41	············return;
42	········}	42	········}
43	········Tethering.access$4300(this.this$1.this$0).maybeRemoveDeprecatedUpstreams();
44	········Tethering.access$3600(this.this$1.this$0).startObserveAllNetworks();	43	········Tethering.access$3600(this.this$1.this$0).startObserveAllNetworks();
45	········if·(Tethering.access$4400(this.this$1.this$0))·{	44	········if·(Tethering.access$4400(this.this$1.this$0))·{
46	············final·boolean·mUpstreamWanted·=·true;	45	············final·boolean·mUpstreamWanted·=·true;
47	············this.mUpstreamWanted·=·mUpstreamWanted;	46	············this.mUpstreamWanted·=·mUpstreamWanted;
48	············Tethering$TetherMasterSM.access$4500(this.this$1).start();	47	············Tethering$TetherMasterSM.access$4500(this.this$1).start();
49	············this.this$1.chooseUpstreamType(mUpstreamWanted);	48	············this.this$1.chooseUpstreamType(mUpstreamWanted);
50	············this.mTryCell·=·false;	49	············this.mTryCell·=·false;


Offset 23, 10 lines modified		Offset 23, 10 lines modified
23	····private·void·handleError()·{	23	····private·void·handleError()·{
24	········IpServer.access$102(this.this$0,·12);	24	········IpServer.access$102(this.this$0,·12);
25	········final·IpServer·this$0·=·this.this$0;	25	········final·IpServer·this$0·=·this.this$0;
26	········((StateMachine)this$0).transitionTo((IState)IpServer.access$200(this$0));	26	········((StateMachine)this$0).transitionTo((IState)IpServer.access$200(this$0));
27	····}	27	····}
28	····	28	····
29	····public·void·onDhcpServerCreated(final·int·n,·final·IDhcpServer·dhcpServer)·{	29	····public·void·onDhcpServerCreated(final·int·n,·final·IDhcpServer·dhcpServer)·{
30	········((StateMachine)this.this$0).getHandler().post((Runnable)new·-$$Lambda$IpServer$DhcpServerCallbacksImpl$~~jOx3aMVF_QeZp19IuEPKpIgN6u~~4(this,·dhcpServer~~,·n~~));	30	········((StateMachine)this.this$0).getHandler().post((Runnable)new·-$$Lambda$IpServer$DhcpServerCallbacksImpl$nBlfeyPZEu2j0KBs4BJklDJTve4(this,·n,·dhcpServer));
31	····}	31	····}
32	}	32	}


Offset 18, 48 lines modified		Offset 18, 48 lines modified
18	.field·final·synthetic·this$0:Landroid/net/ip/IpServer;	18	.field·final·synthetic·this$0:Landroid/net/ip/IpServer;


19	#·direct·methods	19	#·direct·methods
20	.method·constructor·<init>(Landroid/net/ip/IpServer;)V	20	.method·constructor·<init>(Landroid/net/ip/IpServer;)V
21	····.locals·0	21	····.locals·0

22	····.line·1043	22	····.line·1039
23	····iput-object·p1,·p0,·Landroid/net/ip/IpServer$InitialState;->this$0:Landroid/net/ip/IpServer;	23	····iput-object·p1,·p0,·Landroid/net/ip/IpServer$InitialState;->this$0:Landroid/net/ip/IpServer;

24	····invoke-direct·{p0},·Lcom/android/networkstack/tethering/util/State;-><init>()V	24	····invoke-direct·{p0},·Lcom/android/networkstack/tethering/util/State;-><init>()V

25	····return-void	25	····return-void
26	.end·method	26	.end·method


27	#·virtual·methods	27	#·virtual·methods
28	.method·public·enter()V	28	.method·public·enter()V
29	····.locals·1	29	····.locals·1

30	····.line·1046	30	····.line·1042
31	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$InitialState;->this$0:Landroid/net/ip/IpServer;	31	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$InitialState;->this$0:Landroid/net/ip/IpServer;

32	····const/4·v0,·0x1	32	····const/4·v0,·0x1

33	····invoke-static·{p0,·v0},·Landroid/net/ip/IpServer;->access$1300(Landroid/net/ip/IpServer;I)V	33	····invoke-static·{p0,·v0},·Landroid/net/ip/IpServer;->access$1300(Landroid/net/ip/IpServer;I)V

34	····return-void	34	····return-void
35	.end·method	35	.end·method

36	.method·public·processMessage(Landroid/os/Message;)Z	36	.method·public·processMessage(Landroid/os/Message;)Z
37	····.locals·3	37	····.locals·3

38	····.line·1051	38	····.line·1047
39	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$InitialState;->this$0:Landroid/net/ip/IpServer;	39	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$InitialState;->this$0:Landroid/net/ip/IpServer;

40	····iget·v1,·p1,·Landroid/os/Message;->what:I	40	····iget·v1,·p1,·Landroid/os/Message;->what:I

41	····invoke-static·{v0,·p0,·v1},·Landroid/net/ip/IpServer;->access$1400(Landroid/net/ip/IpServer;Lcom/android/networkstack/tethering/util/State;I)V	41	····invoke-static·{v0,·p0,·v1},·Landroid/net/ip/IpServer;->access$1400(Landroid/net/ip/IpServer;Lcom/android/networkstack/tethering/util/State;I)V

42	····.line·1052	42	····.line·1048
43	····iget·v0,·p1,·Landroid/os/Message;->what:I	43	····iget·v0,·p1,·Landroid/os/Message;->what:I

44	····const/16·v1,·0x65	44	····const/16·v1,·0x65

45	····const/4·v2,·0x0	45	····const/4·v2,·0x0

46	····if-eq·v0,·v1,·:cond_2	46	····if-eq·v0,·v1,·:cond_2
Offset 70, 102 lines modified		Offset 70, 102 lines modified

70	····const/16·v1,·0x6e	70	····const/16·v1,·0x6e

71	····if-eq·v0,·v1,·:cond_0	71	····if-eq·v0,·v1,·:cond_0

72	····return·v2	72	····return·v2

73	····.line·1072	73	····.line·1068
74	····:cond_0	74	····:cond_0
75	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$InitialState;->this$0:Landroid/net/ip/IpServer;	75	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$InitialState;->this$0:Landroid/net/ip/IpServer;

76	····iget-object·v0,·p1,·Landroid/os/Message;->obj:Ljava/lang/Object;	76	····iget-object·v0,·p1,·Landroid/os/Message;->obj:Ljava/lang/Object;

77	····check-cast·v0,·Landroid/net/LinkProperties;	77	····check-cast·v0,·Landroid/net/LinkProperties;

78	····iget·p1,·p1,·Landroid/os/Message;->arg1:I	78	····iget·p1,·p1,·Landroid/os/Message;->arg1:I

79	····invoke-static·{p0,·v0,·p1},·Landroid/net/ip/IpServer;->access$1900(Landroid/net/ip/IpServer;Landroid/net/LinkProperties;I)V	79	····invoke-static·{p0,·v0,·p1},·Landroid/net/ip/IpServer;->access$1900(Landroid/net/ip/IpServer;Landroid/net/LinkProperties;I)V

80	····goto·:goto_0	80	····goto·:goto_0

81	····.line·1069	81	····.line·1065
82	····:cond_1	82	····:cond_1
83	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$InitialState;->this$0:Landroid/net/ip/IpServer;	83	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$InitialState;->this$0:Landroid/net/ip/IpServer;

84	····invoke-static·{p0},·Landroid/net/ip/IpServer;->access$1800(Landroid/net/ip/IpServer;)Lcom/android/networkstack/tethering/util/State;	84	····invoke-static·{p0},·Landroid/net/ip/IpServer;->access$1800(Landroid/net/ip/IpServer;)Lcom/android/networkstack/tethering/util/State;

85	····move-result-object·p1	85	····move-result-object·p1

86	····invoke-virtual·{p0,·p1},·Lcom/android/networkstack/tethering/util/StateMachine;->transitionTo(Lcom/android/networkstack/tethering/util/IState;)V	86	····invoke-virtual·{p0,·p1},·Lcom/android/networkstack/tethering/util/StateMachine;->transitionTo(Lcom/android/networkstack/tethering/util/IState;)V

87	····goto·:goto_0	87	····goto·:goto_0

88	····.line·1054	88	····.line·1050
89	····:cond_2	89	····:cond_2
90	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$InitialState;->this$0:Landroid/net/ip/IpServer;	90	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$InitialState;->this$0:Landroid/net/ip/IpServer;

91	····invoke-static·{v0,·v2},·Landroid/net/ip/IpServer;->access$102(Landroid/net/ip/IpServer;I)I	91	····invoke-static·{v0,·v2},·Landroid/net/ip/IpServer;->access$102(Landroid/net/ip/IpServer;I)I

92	····.line·1055	92	····.line·1051
93	····iget·v0,·p1,·Landroid/os/Message;->arg1:I	93	····iget·v0,·p1,·Landroid/os/Message;->arg1:I

94	····const/4·v1,·0x2	94	····const/4·v1,·0x2

95	····if-eq·v0,·v1,·:cond_4	95	····if-eq·v0,·v1,·:cond_4

96	····const/4·v1,·0x3	96	····const/4·v1,·0x3

97	····if-eq·v0,·v1,·:cond_3	97	····if-eq·v0,·v1,·:cond_3

98	····.line·1065	98	····.line·1061
99	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$InitialState;->this$0:Landroid/net/ip/IpServer;	99	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$InitialState;->this$0:Landroid/net/ip/IpServer;

100	····invoke-static·{p0},·Landroid/net/ip/IpServer;->access$400(Landroid/net/ip/IpServer;)Landroid/net/util/SharedLog;	100	····invoke-static·{p0},·Landroid/net/ip/IpServer;->access$400(Landroid/net/ip/IpServer;)Landroid/net/util/SharedLog;

101	····move-result-object·p0	101	····move-result-object·p0

102	····const-string·p1,·"Invalid·tethering·interface·serving·state·specified."	102	····const-string·p1,·"Invalid·tethering·interface·serving·state·specified."

103	····invoke-virtual·{p0,·p1},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;)V	103	····invoke-virtual·{p0,·p1},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;)V

104	····goto·:goto_0	104	····goto·:goto_0

105	····.line·1057	105	····.line·1053
106	····:cond_3	106	····:cond_3
107	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$InitialState;->this$0:Landroid/net/ip/IpServer;	107	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$InitialState;->this$0:Landroid/net/ip/IpServer;

108	····iget-object·p1,·p1,·Landroid/os/Message;->obj:Ljava/lang/Object;	108	····iget-object·p1,·p1,·Landroid/os/Message;->obj:Ljava/lang/Object;

109	····check-cast·p1,·Landroid/net/TetheringRequestParcel;	109	····check-cast·p1,·Landroid/net/TetheringRequestParcel;

110	····invoke-static·{v0,·p1},·Landroid/net/ip/IpServer;->access$1500(Landroid/net/ip/IpServer;Landroid/net/TetheringRequestParcel;)V	110	····invoke-static·{v0,·p1},·Landroid/net/ip/IpServer;->access$1500(Landroid/net/ip/IpServer;Landroid/net/TetheringRequestParcel;)V

111	····.line·1058	111	····.line·1054
112	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$InitialState;->this$0:Landroid/net/ip/IpServer;	112	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$InitialState;->this$0:Landroid/net/ip/IpServer;

113	····invoke-static·{p0},·Landroid/net/ip/IpServer;->access$1600(Landroid/net/ip/IpServer;)Lcom/android/networkstack/tethering/util/State;	113	····invoke-static·{p0},·Landroid/net/ip/IpServer;->access$1600(Landroid/net/ip/IpServer;)Lcom/android/networkstack/tethering/util/State;

... Open expanded diff ...


Offset 18, 37 lines modified		Offset 18, 37 lines modified
18	.field·final·synthetic·this$0:Landroid/net/ip/IpServer;	18	.field·final·synthetic·this$0:Landroid/net/ip/IpServer;


19	#·direct·methods	19	#·direct·methods
20	.method·constructor·<init>(Landroid/net/ip/IpServer;)V	20	.method·constructor·<init>(Landroid/net/ip/IpServer;)V
21	····.locals·0	21	····.locals·0

22	····.line·1~~203~~	22	····.line·1199
23	····iput-object·p1,·p0,·Landroid/net/ip/IpServer$TetheredState;->this$0:Landroid/net/ip/IpServer;	23	····iput-object·p1,·p0,·Landroid/net/ip/IpServer$TetheredState;->this$0:Landroid/net/ip/IpServer;

24	····invoke-direct·{p0,·p1},·Landroid/net/ip/IpServer$BaseServingState;-><init>(Landroid/net/ip/IpServer;)V	24	····invoke-direct·{p0,·p1},·Landroid/net/ip/IpServer$BaseServingState;-><init>(Landroid/net/ip/IpServer;)V

25	····return-void	25	····return-void
26	.end·method	26	.end·method

27	.method·private·cleanupUpstream()V	27	.method·private·cleanupUpstream()V
28	····.locals·2	28	····.locals·2

29	····.line·1222	29	····.line·1218
30	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$TetheredState;->this$0:Landroid/net/ip/IpServer;	30	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$TetheredState;->this$0:Landroid/net/ip/IpServer;

31	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$3100(Landroid/net/ip/IpServer;)Landroid/net/util/InterfaceSet;	31	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$3100(Landroid/net/ip/IpServer;)Landroid/net/util/InterfaceSet;

32	····move-result-object·v0	32	····move-result-object·v0

33	····if-nez·v0,·:cond_0	33	····if-nez·v0,·:cond_0

34	····return-void	34	····return-void

35	····.line·1224	35	····.line·1220
36	····:cond_0	36	····:cond_0
37	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$TetheredState;->this$0:Landroid/net/ip/IpServer;	37	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$TetheredState;->this$0:Landroid/net/ip/IpServer;

38	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$3100(Landroid/net/ip/IpServer;)Landroid/net/util/InterfaceSet;	38	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$3100(Landroid/net/ip/IpServer;)Landroid/net/util/InterfaceSet;

39	····move-result-object·v0	39	····move-result-object·v0

Offset 71, 34 lines modified		Offset 71, 34 lines modified

71	····check-cast·v1,·Ljava/lang/String;	71	····check-cast·v1,·Ljava/lang/String;

72	····invoke-direct·{p0,·v1},·Landroid/net/ip/IpServer$TetheredState;->cleanupUpstreamInterface(Ljava/lang/String;)V	72	····invoke-direct·{p0,·v1},·Landroid/net/ip/IpServer$TetheredState;->cleanupUpstreamInterface(Ljava/lang/String;)V

73	····goto·:goto_0	73	····goto·:goto_0

74	····.line·1225	74	····.line·1221
75	····:cond_1	75	····:cond_1
76	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$TetheredState;->this$0:Landroid/net/ip/IpServer;	76	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$TetheredState;->this$0:Landroid/net/ip/IpServer;

77	····const/4·v1,·0x0	77	····const/4·v1,·0x0

78	····invoke-static·{v0,·v1},·Landroid/net/ip/IpServer;->access$3102(Landroid/net/ip/IpServer;Landroid/net/util/InterfaceSet;)Landroid/net/util/InterfaceSet;	78	····invoke-static·{v0,·v1},·Landroid/net/ip/IpServer;->access$3102(Landroid/net/ip/IpServer;Landroid/net/util/InterfaceSet;)Landroid/net/util/InterfaceSet;

79	····.line·1226	79	····.line·1222
80	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$TetheredState;->this$0:Landroid/net/ip/IpServer;	80	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$TetheredState;->this$0:Landroid/net/ip/IpServer;

81	····invoke-static·{p0},·Landroid/net/ip/IpServer;->access$3200(Landroid/net/ip/IpServer;)V	81	····invoke-static·{p0},·Landroid/net/ip/IpServer;->access$3200(Landroid/net/ip/IpServer;)V

82	····return-void	82	····return-void
83	.end·method	83	.end·method

84	.method·private·cleanupUpstreamInterface(Ljava/lang/String;)V	84	.method·private·cleanupUpstreamInterface(Ljava/lang/String;)V
85	····.locals·4	85	····.locals·4

86	····.line·1235	86	····.line·1231
87	····:try_start_0	87	····:try_start_0
88	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$TetheredState;->this$0:Landroid/net/ip/IpServer;	88	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$TetheredState;->this$0:Landroid/net/ip/IpServer;

89	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$2100(Landroid/net/ip/IpServer;)Landroid/net/INetd;	89	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$2100(Landroid/net/ip/IpServer;)Landroid/net/INetd;

90	····move-result-object·v0	90	····move-result-object·v0

Offset 114, 15 lines modified		Offset 114, 15 lines modified
114	····.catch·Landroid/os/ServiceSpecificException;·{:try_start_0·..·:try_end_0}·:catch_0	114	····.catch·Landroid/os/ServiceSpecificException;·{:try_start_0·..·:try_end_0}·:catch_0

115	····goto·:goto_0	115	····goto·:goto_0

116	····:catch_0	116	····:catch_0
117	····move-exception·v0	117	····move-exception·v0

118	····.line·1237	118	····.line·1233
119	····iget-object·v1,·p0,·Landroid/net/ip/IpServer$TetheredState;->this$0:Landroid/net/ip/IpServer;	119	····iget-object·v1,·p0,·Landroid/net/ip/IpServer$TetheredState;->this$0:Landroid/net/ip/IpServer;

120	····invoke-static·{v1},·Landroid/net/ip/IpServer;->access$400(Landroid/net/ip/IpServer;)Landroid/net/util/SharedLog;	120	····invoke-static·{v1},·Landroid/net/ip/IpServer;->access$400(Landroid/net/ip/IpServer;)Landroid/net/util/SharedLog;

121	····move-result-object·v1	121	····move-result-object·v1

122	····new-instance·v2,·Ljava/lang/StringBuilder;	122	····new-instance·v2,·Ljava/lang/StringBuilder;
Offset 141, 15 lines modified		Offset 141, 15 lines modified

141	····invoke-virtual·{v2},·Ljava/lang/StringBuilder;->toString()Ljava/lang/String;	141	····invoke-virtual·{v2},·Ljava/lang/StringBuilder;->toString()Ljava/lang/String;

142	····move-result-object·v0	142	····move-result-object·v0

143	····invoke-virtual·{v1,·v0},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;)V	143	····invoke-virtual·{v1,·v0},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;)V

144	····.line·1240	144	····.line·1236
145	····:goto_0	145	····:goto_0
146	····:try_start_1	146	····:try_start_1
147	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$TetheredState;->this$0:Landroid/net/ip/IpServer;	147	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$TetheredState;->this$0:Landroid/net/ip/IpServer;

148	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$2100(Landroid/net/ip/IpServer;)Landroid/net/INetd;	148	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$2100(Landroid/net/ip/IpServer;)Landroid/net/INetd;

149	····move-result-object·v0	149	····move-result-object·v0
Offset 166, 15 lines modified		Offset 166, 15 lines modified
166	····.catch·Landroid/os/ServiceSpecificException;·{:try_start_1·..·:try_end_1}·:catch_1	166	····.catch·Landroid/os/ServiceSpecificException;·{:try_start_1·..·:try_end_1}·:catch_1

167	····goto·:goto_1	167	····goto·:goto_1

168	····:catch_1	168	····:catch_1
169	····move-exception·p1	169	····move-exception·p1

170	····.line·1242	170	····.line·1238
171	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$TetheredState;->this$0:Landroid/net/ip/IpServer;	171	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$TetheredState;->this$0:Landroid/net/ip/IpServer;

172	····invoke-static·{p0},·Landroid/net/ip/IpServer;->access$400(Landroid/net/ip/IpServer;)Landroid/net/util/SharedLog;	172	····invoke-static·{p0},·Landroid/net/ip/IpServer;->access$400(Landroid/net/ip/IpServer;)Landroid/net/util/SharedLog;

173	····move-result-object·p0	173	····move-result-object·p0

174	····new-instance·v0,·Ljava/lang/StringBuilder;	174	····new-instance·v0,·Ljava/lang/StringBuilder;
Offset 200, 42 lines modified		Offset 200, 42 lines modified
200	····:goto_1	200	····:goto_1
201	····return-void	201	····return-void
202	.end·method	202	.end·method

203	.method·private·noChangeInUpstreamIfaceSet(Landroid/net/util/InterfaceSet;)Z	203	.method·private·noChangeInUpstreamIfaceSet(Landroid/net/util/InterfaceSet;)Z
204	····.locals·1	204	····.locals·1
... Open expanded diff ...


Offset 18, 97 lines modified		Offset 18, 97 lines modified
18	.field·final·synthetic·this$0:Landroid/net/ip/IpServer;	18	.field·final·synthetic·this$0:Landroid/net/ip/IpServer;


19	#·direct·methods	19	#·direct·methods
20	.method·constructor·<init>(Landroid/net/ip/IpServer;)V	20	.method·constructor·<init>(Landroid/net/ip/IpServer;)V
21	····.locals·0	21	····.locals·0

22	····.line·1167	22	····.line·1163
23	····iput-object·p1,·p0,·Landroid/net/ip/IpServer$LocalHotspotState;->this$0:Landroid/net/ip/IpServer;	23	····iput-object·p1,·p0,·Landroid/net/ip/IpServer$LocalHotspotState;->this$0:Landroid/net/ip/IpServer;

24	····invoke-direct·{p0,·p1},·Landroid/net/ip/IpServer$BaseServingState;-><init>(Landroid/net/ip/IpServer;)V	24	····invoke-direct·{p0,·p1},·Landroid/net/ip/IpServer$BaseServingState;-><init>(Landroid/net/ip/IpServer;)V

25	····return-void	25	····return-void
26	.end·method	26	.end·method


27	#·virtual·methods	27	#·virtual·methods
28	.method·public·enter()V	28	.method·public·enter()V
29	····.locals·2	29	····.locals·2

30	····.line·1170	30	····.line·1166
31	····invoke-super·{p0},·Landroid/net/ip/IpServer$BaseServingState;->enter()V	31	····invoke-super·{p0},·Landroid/net/ip/IpServer$BaseServingState;->enter()V

32	····.line·1171	32	····.line·1167
33	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$LocalHotspotState;->this$0:Landroid/net/ip/IpServer;	33	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$LocalHotspotState;->this$0:Landroid/net/ip/IpServer;

34	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$100(Landroid/net/ip/IpServer;)I	34	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$100(Landroid/net/ip/IpServer;)I

35	····move-result·v0	35	····move-result·v0

36	····if-eqz·v0,·:cond_0	36	····if-eqz·v0,·:cond_0

37	····.line·1172	37	····.line·1168
38	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$LocalHotspotState;->this$0:Landroid/net/ip/IpServer;	38	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$LocalHotspotState;->this$0:Landroid/net/ip/IpServer;

39	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$200(Landroid/net/ip/IpServer;)Lcom/android/networkstack/tethering/util/State;	39	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$200(Landroid/net/ip/IpServer;)Lcom/android/networkstack/tethering/util/State;

40	····move-result-object·v1	40	····move-result-object·v1

41	····invoke-virtual·{v0,·v1},·Lcom/android/networkstack/tethering/util/StateMachine;->transitionTo(Lcom/android/networkstack/tethering/util/IState;)V	41	····invoke-virtual·{v0,·v1},·Lcom/android/networkstack/tethering/util/StateMachine;->transitionTo(Lcom/android/networkstack/tethering/util/IState;)V

42	····.line·1176	42	····.line·1172
43	····:cond_0	43	····:cond_0
44	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$LocalHotspotState;->this$0:Landroid/net/ip/IpServer;	44	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$LocalHotspotState;->this$0:Landroid/net/ip/IpServer;

45	····const/4·v0,·0x3	45	····const/4·v0,·0x3

46	····invoke-static·{p0,·v0},·Landroid/net/ip/IpServer;->access$1300(Landroid/net/ip/IpServer;I)V	46	····invoke-static·{p0,·v0},·Landroid/net/ip/IpServer;->access$1300(Landroid/net/ip/IpServer;I)V

47	····return-void	47	····return-void
48	.end·method	48	.end·method

49	.method·public·processMessage(Landroid/os/Message;)Z	49	.method·public·processMessage(Landroid/os/Message;)Z
50	····.locals·3	50	····.locals·3

51	····.line·1181	51	····.line·1177
52	····invoke-super·{p0,·p1},·Landroid/net/ip/IpServer$BaseServingState;->processMessage(Landroid/os/Message;)Z	52	····invoke-super·{p0,·p1},·Landroid/net/ip/IpServer$BaseServingState;->processMessage(Landroid/os/Message;)Z

53	····move-result·v0	53	····move-result·v0

54	····const/4·v1,·0x1	54	····const/4·v1,·0x1

55	····if-eqz·v0,·:cond_0	55	····if-eqz·v0,·:cond_0

56	····return·v1	56	····return·v1

57	····.line·1183	57	····.line·1179
58	····:cond_0	58	····:cond_0
59	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$LocalHotspotState;->this$0:Landroid/net/ip/IpServer;	59	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$LocalHotspotState;->this$0:Landroid/net/ip/IpServer;

60	····iget·v2,·p1,·Landroid/os/Message;->what:I	60	····iget·v2,·p1,·Landroid/os/Message;->what:I

61	····invoke-static·{v0,·p0,·v2},·Landroid/net/ip/IpServer;->access$1400(Landroid/net/ip/IpServer;Lcom/android/networkstack/tethering/util/State;I)V	61	····invoke-static·{v0,·p0,·v2},·Landroid/net/ip/IpServer;->access$1400(Landroid/net/ip/IpServer;Lcom/android/networkstack/tethering/util/State;I)V

62	····.line·1184	62	····.line·1180
63	····iget·p1,·p1,·Landroid/os/Message;->what:I	63	····iget·p1,·p1,·Landroid/os/Message;->what:I

64	····const/16·v0,·0x65	64	····const/16·v0,·0x65

65	····if-eq·p1,·v0,·:cond_1	65	····if-eq·p1,·v0,·:cond_1

66	····const/16·p0,·0x6d	66	····const/16·p0,·0x6d

67	····if-eq·p1,·p0,·:cond_2	67	····if-eq·p1,·p0,·:cond_2

68	····const/4·p0,·0x0	68	····const/4·p0,·0x0

69	····return·p0	69	····return·p0

70	····.line·1186	70	····.line·1182
71	····:cond_1	71	····:cond_1
72	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$LocalHotspotState;->this$0:Landroid/net/ip/IpServer;	72	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$LocalHotspotState;->this$0:Landroid/net/ip/IpServer;

73	····invoke-static·{p0},·Landroid/net/ip/IpServer;->access$400(Landroid/net/ip/IpServer;)Landroid/net/util/SharedLog;	73	····invoke-static·{p0},·Landroid/net/ip/IpServer;->access$400(Landroid/net/ip/IpServer;)Landroid/net/util/SharedLog;

74	····move-result-object·p0	74	····move-result-object·p0


Offset 1, 15 lines modified		Offset 1, 15 lines modified
1	.class·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl$1;	1	.class·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl$1;
2	.super·Landroid/net/ip/IpServer$OnHandlerStatusCallback;	2	.super·Landroid/net/ip/IpServer$OnHandlerStatusCallback;
3	.source·"IpServer.java"	3	.source·"IpServer.java"


4	#·annotations	4	#·annotations
5	.annotation·system·Ldalvik/annotation/EnclosingMethod;	5	.annotation·system·Ldalvik/annotation/EnclosingMethod;
6	····value·=·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->lambda$onDhcpServerCreated$0(Landroid/net/dhcp/IDhcpServer;I)V	6	····value·=·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->lambda$onDhcpServerCreated$0(ILandroid/net/dhcp/IDhcpServer;)V
7	.end·annotation	7	.end·annotation

8	.annotation·system·Ldalvik/annotation/InnerClass;	8	.annotation·system·Ldalvik/annotation/InnerClass;
9	····accessFlags·=·0x0	9	····accessFlags·=·0x0
10	····name·=·null	10	····name·=·null
11	.end·annotation	11	.end·annotation

Offset 18, 15 lines modified		Offset 18, 15 lines modified
18	.field·final·synthetic·this$1:Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;	18	.field·final·synthetic·this$1:Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;


19	#·direct·methods	19	#·direct·methods
20	.method·constructor·<init>(Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;)V	20	.method·constructor·<init>(Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;)V
21	····.locals·1	21	····.locals·1

22	····.line·444	22	····.line·440
23	····iput-object·p1,·p0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl$1;->this$1:Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;	23	····iput-object·p1,·p0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl$1;->this$1:Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;

24	····iget-object·p1,·p1,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->this$0:Landroid/net/ip/IpServer;	24	····iget-object·p1,·p1,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->this$0:Landroid/net/ip/IpServer;

25	····const/4·v0,·0x0	25	····const/4·v0,·0x0

26	····invoke-direct·{p0,·p1,·v0},·Landroid/net/ip/IpServer$OnHandlerStatusCallback;-><init>(Landroid/net/ip/IpServer;Landroid/net/ip/IpServer$1;)V	26	····invoke-direct·{p0,·p1,·v0},·Landroid/net/ip/IpServer$OnHandlerStatusCallback;-><init>(Landroid/net/ip/IpServer;Landroid/net/ip/IpServer$1;)V
Offset 39, 15 lines modified		Offset 39, 15 lines modified
39	.method·public·callback(I)V	39	.method·public·callback(I)V
40	····.locals·3	40	····.locals·3

41	····const/4·v0,·0x1	41	····const/4·v0,·0x1

42	····if-eq·p1,·v0,·:cond_0	42	····if-eq·p1,·v0,·:cond_0

43	····.line·448	43	····.line·444
44	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl$1;->this$1:Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;	44	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl$1;->this$1:Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;

45	····iget-object·v0,·v0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->this$0:Landroid/net/ip/IpServer;	45	····iget-object·v0,·v0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->this$0:Landroid/net/ip/IpServer;

46	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$400(Landroid/net/ip/IpServer;)Landroid/net/util/SharedLog;	46	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$400(Landroid/net/ip/IpServer;)Landroid/net/util/SharedLog;

47	····move-result-object·v0	47	····move-result-object·v0
Offset 64, 15 lines modified		Offset 64, 15 lines modified

64	····invoke-virtual·{v1},·Ljava/lang/StringBuilder;->toString()Ljava/lang/String;	64	····invoke-virtual·{v1},·Ljava/lang/StringBuilder;->toString()Ljava/lang/String;

65	····move-result-object·p1	65	····move-result-object·p1

66	····invoke-virtual·{v0,·p1},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;)V	66	····invoke-virtual·{v0,·p1},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;)V

67	····.line·449	67	····.line·445
68	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl$1;->this$1:Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;	68	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl$1;->this$1:Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;

69	····invoke-static·{p0},·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->access$700(Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;)V	69	····invoke-static·{p0},·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->access$700(Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;)V

70	····:cond_0	70	····:cond_0
71	····return-void	71	····return-void
72	.end·method	72	.end·method


Offset 687, 22 lines modified		Offset 687, 22 lines modified

687	····return·p0	687	····return·p0
688	.end·method	688	.end·method

689	.method·private·addIpv6ForwardingRule(Lcom/android/networkstack/tethering/BpfCoordinator$Ipv6ForwardingRule;)V	689	.method·private·addIpv6ForwardingRule(Lcom/android/networkstack/tethering/BpfCoordinator$Ipv6ForwardingRule;)V
690	····.locals·1	690	····.locals·1

691	····.line·847	691	····.line·843
692	····iget-boolean·v0,·p0,·Landroid/net/ip/IpServer;->mUsingBpfOffload:Z	692	····iget-boolean·v0,·p0,·Landroid/net/ip/IpServer;->mUsingBpfOffload:Z

693	····if-nez·v0,·:cond_0	693	····if-nez·v0,·:cond_0

694	····return-void	694	····return-void

695	····.line·849	695	····.line·845
696	····:cond_0	696	····:cond_0
697	····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mBpfCoordinator:Lcom/android/networkstack/tethering/BpfCoordinator;	697	····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mBpfCoordinator:Lcom/android/networkstack/tethering/BpfCoordinator;

698	····invoke-virtual·{v0,·p0,·p1},·Lcom/android/networkstack/tethering/BpfCoordinator;->tetherOffloadRuleAdd(Landroid/net/ip/IpServer;Lcom/android/networkstack/tethering/BpfCoordinator$Ipv6ForwardingRule;)V	698	····invoke-virtual·{v0,·p0,·p1},·Lcom/android/networkstack/tethering/BpfCoordinator;->tetherOffloadRuleAdd(Landroid/net/ip/IpServer;Lcom/android/networkstack/tethering/BpfCoordinator$Ipv6ForwardingRule;)V

699	····return-void	699	····return-void
700	.end·method	700	.end·method
Offset 714, 40 lines modified		Offset 714, 40 lines modified
714	············"(",	714	············"(",
715	············"Ljava/util/List<",	715	············"Ljava/util/List<",
716	············"Landroid/net/RouteInfo;",	716	············"Landroid/net/RouteInfo;",
717	············">;)V"	717	············">;)V"
718	········}	718	········}
719	····.end·annotation	719	····.end·annotation

720	····.line·761	720	····.line·757
721	····:try_start_0	721	····:try_start_0
722	····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mNetd:Landroid/net/INetd;	722	····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mNetd:Landroid/net/INetd;

723	····const/16·v1,·0x63	723	····const/16·v1,·0x63

724	····iget-object·v2,·p0,·Landroid/net/ip/IpServer;->mIfaceName:Ljava/lang/String;	724	····iget-object·v2,·p0,·Landroid/net/ip/IpServer;->mIfaceName:Ljava/lang/String;

725	····invoke-interface·{v0,·v1,·v2},·Landroid/net/INetd;->networkAddInterface(ILjava/lang/String;)V	725	····invoke-interface·{v0,·v1,·v2},·Landroid/net/INetd;->networkAddInterface(ILjava/lang/String;)V
726	····:try_end_0	726	····:try_end_0
727	····.catch·Landroid/os/ServiceSpecificException;·{:try_start_0·..·:try_end_0}·:catch_1	727	····.catch·Landroid/os/ServiceSpecificException;·{:try_start_0·..·:try_end_0}·:catch_1
728	····.catch·Landroid/os/RemoteException;·{:try_start_0·..·:try_end_0}·:catch_1	728	····.catch·Landroid/os/RemoteException;·{:try_start_0·..·:try_end_0}·:catch_1

729	····.line·765	729	····.line·761
730	····:try_start_1	730	····:try_start_1
731	····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mNetd:Landroid/net/INetd;	731	····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mNetd:Landroid/net/INetd;

732	····iget-object·v1,·p0,·Landroid/net/ip/IpServer;->mIfaceName:Ljava/lang/String;	732	····iget-object·v1,·p0,·Landroid/net/ip/IpServer;->mIfaceName:Ljava/lang/String;

733	····invoke-static·{v0,·v1,·p1},·Landroid/net/shared/RouteUtils;->addRoutesToLocalNetwork(Landroid/net/INetd;Ljava/lang/String;Ljava/util/List;)V	733	····invoke-static·{v0,·v1,·p1},·Landroid/net/shared/RouteUtils;->addRoutesToLocalNetwork(Landroid/net/INetd;Ljava/lang/String;Ljava/util/List;)V
734	····:try_end_1	734	····:try_end_1
735	····.catch·Ljava/lang/IllegalStateException;·{:try_start_1·..·:try_end_1}·:catch_0	735	····.catch·Ljava/lang/IllegalStateException;·{:try_start_1·..·:try_end_1}·:catch_0
736	····.catch·Landroid/os/ServiceSpecificException;·{:try_start_1·..·:try_end_1}·:catch_1	736	····.catch·Landroid/os/ServiceSpecificException;·{:try_start_1·..·:try_end_1}·:catch_1
737	····.catch·Landroid/os/RemoteException;·{:try_start_1·..·:try_end_1}·:catch_1	737	····.catch·Landroid/os/RemoteException;·{:try_start_1·..·:try_end_1}·:catch_1

738	····.line·775	738	····.line·771
739	····invoke-interface·{p1},·Ljava/util/List;->iterator()Ljava/util/Iterator;	739	····invoke-interface·{p1},·Ljava/util/List;->iterator()Ljava/util/Iterator;

740	····move-result-object·p1	740	····move-result-object·p1

741	····:goto_0	741	····:goto_0
742	····invoke-interface·{p1},·Ljava/util/Iterator;->hasNext()Z	742	····invoke-interface·{p1},·Ljava/util/Iterator;->hasNext()Z

Offset 769, 15 lines modified		Offset 769, 15 lines modified

769	····:cond_0	769	····:cond_0
770	····return-void	770	····return-void

771	····:catch_0	771	····:catch_0
772	····move-exception·p1	772	····move-exception·p1

773	····.line·767	773	····.line·763
774	····:try_start_2	774	····:try_start_2
775	····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog;	775	····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog;

776	····new-instance·v1,·Ljava/lang/StringBuilder;	776	····new-instance·v1,·Ljava/lang/StringBuilder;

777	····invoke-direct·{v1},·Ljava/lang/StringBuilder;-><init>()V	777	····invoke-direct·{v1},·Ljava/lang/StringBuilder;-><init>()V

Offset 797, 15 lines modified		Offset 797, 15 lines modified
797	····.catch·Landroid/os/RemoteException;·{:try_start_2·..·:try_end_2}·:catch_1	797	····.catch·Landroid/os/RemoteException;·{:try_start_2·..·:try_end_2}·:catch_1

798	····return-void	798	····return-void

799	····:catch_1	799	····:catch_1
800	····move-exception·p1	800	····move-exception·p1

801	····.line·771	801	····.line·767
802	····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog;	802	····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog;

803	····new-instance·v1,·Ljava/lang/StringBuilder;	803	····new-instance·v1,·Ljava/lang/StringBuilder;

804	····invoke-direct·{v1},·Ljava/lang/StringBuilder;-><init>()V	804	····invoke-direct·{v1},·Ljava/lang/StringBuilder;-><init>()V

805	····const-string·v2,·"Failed·to·add·"	805	····const-string·v2,·"Failed·to·add·"
Offset 828, 102 lines modified		Offset 828, 102 lines modified

828	····return-void	828	····return-void
829	.end·method	829	.end·method

830	.method·private·clearIpv6ForwardingRules()V	830	.method·private·clearIpv6ForwardingRules()V
831	····.locals·1	831	····.locals·1

832	····.line·861	832	····.line·857
833	····iget-boolean·v0,·p0,·Landroid/net/ip/IpServer;->mUsingBpfOffload:Z	833	····iget-boolean·v0,·p0,·Landroid/net/ip/IpServer;->mUsingBpfOffload:Z

834	····if-nez·v0,·:cond_0	834	····if-nez·v0,·:cond_0

835	····return-void	835	····return-void

836	····.line·863	836	····.line·859
837	····:cond_0	837	····:cond_0
838	····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mBpfCoordinator:Lcom/android/networkstack/tethering/BpfCoordinator;	838	····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mBpfCoordinator:Lcom/android/networkstack/tethering/BpfCoordinator;

839	····invoke-virtual·{v0,·p0},·Lcom/android/networkstack/tethering/BpfCoordinator;->tetherOffloadRuleClear(Landroid/net/ip/IpServer;)V	839	····invoke-virtual·{v0,·p0},·Lcom/android/networkstack/tethering/BpfCoordinator;->tetherOffloadRuleClear(Landroid/net/ip/IpServer;)V

840	····return-void	840	····return-void
841	.end·method	841	.end·method

842	.method·private·configureDhcp(ZLandroid/net/LinkAddress;Landroid/net/LinkAddress;)Z	842	.method·private·configureDhcp(ZLandroid/net/LinkAddress;Landroid/net/LinkAddress;)Z
843	····.locals·0	843	····.locals·0

844	····if-eqz·p1,·:cond_0	844	····if-eqz·p1,·:cond_0

845	····.line·582	845	····.line·578
846	····invoke-direct·{p0,·p2,·p3},·Landroid/net/ip/IpServer;->startDhcp(Landroid/net/LinkAddress;Landroid/net/LinkAddress;)Z	846	····invoke-direct·{p0,·p2,·p3},·Landroid/net/ip/IpServer;->startDhcp(Landroid/net/LinkAddress;Landroid/net/LinkAddress;)Z

... Open expanded diff (truncated) ...


Offset 18, 40 lines modified		Offset 18, 40 lines modified
18	.field·final·synthetic·this$0:Landroid/net/ip/IpServer;	18	.field·final·synthetic·this$0:Landroid/net/ip/IpServer;


19	#·direct·methods	19	#·direct·methods
20	.method·private·constructor·<init>(Landroid/net/ip/IpServer;)V	20	.method·private·constructor·<init>(Landroid/net/ip/IpServer;)V
21	····.locals·0	21	····.locals·0

22	····.line·465	22	····.line·461
23	····iput-object·p1,·p0,·Landroid/net/ip/IpServer$DhcpEventCallback;->this$0:Landroid/net/ip/IpServer;	23	····iput-object·p1,·p0,·Landroid/net/ip/IpServer$DhcpEventCallback;->this$0:Landroid/net/ip/IpServer;

24	····invoke-direct·{p0},·Landroid/net/dhcp/IDhcpEventCallbacks$Stub;-><init>()V	24	····invoke-direct·{p0},·Landroid/net/dhcp/IDhcpEventCallbacks$Stub;-><init>()V

25	····return-void	25	····return-void
26	.end·method	26	.end·method

27	.method·synthetic·constructor·<init>(Landroid/net/ip/IpServer;Landroid/net/ip/IpServer$1;)V	27	.method·synthetic·constructor·<init>(Landroid/net/ip/IpServer;Landroid/net/ip/IpServer$1;)V
28	····.locals·0	28	····.locals·0

29	····.line·465	29	····.line·461
30	····invoke-direct·{p0,·p1},·Landroid/net/ip/IpServer$DhcpEventCallback;-><init>(Landroid/net/ip/IpServer;)V	30	····invoke-direct·{p0,·p1},·Landroid/net/ip/IpServer$DhcpEventCallback;-><init>(Landroid/net/ip/IpServer;)V

31	····return-void	31	····return-void
32	.end·method	32	.end·method

33	.method·private·synthetic·lambda$onLeasesChanged$0(Ljava/util/ArrayList;)V	33	.method·private·synthetic·lambda$onLeasesChanged$0(Ljava/util/ArrayList;)V
34	····.locals·1	34	····.locals·1

35	····.line·493	35	····.line·489
36	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$DhcpEventCallback;->this$0:Landroid/net/ip/IpServer;	36	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$DhcpEventCallback;->this$0:Landroid/net/ip/IpServer;

37	····invoke-static·{v0,·p1},·Landroid/net/ip/IpServer;->access$1002(Landroid/net/ip/IpServer;Ljava/util/List;)Ljava/util/List;	37	····invoke-static·{v0,·p1},·Landroid/net/ip/IpServer;->access$1002(Landroid/net/ip/IpServer;Ljava/util/List;)Ljava/util/List;

38	····.line·494	38	····.line·490
39	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$DhcpEventCallback;->this$0:Landroid/net/ip/IpServer;	39	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$DhcpEventCallback;->this$0:Landroid/net/ip/IpServer;

40	····invoke-static·{p0},·Landroid/net/ip/IpServer;->access$1100(Landroid/net/ip/IpServer;)Landroid/net/ip/IpServer$Callback;	40	····invoke-static·{p0},·Landroid/net/ip/IpServer;->access$1100(Landroid/net/ip/IpServer;)Landroid/net/ip/IpServer$Callback;

41	····move-result-object·p0	41	····move-result-object·p0

42	····invoke-virtual·{p0},·Landroid/net/ip/IpServer$Callback;->dhcpLeasesChanged()V	42	····invoke-virtual·{p0},·Landroid/net/ip/IpServer$Callback;->dhcpLeasesChanged()V
Offset 97, 20 lines modified		Offset 97, 20 lines modified
97	············"(",	97	············"(",
98	············"Ljava/util/List<",	98	············"Ljava/util/List<",
99	············"Landroid/net/dhcp/DhcpLeaseParcelable;",	99	············"Landroid/net/dhcp/DhcpLeaseParcelable;",
100	············">;)V"	100	············">;)V"
101	········}	101	········}
102	····.end·annotation	102	····.end·annotation

103	····.line·468	103	····.line·464
104	····new-instance·v0,·Ljava/util/ArrayList;	104	····new-instance·v0,·Ljava/util/ArrayList;

105	····invoke-direct·{v0},·Ljava/util/ArrayList;-><init>()V	105	····invoke-direct·{v0},·Ljava/util/ArrayList;-><init>()V

106	····.line·469	106	····.line·465
107	····invoke-interface·{p1},·Ljava/util/List;->iterator()Ljava/util/Iterator;	107	····invoke-interface·{p1},·Ljava/util/List;->iterator()Ljava/util/Iterator;

108	····move-result-object·p1	108	····move-result-object·p1

109	····:goto_0	109	····:goto_0
110	····invoke-interface·{p1},·Ljava/util/Iterator;->hasNext()Z	110	····invoke-interface·{p1},·Ljava/util/Iterator;->hasNext()Z

Offset 120, 20 lines modified		Offset 120, 20 lines modified

120	····invoke-interface·{p1},·Ljava/util/Iterator;->next()Ljava/lang/Object;	120	····invoke-interface·{p1},·Ljava/util/Iterator;->next()Ljava/lang/Object;

121	····move-result-object·v1	121	····move-result-object·v1

122	····check-cast·v1,·Landroid/net/dhcp/DhcpLeaseParcelable;	122	····check-cast·v1,·Landroid/net/dhcp/DhcpLeaseParcelable;

123	····.line·470	123	····.line·466
124	····new-instance·v11,·Landroid/net/LinkAddress;	124	····new-instance·v11,·Landroid/net/LinkAddress;

125	····iget·v2,·v1,·Landroid/net/dhcp/DhcpLeaseParcelable;->netAddr:I	125	····iget·v2,·v1,·Landroid/net/dhcp/DhcpLeaseParcelable;->netAddr:I

126	····.line·471	126	····.line·467
127	····invoke-static·{v2},·Lcom/android/networkstack/tethering/util/Inet4AddressUtils;->intToInet4AddressHTH(I)Ljava/net/Inet4Address;	127	····invoke-static·{v2},·Lcom/android/networkstack/tethering/util/Inet4AddressUtils;->intToInet4AddressHTH(I)Ljava/net/Inet4Address;

128	····move-result-object·v3	128	····move-result-object·v3

129	····iget·v4,·v1,·Landroid/net/dhcp/DhcpLeaseParcelable;->prefixLength:I	129	····iget·v4,·v1,·Landroid/net/dhcp/DhcpLeaseParcelable;->prefixLength:I

130	····const/4·v5,·0x0	130	····const/4·v5,·0x0
Offset 144, 84 lines modified		Offset 144, 84 lines modified

144	····move-object·v2,·v11	144	····move-object·v2,·v11

145	····move-wide·v7,·v9	145	····move-wide·v7,·v9

146	····invoke-direct/range·{v2·..·v10},·Landroid/net/LinkAddress;-><init>(Ljava/net/InetAddress;IIIJJ)V	146	····invoke-direct/range·{v2·..·v10},·Landroid/net/LinkAddress;-><init>(Ljava/net/InetAddress;IIIJJ)V

147	····.line·477	147	····.line·473
148	····:try_start_0	148	····:try_start_0
149	····iget-object·v2,·v1,·Landroid/net/dhcp/DhcpLeaseParcelable;->hwAddr:[B	149	····iget-object·v2,·v1,·Landroid/net/dhcp/DhcpLeaseParcelable;->hwAddr:[B

150	····invoke-static·{v2},·Landroid/net/MacAddress;->fromBytes([B)Landroid/net/MacAddress;	150	····invoke-static·{v2},·Landroid/net/MacAddress;->fromBytes([B)Landroid/net/MacAddress;

151	····move-result-object·v2	151	····move-result-object·v2
152	····:try_end_0	152	····:try_end_0
153	····.catch·Ljava/lang/IllegalArgumentException;·{:try_start_0·..·:try_end_0}·:catch_0	153	····.catch·Ljava/lang/IllegalArgumentException;·{:try_start_0·..·:try_end_0}·:catch_0

154	····.line·484	154	····.line·480
155	····new-instance·v3,·Landroid/net/TetheredClient$AddressInfo;	155	····new-instance·v3,·Landroid/net/TetheredClient$AddressInfo;

156	····iget-object·v1,·v1,·Landroid/net/dhcp/DhcpLeaseParcelable;->hostname:Ljava/lang/String;	156	····iget-object·v1,·v1,·Landroid/net/dhcp/DhcpLeaseParcelable;->hostname:Ljava/lang/String;

157	····invoke-direct·{v3,·v11,·v1},·Landroid/net/TetheredClient$AddressInfo;-><init>(Landroid/net/LinkAddress;Ljava/lang/String;)V	157	····invoke-direct·{v3,·v11,·v1},·Landroid/net/TetheredClient$AddressInfo;-><init>(Landroid/net/LinkAddress;Ljava/lang/String;)V

158	····.line·486	158	····.line·482
159	····new-instance·v1,·Landroid/net/TetheredClient;	159	····new-instance·v1,·Landroid/net/TetheredClient;

160	····.line·488	160	····.line·484
161	····invoke-static·{v3},·Ljava/util/Collections;->singletonList(Ljava/lang/Object;)Ljava/util/List;	161	····invoke-static·{v3},·Ljava/util/Collections;->singletonList(Ljava/lang/Object;)Ljava/util/List;

162	····move-result-object·v3	162	····move-result-object·v3

163	····iget-object·v4,·p0,·Landroid/net/ip/IpServer$DhcpEventCallback;->this$0:Landroid/net/ip/IpServer;	163	····iget-object·v4,·p0,·Landroid/net/ip/IpServer$DhcpEventCallback;->this$0:Landroid/net/ip/IpServer;

164	····.line·489	164	····.line·485
165	····invoke-static·{v4},·Landroid/net/ip/IpServer;->access$900(Landroid/net/ip/IpServer;)I	165	····invoke-static·{v4},·Landroid/net/ip/IpServer;->access$900(Landroid/net/ip/IpServer;)I

166	····move-result·v4	166	····move-result·v4

167	····invoke-direct·{v1,·v2,·v3,·v4},·Landroid/net/TetheredClient;-><init>(Landroid/net/MacAddress;Ljava/util/Collection;I)V	167	····invoke-direct·{v1,·v2,·v3,·v4},·Landroid/net/TetheredClient;-><init>(Landroid/net/MacAddress;Ljava/util/Collection;I)V

168	····.line·486	168	····.line·482
169	····invoke-virtual·{v0,·v1},·Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z	169	····invoke-virtual·{v0,·v1},·Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z

... Open expanded diff ...


Offset 18, 43 lines modified		Offset 18, 43 lines modified
18	.field·final·synthetic·this$0:Landroid/net/ip/IpServer;	18	.field·final·synthetic·this$0:Landroid/net/ip/IpServer;


19	#·direct·methods	19	#·direct·methods
20	.method·constructor·<init>(Landroid/net/ip/IpServer;)V	20	.method·constructor·<init>(Landroid/net/ip/IpServer;)V
21	····.locals·0	21	····.locals·0

22	····.line·1328	22	····.line·1324
23	····iput-object·p1,·p0,·Landroid/net/ip/IpServer$UnavailableState;->this$0:Landroid/net/ip/IpServer;	23	····iput-object·p1,·p0,·Landroid/net/ip/IpServer$UnavailableState;->this$0:Landroid/net/ip/IpServer;

24	····invoke-direct·{p0},·Lcom/android/networkstack/tethering/util/State;-><init>()V	24	····invoke-direct·{p0},·Lcom/android/networkstack/tethering/util/State;-><init>()V

25	····return-void	25	····return-void
26	.end·method	26	.end·method


27	#·virtual·methods	27	#·virtual·methods
28	.method·public·enter()V	28	.method·public·enter()V
29	····.locals·2	29	····.locals·2

30	····.line·1331	30	····.line·1327
31	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$UnavailableState;->this$0:Landroid/net/ip/IpServer;	31	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$UnavailableState;->this$0:Landroid/net/ip/IpServer;

32	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$3400(Landroid/net/ip/IpServer;)Landroid/net/ip/IpNeighborMonitor;	32	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$3400(Landroid/net/ip/IpServer;)Landroid/net/ip/IpNeighborMonitor;

33	····move-result-object·v0	33	····move-result-object·v0

34	····invoke-virtual·{v0},·Landroid/net/util/FdEventsReader;->stop()V	34	····invoke-virtual·{v0},·Landroid/net/util/FdEventsReader;->stop()V

35	····.line·1332	35	····.line·1328
36	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$UnavailableState;->this$0:Landroid/net/ip/IpServer;	36	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$UnavailableState;->this$0:Landroid/net/ip/IpServer;

37	····const/4·v1,·0x0	37	····const/4·v1,·0x0

38	····invoke-static·{v0,·v1},·Landroid/net/ip/IpServer;->access$102(Landroid/net/ip/IpServer;I)I	38	····invoke-static·{v0,·v1},·Landroid/net/ip/IpServer;->access$102(Landroid/net/ip/IpServer;I)I

39	····.line·1333	39	····.line·1329
40	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$UnavailableState;->this$0:Landroid/net/ip/IpServer;	40	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$UnavailableState;->this$0:Landroid/net/ip/IpServer;

41	····invoke-static·{p0,·v1},·Landroid/net/ip/IpServer;->access$1300(Landroid/net/ip/IpServer;I)V	41	····invoke-static·{p0,·v1},·Landroid/net/ip/IpServer;->access$1300(Landroid/net/ip/IpServer;I)V

42	····return-void	42	····return-void
43	.end·method	43	.end·method


Offset 18, 35 lines modified		Offset 18, 35 lines modified
18	.field·final·synthetic·this$0:Landroid/net/ip/IpServer;	18	.field·final·synthetic·this$0:Landroid/net/ip/IpServer;


19	#·direct·methods	19	#·direct·methods
20	.method·constructor·<init>(Landroid/net/ip/IpServer;)V	20	.method·constructor·<init>(Landroid/net/ip/IpServer;)V
21	····.locals·0	21	····.locals·0

22	····.line·1337	22	····.line·1333
23	····iput-object·p1,·p0,·Landroid/net/ip/IpServer$WaitingForRestartState;->this$0:Landroid/net/ip/IpServer;	23	····iput-object·p1,·p0,·Landroid/net/ip/IpServer$WaitingForRestartState;->this$0:Landroid/net/ip/IpServer;

24	····invoke-direct·{p0},·Lcom/android/networkstack/tethering/util/State;-><init>()V	24	····invoke-direct·{p0},·Lcom/android/networkstack/tethering/util/State;-><init>()V

25	····return-void	25	····return-void
26	.end·method	26	.end·method


27	#·virtual·methods	27	#·virtual·methods
28	.method·public·processMessage(Landroid/os/Message;)Z	28	.method·public·processMessage(Landroid/os/Message;)Z
29	····.locals·3	29	····.locals·3

30	····.line·1340	30	····.line·1336
31	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$WaitingForRestartState;->this$0:Landroid/net/ip/IpServer;	31	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$WaitingForRestartState;->this$0:Landroid/net/ip/IpServer;

32	····iget·v1,·p1,·Landroid/os/Message;->what:I	32	····iget·v1,·p1,·Landroid/os/Message;->what:I

33	····invoke-static·{v0,·p0,·v1},·Landroid/net/ip/IpServer;->access$1400(Landroid/net/ip/IpServer;Lcom/android/networkstack/tethering/util/State;I)V	33	····invoke-static·{v0,·p0,·v1},·Landroid/net/ip/IpServer;->access$1400(Landroid/net/ip/IpServer;Lcom/android/networkstack/tethering/util/State;I)V

34	····.line·1341	34	····.line·1337
35	····iget·p1,·p1,·Landroid/os/Message;->what:I	35	····iget·p1,·p1,·Landroid/os/Message;->what:I

36	····const/16·v0,·0x66	36	····const/16·v0,·0x66

37	····const/4·v1,·0x1	37	····const/4·v1,·0x1

38	····if-eq·p1,·v0,·:cond_1	38	····if-eq·p1,·v0,·:cond_1
Offset 55, 25 lines modified		Offset 55, 25 lines modified

55	····if-eq·p1,·v0,·:cond_0	55	····if-eq·p1,·v0,·:cond_0

56	····const/4·p0,·0x0	56	····const/4·p0,·0x0

57	····return·p0	57	····return·p0

58	····.line·1348	58	····.line·1344
59	····:cond_0	59	····:cond_0
60	····iget-object·p1,·p0,·Landroid/net/ip/IpServer$WaitingForRestartState;->this$0:Landroid/net/ip/IpServer;	60	····iget-object·p1,·p0,·Landroid/net/ip/IpServer$WaitingForRestartState;->this$0:Landroid/net/ip/IpServer;

61	····invoke-static·{p1},·Landroid/net/ip/IpServer;->access$1800(Landroid/net/ip/IpServer;)Lcom/android/networkstack/tethering/util/State;	61	····invoke-static·{p1},·Landroid/net/ip/IpServer;->access$1800(Landroid/net/ip/IpServer;)Lcom/android/networkstack/tethering/util/State;

62	····move-result-object·v0	62	····move-result-object·v0

63	····invoke-virtual·{p1,·v0},·Lcom/android/networkstack/tethering/util/StateMachine;->transitionTo(Lcom/android/networkstack/tethering/util/IState;)V	63	····invoke-virtual·{p1,·v0},·Lcom/android/networkstack/tethering/util/StateMachine;->transitionTo(Lcom/android/networkstack/tethering/util/IState;)V

64	····.line·1349	64	····.line·1345
65	····iget-object·p1,·p0,·Landroid/net/ip/IpServer$WaitingForRestartState;->this$0:Landroid/net/ip/IpServer;	65	····iget-object·p1,·p0,·Landroid/net/ip/IpServer$WaitingForRestartState;->this$0:Landroid/net/ip/IpServer;

66	····invoke-static·{p1},·Landroid/net/ip/IpServer;->access$400(Landroid/net/ip/IpServer;)Landroid/net/util/SharedLog;	66	····invoke-static·{p1},·Landroid/net/ip/IpServer;->access$400(Landroid/net/ip/IpServer;)Landroid/net/util/SharedLog;

67	····move-result-object·p1	67	····move-result-object·p1

68	····new-instance·v0,·Ljava/lang/StringBuilder;	68	····new-instance·v0,·Ljava/lang/StringBuilder;
Offset 94, 15 lines modified		Offset 94, 15 lines modified

94	····invoke-virtual·{v0},·Ljava/lang/StringBuilder;->toString()Ljava/lang/String;	94	····invoke-virtual·{v0},·Ljava/lang/StringBuilder;->toString()Ljava/lang/String;

95	····move-result-object·v0	95	····move-result-object·v0

96	····invoke-virtual·{p1,·v0},·Landroid/net/util/SharedLog;->i(Ljava/lang/String;)V	96	····invoke-virtual·{p1,·v0},·Landroid/net/util/SharedLog;->i(Ljava/lang/String;)V

97	····.line·1350	97	····.line·1346
98	····iget-object·p1,·p0,·Landroid/net/ip/IpServer$WaitingForRestartState;->this$0:Landroid/net/ip/IpServer;	98	····iget-object·p1,·p0,·Landroid/net/ip/IpServer$WaitingForRestartState;->this$0:Landroid/net/ip/IpServer;

99	····invoke-static·{p1},·Landroid/net/ip/IpServer;->access$1100(Landroid/net/ip/IpServer;)Landroid/net/ip/IpServer$Callback;	99	····invoke-static·{p1},·Landroid/net/ip/IpServer;->access$1100(Landroid/net/ip/IpServer;)Landroid/net/ip/IpServer$Callback;

100	····move-result-object·p1	100	····move-result-object·p1

101	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$WaitingForRestartState;->this$0:Landroid/net/ip/IpServer;	101	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$WaitingForRestartState;->this$0:Landroid/net/ip/IpServer;
Offset 111, 25 lines modified		Offset 111, 25 lines modified

111	····move-result·p0	111	····move-result·p0

112	····invoke-virtual·{p1,·p0,·v1},·Landroid/net/ip/IpServer$Callback;->requestEnableTethering(IZ)V	112	····invoke-virtual·{p1,·p0,·v1},·Landroid/net/ip/IpServer$Callback;->requestEnableTethering(IZ)V

113	····goto·:goto_0	113	····goto·:goto_0

114	····.line·1343	114	····.line·1339
115	····:cond_1	115	····:cond_1
116	····iget-object·p1,·p0,·Landroid/net/ip/IpServer$WaitingForRestartState;->this$0:Landroid/net/ip/IpServer;	116	····iget-object·p1,·p0,·Landroid/net/ip/IpServer$WaitingForRestartState;->this$0:Landroid/net/ip/IpServer;

117	····invoke-static·{p1},·Landroid/net/ip/IpServer;->access$200(Landroid/net/ip/IpServer;)Lcom/android/networkstack/tethering/util/State;	117	····invoke-static·{p1},·Landroid/net/ip/IpServer;->access$200(Landroid/net/ip/IpServer;)Lcom/android/networkstack/tethering/util/State;

118	····move-result-object·v0	118	····move-result-object·v0

119	····invoke-virtual·{p1,·v0},·Lcom/android/networkstack/tethering/util/StateMachine;->transitionTo(Lcom/android/networkstack/tethering/util/IState;)V	119	····invoke-virtual·{p1,·v0},·Lcom/android/networkstack/tethering/util/StateMachine;->transitionTo(Lcom/android/networkstack/tethering/util/IState;)V

120	····.line·1344	120	····.line·1340
121	····iget-object·p1,·p0,·Landroid/net/ip/IpServer$WaitingForRestartState;->this$0:Landroid/net/ip/IpServer;	121	····iget-object·p1,·p0,·Landroid/net/ip/IpServer$WaitingForRestartState;->this$0:Landroid/net/ip/IpServer;

122	····invoke-static·{p1},·Landroid/net/ip/IpServer;->access$400(Landroid/net/ip/IpServer;)Landroid/net/util/SharedLog;	122	····invoke-static·{p1},·Landroid/net/ip/IpServer;->access$400(Landroid/net/ip/IpServer;)Landroid/net/util/SharedLog;

123	····move-result-object·p1	123	····move-result-object·p1

124	····new-instance·v0,·Ljava/lang/StringBuilder;	124	····new-instance·v0,·Ljava/lang/StringBuilder;
Offset 150, 15 lines modified		Offset 150, 15 lines modified

150	····invoke-virtual·{v0},·Ljava/lang/StringBuilder;->toString()Ljava/lang/String;	150	····invoke-virtual·{v0},·Ljava/lang/StringBuilder;->toString()Ljava/lang/String;

151	····move-result-object·v0	151	····move-result-object·v0

152	····invoke-virtual·{p1,·v0},·Landroid/net/util/SharedLog;->i(Ljava/lang/String;)V	152	····invoke-virtual·{p1,·v0},·Landroid/net/util/SharedLog;->i(Ljava/lang/String;)V

153	····.line·1345	153	····.line·1341
154	····iget-object·p1,·p0,·Landroid/net/ip/IpServer$WaitingForRestartState;->this$0:Landroid/net/ip/IpServer;	154	····iget-object·p1,·p0,·Landroid/net/ip/IpServer$WaitingForRestartState;->this$0:Landroid/net/ip/IpServer;

155	····invoke-static·{p1},·Landroid/net/ip/IpServer;->access$1100(Landroid/net/ip/IpServer;)Landroid/net/ip/IpServer$Callback;	155	····invoke-static·{p1},·Landroid/net/ip/IpServer;->access$1100(Landroid/net/ip/IpServer;)Landroid/net/ip/IpServer$Callback;

156	····move-result-object·p1	156	····move-result-object·p1

157	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$WaitingForRestartState;->this$0:Landroid/net/ip/IpServer;	157	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$WaitingForRestartState;->this$0:Landroid/net/ip/IpServer;


Offset 52, 138 lines modified		Offset 52, 131 lines modified

52	····return-void	52	····return-void
53	.end·method	53	.end·method

54	.method·private·handleError()V	54	.method·private·handleError()V
55	····.locals·2	55	····.locals·2

56	····.line·460	56	····.line·456
57	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->this$0:Landroid/net/ip/IpServer;	57	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->this$0:Landroid/net/ip/IpServer;

58	····const/16·v1,·0xc	58	····const/16·v1,·0xc

59	····invoke-static·{v0,·v1},·Landroid/net/ip/IpServer;->access$102(Landroid/net/ip/IpServer;I)I	59	····invoke-static·{v0,·v1},·Landroid/net/ip/IpServer;->access$102(Landroid/net/ip/IpServer;I)I

60	····.line·461	60	····.line·457
61	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->this$0:Landroid/net/ip/IpServer;	61	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->this$0:Landroid/net/ip/IpServer;

62	····invoke-static·{p0},·Landroid/net/ip/IpServer;->access$200(Landroid/net/ip/IpServer;)Lcom/android/networkstack/tethering/util/State;	62	····invoke-static·{p0},·Landroid/net/ip/IpServer;->access$200(Landroid/net/ip/IpServer;)Lcom/android/networkstack/tethering/util/State;

63	····move-result-object·v0	63	····move-result-object·v0

64	····invoke-virtual·{p0,·v0},·Lcom/android/networkstack/tethering/util/StateMachine;->transitionTo(Lcom/android/networkstack/tethering/util/IState;)V	64	····invoke-virtual·{p0,·v0},·Lcom/android/networkstack/tethering/util/StateMachine;->transitionTo(Lcom/android/networkstack/tethering/util/IState;)V

65	····return-void	65	····return-void
66	.end·method	66	.end·method

67	.method·private·synthetic·lambda$onDhcpServerCreated$0(Landroid/net/dhcp/IDhcpServer;I)V	67	.method·private·synthetic·lambda$onDhcpServerCreated$0(ILandroid/net/dhcp/IDhcpServer;)V
68	····.locals·3	68	····.locals·2

69	····.line·425	69	····.line·425
70	····iget·v0,·p0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->mStartIndex:I	70	····iget·v0,·p0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->mStartIndex:I

71	····iget-object·v1,·p0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->this$0:Landroid/net/ip/IpServer;	71	····iget-object·v1,·p0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->this$0:Landroid/net/ip/IpServer;

72	····invoke-static·{v1},·Landroid/net/ip/IpServer;->access$300(Landroid/net/ip/IpServer;)I	72	····invoke-static·{v1},·Landroid/net/ip/IpServer;->access$300(Landroid/net/ip/IpServer;)I

73	····move-result·v1	73	····move-result·v1

74	····const/4·v2,·0x0

75	····if-eq·v0,·v1,·:cond_0	74	····if-eq·v0,·v1,·:cond_0

76	····.line·431
77	····:try_start_0
78	····invoke-interface·{p1,·v2},·Landroid/net/dhcp/IDhcpServer;->stop(Landroid/net/INetworkStackStatusCallback;)V
79	····:try_end_0
80	····.catch·Landroid/os/RemoteException;·{:try_start_0·..·:try_end_0}·:catch_0

81	····:catch_0
82	····return-void	75	····return-void

83	····:cond_0	76	····:cond_0
84	····const/4·v0,·0x1	77	····const/4·v0,·0x1

85	····if-eq·p2,·v0,·:cond_1	78	····if-eq·p1,·v0,·:cond_1

86	····.line·437	79	····.line·433
87	····iget-object·p1,·p0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->this$0:Landroid/net/ip/IpServer;	80	····iget-object·p2,·p0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->this$0:Landroid/net/ip/IpServer;

88	····invoke-static·{p1},·Landroid/net/ip/IpServer;->access$400(Landroid/net/ip/IpServer;)Landroid/net/util/SharedLog;	81	····invoke-static·{p2},·Landroid/net/ip/IpServer;->access$400(Landroid/net/ip/IpServer;)Landroid/net/util/SharedLog;

89	····move-result-object·p1	82	····move-result-object·p2

90	····new-instance·v0,·Ljava/lang/StringBuilder;	83	····new-instance·v0,·Ljava/lang/StringBuilder;

91	····invoke-direct·{v0},·Ljava/lang/StringBuilder;-><init>()V	84	····invoke-direct·{v0},·Ljava/lang/StringBuilder;-><init>()V

92	····const-string·v1,·"Error·obtaining·DHCP·server:·"	85	····const-string·v1,·"Error·obtaining·DHCP·server:·"

93	····invoke-virtual·{v0,·v1},·Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;	86	····invoke-virtual·{v0,·v1},·Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;

94	····invoke-virtual·{v0,·p2},·Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;	87	····invoke-virtual·{v0,·p1},·Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;

95	····invoke-virtual·{v0},·Ljava/lang/StringBuilder;->toString()Ljava/lang/String;	88	····invoke-virtual·{v0},·Ljava/lang/StringBuilder;->toString()Ljava/lang/String;

96	····move-result-object·p2	89	····move-result-object·p1

97	····invoke-virtual·{p1,·p2},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;)V	90	····invoke-virtual·{p2,·p1},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;)V

98	····.line·438	91	····.line·434
99	····invoke-direct·{p0},·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->handleError()V	92	····invoke-direct·{p0},·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->handleError()V

100	····return-void	93	····return-void

101	····.line·442	94	····.line·438
102	····:cond_1	95	····:cond_1
103	····iget-object·p2,·p0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->this$0:Landroid/net/ip/IpServer;	96	····iget-object·p1,·p0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->this$0:Landroid/net/ip/IpServer;

104	····invoke-static·{p2,·p1},·Landroid/net/ip/IpServer;->access$502(Landroid/net/ip/IpServer;Landroid/net/dhcp/IDhcpServer;)Landroid/net/dhcp/IDhcpServer;	97	····invoke-static·{p1,·p2},·Landroid/net/ip/IpServer;->access$502(Landroid/net/ip/IpServer;Landroid/net/dhcp/IDhcpServer;)Landroid/net/dhcp/IDhcpServer;

105	····.line·444	98	····.line·440
106	····:try_start_1	99	····:try_start_0
107	····iget-object·p1,·p0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->this$0:Landroid/net/ip/IpServer;	100	····iget-object·p1,·p0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->this$0:Landroid/net/ip/IpServer;

108	····invoke-static·{p1},·Landroid/net/ip/IpServer;->access$500(Landroid/net/ip/IpServer;)Landroid/net/dhcp/IDhcpServer;	101	····invoke-static·{p1},·Landroid/net/ip/IpServer;->access$500(Landroid/net/ip/IpServer;)Landroid/net/dhcp/IDhcpServer;

109	····move-result-object·p1	102	····move-result-object·p1

110	····new-instance·p2,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl$1;	103	····new-instance·p2,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl$1;

111	····invoke-direct·{p2,·p0},·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl$1;-><init>(Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;)V	104	····invoke-direct·{p2,·p0},·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl$1;-><init>(Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;)V

112	····new-instance·v0,·Landroid/net/ip/IpServer$DhcpEventCallback;	105	····new-instance·v0,·Landroid/net/ip/IpServer$DhcpEventCallback;

113	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->this$0:Landroid/net/ip/IpServer;	106	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$DhcpServerCallbacksImpl;->this$0:Landroid/net/ip/IpServer;

114	····~~invoke-direct·{v0,·p0,·v2},·Landroid/net/ip/IpServer$DhcpEventCallba~~c~~k;-><init>(Landroid/net/ip/IpServer;Landr~~o~~id/~~net~~/ip~~/~~IpS~~erve~~r$1;)V~~	107	····const/4·v1,·0x0

		108	····invoke-direct·{v0,·p0,·v1},·Landroid/net/ip/IpServer$DhcpEventCallback;-><init>(Landroid/net/ip/IpServer;Landroid/net/ip/IpServer$1;)V

115	····invoke-interface·{p1,·p2,·v0},·Landroid/net/dhcp/IDhcpServer;->startWithCallbacks(Landroid/net/INetworkStackStatusCallback;Landroid/net/dhcp/IDhcpEventCallbacks;)V	109	····invoke-interface·{p1,·p2,·v0},·Landroid/net/dhcp/IDhcpServer;->startWithCallbacks(Landroid/net/INetworkStackStatusCallback;Landroid/net/dhcp/IDhcpEventCallbacks;)V
116	····:try_end_1	110	····:try_end_0
117	····.catch·Landroid/os/RemoteException;·{:try_start_1·..·:try_end_1}·:catch_1	111	····.catch·Landroid/os/RemoteException;·{:try_start_0·..·:try_end_0}·:catch_0

118	····return-void	112	····return-void

119	····:catch_1	113	····:catch_0
120	····move-exception·p0	114	····move-exception·p0

121	····.line·454	115	····.line·450
122	····new-instance·p1,·Ljava/lang/IllegalStateException;	116	····new-instance·p1,·Ljava/lang/IllegalStateException;

123	····invoke-direct·{p1,·p0},·Ljava/lang/IllegalStateException;-><init>(Ljava/lang/Throwable;)V	117	····invoke-direct·{p1,·p0},·Ljava/lang/IllegalStateException;-><init>(Ljava/lang/Throwable;)V

124	····throw·p1	118	····throw·p1
125	.end·method	119	.end·method

... Open expanded diff ...


Offset 18, 46 lines modified		Offset 18, 46 lines modified
18	.field·final·synthetic·this$0:Landroid/net/ip/IpServer;	18	.field·final·synthetic·this$0:Landroid/net/ip/IpServer;


19	#·direct·methods	19	#·direct·methods
20	.method·constructor·<init>(Landroid/net/ip/IpServer;)V	20	.method·constructor·<init>(Landroid/net/ip/IpServer;)V
21	····.locals·0	21	····.locals·0

22	····.line·1081	22	····.line·1077
23	····iput-object·p1,·p0,·Landroid/net/ip/IpServer$BaseServingState;->this$0:Landroid/net/ip/IpServer;	23	····iput-object·p1,·p0,·Landroid/net/ip/IpServer$BaseServingState;->this$0:Landroid/net/ip/IpServer;

24	····invoke-direct·{p0},·Lcom/android/networkstack/tethering/util/State;-><init>()V	24	····invoke-direct·{p0},·Lcom/android/networkstack/tethering/util/State;-><init>()V

25	····return-void	25	····return-void
26	.end·method	26	.end·method


27	#·virtual·methods	27	#·virtual·methods
28	.method·public·enter()V	28	.method·public·enter()V
29	····.locals·3	29	····.locals·3

30	····.line·1084	30	····.line·1080
31	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$BaseServingState;->this$0:Landroid/net/ip/IpServer;	31	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$BaseServingState;->this$0:Landroid/net/ip/IpServer;

32	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$2000(Landroid/net/ip/IpServer;)Z	32	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$2000(Landroid/net/ip/IpServer;)Z

33	····move-result·v0	33	····move-result·v0

34	····if-nez·v0,·:cond_0	34	····if-nez·v0,·:cond_0

35	····.line·1085	35	····.line·1081
36	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$BaseServingState;->this$0:Landroid/net/ip/IpServer;	36	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$BaseServingState;->this$0:Landroid/net/ip/IpServer;

37	····const/16·v0,·0xa	37	····const/16·v0,·0xa

38	····invoke-static·{p0,·v0},·Landroid/net/ip/IpServer;->access$102(Landroid/net/ip/IpServer;I)I	38	····invoke-static·{p0,·v0},·Landroid/net/ip/IpServer;->access$102(Landroid/net/ip/IpServer;I)I

39	····return-void	39	····return-void

40	····.line·1090	40	····.line·1086
41	····:cond_0	41	····:cond_0
42	····:try_start_0	42	····:try_start_0
43	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$BaseServingState;->this$0:Landroid/net/ip/IpServer;	43	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$BaseServingState;->this$0:Landroid/net/ip/IpServer;

44	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$2100(Landroid/net/ip/IpServer;)Landroid/net/INetd;	44	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$2100(Landroid/net/ip/IpServer;)Landroid/net/INetd;

45	····move-result-object·v0	45	····move-result-object·v0
Offset 80, 24 lines modified		Offset 80, 24 lines modified

80	····invoke-static·{v0,·v1,·v2},·Landroid/net/shared/NetdUtils;->tetherInterface(Landroid/net/INetd;Ljava/lang/String;Landroid/net/IpPrefix;)V	80	····invoke-static·{v0,·v1,·v2},·Landroid/net/shared/NetdUtils;->tetherInterface(Landroid/net/INetd;Ljava/lang/String;Landroid/net/IpPrefix;)V
81	····:try_end_0	81	····:try_end_0
82	····.catch·Landroid/os/RemoteException;·{:try_start_0·..·:try_end_0}·:catch_0	82	····.catch·Landroid/os/RemoteException;·{:try_start_0·..·:try_end_0}·:catch_0
83	····.catch·Landroid/os/ServiceSpecificException;·{:try_start_0·..·:try_end_0}·:catch_0	83	····.catch·Landroid/os/ServiceSpecificException;·{:try_start_0·..·:try_end_0}·:catch_0
84	····.catch·Ljava/lang/IllegalStateException;·{:try_start_0·..·:try_end_0}·:catch_0	84	····.catch·Ljava/lang/IllegalStateException;·{:try_start_0·..·:try_end_0}·:catch_0

85	····.line·1097	85	····.line·1093
86	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$BaseServingState;->this$0:Landroid/net/ip/IpServer;	86	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$BaseServingState;->this$0:Landroid/net/ip/IpServer;

87	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$2400(Landroid/net/ip/IpServer;)Z	87	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$2400(Landroid/net/ip/IpServer;)Z

88	····move-result·v0	88	····move-result·v0

89	····if-nez·v0,·:cond_1	89	····if-nez·v0,·:cond_1

90	····.line·1098	90	····.line·1094
91	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$BaseServingState;->this$0:Landroid/net/ip/IpServer;	91	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$BaseServingState;->this$0:Landroid/net/ip/IpServer;

92	····invoke-static·{p0},·Landroid/net/ip/IpServer;->access$400(Landroid/net/ip/IpServer;)Landroid/net/util/SharedLog;	92	····invoke-static·{p0},·Landroid/net/ip/IpServer;->access$400(Landroid/net/ip/IpServer;)Landroid/net/util/SharedLog;

93	····move-result-object·p0	93	····move-result-object·p0

94	····const-string·v0,·"Failed·to·startIPv6"	94	····const-string·v0,·"Failed·to·startIPv6"
Offset 106, 44 lines modified		Offset 106, 44 lines modified

106	····:cond_1	106	····:cond_1
107	····return-void	107	····return-void

108	····:catch_0	108	····:catch_0
109	····move-exception·v0	109	····move-exception·v0

110	····.line·1092	110	····.line·1088
111	····iget-object·v1,·p0,·Landroid/net/ip/IpServer$BaseServingState;->this$0:Landroid/net/ip/IpServer;	111	····iget-object·v1,·p0,·Landroid/net/ip/IpServer$BaseServingState;->this$0:Landroid/net/ip/IpServer;

112	····invoke-static·{v1},·Landroid/net/ip/IpServer;->access$400(Landroid/net/ip/IpServer;)Landroid/net/util/SharedLog;	112	····invoke-static·{v1},·Landroid/net/ip/IpServer;->access$400(Landroid/net/ip/IpServer;)Landroid/net/util/SharedLog;

113	····move-result-object·v1	113	····move-result-object·v1

114	····const-string·v2,·"Error·Tethering"	114	····const-string·v2,·"Error·Tethering"

115	····invoke-virtual·{v1,·v2,·v0},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;Ljava/lang/Throwable;)V	115	····invoke-virtual·{v1,·v2,·v0},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;Ljava/lang/Throwable;)V

116	····.line·1093	116	····.line·1089
117	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$BaseServingState;->this$0:Landroid/net/ip/IpServer;	117	····iget-object·p0,·p0,·Landroid/net/ip/IpServer$BaseServingState;->this$0:Landroid/net/ip/IpServer;

118	····const/4·v0,·0x6	118	····const/4·v0,·0x6

119	····invoke-static·{p0,·v0},·Landroid/net/ip/IpServer;->access$102(Landroid/net/ip/IpServer;I)I	119	····invoke-static·{p0,·v0},·Landroid/net/ip/IpServer;->access$102(Landroid/net/ip/IpServer;I)I

120	····return-void	120	····return-void
121	.end·method	121	.end·method

122	.method·public·exit()V	122	.method·public·exit()V
123	····.locals·4	123	····.locals·4

124	····.line·1109	124	····.line·1105
125	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$BaseServingState;->this$0:Landroid/net/ip/IpServer;	125	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$BaseServingState;->this$0:Landroid/net/ip/IpServer;

126	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$2500(Landroid/net/ip/IpServer;)V	126	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$2500(Landroid/net/ip/IpServer;)V

127	····.line·1112	127	····.line·1108
128	····:try_start_0	128	····:try_start_0
129	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$BaseServingState;->this$0:Landroid/net/ip/IpServer;	129	····iget-object·v0,·p0,·Landroid/net/ip/IpServer$BaseServingState;->this$0:Landroid/net/ip/IpServer;

130	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$2100(Landroid/net/ip/IpServer;)Landroid/net/INetd;	130	····invoke-static·{v0},·Landroid/net/ip/IpServer;->access$2100(Landroid/net/ip/IpServer;)Landroid/net/INetd;

131	····move-result-object·v0	131	····move-result-object·v0

Offset 159, 22 lines modified		Offset 159, 22 lines modified
159	····.catch·Landroid/os/ServiceSpecificException;·{:try_start_0·..·:try_end_0}·:catch_0	159	····.catch·Landroid/os/ServiceSpecificException;·{:try_start_0·..·:try_end_0}·:catch_0

160	····goto·:goto_0	160	····goto·:goto_0

161	····:catch_0	161	····:catch_0
162	····move-exception·v0	162	····move-exception·v0

163	····.line·1114	163	····.line·1110
164	····iget-object·v1,·p0,·Landroid/net/ip/IpServer$BaseServingState;->this$0:Landroid/net/ip/IpServer;	164	····iget-object·v1,·p0,·Landroid/net/ip/IpServer$BaseServingState;->this$0:Landroid/net/ip/IpServer;

... Open expanded diff ...


Offset 18, 42 lines modified		Offset 18, 42 lines modified
18	.field·final·synthetic·this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;	18	.field·final·synthetic·this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;


19	#·direct·methods	19	#·direct·methods
20	.method·constructor·<init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V	20	.method·constructor·<init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V
21	····.locals·0	21	····.locals·0

22	····.line·1941	22	····.line·1937
23	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$StopTetheringErrorState;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;	23	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$StopTetheringErrorState;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;

24	····invoke-direct·{p0,·p1},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$ErrorState;-><init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V	24	····invoke-direct·{p0,·p1},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$ErrorState;-><init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V

25	····return-void	25	····return-void
26	.end·method	26	.end·method


27	#·virtual·methods	27	#·virtual·methods
28	.method·public·enter()V	28	.method·public·enter()V
29	····.locals·2	29	····.locals·2

30	····.line·1944	30	····.line·1940
31	····invoke-static·{},·Lcom/android/networkstack/tethering/Tethering;->access$3400()Ljava/lang/String;	31	····invoke-static·{},·Lcom/android/networkstack/tethering/Tethering;->access$3400()Ljava/lang/String;

32	····move-result-object·v0	32	····move-result-object·v0

33	····const-string·v1,·"Error·in·stopTethering"	33	····const-string·v1,·"Error·in·stopTethering"

34	····invoke-static·{v0,·v1},·Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I	34	····invoke-static·{v0,·v1},·Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I

35	····const/16·v0,·0x6b	35	····const/16·v0,·0x6b

36	····.line·1945	36	····.line·1941
37	····invoke-virtual·{p0,·v0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$ErrorState;->notify(I)V	37	····invoke-virtual·{p0,·v0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$ErrorState;->notify(I)V

38	····.line·1947	38	····.line·1943
39	····:try_start_0	39	····:try_start_0
40	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$StopTetheringErrorState;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;	40	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$StopTetheringErrorState;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;

41	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->this$0:Lcom/android/networkstack/tethering/Tethering;	41	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->this$0:Lcom/android/networkstack/tethering/Tethering;

42	····invoke-static·{p0},·Lcom/android/networkstack/tethering/Tethering;->access$400(Lcom/android/networkstack/tethering/Tethering;)Landroid/net/INetd;	42	····invoke-static·{p0},·Lcom/android/networkstack/tethering/Tethering;->access$400(Lcom/android/networkstack/tethering/Tethering;)Landroid/net/INetd;


Offset 14, 34 lines modified		Offset 14, 34 lines modified
14	.end·annotation	14	.end·annotation


15	#·direct·methods	15	#·direct·methods
16	.method·constructor·<init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V	16	.method·constructor·<init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V
17	····.locals·0	17	····.locals·0

18	····.line·1922	18	····.line·1918
19	····invoke-direct·{p0,·p1},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$ErrorState;-><init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V	19	····invoke-direct·{p0,·p1},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$ErrorState;-><init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V

20	····return-void	20	····return-void
21	.end·method	21	.end·method


22	#·virtual·methods	22	#·virtual·methods
23	.method·public·enter()V	23	.method·public·enter()V
24	····.locals·2	24	····.locals·2

25	····.line·1925	25	····.line·1921
26	····invoke-static·{},·Lcom/android/networkstack/tethering/Tethering;->access$3400()Ljava/lang/String;	26	····invoke-static·{},·Lcom/android/networkstack/tethering/Tethering;->access$3400()Ljava/lang/String;

27	····move-result-object·v0	27	····move-result-object·v0

28	····const-string·v1,·"Error·in·setIpForwardingDisabled"	28	····const-string·v1,·"Error·in·setIpForwardingDisabled"

29	····invoke-static·{v0,·v1},·Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I	29	····invoke-static·{v0,·v1},·Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I

30	····const/16·v0,·0x69	30	····const/16·v0,·0x69

31	····.line·1926	31	····.line·1922
32	····invoke-virtual·{p0,·v0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$ErrorState;->notify(I)V	32	····invoke-virtual·{p0,·v0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$ErrorState;->notify(I)V

33	····return-void	33	····return-void
34	.end·method	34	.end·method


Offset 21, 40 lines modified		Offset 21, 40 lines modified
21	.field·private·final·mTetherHandler:Landroid/os/Handler;	21	.field·private·final·mTetherHandler:Landroid/os/Handler;


22	#·direct·methods	22	#·direct·methods
23	.method·constructor·<init>(Lcom/android/networkstack/tethering/Tethering;Landroid/os/Handler;)V	23	.method·constructor·<init>(Lcom/android/networkstack/tethering/Tethering;Landroid/os/Handler;)V
24	····.locals·0	24	····.locals·0

25	····.line·403	25	····.line·400
26	····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V	26	····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V

27	····.line·404	27	····.line·401
28	····iput-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetheringThreadExecutor;->mTetherHandler:Landroid/os/Handler;	28	····iput-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetheringThreadExecutor;->mTetherHandler:Landroid/os/Handler;

29	····return-void	29	····return-void
30	.end·method	30	.end·method


31	#·virtual·methods	31	#·virtual·methods
32	.method·public·execute(Ljava/lang/Runnable;)V	32	.method·public·execute(Ljava/lang/Runnable;)V
33	····.locals·1	33	····.locals·1

34	····.line·408	34	····.line·405
35	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetheringThreadExecutor;->mTetherHandler:Landroid/os/Handler;	35	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetheringThreadExecutor;->mTetherHandler:Landroid/os/Handler;

36	····invoke-virtual·{v0,·p1},·Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z	36	····invoke-virtual·{v0,·p1},·Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z

37	····move-result·p1	37	····move-result·p1

38	····if-eqz·p1,·:cond_0	38	····if-eqz·p1,·:cond_0

39	····return-void	39	····return-void

40	····.line·409	40	····.line·406
41	····:cond_0	41	····:cond_0
42	····new-instance·p1,·Ljava/util/concurrent/RejectedExecutionException;	42	····new-instance·p1,·Ljava/util/concurrent/RejectedExecutionException;

43	····new-instance·v0,·Ljava/lang/StringBuilder;	43	····new-instance·v0,·Ljava/lang/StringBuilder;

44	····invoke-direct·{v0},·Ljava/lang/StringBuilder;-><init>()V	44	····invoke-direct·{v0},·Ljava/lang/StringBuilder;-><init>()V


Offset 18, 68 lines modified		Offset 18, 68 lines modified
18	.field·final·synthetic·this$0:Lcom/android/networkstack/tethering/Tethering;	18	.field·final·synthetic·this$0:Lcom/android/networkstack/tethering/Tethering;


19	#·direct·methods	19	#·direct·methods
20	.method·private·constructor·<init>(Lcom/android/networkstack/tethering/Tethering;)V	20	.method·private·constructor·<init>(Lcom/android/networkstack/tethering/Tethering;)V
21	····.locals·0	21	····.locals·0

22	····.line·456	22	····.line·453
23	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$NetdCallback;->this$0:Lcom/android/networkstack/tethering/Tethering;	23	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$NetdCallback;->this$0:Lcom/android/networkstack/tethering/Tethering;

24	····invoke-direct·{p0},·Landroid/net/util/BaseNetdUnsolicitedEventListener;-><init>()V	24	····invoke-direct·{p0},·Landroid/net/util/BaseNetdUnsolicitedEventListener;-><init>()V

25	····return-void	25	····return-void
26	.end·method	26	.end·method

27	.method·synthetic·constructor·<init>(Lcom/android/networkstack/tethering/Tethering;Lcom/android/networkstack/tethering/Tethering$1;)V	27	.method·synthetic·constructor·<init>(Lcom/android/networkstack/tethering/Tethering;Lcom/android/networkstack/tethering/Tethering$1;)V
28	····.locals·0	28	····.locals·0

29	····.line·456	29	····.line·453
30	····invoke-direct·{p0,·p1},·Lcom/android/networkstack/tethering/Tethering$NetdCallback;-><init>(Lcom/android/networkstack/tethering/Tethering;)V	30	····invoke-direct·{p0,·p1},·Lcom/android/networkstack/tethering/Tethering$NetdCallback;-><init>(Lcom/android/networkstack/tethering/Tethering;)V

31	····return-void	31	····return-void
32	.end·method	32	.end·method

33	.method·private·synthetic·lambda$onInterfaceAdded$2(Ljava/lang/String;)V	33	.method·private·synthetic·lambda$onInterfaceAdded$2(Ljava/lang/String;)V
34	····.locals·0	34	····.locals·0

35	····.line·469	35	····.line·466
36	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$NetdCallback;->this$0:Lcom/android/networkstack/tethering/Tethering;	36	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$NetdCallback;->this$0:Lcom/android/networkstack/tethering/Tethering;

37	····invoke-virtual·{p0,·p1},·Lcom/android/networkstack/tethering/Tethering;->interfaceAdded(Ljava/lang/String;)V	37	····invoke-virtual·{p0,·p1},·Lcom/android/networkstack/tethering/Tethering;->interfaceAdded(Ljava/lang/String;)V

38	····return-void	38	····return-void
39	.end·method	39	.end·method

40	.method·private·synthetic·lambda$onInterfaceChanged$0(Ljava/lang/String;Z)V	40	.method·private·synthetic·lambda$onInterfaceChanged$0(Ljava/lang/String;Z)V
41	····.locals·0	41	····.locals·0

42	····.line·459	42	····.line·456
43	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$NetdCallback;->this$0:Lcom/android/networkstack/tethering/Tethering;	43	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$NetdCallback;->this$0:Lcom/android/networkstack/tethering/Tethering;

44	····invoke-virtual·{p0,·p1,·p2},·Lcom/android/networkstack/tethering/Tethering;->interfaceStatusChanged(Ljava/lang/String;Z)V	44	····invoke-virtual·{p0,·p1,·p2},·Lcom/android/networkstack/tethering/Tethering;->interfaceStatusChanged(Ljava/lang/String;Z)V

45	····return-void	45	····return-void
46	.end·method	46	.end·method

47	.method·private·synthetic·lambda$onInterfaceLinkStateChanged$1(Ljava/lang/String;Z)V	47	.method·private·synthetic·lambda$onInterfaceLinkStateChanged$1(Ljava/lang/String;Z)V
48	····.locals·0	48	····.locals·0

49	····.line·464	49	····.line·461
50	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$NetdCallback;->this$0:Lcom/android/networkstack/tethering/Tethering;	50	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$NetdCallback;->this$0:Lcom/android/networkstack/tethering/Tethering;

51	····invoke-virtual·{p0,·p1,·p2},·Lcom/android/networkstack/tethering/Tethering;->interfaceLinkStateChanged(Ljava/lang/String;Z)V	51	····invoke-virtual·{p0,·p1,·p2},·Lcom/android/networkstack/tethering/Tethering;->interfaceLinkStateChanged(Ljava/lang/String;Z)V

52	····return-void	52	····return-void
53	.end·method	53	.end·method

54	.method·private·synthetic·lambda$onInterfaceRemoved$3(Ljava/lang/String;)V	54	.method·private·synthetic·lambda$onInterfaceRemoved$3(Ljava/lang/String;)V
55	····.locals·0	55	····.locals·0

56	····.line·474	56	····.line·471
57	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$NetdCallback;->this$0:Lcom/android/networkstack/tethering/Tethering;	57	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$NetdCallback;->this$0:Lcom/android/networkstack/tethering/Tethering;

58	····invoke-virtual·{p0,·p1},·Lcom/android/networkstack/tethering/Tethering;->interfaceRemoved(Ljava/lang/String;)V	58	····invoke-virtual·{p0,·p1},·Lcom/android/networkstack/tethering/Tethering;->interfaceRemoved(Ljava/lang/String;)V

59	····return-void	59	····return-void
60	.end·method	60	.end·method

Offset 116, 15 lines modified		Offset 116, 15 lines modified

116	····return-void	116	····return-void
117	.end·method	117	.end·method

118	.method·public·onInterfaceAdded(Ljava/lang/String;)V	118	.method·public·onInterfaceAdded(Ljava/lang/String;)V
119	····.locals·2	119	····.locals·2

120	····.line·469	120	····.line·466
121	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$NetdCallback;->this$0:Lcom/android/networkstack/tethering/Tethering;	121	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$NetdCallback;->this$0:Lcom/android/networkstack/tethering/Tethering;

122	····invoke-static·{v0},·Lcom/android/networkstack/tethering/Tethering;->access$300(Lcom/android/networkstack/tethering/Tethering;)Landroid/os/Handler;	122	····invoke-static·{v0},·Lcom/android/networkstack/tethering/Tethering;->access$300(Lcom/android/networkstack/tethering/Tethering;)Landroid/os/Handler;

123	····move-result-object·v0	123	····move-result-object·v0

124	····new-instance·v1,·Lcom/android/networkstack/tethering/-$$Lambda$Tethering$NetdCallback$w5cU4M7bVmpOdkxlaGVqVWmPUpo;	124	····new-instance·v1,·Lcom/android/networkstack/tethering/-$$Lambda$Tethering$NetdCallback$w5cU4M7bVmpOdkxlaGVqVWmPUpo;
Offset 135, 15 lines modified		Offset 135, 15 lines modified

135	····return-void	135	····return-void
136	.end·method	136	.end·method

137	.method·public·onInterfaceChanged(Ljava/lang/String;Z)V	137	.method·public·onInterfaceChanged(Ljava/lang/String;Z)V
138	····.locals·2	138	····.locals·2

139	····.line·459	139	····.line·456
140	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$NetdCallback;->this$0:Lcom/android/networkstack/tethering/Tethering;	140	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$NetdCallback;->this$0:Lcom/android/networkstack/tethering/Tethering;

141	····invoke-static·{v0},·Lcom/android/networkstack/tethering/Tethering;->access$300(Lcom/android/networkstack/tethering/Tethering;)Landroid/os/Handler;	141	····invoke-static·{v0},·Lcom/android/networkstack/tethering/Tethering;->access$300(Lcom/android/networkstack/tethering/Tethering;)Landroid/os/Handler;

142	····move-result-object·v0	142	····move-result-object·v0

143	····new-instance·v1,·Lcom/android/networkstack/tethering/-$$Lambda$Tethering$NetdCallback$9EMToFiBFk1XuFac_6siBCknizM;	143	····new-instance·v1,·Lcom/android/networkstack/tethering/-$$Lambda$Tethering$NetdCallback$9EMToFiBFk1XuFac_6siBCknizM;
Offset 154, 15 lines modified		Offset 154, 15 lines modified

154	····return-void	154	····return-void
155	.end·method	155	.end·method

156	.method·public·onInterfaceLinkStateChanged(Ljava/lang/String;Z)V	156	.method·public·onInterfaceLinkStateChanged(Ljava/lang/String;Z)V
157	····.locals·2	157	····.locals·2

158	····.line·464	158	····.line·461
159	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$NetdCallback;->this$0:Lcom/android/networkstack/tethering/Tethering;	159	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$NetdCallback;->this$0:Lcom/android/networkstack/tethering/Tethering;

160	····invoke-static·{v0},·Lcom/android/networkstack/tethering/Tethering;->access$300(Lcom/android/networkstack/tethering/Tethering;)Landroid/os/Handler;	160	····invoke-static·{v0},·Lcom/android/networkstack/tethering/Tethering;->access$300(Lcom/android/networkstack/tethering/Tethering;)Landroid/os/Handler;

161	····move-result-object·v0	161	····move-result-object·v0

162	····new-instance·v1,·Lcom/android/networkstack/tethering/-$$Lambda$Tethering$NetdCallback$qioUsjppIUILOvZaWfcg8daqCUI;	162	····new-instance·v1,·Lcom/android/networkstack/tethering/-$$Lambda$Tethering$NetdCallback$qioUsjppIUILOvZaWfcg8daqCUI;
Offset 173, 15 lines modified		Offset 173, 15 lines modified

173	····return-void	173	····return-void
174	.end·method	174	.end·method

175	.method·public·onInterfaceRemoved(Ljava/lang/String;)V	175	.method·public·onInterfaceRemoved(Ljava/lang/String;)V
176	····.locals·2	176	····.locals·2

177	····.line·474	177	····.line·471
178	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$NetdCallback;->this$0:Lcom/android/networkstack/tethering/Tethering;	178	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$NetdCallback;->this$0:Lcom/android/networkstack/tethering/Tethering;

... Open expanded diff ...


Offset 24, 57 lines modified		Offset 24, 57 lines modified
24	.field·private·final·mWrapper:Lcom/android/networkstack/tethering/Tethering;	24	.field·private·final·mWrapper:Lcom/android/networkstack/tethering/Tethering;


25	#·direct·methods	25	#·direct·methods
26	.method·public·constructor·<init>(Landroid/os/UserManager;Lcom/android/networkstack/tethering/Tethering;Lcom/android/networkstack/tethering/TetheringNotificationUpdater;)V	26	.method·public·constructor·<init>(Landroid/os/UserManager;Lcom/android/networkstack/tethering/Tethering;Lcom/android/networkstack/tethering/TetheringNotificationUpdater;)V
27	····.locals·0	27	····.locals·0

28	····.line·1095	28	····.line·1092
29	····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V	29	····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V

30	····.line·1096	30	····.line·1093
31	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$UserRestrictionActionListener;->mUserMgr:Landroid/os/UserManager;	31	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$UserRestrictionActionListener;->mUserMgr:Landroid/os/UserManager;

32	····.line·1097	32	····.line·1094
33	····iput-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$UserRestrictionActionListener;->mWrapper:Lcom/android/networkstack/tethering/Tethering;	33	····iput-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$UserRestrictionActionListener;->mWrapper:Lcom/android/networkstack/tethering/Tethering;

34	····.line·1098	34	····.line·1095
35	····iput-object·p3,·p0,·Lcom/android/networkstack/tethering/Tethering$UserRestrictionActionListener;->mNotificationUpdater:Lcom/android/networkstack/tethering/TetheringNotificationUpdater;	35	····iput-object·p3,·p0,·Lcom/android/networkstack/tethering/Tethering$UserRestrictionActionListener;->mNotificationUpdater:Lcom/android/networkstack/tethering/TetheringNotificationUpdater;

36	····const/4·p1,·0x0	36	····const/4·p1,·0x0

37	····.line·1099	37	····.line·1096
38	····iput-boolean·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$UserRestrictionActionListener;->mDisallowTethering:Z	38	····iput-boolean·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$UserRestrictionActionListener;->mDisallowTethering:Z

39	····return-void	39	····return-void
40	.end·method	40	.end·method


41	#·virtual·methods	41	#·virtual·methods
42	.method·public·onUserRestrictionsChanged()V	42	.method·public·onUserRestrictionsChanged()V
43	····.locals·2	43	····.locals·2

44	····.line·1106	44	····.line·1103
45	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$UserRestrictionActionListener;->mUserMgr:Landroid/os/UserManager;	45	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$UserRestrictionActionListener;->mUserMgr:Landroid/os/UserManager;

46	····invoke-virtual·{v0},·Landroid/os/UserManager;->getUserRestrictions()Landroid/os/Bundle;	46	····invoke-virtual·{v0},·Landroid/os/UserManager;->getUserRestrictions()Landroid/os/Bundle;

47	····move-result-object·v0	47	····move-result-object·v0

48	····const-string·v1,·"no_config_tethering"	48	····const-string·v1,·"no_config_tethering"

49	····.line·1108	49	····.line·1105
50	····invoke-virtual·{v0,·v1},·Landroid/os/Bundle;->getBoolean(Ljava/lang/String;)Z	50	····invoke-virtual·{v0,·v1},·Landroid/os/Bundle;->getBoolean(Ljava/lang/String;)Z

51	····move-result·v0	51	····move-result·v0

52	····.line·1109	52	····.line·1106
53	····iget-boolean·v1,·p0,·Lcom/android/networkstack/tethering/Tethering$UserRestrictionActionListener;->mDisallowTethering:Z	53	····iget-boolean·v1,·p0,·Lcom/android/networkstack/tethering/Tethering$UserRestrictionActionListener;->mDisallowTethering:Z

54	····.line·1110	54	····.line·1107
55	····iput-boolean·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$UserRestrictionActionListener;->mDisallowTethering:Z	55	····iput-boolean·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$UserRestrictionActionListener;->mDisallowTethering:Z

56	····if-eq·v0,·v1,·:cond_0	56	····if-eq·v0,·v1,·:cond_0

57	····const/4·v1,·0x1	57	····const/4·v1,·0x1

58	····goto·:goto_0	58	····goto·:goto_0
Offset 86, 37 lines modified		Offset 86, 37 lines modified
86	····if-nez·v1,·:cond_1	86	····if-nez·v1,·:cond_1

87	····return-void	87	····return-void

88	····:cond_1	88	····:cond_1
89	····if-nez·v0,·:cond_2	89	····if-nez·v0,·:cond_2

90	····.line·1120	90	····.line·1117
91	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$UserRestrictionActionListener;->mNotificationUpdater:Lcom/android/networkstack/tethering/TetheringNotificationUpdater;	91	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$UserRestrictionActionListener;->mNotificationUpdater:Lcom/android/networkstack/tethering/TetheringNotificationUpdater;

92	····invoke-virtual·{p0},·Lcom/android/networkstack/tethering/TetheringNotificationUpdater;->tetheringRestrictionLifted()V	92	····invoke-virtual·{p0},·Lcom/android/networkstack/tethering/TetheringNotificationUpdater;->tetheringRestrictionLifted()V

93	····return-void	93	····return-void

94	····.line·1124	94	····.line·1121
95	····:cond_2	95	····:cond_2
96	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$UserRestrictionActionListener;->mWrapper:Lcom/android/networkstack/tethering/Tethering;	96	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$UserRestrictionActionListener;->mWrapper:Lcom/android/networkstack/tethering/Tethering;

97	····invoke-virtual·{v0},·Lcom/android/networkstack/tethering/Tethering;->isTetheringActive()Z	97	····invoke-virtual·{v0},·Lcom/android/networkstack/tethering/Tethering;->isTetheringActive()Z

98	····move-result·v0	98	····move-result·v0

99	····if-eqz·v0,·:cond_3	99	····if-eqz·v0,·:cond_3

100	····.line·1127	100	····.line·1124
101	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$UserRestrictionActionListener;->mNotificationUpdater:Lcom/android/networkstack/tethering/TetheringNotificationUpdater;	101	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$UserRestrictionActionListener;->mNotificationUpdater:Lcom/android/networkstack/tethering/TetheringNotificationUpdater;

102	····invoke-virtual·{v0},·Lcom/android/networkstack/tethering/TetheringNotificationUpdater;->notifyTetheringDisabledByRestriction()V	102	····invoke-virtual·{v0},·Lcom/android/networkstack/tethering/TetheringNotificationUpdater;->notifyTetheringDisabledByRestriction()V

103	····.line·1130	103	····.line·1127
104	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$UserRestrictionActionListener;->mWrapper:Lcom/android/networkstack/tethering/Tethering;	104	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$UserRestrictionActionListener;->mWrapper:Lcom/android/networkstack/tethering/Tethering;

105	····invoke-virtual·{p0},·Lcom/android/networkstack/tethering/Tethering;->untetherAll()V	105	····invoke-virtual·{p0},·Lcom/android/networkstack/tethering/Tethering;->untetherAll()V

106	····:cond_3	106	····:cond_3
107	····return-void	107	····return-void
108	.end·method	108	.end·method


Offset 78, 195 lines modified		Offset 78, 195 lines modified
78	.field·final·synthetic·this$0:Lcom/android/networkstack/tethering/Tethering;	78	.field·final·synthetic·this$0:Lcom/android/networkstack/tethering/Tethering;


79	#·direct·methods	79	#·direct·methods
80	.method·constructor·<init>(Lcom/android/networkstack/tethering/Tethering;Ljava/lang/String;Landroid/os/Looper;Lcom/android/networkstack/tethering/TetheringDependencies;)V	80	.method·constructor·<init>(Lcom/android/networkstack/tethering/Tethering;Ljava/lang/String;Landroid/os/Looper;Lcom/android/networkstack/tethering/TetheringDependencies;)V
81	····.locals·0	81	····.locals·0

82	····.line·1431	82	····.line·1428
83	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->this$0:Lcom/android/networkstack/tethering/Tethering;	83	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->this$0:Lcom/android/networkstack/tethering/Tethering;

84	····.line·1432	84	····.line·1429
85	····invoke-direct·{p0,·p2,·p3},·Lcom/android/networkstack/tethering/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Looper;)V	85	····invoke-direct·{p0,·p2,·p3},·Lcom/android/networkstack/tethering/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Looper;)V

86	····.line·1434	86	····.line·1431
87	····new-instance·p2,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$InitialState;	87	····new-instance·p2,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$InitialState;

88	····invoke-direct·{p2,·p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$InitialState;-><init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V	88	····invoke-direct·{p2,·p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$InitialState;-><init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V

89	····iput-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mInitialState:Lcom/android/networkstack/tethering/util/State;	89	····iput-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mInitialState:Lcom/android/networkstack/tethering/util/State;

90	····.line·1435	90	····.line·1432
91	····new-instance·p2,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;	91	····new-instance·p2,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;

92	····invoke-direct·{p2,·p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;-><init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V	92	····invoke-direct·{p2,·p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;-><init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V

93	····iput-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mTetherModeAliveState:Lcom/android/networkstack/tethering/util/State;	93	····iput-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mTetherModeAliveState:Lcom/android/networkstack/tethering/util/State;

94	····.line·1436	94	····.line·1433
95	····new-instance·p2,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$SetIpForwardingEnabledErrorState;	95	····new-instance·p2,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$SetIpForwardingEnabledErrorState;

96	····invoke-direct·{p2,·p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$SetIpForwardingEnabledErrorState;-><init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V	96	····invoke-direct·{p2,·p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$SetIpForwardingEnabledErrorState;-><init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V

97	····iput-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mSetIpForwardingEnabledErrorState:Lcom/android/networkstack/tethering/util/State;	97	····iput-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mSetIpForwardingEnabledErrorState:Lcom/android/networkstack/tethering/util/State;

98	····.line·1437	98	····.line·1434
99	····new-instance·p2,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$SetIpForwardingDisabledErrorState;	99	····new-instance·p2,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$SetIpForwardingDisabledErrorState;

100	····invoke-direct·{p2,·p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$SetIpForwardingDisabledErrorState;-><init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V	100	····invoke-direct·{p2,·p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$SetIpForwardingDisabledErrorState;-><init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V

101	····iput-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mSetIpForwardingDisabledErrorState:Lcom/android/networkstack/tethering/util/State;	101	····iput-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mSetIpForwardingDisabledErrorState:Lcom/android/networkstack/tethering/util/State;

102	····.line·1438	102	····.line·1435
103	····new-instance·p2,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$StartTetheringErrorState;	103	····new-instance·p2,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$StartTetheringErrorState;

104	····invoke-direct·{p2,·p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$StartTetheringErrorState;-><init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V	104	····invoke-direct·{p2,·p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$StartTetheringErrorState;-><init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V

105	····iput-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mStartTetheringErrorState:Lcom/android/networkstack/tethering/util/State;	105	····iput-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mStartTetheringErrorState:Lcom/android/networkstack/tethering/util/State;

106	····.line·1439	106	····.line·1436
107	····new-instance·p2,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$StopTetheringErrorState;	107	····new-instance·p2,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$StopTetheringErrorState;

108	····invoke-direct·{p2,·p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$StopTetheringErrorState;-><init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V	108	····invoke-direct·{p2,·p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$StopTetheringErrorState;-><init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V

109	····iput-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mStopTetheringErrorState:Lcom/android/networkstack/tethering/util/State;	109	····iput-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mStopTetheringErrorState:Lcom/android/networkstack/tethering/util/State;

110	····.line·1440	110	····.line·1437
111	····new-instance·p2,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$SetDnsForwardersErrorState;	111	····new-instance·p2,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$SetDnsForwardersErrorState;

112	····invoke-direct·{p2,·p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$SetDnsForwardersErrorState;-><init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V	112	····invoke-direct·{p2,·p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$SetDnsForwardersErrorState;-><init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V

113	····iput-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mSetDnsForwardersErrorState:Lcom/android/networkstack/tethering/util/State;	113	····iput-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mSetDnsForwardersErrorState:Lcom/android/networkstack/tethering/util/State;

114	····.line·1442	114	····.line·1439
115	····iget-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mInitialState:Lcom/android/networkstack/tethering/util/State;	115	····iget-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mInitialState:Lcom/android/networkstack/tethering/util/State;

116	····invoke-virtual·{p0,·p2},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;)V	116	····invoke-virtual·{p0,·p2},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;)V

117	····.line·1443	117	····.line·1440
118	····iget-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mTetherModeAliveState:Lcom/android/networkstack/tethering/util/State;	118	····iget-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mTetherModeAliveState:Lcom/android/networkstack/tethering/util/State;

119	····invoke-virtual·{p0,·p2},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;)V	119	····invoke-virtual·{p0,·p2},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;)V

120	····.line·1444	120	····.line·1441
121	····iget-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mSetIpForwardingEnabledErrorState:Lcom/android/networkstack/tethering/util/State;	121	····iget-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mSetIpForwardingEnabledErrorState:Lcom/android/networkstack/tethering/util/State;

122	····invoke-virtual·{p0,·p2},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;)V	122	····invoke-virtual·{p0,·p2},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;)V

123	····.line·1445	123	····.line·1442
124	····iget-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mSetIpForwardingDisabledErrorState:Lcom/android/networkstack/tethering/util/State;	124	····iget-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mSetIpForwardingDisabledErrorState:Lcom/android/networkstack/tethering/util/State;

125	····invoke-virtual·{p0,·p2},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;)V	125	····invoke-virtual·{p0,·p2},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;)V

126	····.line·1446	126	····.line·1443
127	····iget-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mStartTetheringErrorState:Lcom/android/networkstack/tethering/util/State;	127	····iget-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mStartTetheringErrorState:Lcom/android/networkstack/tethering/util/State;

128	····invoke-virtual·{p0,·p2},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;)V	128	····invoke-virtual·{p0,·p2},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;)V

129	····.line·1447	129	····.line·1444
130	····iget-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mStopTetheringErrorState:Lcom/android/networkstack/tethering/util/State;	130	····iget-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mStopTetheringErrorState:Lcom/android/networkstack/tethering/util/State;

131	····invoke-virtual·{p0,·p2},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;)V	131	····invoke-virtual·{p0,·p2},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;)V

132	····.line·1448	132	····.line·1445
133	····iget-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mSetDnsForwardersErrorState:Lcom/android/networkstack/tethering/util/State;	133	····iget-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mSetDnsForwardersErrorState:Lcom/android/networkstack/tethering/util/State;

134	····invoke-virtual·{p0,·p2},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;)V	134	····invoke-virtual·{p0,·p2},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;)V

135	····.line·1450	135	····.line·1447
136	····new-instance·p2,·Ljava/util/ArrayList;	136	····new-instance·p2,·Ljava/util/ArrayList;

137	····invoke-direct·{p2},·Ljava/util/ArrayList;-><init>()V	137	····invoke-direct·{p2},·Ljava/util/ArrayList;-><init>()V

138	····iput-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mNotifyList:Ljava/util/ArrayList;	138	····iput-object·p2,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mNotifyList:Ljava/util/ArrayList;

139	····.line·1451	139	····.line·1448
140	····invoke-static·{p1},·Lcom/android/networkstack/tethering/Tethering;->access$600(Lcom/android/networkstack/tethering/Tethering;)Landroid/net/util/SharedLog;	140	····invoke-static·{p1},·Lcom/android/networkstack/tethering/Tethering;->access$600(Lcom/android/networkstack/tethering/Tethering;)Landroid/net/util/SharedLog;

141	····move-result-object·p1	141	····move-result-object·p1

142	····invoke-virtual·{p4,·p2,·p1},·Lcom/android/networkstack/tethering/TetheringDependencies;->getIPv6TetheringCoordinator(Ljava/util/ArrayList;Landroid/net/util/SharedLog;)Lcom/android/networkstack/tethering/IPv6TetheringCoordinator;	142	····invoke-virtual·{p4,·p2,·p1},·Lcom/android/networkstack/tethering/TetheringDependencies;->getIPv6TetheringCoordinator(Ljava/util/ArrayList;Landroid/net/util/SharedLog;)Lcom/android/networkstack/tethering/IPv6TetheringCoordinator;

143	····move-result-object·p1	143	····move-result-object·p1

144	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mIPv6TetheringCoordinator:Lcom/android/networkstack/tethering/IPv6TetheringCoordinator;	144	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mIPv6TetheringCoordinator:Lcom/android/networkstack/tethering/IPv6TetheringCoordinator;

145	····.line·1452	145	····.line·1449
146	····new-instance·p1,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;	146	····new-instance·p1,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;

147	····invoke-direct·{p1,·p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;-><init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V	147	····invoke-direct·{p1,·p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;-><init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V

148	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mOffload:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;	148	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mOffload:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;

149	····.line·1454	149	····.line·1451
150	····iget-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mInitialState:Lcom/android/networkstack/tethering/util/State;	150	····iget-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->mInitialState:Lcom/android/networkstack/tethering/util/State;

151	····invoke-virtual·{p0,·p1},·Lcom/android/networkstack/tethering/util/StateMachine;->setInitialState(Lcom/android/networkstack/tethering/util/State;)V	151	····invoke-virtual·{p0,·p1},·Lcom/android/networkstack/tethering/util/StateMachine;->setInitialState(Lcom/android/networkstack/tethering/util/State;)V

... Open expanded diff (truncated) ...


Offset 18, 47 lines modified		Offset 18, 47 lines modified
18	.field·final·synthetic·this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;	18	.field·final·synthetic·this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;


19	#·direct·methods	19	#·direct·methods
20	.method·constructor·<init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V	20	.method·constructor·<init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V
21	····.locals·0	21	····.locals·0

22	····.line·1972	22	····.line·1968
23	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;	23	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;

24	····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V	24	····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V

25	····return-void	25	····return-void
26	.end·method	26	.end·method

27	.method·private·updateOffloadStatus(I)V	27	.method·private·updateOffloadStatus(I)V
28	····.locals·1	28	····.locals·1

29	····.line·2045	29	····.line·2041
30	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;	30	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;

31	····iget-object·v0,·v0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->this$0:Lcom/android/networkstack/tethering/Tethering;	31	····iget-object·v0,·v0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->this$0:Lcom/android/networkstack/tethering/Tethering;

32	····invoke-static·{v0},·Lcom/android/networkstack/tethering/Tethering;->access$5000(Lcom/android/networkstack/tethering/Tethering;)I	32	····invoke-static·{v0},·Lcom/android/networkstack/tethering/Tethering;->access$5000(Lcom/android/networkstack/tethering/Tethering;)I

33	····move-result·v0	33	····move-result·v0

34	····if-ne·p1,·v0,·:cond_0	34	····if-ne·p1,·v0,·:cond_0

35	····return-void	35	····return-void

36	····.line·2047	36	····.line·2043
37	····:cond_0	37	····:cond_0
38	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;	38	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;

39	····iget-object·v0,·v0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->this$0:Lcom/android/networkstack/tethering/Tethering;	39	····iget-object·v0,·v0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->this$0:Lcom/android/networkstack/tethering/Tethering;

40	····invoke-static·{v0,·p1},·Lcom/android/networkstack/tethering/Tethering;->access$5002(Lcom/android/networkstack/tethering/Tethering;I)I	40	····invoke-static·{v0,·p1},·Lcom/android/networkstack/tethering/Tethering;->access$5002(Lcom/android/networkstack/tethering/Tethering;I)I

41	····.line·2048	41	····.line·2044
42	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;	42	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;

43	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->this$0:Lcom/android/networkstack/tethering/Tethering;	43	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->this$0:Lcom/android/networkstack/tethering/Tethering;

44	····invoke-static·{p0},·Lcom/android/networkstack/tethering/Tethering;->access$5000(Lcom/android/networkstack/tethering/Tethering;)I	44	····invoke-static·{p0},·Lcom/android/networkstack/tethering/Tethering;->access$5000(Lcom/android/networkstack/tethering/Tethering;)I

45	····move-result·p1	45	····move-result·p1
Offset 69, 18 lines modified		Offset 69, 18 lines modified
69	.end·method	69	.end·method


70	#·virtual·methods	70	#·virtual·methods
71	.method·public·excludeDownstreamInterface(Ljava/lang/String;)V	71	.method·public·excludeDownstreamInterface(Ljava/lang/String;)V
72	····.locals·0	72	····.locals·0

73	····.line·~~2000~~	73	····.line·1996
74	····invoke-virtual·{p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;->sendOffloadExemptPrefixes()V	74	····invoke-virtual·{p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;->sendOffloadExemptPrefixes()V

75	····.line·~~2001~~	75	····.line·1997
76	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;	76	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;

77	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->this$0:Lcom/android/networkstack/tethering/Tethering;	77	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->this$0:Lcom/android/networkstack/tethering/Tethering;

78	····invoke-static·{p0},·Lcom/android/networkstack/tethering/Tethering;->access$4900(Lcom/android/networkstack/tethering/Tethering;)Lcom/android/networkstack/tethering/OffloadController;	78	····invoke-static·{p0},·Lcom/android/networkstack/tethering/Tethering;->access$4900(Lcom/android/networkstack/tethering/Tethering;)Lcom/android/networkstack/tethering/OffloadController;

79	····move-result-object·p0	79	····move-result-object·p0
Offset 89, 15 lines modified		Offset 89, 15 lines modified

89	····return-void	89	····return-void
90	.end·method	90	.end·method

91	.method·public·sendOffloadExemptPrefixes()V	91	.method·public·sendOffloadExemptPrefixes()V
92	····.locals·1	92	····.locals·1

93	····.line·2005	93	····.line·2001
94	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;	94	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;

95	····iget-object·v0,·v0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->this$0:Lcom/android/networkstack/tethering/Tethering;	95	····iget-object·v0,·v0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->this$0:Lcom/android/networkstack/tethering/Tethering;

96	····invoke-static·{v0},·Lcom/android/networkstack/tethering/Tethering;->access$3600(Lcom/android/networkstack/tethering/Tethering;)Lcom/android/networkstack/tethering/UpstreamNetworkMonitor;	96	····invoke-static·{v0},·Lcom/android/networkstack/tethering/Tethering;->access$3600(Lcom/android/networkstack/tethering/Tethering;)Lcom/android/networkstack/tethering/UpstreamNetworkMonitor;

97	····move-result-object·v0	97	····move-result-object·v0
Offset 118, 23 lines modified		Offset 118, 23 lines modified
118	············"(",	118	············"(",
119	············"Ljava/util/Set<",	119	············"Ljava/util/Set<",
120	············"Landroid/net/IpPrefix;",	120	············"Landroid/net/IpPrefix;",
121	············">;)V"	121	············">;)V"
122	········}	122	········}
123	····.end·annotation	123	····.end·annotation

124	····.line·2010	124	····.line·2006
125	····invoke-static·{p1},·Landroid/net/util/PrefixUtils;->addNonForwardablePrefixes(Ljava/util/Set;)V	125	····invoke-static·{p1},·Landroid/net/util/PrefixUtils;->addNonForwardablePrefixes(Ljava/util/Set;)V

126	····.line·2012	126	····.line·2008
127	····sget-object·v0,·Landroid/net/util/PrefixUtils;->DEFAULT_WIFI_P2P_PREFIX:Landroid/net/IpPrefix;	127	····sget-object·v0,·Landroid/net/util/PrefixUtils;->DEFAULT_WIFI_P2P_PREFIX:Landroid/net/IpPrefix;

128	····invoke-interface·{p1,·v0},·Ljava/util/Set;->add(Ljava/lang/Object;)Z	128	····invoke-interface·{p1,·v0},·Ljava/util/Set;->add(Ljava/lang/Object;)Z

129	····.line·2016	129	····.line·2012
130	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;	130	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;

131	····invoke-static·{v0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->access$4700(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)Ljava/util/ArrayList;	131	····invoke-static·{v0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->access$4700(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)Ljava/util/ArrayList;

132	····move-result-object·v0	132	····move-result-object·v0

133	····invoke-virtual·{v0},·Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;	133	····invoke-virtual·{v0},·Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
Offset 151, 20 lines modified		Offset 151, 20 lines modified

151	····invoke-interface·{v0},·Ljava/util/Iterator;->next()Ljava/lang/Object;	151	····invoke-interface·{v0},·Ljava/util/Iterator;->next()Ljava/lang/Object;

152	····move-result-object·v1	152	····move-result-object·v1

153	····check-cast·v1,·Landroid/net/ip/IpServer;	153	····check-cast·v1,·Landroid/net/ip/IpServer;

154	····.line·2017	154	····.line·2013
155	····invoke-virtual·{v1},·Landroid/net/ip/IpServer;->linkProperties()Landroid/net/LinkProperties;	155	····invoke-virtual·{v1},·Landroid/net/ip/IpServer;->linkProperties()Landroid/net/LinkProperties;

156	····move-result-object·v2	156	····move-result-object·v2

157	····.line·2019	157	····.line·2015
158	····invoke-virtual·{v1},·Landroid/net/ip/IpServer;->servingMode()I	158	····invoke-virtual·{v1},·Landroid/net/ip/IpServer;->servingMode()I

159	····move-result·v1	159	····move-result·v1

160	····if-eqz·v1,·:cond_0	160	····if-eqz·v1,·:cond_0

161	····const/4·v3,·0x1	161	····const/4·v3,·0x1
... Open expanded diff ...


Offset 22, 65 lines modified		Offset 22, 65 lines modified
22	.field·final·synthetic·this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;	22	.field·final·synthetic·this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;


23	#·direct·methods	23	#·direct·methods
24	.method·constructor·<init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V	24	.method·constructor·<init>(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)V
25	····.locals·0	25	····.locals·0

26	····.line·1745	26	····.line·1742
27	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;	27	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;

28	····invoke-direct·{p0},·Lcom/android/networkstack/tethering/util/State;-><init>()V	28	····invoke-direct·{p0},·Lcom/android/networkstack/tethering/util/State;-><init>()V

29	····const/4·p1,·0x0	29	····const/4·p1,·0x0

30	····.line·1746	30	····.line·1743
31	····iput-boolean·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->mUpstreamWanted:Z	31	····iput-boolean·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->mUpstreamWanted:Z

32	····const/4·p1,·0x1	32	····const/4·p1,·0x1

33	····.line·1747	33	····.line·1744
34	····iput-boolean·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->mTryCell:Z	34	····iput-boolean·p1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->mTryCell:Z

35	····return-void	35	····return-void
36	.end·method	36	.end·method

37	.method·private·updateUpstreamWanted()Z	37	.method·private·updateUpstreamWanted()Z
38	····.locals·2	38	····.locals·2

39	····.line·1786	39	····.line·1782
40	····iget-boolean·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->mUpstreamWanted:Z	40	····iget-boolean·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->mUpstreamWanted:Z

41	····.line·1787	41	····.line·1783
42	····iget-object·v1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;	42	····iget-object·v1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;

43	····iget-object·v1,·v1,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->this$0:Lcom/android/networkstack/tethering/Tethering;	43	····iget-object·v1,·v1,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->this$0:Lcom/android/networkstack/tethering/Tethering;

44	····invoke-static·{v1},·Lcom/android/networkstack/tethering/Tethering;->access$4400(Lcom/android/networkstack/tethering/Tethering;)Z	44	····invoke-static·{v1},·Lcom/android/networkstack/tethering/Tethering;->access$4400(Lcom/android/networkstack/tethering/Tethering;)Z

45	····move-result·v1	45	····move-result·v1

46	····iput-boolean·v1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->mUpstreamWanted:Z	46	····iput-boolean·v1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->mUpstreamWanted:Z

47	····if-eq·v1,·v0,·:cond_1	47	····if-eq·v1,·v0,·:cond_1

48	····if-eqz·v1,·:cond_0	48	····if-eqz·v1,·:cond_0

49	····.line·1790	49	····.line·1786
50	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;	50	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;

51	····invoke-static·{p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->access$4500(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;	51	····invoke-static·{p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->access$4500(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;

52	····move-result-object·p0	52	····move-result-object·p0

53	····invoke-virtual·{p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;->start()V	53	····invoke-virtual·{p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;->start()V

54	····goto·:goto_0	54	····goto·:goto_0

55	····.line·1792	55	····.line·1788
56	····:cond_0	56	····:cond_0
57	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;	57	····iget-object·p0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;

58	····invoke-static·{p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->access$4500(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;	58	····invoke-static·{p0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->access$4500(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;

59	····move-result-object·p0	59	····move-result-object·p0

Offset 92, 84 lines modified		Offset 92, 73 lines modified
92	.end·method	92	.end·method


93	#·virtual·methods	93	#·virtual·methods
94	.method·public·enter()V	94	.method·public·enter()V
95	····.locals·2	95	····.locals·2

96	····.line·1753	96	····.line·1750
97	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;	97	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;

98	····invoke-virtual·{v0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->turnOnMasterTetherSettings()Z	98	····invoke-virtual·{v0},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->turnOnMasterTetherSettings()Z

99	····move-result·v0	99	····move-result·v0

100	····if-nez·v0,·:cond_0	100	····if-nez·v0,·:cond_0

101	····return-void	101	····return-void

102	····.line·1757	102	····.line·1754
103	····:cond_0	103	····:cond_0
104	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;	104	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;

105	····iget-object·v0,·v0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->this$0:Lcom/android/networkstack/tethering/Tethering;	105	····iget-object·v0,·v0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->this$0:Lcom/android/networkstack/tethering/Tethering;

106	····invoke-static·{v0},·Lcom/android/networkstack/tethering/Tethering;->access$4300(Lcom/android/networkstack/tethering/Tethering;)Lcom/android/networkstack/tethering/PrivateAddressCoordinator;

107	····move-result-object·v0

108	····invoke-virtual·{v0},·Lcom/android/networkstack/tethering/PrivateAddressCoordinator;->maybeRemoveDeprecatedUpstreams()V

109	····.line·1758
110	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;

111	····iget-object·v0,·v0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->this$0:Lcom/android/networkstack/tethering/Tethering;

112	····invoke-static·{v0},·Lcom/android/networkstack/tethering/Tethering;->access$3600(Lcom/android/networkstack/tethering/Tethering;)Lcom/android/networkstack/tethering/UpstreamNetworkMonitor;	106	····invoke-static·{v0},·Lcom/android/networkstack/tethering/Tethering;->access$3600(Lcom/android/networkstack/tethering/Tethering;)Lcom/android/networkstack/tethering/UpstreamNetworkMonitor;

113	····move-result-object·v0	107	····move-result-object·v0

114	····invoke-virtual·{v0},·Lcom/android/networkstack/tethering/UpstreamNetworkMonitor;->startObserveAllNetworks()V	108	····invoke-virtual·{v0},·Lcom/android/networkstack/tethering/UpstreamNetworkMonitor;->startObserveAllNetworks()V

115	····.line·1761	109	····.line·1757
116	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;	110	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;

117	····iget-object·v0,·v0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->this$0:Lcom/android/networkstack/tethering/Tethering;	111	····iget-object·v0,·v0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->this$0:Lcom/android/networkstack/tethering/Tethering;

118	····invoke-static·{v0},·Lcom/android/networkstack/tethering/Tethering;->access$4400(Lcom/android/networkstack/tethering/Tethering;)Z	112	····invoke-static·{v0},·Lcom/android/networkstack/tethering/Tethering;->access$4400(Lcom/android/networkstack/tethering/Tethering;)Z

119	····move-result·v0	113	····move-result·v0

120	····if-eqz·v0,·:cond_1	114	····if-eqz·v0,·:cond_1

121	····const/4·v0,·0x1	115	····const/4·v0,·0x1

122	····.line·1762	116	····.line·1758
123	····iput-boolean·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->mUpstreamWanted:Z	117	····iput-boolean·v0,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->mUpstreamWanted:Z

124	····.line·1763	118	····.line·1759
125	····iget-object·v1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;	119	····iget-object·v1,·p0,·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState;->this$1:Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;

126	····invoke-static·{v1},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->access$4500(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;	120	····invoke-static·{v1},·Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;->access$4500(Lcom/android/networkstack/tethering/Tethering$TetherMasterSM;)Lcom/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper;
... Open expanded diff ...


Offset 1, 15 lines modified		Offset 1, 13 lines modified
1	.class·public·Lcom/android/networkstack/tethering/PrivateAddressCoordinator;	1	.class·public·Lcom/android/networkstack/tethering/PrivateAddressCoordinator;
2	.super·Ljava/lang/Object;	2	.super·Ljava/lang/Object;
3	.source·"PrivateAddressCoordinator.java"	3	.source·"PrivateAddressCoordinator.java"


4	#·instance·fields	4	#·instance·fields
5	.field·private·final·mConfig:Lcom/android/networkstack/tethering/TetheringConfiguration;

6	.field·private·final·mConnectivityMgr:Landroid/net/ConnectivityManager;	5	.field·private·final·mConnectivityMgr:Landroid/net/ConnectivityManager;

7	.field·private·final·mDownstreams:Landroid/util/ArraySet;	6	.field·private·final·mDownstreams:Landroid/util/ArraySet;
8	····.annotation·system·Ldalvik/annotation/Signature;	7	····.annotation·system·Ldalvik/annotation/Signature;
9	········value·=·{	8	········value·=·{
10	············"Landroid/util/ArraySet<",	9	············"Landroid/util/ArraySet<",
11	············"Landroid/net/ip/IpServer;",	10	············"Landroid/net/ip/IpServer;",
Offset 30, 75 lines modified		Offset 28, 72 lines modified
30	············">;>;"	28	············">;>;"
31	········}	29	········}
32	····.end·annotation	30	····.end·annotation
33	.end·field	31	.end·field


34	#·direct·methods	32	#·direct·methods
35	.method·public·constructor·<init>(Landroid/content/Context;~~Lcom/android/networkstack/tethering/TetheringConfiguration;~~)V	33	.method·public·constructor·<init>(Landroid/content/Context;)V
36	····.locals·2	34	····.locals·2

37	····.line·82	35	····.line·74
38	····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V	36	····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V

39	····.line·83	37	····.line·75
40	····new-instance·v0,·Landroid/util/ArraySet;	38	····new-instance·v0,·Landroid/util/ArraySet;

41	····invoke-direct·{v0},·Landroid/util/ArraySet;-><init>()V	39	····invoke-direct·{v0},·Landroid/util/ArraySet;-><init>()V

42	····iput-object·v0,·p0,·Lcom/android/networkstack/tethering/PrivateAddressCoordinator;->mDownstreams:Landroid/util/ArraySet;	40	····iput-object·v0,·p0,·Lcom/android/networkstack/tethering/PrivateAddressCoordinator;->mDownstreams:Landroid/util/ArraySet;

43	····.line·84	41	····.line·76
44	····new-instance·v0,·Landroid/util/ArrayMap;	42	····new-instance·v0,·Landroid/util/ArrayMap;

45	····invoke-direct·{v0},·Landroid/util/ArrayMap;-><init>()V	43	····invoke-direct·{v0},·Landroid/util/ArrayMap;-><init>()V

46	····iput-object·v0,·p0,·Lcom/android/networkstack/tethering/PrivateAddressCoordinator;->mUpstreamPrefixMap:Landroid/util/ArrayMap;	44	····iput-object·v0,·p0,·Lcom/android/networkstack/tethering/PrivateAddressCoordinator;->mUpstreamPrefixMap:Landroid/util/ArrayMap;

47	····.line·85	45	····.line·77
48	····new-instance·v0,·Landroid/net/IpPrefix;	46	····new-instance·v0,·Landroid/net/IpPrefix;

49	····const-string·v1,·"192.168.0.0/16"	47	····const-string·v1,·"192.168.0.0/16"

50	····invoke-direct·{v0,·v1},·Landroid/net/IpPrefix;-><init>(Ljava/lang/String;)V	48	····invoke-direct·{v0,·v1},·Landroid/net/IpPrefix;-><init>(Ljava/lang/String;)V

51	····iput-object·v0,·p0,·Lcom/android/networkstack/tethering/PrivateAddressCoordinator;->mTetheringPrefix:Landroid/net/IpPrefix;	49	····iput-object·v0,·p0,·Lcom/android/networkstack/tethering/PrivateAddressCoordinator;->mTetheringPrefix:Landroid/net/IpPrefix;

52	····const-string·v0,·"connectivity"	50	····const-string·v0,·"connectivity"

53	····.line·86	51	····.line·78
54	····invoke-virtual·{p1,·v0},·Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;	52	····invoke-virtual·{p1,·v0},·Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;

55	····move-result-object·p1	53	····move-result-object·p1

56	····check-cast·p1,·Landroid/net/ConnectivityManager;	54	····check-cast·p1,·Landroid/net/ConnectivityManager;

57	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/PrivateAddressCoordinator;->mConnectivityMgr:Landroid/net/ConnectivityManager;	55	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/PrivateAddressCoordinator;->mConnectivityMgr:Landroid/net/ConnectivityManager;

58	····.line·88
59	····iput-object·p2,·p0,·Lcom/android/networkstack/tethering/PrivateAddressCoordinator;->mConfig:Lcom/android/networkstack/tethering/TetheringConfiguration;

60	····return-void	56	····return-void
61	.end·method	57	.end·method

62	.method·private·getDownstreamPrefix(Landroid/net/ip/IpServer;)Landroid/net/IpPrefix;	58	.method·private·getDownstreamPrefix(Landroid/net/ip/IpServer;)Landroid/net/IpPrefix;
63	····.locals·0	59	····.locals·0

64	····.line·250	60	····.line·233
65	····invoke-virtual·{p1},·Landroid/net/ip/IpServer;->getAddress()Landroid/net/LinkAddress;	61	····invoke-virtual·{p1},·Landroid/net/ip/IpServer;->getAddress()Landroid/net/LinkAddress;

66	····move-result-object·p0	62	····move-result-object·p0

67	····if-nez·p0,·:cond_0	63	····if-nez·p0,·:cond_0

68	····const/4·p0,·0x0	64	····const/4·p0,·0x0

69	····return-object·p0	65	····return-object·p0

70	····.line·253	66	····.line·236
71	····:cond_0	67	····:cond_0
72	····invoke-static·{p0},·Landroid/net/util/PrefixUtils;->asIpPrefix(Landroid/net/LinkAddress;)Landroid/net/IpPrefix;	68	····invoke-static·{p0},·Landroid/net/util/PrefixUtils;->asIpPrefix(Landroid/net/LinkAddress;)Landroid/net/IpPrefix;

73	····move-result-object·p0	69	····move-result-object·p0

74	····return-object·p0	70	····return-object·p0
75	.end·method	71	.end·method
Offset 113, 20 lines modified		Offset 108, 20 lines modified
113	············">;)",	108	············">;)",
114	············"Ljava/util/ArrayList<",	109	············"Ljava/util/ArrayList<",
115	············"Landroid/net/IpPrefix;",	110	············"Landroid/net/IpPrefix;",
116	············">;"	111	············">;"
117	········}	112	········}
118	····.end·annotation	113	····.end·annotation

119	····.line·107	114	····.line·98
120	····new-instance·p0,·Ljava/util/ArrayList;	115	····new-instance·p0,·Ljava/util/ArrayList;

121	····invoke-direct·{p0},·Ljava/util/ArrayList;-><init>()V	116	····invoke-direct·{p0},·Ljava/util/ArrayList;-><init>()V

122	····.line·108	117	····.line·99
123	····invoke-interface·{p1},·Ljava/util/List;->iterator()Ljava/util/Iterator;	118	····invoke-interface·{p1},·Ljava/util/List;->iterator()Ljava/util/Iterator;

124	····move-result-object·p1	119	····move-result-object·p1

125	····:goto_0	120	····:goto_0
126	····invoke-interface·{p1},·Ljava/util/Iterator;->hasNext()Z	121	····invoke-interface·{p1},·Ljava/util/Iterator;->hasNext()Z

Offset 136, 24 lines modified		Offset 131, 24 lines modified

136	····invoke-interface·{p1},·Ljava/util/Iterator;->next()Ljava/lang/Object;	131	····invoke-interface·{p1},·Ljava/util/Iterator;->next()Ljava/lang/Object;

137	····move-result-object·v0	132	····move-result-object·v0

138	····check-cast·v0,·Landroid/net/LinkAddress;	133	····check-cast·v0,·Landroid/net/LinkAddress;

139	····.line·109	134	····.line·100
140	····invoke-virtual·{v0},·Landroid/net/LinkAddress;->isIpv4()Z	135	····invoke-virtual·{v0},·Landroid/net/LinkAddress;->isIpv4()Z

141	····move-result·v1	136	····move-result·v1

142	····if-nez·v1,·:cond_0	137	····if-nez·v1,·:cond_0

... Open expanded diff ...


Offset 478, 42 lines modified		Offset 478, 40 lines modified
478	····.line·322	478	····.line·322
479	····new-instance·p1,·Lcom/android/networkstack/tethering/Tethering$NetdCallback;	479	····new-instance·p1,·Lcom/android/networkstack/tethering/Tethering$NetdCallback;

480	····invoke-direct·{p1,·p0,·v1},·Lcom/android/networkstack/tethering/Tethering$NetdCallback;-><init>(Lcom/android/networkstack/tethering/Tethering;Lcom/android/networkstack/tethering/Tethering$1;)V	480	····invoke-direct·{p1,·p0,·v1},·Lcom/android/networkstack/tethering/Tethering$NetdCallback;-><init>(Lcom/android/networkstack/tethering/Tethering;Lcom/android/networkstack/tethering/Tethering$1;)V

481	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering;->mNetdCallback:Lcom/android/networkstack/tethering/Tethering$NetdCallback;	481	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering;->mNetdCallback:Lcom/android/networkstack/tethering/Tethering$NetdCallback;

482	····.line·325	482	····.line·323
483	····invoke-direct·{p0},·Lcom/android/networkstack/tethering/Tethering;->updateConfiguration()V

484	····.line·329
485	····new-instance·p1,·Lcom/android/networkstack/tethering/PrivateAddressCoordinator;	483	····new-instance·p1,·Lcom/android/networkstack/tethering/PrivateAddressCoordinator;

486	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering;->mContext:Landroid/content/Context;	484	····iget-object·v0,·p0,·Lcom/android/networkstack/tethering/Tethering;->mContext:Landroid/content/Context;

487	····i~~get~~-~~obj~~ect·v1,·p0,·Lcom/android/networkstack/tethering/~~Teth~~eri~~ng;->mConfig:Lc~~o~~m/andr~~oid/networ~~kstack/~~t~~ethe~~r~~ing~~/~~Teth~~er~~ing~~Con~~figura~~ti~~on;~~	485	····invoke-direct·{p1,·v0},·Lcom/android/networkstack/tethering/PrivateAddressCoordinator;-><init>(Landroid/content/Context;)V

488	····invoke-direct·{p1,·v0,·v1},·Lcom/android/networkstack/tethering/PrivateAddressCoordinator;-><init>(Landroid/content/Context;Lcom/android/networkstack/tethering/TetheringConfiguration;)V

489	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering;->mPrivateAddressCoordinator:Lcom/android/networkstack/tethering/PrivateAddressCoordinator;	486	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering;->mPrivateAddressCoordinator:Lcom/android/networkstack/tethering/PrivateAddressCoordinator;

490	····.line·333	487	····.line·326
		488	····invoke-direct·{p0},·Lcom/android/networkstack/tethering/Tethering;->updateConfiguration()V

		489	····.line·330
491	····iget-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering;->mDeps:Lcom/android/networkstack/tethering/TetheringDependencies;	490	····iget-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering;->mDeps:Lcom/android/networkstack/tethering/TetheringDependencies;

492	····new-instance·v0,·Lcom/android/networkstack/tethering/Tethering$2;	491	····new-instance·v0,·Lcom/android/networkstack/tethering/Tethering$2;

493	····invoke-direct·{v0,·p0},·Lcom/android/networkstack/tethering/Tethering$2;-><init>(Lcom/android/networkstack/tethering/Tethering;)V	492	····invoke-direct·{v0,·p0},·Lcom/android/networkstack/tethering/Tethering$2;-><init>(Lcom/android/networkstack/tethering/Tethering;)V

494	····invoke-virtual·{p1,·v0},·Lcom/android/networkstack/tethering/TetheringDependencies;->getBpfCoordinator(Lcom/android/networkstack/tethering/BpfCoordinator$Dependencies;)Lcom/android/networkstack/tethering/BpfCoordinator;	493	····invoke-virtual·{p1,·v0},·Lcom/android/networkstack/tethering/TetheringDependencies;->getBpfCoordinator(Lcom/android/networkstack/tethering/BpfCoordinator$Dependencies;)Lcom/android/networkstack/tethering/BpfCoordinator;

495	····move-result-object·p1	494	····move-result-object·p1

496	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering;->mBpfCoordinator:Lcom/android/networkstack/tethering/BpfCoordinator;	495	····iput-object·p1,·p0,·Lcom/android/networkstack/tethering/Tethering;->mBpfCoordinator:Lcom/android/networkstack/tethering/BpfCoordinator;

497	····.line·361	496	····.line·358
498	····invoke-direct·{p0},·Lcom/android/networkstack/tethering/Tethering;->startStateMachineUpdaters()V	497	····invoke-direct·{p0},·Lcom/android/networkstack/tethering/Tethering;->startStateMachineUpdaters()V

499	····return-void	498	····return-void
500	.end·method	499	.end·method

501	.method·static·synthetic·access$000(Lcom/android/networkstack/tethering/Tethering;)Lcom/android/networkstack/tethering/TetheringConfiguration;	500	.method·static·synthetic·access$000(Lcom/android/networkstack/tethering/Tethering;)Lcom/android/networkstack/tethering/TetheringConfiguration;
502	····.locals·0	501	····.locals·0
Offset 988, 27 lines modified		Offset 986, 27 lines modified

988	····return-void	986	····return-void
989	.end·method	987	.end·method

990	.method·private·static·argsContain([Ljava/lang/String;Ljava/lang/String;)Z	988	.method·private·static·argsContain([Ljava/lang/String;Ljava/lang/String;)Z
991	····.locals·4	989	····.locals·4

992	····.line·2299	990	····.line·2295
993	····array-length·v0,·p0	991	····array-length·v0,·p0

994	····const/4·v1,·0x0	992	····const/4·v1,·0x0

995	····move·v2,·v1	993	····move·v2,·v1

996	····:goto_0	994	····:goto_0
997	····if-ge·v2,·v0,·:cond_1	995	····if-ge·v2,·v0,·:cond_1

998	····aget-object·v3,·p0,·v2	996	····aget-object·v3,·p0,·v2

999	····.line·2~~300~~	997	····.line·2296
1000	····invoke-virtual·{p1,·v3},·Ljava/lang/String;->equals(Ljava/lang/Object;)Z	998	····invoke-virtual·{p1,·v3},·Ljava/lang/String;->equals(Ljava/lang/Object;)Z

1001	····move-result·v3	999	····move-result·v3

1002	····if-eqz·v3,·:cond_0	1000	····if-eqz·v3,·:cond_0

1003	····const/4·p0,·0x1	1001	····const/4·p0,·0x1
Offset 1037, 15 lines modified		Offset 1035, 15 lines modified

1037	····if-eq·p2,·v0,·:cond_0	1035	····if-eq·p2,·v0,·:cond_0

1038	····const/4·v0,·0x3	1036	····const/4·v0,·0x3

1039	····if-eq·p2,·v0,·:cond_0	1037	····if-eq·p2,·v0,·:cond_0

1040	····.line·1252	1038	····.line·1249
1041	····sget-object·p0,·Lcom/android/networkstack/tethering/Tethering;->TAG:Ljava/lang/String;	1039	····sget-object·p0,·Lcom/android/networkstack/tethering/Tethering;->TAG:Ljava/lang/String;

1042	····new-instance·p1,·Ljava/lang/StringBuilder;	1040	····new-instance·p1,·Ljava/lang/StringBuilder;

1043	····invoke-direct·{p1},·Ljava/lang/StringBuilder;-><init>()V	1041	····invoke-direct·{p1},·Ljava/lang/StringBuilder;-><init>()V

1044	····const-string·v0,·"Unknown·interface·state:·"	1042	····const-string·v0,·"Unknown·interface·state:·"
Offset 1058, 32 lines modified		Offset 1056, 32 lines modified

1058	····move-result-object·p1	1056	····move-result-object·p1

1059	····invoke-static·{p0,·p1},·Landroid/util/Log;->wtf(Ljava/lang/String;Ljava/lang/String;)I	1057	····invoke-static·{p0,·p1},·Landroid/util/Log;->wtf(Ljava/lang/String;Ljava/lang/String;)I

1060	····return-void	1058	····return-void

1061	····.line·1249	1059	····.line·1246
1062	····:cond_0	1060	····:cond_0
1063	····invoke-direct·{p0,·p1,·p2},·Lcom/android/networkstack/tethering/Tethering;->tether(Ljava/lang/String;I)I	1061	····invoke-direct·{p0,·p1,·p2},·Lcom/android/networkstack/tethering/Tethering;->tether(Ljava/lang/String;I)I

1064	····move-result·p0	1062	····move-result·p0

1065	····goto·:goto_0	1063	····goto·:goto_0

1066	····.line·1245	1064	····.line·1242
1067	····:cond_1	1065	····:cond_1
1068	····invoke-virtual·{p0,·p1},·Lcom/android/networkstack/tethering/Tethering;->untether(Ljava/lang/String;)I	1066	····invoke-virtual·{p0,·p1},·Lcom/android/networkstack/tethering/Tethering;->untether(Ljava/lang/String;)I

1069	····move-result·p0	1067	····move-result·p0

1070	····:goto_0	1068	····:goto_0
1071	····if-eqz·p0,·:cond_2	1069	····if-eqz·p0,·:cond_2

1072	····.line·1256	1070	····.line·1253
1073	····sget-object·p0,·Lcom/android/networkstack/tethering/Tethering;->TAG:Ljava/lang/String;	1071	····sget-object·p0,·Lcom/android/networkstack/tethering/Tethering;->TAG:Ljava/lang/String;

1074	····new-instance·p2,·Ljava/lang/StringBuilder;	1072	····new-instance·p2,·Ljava/lang/StringBuilder;

1075	····invoke-direct·{p2},·Ljava/lang/StringBuilder;-><init>()V	1073	····invoke-direct·{p2},·Ljava/lang/StringBuilder;-><init>()V

1076	····const-string·v0,·"unable·start·or·stop·tethering·on·iface·"	1074	····const-string·v0,·"unable·start·or·stop·tethering·on·iface·"
Offset 1103, 27 lines modified		Offset 1101, 27 lines modified
1103	.end·method	1101	.end·method

1104	.method·private·disableWifiIpServingLocked(Ljava/lang/String;I)V	1102	.method·private·disableWifiIpServingLocked(Ljava/lang/String;I)V
1105	····.locals·1	1103	····.locals·1
... Open expanded diff (truncated) ...