/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_r32_crosshatch-user_Google__android-11.0.0_r32_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_r32_crosshatch-user_Google__android-11.0.0_r32_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_r32/crosshatch-user/Google/system.img.apexes/com.google.android.tethering.apex-apex_payload.img.mount /home/dev/aosp/build/android-11.0.0_r32/aosp_crosshatch-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex

⊟

2.09 MB

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

/home/dev/aosp/build/android-11.0.0_r32/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_r32/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_r32/aosp_crosshatch-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.mount/apex_manifest.pb ¶

⊟

477 KB

/home/dev/aosp/build/android-11.0.0_r32/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_r32/aosp_crosshatch-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.mount/javalib ¶

⊟

477 KB

/home/dev/aosp/build/android-11.0.0_r32/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_r32/aosp_crosshatch-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.mount/javalib/framework-tethering.jar ¶

⊟

475 B

zipinfo {} ¶

⊟

476 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

⊟

305 B

stat {} ¶

⊟

1.62 MB

/home/dev/aosp/build/android-11.0.0_r32/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_r32/aosp_crosshatch-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.mount/priv-app ¶

⊟

124 B

file list ¶

⊟

1.62 MB

/home/dev/aosp/build/android-11.0.0_r32/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_r32/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.62 MB

/home/dev/aosp/build/android-11.0.0_r32/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_r32/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.82 KB

AndroidManifest.xml (decoded) ¶

⊟

2.76 KB

AndroidManifest.xml ¶

⊟

843 B

APK metadata ¶

⊟

82.4 KB

classes.dex ¶

⊟

82.4 KB

classes.jar ¶

⊟

16.8 KB

zipinfo {} ¶

⊟

4.04 KB

zipnote «TEMP»/diffoscope_erg8tr9u/tmpov5r1zn_.zip ¶

⊟

1.04 KB

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

⊟

946 B

procyon -ec {} ¶

⊟

16.5 KB

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

⊟

16.3 KB

procyon -ec {} ¶

⊟

786 B

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

⊟

692 B

procyon -ec {} ¶

⊟

8.86 KB

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

⊟

8.76 KB

procyon -ec {} ¶

⊟

4.47 KB

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

⊟

4.35 KB

procyon -ec {} ¶

⊟

1.2 KB

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

⊟

1.07 KB

procyon -ec {} ¶

⊟

822 B

com/android/networkstack/tethering/util/Inet4AddressUtils.class ¶

⊟

696 B

procyon -ec {} ¶

⊟

2.51 KB

android/net/ip/IpServer.class ¶

⊟

2.45 KB

procyon -ec {} ¶

⊟

502 B

android/net/dhcp/DhcpServerCallbacks.class ¶

⊟

418 B

procyon -ec {} ¶

⊟

943 B

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

⊟

849 B

procyon -ec {} ¶

⊟

800 B

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

⊟

694 B

procyon -ec {} ¶

⊟

795 B

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

⊟

689 B

procyon -ec {} ¶

⊟

1.92 KB

com/android/networkstack/tethering/Tethering$TetherMainSM$OffloadWrapper.class vs.

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

Files similar despite different names (score: 21, lower is more similar)

⊟

1.69 KB

procyon -ec {} ¶

⊟

13.3 KB

com/android/networkstack/tethering/Tethering$TetherMainSM.class vs.

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

Files similar despite different names (score: 30, lower is more similar)

⊟

13.1 KB

procyon -ec {} ¶

⊟

2.22 KB

com/android/networkstack/tethering/Tethering$TetherMainSM$ErrorState.class vs.

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

Files similar despite different names (score: 51, lower is more similar)

⊟

2.01 KB

procyon -ec {} ¶

⊟

2.11 KB

com/android/networkstack/tethering/Tethering$TetherMainSM$InitialState.class vs.

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

Files similar despite different names (score: 57, lower is more similar)

⊟

1.89 KB

procyon -ec {} ¶

⊟

1.16 KB

com/android/networkstack/tethering/Tethering$TetherMainSM$SetIpForwardingDisabledErrorState.class vs.

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

Files similar despite different names (score: 58, lower is more similar)

⊟

919 B

procyon -ec {} ¶

⊟

1.69 KB

com/android/networkstack/tethering/Tethering$TetherMainSM$StopTetheringErrorState.class vs.

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

Files similar despite different names (score: 49, lower is more similar)

⊟

1.44 KB

procyon -ec {} ¶

⊟

1010 KB

resources.arsc ¶

⊟

3.64 KB

smali/android/net/INetworkStackConnector$Stub$Proxy.smali ¶

⊟

1.96 KB

smali/android/net/INetworkStackConnector$Stub.smali ¶

⊟

520 B

smali/android/net/dhcp/DhcpServerCallbacks.smali ¶

⊟

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 ¶

⊟

65.2 KB

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

⊟

6.57 KB

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

⊟

2.08 KB

smali/android/net/ip/IpServer$OnHandlerStatusCallback.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 ¶

⊟

1.21 KB

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

⊟

8.41 KB

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

⊟

10.0 KB

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

⊟

1.19 KB

smali/android/net/util/PacketReader.smali ¶

⊟

10.9 KB

smali/android/net/util/FdEventsReader.smali ¶

⊟

1.26 KB

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

⊟

5.01 KB

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

⊟

3.74 KB

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

⊟

48.4 KB

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

⊟

123 KB

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

⊟

1.55 KB

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

⊟

769 B

smali/com/android/networkstack/tethering/EntitlementManager.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 ¶

⊟

4.99 KB

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

⊟

3.01 KB

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

⊟

4.53 KB

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

⊟

717 B

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

⊟

48.9 KB

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

⊟

1.27 KB

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

⊟

1.07 KB

smali/com/android/networkstack/tethering/util/Inet4AddressUtils.smali ¶

⊟

1.03 KB

lib/arm64-v8a/libtetherutilsjni.so ¶

⊟

985 B

readelf --wide --notes {} ¶

⊟

1.05 KB

lib/arm64-v8a/libnativehelper_compat_libc++.so ¶

⊟

985 B

readelf --wide --notes {} ¶

⊟

2.44 KB

original/META-INF/MANIFEST.MF ¶

⊟

2.61 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 ¶

⊟

888 B

res/values-mcc310-mnc4-iw/strings.xml ¶

⊟

814 B

res/values-mcc310-mnc4-iw/strings.xml ¶

⊟

1.15 KB

res/values-iw/strings.xml ¶

⊟

1.1 KB

res/values-iw/strings.xml ¶

⊟

2.34 KB

smali/com/android/networkstack/tethering/Tethering$TetherMainSM$SetIpForwardingDisabledErrorState.smali vs.

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

Files similar despite different names (score: 55, lower is more similar)

⊟

5.22 KB

smali/com/android/networkstack/tethering/Tethering$TetherMainSM$StartTetheringErrorState.smali vs.

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

Files similar despite different names (score: 24, lower is more similar)

⊟

5.22 KB

smali/com/android/networkstack/tethering/Tethering$TetherMainSM$SetDnsForwardersErrorState.smali vs.

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

Files similar despite different names (score: 48, lower is more similar)

⊟

72.0 KB

smali/com/android/networkstack/tethering/Tethering$TetherMainSM.smali vs.

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

Files similar despite different names (score: 36, lower is more similar)

⊟

36.2 KB

smali/com/android/networkstack/tethering/Tethering$TetherMainSM$TetherModeAliveState.smali vs.

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

Files similar despite different names (score: 46, lower is more similar)

⊟

3.77 KB

smali/com/android/networkstack/tethering/Tethering$TetherMainSM$StopTetheringErrorState.smali vs.

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

Files similar despite different names (score: 21, lower is more similar)

⊟

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·8~~881~~·dc8f·01·········thering......		00000010:·7468·6572·696e·6710·80c6·868f·01·········thering......


Offset 1, 4 lines modified		Offset 1, 4 lines modified
1	Zip·file·size:·56~~750~~·bytes,·number·of·entries:·2	1	Zip·file·size:·56838·bytes,·number·of·entries:·2
2	-rw----·····2.0·fat····56~~464~~·b-·stor·08-Jan-01·00:00·classes.dex	2	-rw----·····2.0·fat····56552·b-·stor·08-Jan-01·00:00·classes.dex
3	-rw----·····2.0·fat·······45·b-·defN·08-Jan-01·00:00·META-INF/MANIFEST.MF	3	-rw----·····2.0·fat·······45·b-·defN·08-Jan-01·00:00·META-INF/MANIFEST.MF
4	2·files,·56509·bytes·uncompressed,·56511·bytes·compressed:··0.0%	4	2·files,·56597·bytes·uncompressed,·56599·bytes·compressed:··0.0%


Offset 1, 3529 lines modified		Offset 1, 3535 lines modified
00000000:·6465·780a·3033·3900·~~f088~~·b679·~~24c9~~·~~7cde~~··dex.039....~~y$.\|~~.		00000000:·6465·780a·3033·3900·039c·eb76·9348·d90d··dex.039....v.H..
00000010:·~~a574~~·~~74c~~5·~~54aa~~·~~fdba~~·~~0d3a~~·~~c475~~·5a63·~~022c~~··.tt.T..~~..:~~.uZc.,		00000010:·be1e·2d75·c231·ecc9·3c71·4ab9·8a74·8e36··..-u.1..<qJ..t.6
00000020:·90dc·0000·7000·0000·7856·3412·0000·0000··....p...xV4.....		00000020:·e8dc·0000·7000·0000·7856·3412·0000·0000··....p...xV4.....
00000030:·0000·0000·b4db·0000·8202·0000·7000·0000··............p...		00000030:·0000·0000·0cdc·0000·8302·0000·7000·0000··............p...
00000040:·8800·0000·780a·0000·9600·0000·980c·0000··....x...........		00000040:·8900·0000·7c0a·0000·9600·0000·a00c·0000··....\|...........
00000050:·c700·0000·a013·0000·b901·0000·d819·0000··................		00000050:·c700·0000·a813·0000·b901·0000·e019·0000··................
00000060:·4500·0000·a027·0000·50ac·0000·4030·0000··E....'..P...@0..		00000060:·4500·0000·a827·0000·a0ac·0000·4830·0000··E....'......H0..
00000070:·5486·0000·5686·0000·5a86·0000·5d86·0000··T...V...Z...]...		00000070:·7486·0000·7686·0000·7a86·0000·7d86·0000··t...v...z...}...
00000080:·6186·0000·6f86·0000·8f86·0000·9c86·0000··a...o...........		00000080:·8186·0000·8f86·0000·af86·0000·bc86·0000··................
00000090:·b286·0000·ca86·0000·e386·0000·f586·0000··................		00000090:·d286·0000·ea86·0000·0387·0000·1587·0000··................
000000a0:·ff86·0000·0787·0000·0b87·0000·1187·0000··................		000000a0:·1f87·0000·2787·0000·2b87·0000·3187·0000··....'...+...1...
000000b0:·1887·0000·3587·0000·4287·0000·5187·0000··....5...B...Q...		000000b0:·3887·0000·5587·0000·6287·0000·7187·0000··8...U...b...q...
000000c0:·5a87·0000·7a87·0000·8387·0000·9587·0000··Z...z...........		000000c0:·7a87·0000·9a87·0000·a387·0000·b587·0000··z...............
000000d0:·a887·0000·bc87·0000·c887·0000·d187·0000··................		000000d0:·c887·0000·dc87·0000·e887·0000·f187·0000··................
000000e0:·ea87·0000·ff87·0000·1688·0000·2e88·0000··................		000000e0:·0a88·0000·1f88·0000·3688·0000·4e88·0000··........6...N...
000000f0:·4488·0000·5e88·0000·7588·0000·8a88·0000··D...^...u.......		000000f0:·6488·0000·7e88·0000·9588·0000·aa88·0000··d...~...........
00000100:·9b88·0000·bf88·0000·e888·0000·fc88·0000··................		00000100:·bb88·0000·df88·0000·0889·0000·1c89·0000··................
00000110:·2389·0000·3689·0000·6c89·0000·6f89·0000··#...6...l...o...		00000110:·4389·0000·5689·0000·8c89·0000·8f89·0000··C...V...........
00000120:·8889·0000·8c89·0000·9189·0000·9789·0000··................		00000120:·a889·0000·ac89·0000·b189·0000·b789·0000··................
00000130:·b189·0000·cf89·0000·d389·0000·f789·0000··................		00000130:·d189·0000·ef89·0000·f389·0000·178a·0000··................
00000140:·fa89·0000·fd89·0000·018a·0000·058a·0000··................		00000140:·1a8a·0000·1d8a·0000·218a·0000·258a·0000··........!...%...
00000150:·0a8a·0000·0e8a·0000·358a·0000·558a·0000··........5...U...		00000150:·2a8a·0000·2e8a·0000·558a·0000·7f8a·0000··*.......U.......
00000160:·708a·0000·b68a·0000·fc8a·0000·428b·0000··p...........B...		00000160:·9f8a·0000·ba8a·0000·008b·0000·468b·0000··............F...
00000170:·888b·0000·d08b·0000·188c·0000·608c·0000··............`...		00000170:·8c8b·0000·d28b·0000·1a8c·0000·628c·0000··............b...
00000180:·a88c·0000·f08c·0000·388d·0000·808d·0000··........8.......		00000180:·aa8c·0000·f28c·0000·3a8d·0000·828d·0000··........:.......
00000190:·c88d·0000·108e·0000·568e·0000·9c8e·0000··........V.......		00000190:·ca8d·0000·128e·0000·5a8e·0000·a08e·0000··........Z.......
000001a0:·e28e·0000·288f·0000·808f·0000·c68f·0000··....(...........		000001a0:·e68e·0000·2c8f·0000·728f·0000·ca8f·0000··....,...r.......
000001b0:·0c90·0000·5290·0000·9890·0000·c290·0000··....R...........		000001b0:·1090·0000·5690·0000·9c90·0000·e290·0000··....V...........
000001c0:·ef90·0000·1691·0000·3891·0000·6391·0000··........8...c...		000001c0:·0c91·0000·3991·0000·6091·0000·8291·0000··....9...`.......
000001d0:·9191·0000·b991·0000·dc91·0000·0b92·0000··................		000001d0:·ad91·0000·db91·0000·0392·0000·2692·0000··............&...
000001e0:·3d92·0000·6992·0000·9092·0000·a892·0000··=...i...........		000001e0:·5592·0000·8792·0000·b392·0000·da92·0000··U...............
000001f0:·c392·0000·dd92·0000·f492·0000·1893·0000··................		000001f0:·f292·0000·0d93·0000·2793·0000·3e93·0000··........'...>...
00000200:·3a93·0000·5a93·0000·8693·0000·b093·0000··:...Z...........		00000200:·6293·0000·8493·0000·a493·0000·d093·0000··b...............
00000210:·ce93·0000·fe93·0000·2c94·0000·5a94·0000··........,...Z...		00000210:·fa93·0000·1894·0000·4894·0000·7694·0000··........H...v...
00000220:·8694·0000·a894·0000·ca94·0000·ec94·0000··................		00000220:·a494·0000·d094·0000·f294·0000·1495·0000··................
00000230:·0e95·0000·3095·0000·5295·0000·8495·0000··....0...R.......		00000230:·3695·0000·5895·0000·7a95·0000·9c95·0000··6...X...z.......
00000240:·b695·0000·fb95·0000·2f96·0000·6196·0000··......../...a...		00000240:·ce95·0000·0096·0000·4596·0000·7996·0000··........E...y...
00000250:·8f96·0000·c696·0000·fa96·0000·2e97·0000··................		00000250:·ab96·0000·d996·0000·1097·0000·4497·0000··............D...
00000260:·6897·0000·9f97·0000·d397·0000·0d98·0000··h...............		00000260:·7897·0000·b297·0000·e997·0000·1d98·0000··x...............
00000270:·4698·0000·7798·0000·a598·0000·c598·0000··F...w...........		00000270:·5798·0000·9098·0000·c198·0000·ef98·0000··W...............
00000280:·ed98·0000·1399·0000·2899·0000·3d99·0000··........(...=...		00000280:·0f99·0000·3799·0000·5d99·0000·7299·0000··....7...]...r...
00000290:·5d99·0000·7399·0000·8999·0000·a299·0000··]...s...........		00000290:·8799·0000·a799·0000·bd99·0000·d399·0000··................
000002a0:·b799·0000·d899·0000·f999·0000·129a·0000··................		000002a0:·ec99·0000·019a·0000·229a·0000·439a·0000··........"...C...
000002b0:·309a·0000·4d9a·0000·669a·0000·7f9a·0000··0...M...f.......		000002b0:·5c9a·0000·7a9a·0000·979a·0000·b09a·0000··\...z...........
000002c0:·939a·0000·b79a·0000·dc9a·0000·fc9a·0000··................		000002c0:·c99a·0000·dd9a·0000·019b·0000·269b·0000··............&...
000002d0:·1f9b·0000·3e9b·0000·5a9b·0000·6d9b·0000··....>...Z...m...		000002d0:·469b·0000·699b·0000·889b·0000·a49b·0000··F...i...........
000002e0:·869b·0000·9e9b·0000·c49b·0000·e79b·0000··................		000002e0:·b79b·0000·d09b·0000·e89b·0000·0e9c·0000··................
000002f0:·fc9b·0000·1e9c·0000·329c·0000·489c·0000··........2...H...		000002f0:·319c·0000·469c·0000·689c·0000·7c9c·0000··1...F...h...\|...
00000300:·679c·0000·7b9c·0000·969c·0000·aa9c·0000··g...{...........		00000300:·929c·0000·b19c·0000·c59c·0000·e09c·0000··................
00000310:·c19c·0000·e49c·0000·069d·0000·2e9d·0000··................		00000310:·f49c·0000·0b9d·0000·2e9d·0000·509d·0000··............P...
00000320:·459d·0000·599d·0000·719d·0000·899d·0000··E...Y...q.......		00000320:·789d·0000·8f9d·0000·a39d·0000·bb9d·0000··x...............
00000330:·cb9d·0000·019e·0000·1a9e·0000·2f9e·0000··............/...		00000330:·d39d·0000·159e·0000·4b9e·0000·649e·0000··........K...d...
00000340:·449e·0000·5a9e·0000·759e·0000·ba9e·0000··D...Z...u.......		00000340:·799e·0000·8e9e·0000·a49e·0000·bf9e·0000··y...............
00000350:·cc9e·0000·de9e·0000·0e9f·0000·529f·0000··............R...		00000350:·049f·0000·169f·0000·289f·0000·589f·0000··........(...X...
00000360:·789f·0000·8d9f·0000·ae9f·0000·cd9f·0000··x...............		00000360:·9c9f·0000·c29f·0000·d79f·0000·f89f·0000··................
00000370:·~~ec9f~~·0000·21a0·0000·33a0·0000·6aa0·0000··....!...3...j...		00000370:·17a0·0000·36a0·0000·6ba0·0000·7da0·0000··....6...k...}...
00000380:·c3a0·0000·e9a0·0000·1fa1·0000·26a1·0000··............&...		00000380:·b4a0·0000·0da1·0000·33a1·0000·69a1·0000··........3...i...
00000390:·39a1·0000·48a1·0000·50a1·0000·68a1·0000··9...H...P...h...		00000390:·70a1·0000·83a1·0000·92a1·0000·9aa1·0000··p...............
000003a0:·7da1·0000·83a1·0000·88a1·0000·9da1·0000··}...............		000003a0:·b2a1·0000·c7a1·0000·cda1·0000·d2a1·0000··................
000003b0:·b1a1·0000·c4a1·0000·d3a1·0000·e2a1·0000··................		000003b0:·e7a1·0000·fba1·0000·0ea2·0000·1da2·0000··................
000003c0:·f2a1·0000·06a2·0000·17a2·0000·36a2·0000··............6...		000003c0:·2ca2·0000·3ca2·0000·50a2·0000·61a2·0000··,...<...P...a...
000003d0:·5da2·0000·83a2·0000·a5a2·0000·c3a2·0000··]...............		000003d0:·80a2·0000·a7a2·0000·cda2·0000·efa2·0000··................
000003e0:·e0a2·0000·0da3·0000·3aa3·0000·51a3·0000··........:...Q...		000003e0:·0da3·0000·2aa3·0000·57a3·0000·84a3·0000··....*...W.......
000003f0:·73a3·0000·91a3·0000·b2a3·0000·cea3·0000··s...............		000003f0:·9ba3·0000·bda3·0000·dba3·0000·fca3·0000··................
00000400:·eaa3·0000·05a4·0000·1fa4·0000·42a4·0000··............B...		00000400:·18a4·0000·34a4·0000·4fa4·0000·69a4·0000··....4...O...i...
00000410:·62a4·0000·83a4·0000·a4a4·0000·c6a4·0000··b...............		00000410:·8ca4·0000·aca4·0000·cda4·0000·eea4·0000··................
00000420:·e5a4·0000·04a5·0000·28a5·0000·4ca5·0000··........(...L...		00000420:·10a5·0000·2fa5·0000·4ea5·0000·72a5·0000··..../...N...r...
00000430:·62a5·0000·86a5·0000·a9a5·0000·c8a5·0000··b...............		00000430:·96a5·0000·aca5·0000·d0a5·0000·f3a5·0000··................
00000440:·f4a5·0000·29a6·0000·46a6·0000·62a6·0000··....)...F...b...		00000440:·12a6·0000·3ea6·0000·73a6·0000·90a6·0000··....>...s.......
00000450:·80a6·0000·9ba6·0000·afa6·0000·dda6·0000··................		00000450:·aca6·0000·caa6·0000·e5a6·0000·f9a6·0000··................
00000460:·f3a6·0000·08a7·0000·21a7·0000·3aa7·0000··........!...:...		00000460:·27a7·0000·3da7·0000·52a7·0000·6ba7·0000··'...=...R...k...
00000470:·4fa7·0000·6aa7·0000·8fa7·0000·b2a7·0000··O...j...........		00000470:·84a7·0000·99a7·0000·b4a7·0000·d9a7·0000··................
00000480:·cba7·0000·e3a7·0000·f8a7·0000·13a8·0000··................		00000480:·fca7·0000·15a8·0000·2da8·0000·42a8·0000··........-...B...
00000490:·2aa8·0000·3ca8·0000·57a8·0000·74a8·0000··*...<...W...t...		00000490:·5da8·0000·74a8·0000·86a8·0000·a1a8·0000··]...t...........
000004a0:·83a8·0000·86a8·0000·8aa8·0000·8fa8·0000··................		000004a0:·bea8·0000·cda8·0000·d0a8·0000·d4a8·0000··................
000004b0:·95a8·0000·9ba8·0000·a2a8·0000·aaa8·0000··................		000004b0:·d9a8·0000·dfa8·0000·e5a8·0000·eca8·0000··................
000004c0:·b1a8·0000·b5a8·0000·b9a8·0000·bea8·0000··................		000004c0:·f4a8·0000·fba8·0000·ffa8·0000·03a9·0000··................
000004d0:·c4a8·0000·c9a8·0000·cfa8·0000·d5a8·0000··................		000004d0:·08a9·0000·0ea9·0000·13a9·0000·19a9·0000··................
000004e0:·dca8·0000·e0a8·0000·e5a8·0000·eba8·0000··................		000004e0:·1fa9·0000·26a9·0000·2aa9·0000·2fa9·0000··....&...*.../...
000004f0:·f2a8·0000·f5a8·0000·fca8·0000·00a9·0000··................		000004f0:·35a9·0000·3ca9·0000·3fa9·0000·46a9·0000··5...<...?...F...
00000500:·04a9·0000·09a9·0000·0da9·0000·30a9·0000··............0...		00000500:·4aa9·0000·4ea9·0000·53a9·0000·57a9·0000··J...N...S...W...
00000510:·5ba9·0000·7aa9·0000·a9a9·0000·d6a9·0000··[...z...........		00000510:·7aa9·0000·a5a9·0000·c4a9·0000·f3a9·0000··z...............
00000520:·fda9·0000·12aa·0000·27aa·0000·36aa·0000··........'...6...		00000520:·20aa·0000·47aa·0000·5caa·0000·71aa·0000···...G...\...q...
00000530:·42aa·0000·4daa·0000·5baa·0000·72aa·0000··B...M...[...r...		00000530:·80aa·0000·8caa·0000·97aa·0000·a5aa·0000··................
00000540:·7eaa·0000·8caa·0000·9daa·0000·a4aa·0000··~...............		00000540:·bcaa·0000·c8aa·0000·d6aa·0000·e7aa·0000··................
00000550:·abaa·0000·b2aa·0000·b9aa·0000·c0aa·0000··................		00000550:·eeaa·0000·f5aa·0000·fcaa·0000·03ab·0000··................
00000560:·c9aa·0000·d5aa·0000·e1aa·0000·edaa·0000··................		00000560:·0aab·0000·13ab·0000·1fab·0000·2bab·0000··............+...
00000570:·f9aa·0000·05ab·0000·12ab·0000·17ab·0000··................		00000570:·37ab·0000·43ab·0000·4fab·0000·5cab·0000··7...C...O...\...
00000580:·25ab·0000·2dab·0000·36ab·0000·41ab·0000··%...-...6...A...		00000580:·61ab·0000·6fab·0000·77ab·0000·80ab·0000··a...o...w.......
00000590:·61ab·0000·82ab·0000·a7ab·0000·ceab·0000··a...............		00000590:·8bab·0000·abab·0000·ccab·0000·f1ab·0000··................
000005a0:·f3ab·0000·23ac·0000·58ac·0000·78ac·0000··....#...X...x...		000005a0:·18ac·0000·3dac·0000·6dac·0000·a2ac·0000··....=...m.......
000005b0:·abac·0000·b3ac·0000·b9ac·0000·c3ac·0000··................		000005b0:·c2ac·0000·f5ac·0000·fdac·0000·03ad·0000··................
000005c0:·d0ac·0000·d8ac·0000·e9ac·0000·f9ac·0000··................		000005c0:·0dad·0000·1aad·0000·22ad·0000·33ad·0000··........"...3...
000005d0:·08ad·0000·0fad·0000·16ad·0000·19ad·0000··................		000005d0:·43ad·0000·52ad·0000·59ad·0000·60ad·0000··C...R...Y...`...
000005e0:·23ad·0000·45ad·0000·63ad·0000·6ead·0000··#...E...c...n...		000005e0:·63ad·0000·6dad·0000·8fad·0000·adad·0000··c...m...........
000005f0:·8fad·0000·acad·0000·b3ad·0000·bbad·0000··................		000005f0:·b8ad·0000·d9ad·0000·f6ad·0000·fdad·0000··................
00000600:·caad·0000·d3ad·0000·daad·0000·e0ad·0000··................		00000600:·05ae·0000·14ae·0000·1dae·0000·24ae·0000··............$...
00000610:·e8ad·0000·f3ad·0000·06ae·0000·10ae·0000··................		00000610:·2aae·0000·32ae·0000·3dae·0000·50ae·0000··*...2...=...P...
00000620:·1dae·0000·26ae·0000·38ae·0000·48ae·0000··....&...8...H...		00000620:·5aae·0000·67ae·0000·70ae·0000·82ae·0000··Z...g...p.......
00000630:·5bae·0000·71ae·0000·77ae·0000·85ae·0000··[...q...w.......		00000630:·92ae·0000·a5ae·0000·bbae·0000·c1ae·0000··................
00000640:·95ae·0000·a7ae·0000·b3ae·0000·b9ae·0000··................		00000640:·cfae·0000·dfae·0000·f1ae·0000·fdae·0000··................
00000650:·c5ae·0000·c8ae·0000·d0ae·0000·e8ae·0000··................		00000650:·03af·0000·0faf·0000·12af·0000·1aaf·0000··................
00000660:·faae·0000·02af·0000·09af·0000·14af·0000··................		00000660:·32af·0000·44af·0000·4caf·0000·53af·0000··2...D...L...S...
00000670:·1daf·0000·2baf·0000·3daf·0000·46af·0000··....+...=...F...		00000670:·5eaf·0000·67af·0000·75af·0000·87af·0000··^...g...u.......
00000680:·50af·0000·58af·0000·74af·0000·88af·0000··P...X...t.......		00000680:·90af·0000·9aaf·0000·a2af·0000·beaf·0000··................
00000690:·a0af·0000·b4af·0000·c7af·0000·~~d6af~~·0000··................		00000690:·d2af·0000·eaaf·0000·feaf·0000·11b0·0000··................
000006a0:·~~dbaf~~·0000·~~e0af~~·0000·~~e5af~~·0000·~~eaaf~~·0000··................		000006a0:·20b0·0000·25b0·0000·2ab0·0000·2fb0·0000···...%...*.../...
000006b0:·~~f1af~~·0000·~~f6af~~·0000·02b0·0000·10b0·0000··................		000006b0:·34b0·0000·3bb0·0000·40b0·0000·4cb0·0000··4...;...@...L...
000006c0:·2cb0·0000·3ab0·0000·4ab0·0000·5db0·0000··,...:...J...]...		000006c0:·5ab0·0000·76b0·0000·84b0·0000·94b0·0000··Z...v...........
000006d0:·6ab0·0000·82b0·0000·96b0·0000·c3b0·0000··j...............		000006d0:·a7b0·0000·b4b0·0000·ccb0·0000·e0b0·0000··................
000006e0:·d8b0·0000·e7b0·0000·f9b0·0000·04b1·0000··................		000006e0:·0db1·0000·22b1·0000·31b1·0000·43b1·0000··...."...1...C...
000006f0:·15b1·0000·31b1·0000·40b1·0000·5eb1·0000··....1...@...^...		000006f0:·4eb1·0000·5fb1·0000·7bb1·0000·8ab1·0000··N..._...{.......
00000700:·73b1·0000·8bb1·0000·a4b1·0000·bbb1·0000··s...............		00000700:·a8b1·0000·bdb1·0000·d5b1·0000·eeb1·0000··................
00000710:·ceb1·0000·e9b1·0000·fbb1·0000·04b2·0000··................		00000710:·05b2·0000·18b2·0000·33b2·0000·45b2·0000··........3...E...
00000720:·0ab2·0000·14b2·0000·1eb2·0000·21b2·0000··............!...		00000720:·4eb2·0000·54b2·0000·5eb2·0000·68b2·0000··N...T...^...h...
00000730:·29b2·0000·30b2·0000·35b2·0000·3bb2·0000··)...0...5...;...		00000730:·6bb2·0000·73b2·0000·7ab2·0000·7fb2·0000··k...s...z.......
00000740:·3fb2·0000·4bb2·0000·5ab2·0000·78b2·0000··?...K...Z...x...		00000740:·85b2·0000·89b2·0000·95b2·0000·a4b2·0000··................
00000750:·80b2·0000·96b2·0000·a0b2·0000·a8b2·0000··................		00000750:·c2b2·0000·cab2·0000·e0b2·0000·eab2·0000··................
00000760:·c8b2·0000·e7b2·0000·16b3·0000·45b3·0000··............E...		00000760:·f2b2·0000·12b3·0000·31b3·0000·60b3·0000··........1...`...
00000770:·79b3·0000·9ab3·0000·b4b3·0000·c7b3·0000··y...............		00000770:·8fb3·0000·c3b3·0000·e4b3·0000·feb3·0000··................
00000780:·e8b3·0000·1bb4·0000·37b4·0000·60b4·0000··........7...`...		00000780:·11b4·0000·32b4·0000·65b4·0000·81b4·0000··....2...e.......
00000790:·92b4·0000·acb4·0000·e0b4·0000·f9b4·0000··................		00000790:·aab4·0000·dcb4·0000·f6b4·0000·2ab5·0000··............*...
000007a0:·15b5·0000·42b5·0000·5ab5·0000·83b5·0000··....B...Z.......		000007a0:·43b5·0000·5fb5·0000·8cb5·0000·a4b5·0000··C..._...........
000007b0:·94b5·0000·bfb5·0000·d2b5·0000·0db6·0000··................		000007b0:·cdb5·0000·deb5·0000·09b6·0000·1cb6·0000··................
000007c0:·18b6·0000·27b6·0000·39b6·0000·43b6·0000··....'...9...C...		000007c0:·57b6·0000·62b6·0000·71b6·0000·83b6·0000··W...b...q.......
000007d0:·55b6·0000·64b6·0000·74b6·0000·7eb6·0000··U...d...t...~...		000007d0:·8db6·0000·9fb6·0000·aeb6·0000·beb6·0000··................
000007e0:·8ab6·0000·9ab6·0000·a5b6·0000·b1b6·0000··................		000007e0:·c8b6·0000·d4b6·0000·e4b6·0000·efb6·0000··................
... Open expanded diff (truncated) ...


Offset 1, 8 lines modified		Offset 1, 8 lines modified

1	··Size:·56~~750~~·····» Blocks:·112········IO·Block:·4096···regular·file	1	··Size:·56838·····» Blocks:·112········IO·Block:·4096···regular·file
2	Links:·1	2	Links:·1
3	Access:·(0644/-rw-r--r--)··Uid:·(·1001/·····dev)···Gid:·(·1001/·····dev)	3	Access:·(0644/-rw-r--r--)··Uid:·(·1001/·····dev)···Gid:·(·1001/·····dev)

4	Modify:·1970-01-01·00:00:00.000000000·+0000	4	Modify:·1970-01-01·00:00:00.000000000·+0000


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, 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 1, 1 lines modified		Offset 1, 1 lines modified
1	Tethering~~Google~~.apk	1	Tethering.apk


Offset 1, 10 lines modified		Offset 1, 9 lines modified
1	Zip·file·size:·823~~014~~·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···305828·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···121828·bx·stor·09-Jan-01·00:00·resources.arsc	20	-rw----·····1.0·fat···121720·bx·stor·09-Jan-01·00:00·resources.arsc
22	-rw----·····2.0·fat·····~~5332~~·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,·743491·bytes·uncompressed,·732069·bytes·compressed:··1.5%
34	32·files,·804018·bytes·uncompressed,·792206·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~~-6927367~~"·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 12, 16 lines modified		Offset 12, 15 lines modified
12	··<uses-permission·android:name="android.permission.READ_NETWORK_USAGE_HISTORY"/>	12	··<uses-permission·android:name="android.permission.READ_NETWORK_USAGE_HISTORY"/>
13	··<uses-permission·android:name="android.permission.READ_PHONE_STATE"/>	13	··<uses-permission·android:name="android.permission.READ_PHONE_STATE"/>
14	··<uses-permission·android:name="android.permission.TETHER_PRIVILEGED"/>	14	··<uses-permission·android:name="android.permission.TETHER_PRIVILEGED"/>
15	··<uses-permission·android:name="android.permission.UPDATE_APP_OPS_STATS"/>	15	··<uses-permission·android:name="android.permission.UPDATE_APP_OPS_STATS"/>
16	··<uses-permission·android:name="android.permission.UPDATE_DEVICE_STATS"/>	16	··<uses-permission·android:name="android.permission.UPDATE_DEVICE_STATS"/>
17	··<uses-permission·android:name="android.permission.WRITE_SETTINGS"/>	17	··<uses-permission·android:name="android.permission.WRITE_SETTINGS"/>
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"~~·android:usesCleartextTraffic="true"~~>	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~~-69273~~67	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 522, 15 lines modified		Offset 522, 15 lines modified

522	Filename:·com/android/networkstack/tethering/Tethering$EthernetCallback.class	522	Filename:·com/android/networkstack/tethering/Tethering$EthernetCallback.class
523	Comment:·	523	Comment:·

524	Filename:·com/android/networkstack/tethering/Tethering$StateReceiver.class	524	Filename:·com/android/networkstack/tethering/Tethering$StateReceiver.class
525	Comment:·	525	Comment:·

526	Filename:·com/android/networkstack/tethering/Tethering$TetherMainSM$OffloadWrapper.class	526	Filename:·com/android/networkstack/tethering/Tethering$TetherMasterSM$OffloadWrapper.class
527	Comment:·	527	Comment:·

528	Filename:·com/android/networkstack/tethering/Tethering$TetherState.class	528	Filename:·com/android/networkstack/tethering/Tethering$TetherState.class
529	Comment:·	529	Comment:·

530	Filename:·com/android/networkstack/tethering/Tethering$TetheringSoftApCallback.class	530	Filename:·com/android/networkstack/tethering/Tethering$TetheringSoftApCallback.class
531	Comment:·	531	Comment:·
Offset 744, 15 lines modified		Offset 744, 15 lines modified

744	Filename:·com/android/networkstack/tethering/Tethering$2.class	744	Filename:·com/android/networkstack/tethering/Tethering$2.class
745	Comment:·	745	Comment:·

746	Filename:·com/android/networkstack/tethering/Tethering$4.class	746	Filename:·com/android/networkstack/tethering/Tethering$4.class
747	Comment:·	747	Comment:·

748	Filename:·com/android/networkstack/tethering/Tethering$TetherMainSM.class	748	Filename:·com/android/networkstack/tethering/Tethering$TetherMasterSM.class
749	Comment:·	749	Comment:·

750	Filename:·com/android/networkstack/tethering/TetheringService$1$1.class	750	Filename:·com/android/networkstack/tethering/TetheringService$1$1.class
751	Comment:·	751	Comment:·

752	Filename:·com/android/networkstack/tethering/TetheringService$1.class	752	Filename:·com/android/networkstack/tethering/TetheringService$1.class
753	Comment:·	753	Comment:·
Offset 786, 21 lines modified		Offset 786, 21 lines modified

786	Filename:·android/net/util/BaseNetdUnsolicitedEventListener.class	786	Filename:·android/net/util/BaseNetdUnsolicitedEventListener.class
787	Comment:·	787	Comment:·

788	Filename:·com/android/networkstack/tethering/OffloadHardwareInterface$TetheringOffloadCallback.class	788	Filename:·com/android/networkstack/tethering/OffloadHardwareInterface$TetheringOffloadCallback.class
789	Comment:·	789	Comment:·

790	Filename:·com/android/networkstack/tethering/Tethering$TetherMainSM$ErrorState.class	790	Filename:·com/android/networkstack/tethering/Tethering$TetherMasterSM$ErrorState.class
791	Comment:·	791	Comment:·

792	Filename:·com/android/networkstack/tethering/Tethering$TetherMainSM$InitialState.class	792	Filename:·com/android/networkstack/tethering/Tethering$TetherMasterSM$InitialState.class
793	Comment:·	793	Comment:·

794	Filename:·com/android/networkstack/tethering/Tethering$TetherMainSM$TetherModeAliveState.class	794	Filename:·com/android/networkstack/tethering/Tethering$TetherMasterSM$TetherModeAliveState.class
795	Comment:·	795	Comment:·

796	Filename:·com/android/networkstack/tethering/util/StateMachine$SmHandler$HaltingState.class	796	Filename:·com/android/networkstack/tethering/util/StateMachine$SmHandler$HaltingState.class
797	Comment:·	797	Comment:·

798	Filename:·com/android/networkstack/tethering/util/StateMachine$SmHandler$QuittingState.class	798	Filename:·com/android/networkstack/tethering/util/StateMachine$SmHandler$QuittingState.class
799	Comment:·	799	Comment:·
Offset 825, 23 lines modified		Offset 825, 23 lines modified

825	Filename:·android/net/ip/IpServer$TetheredState.class	825	Filename:·android/net/ip/IpServer$TetheredState.class
826	Comment:·	826	Comment:·

827	Filename:·com/android/networkstack/tethering/Tethering$NetdCallback.class	827	Filename:·com/android/networkstack/tethering/Tethering$NetdCallback.class
828	Comment:·	828	Comment:·

829	Filename:·com/android/networkstack/tethering/Tethering$TetherMainSM$SetDnsForwardersErrorState.class	829	Filename:·com/android/networkstack/tethering/Tethering$TetherMasterSM$SetDnsForwardersErrorState.class
830	Comment:·	830	Comment:·

831	Filename:·com/android/networkstack/tethering/Tethering$TetherMainSM$SetIpForwardingDisabledErrorState.class	831	Filename:·com/android/networkstack/tethering/Tethering$TetherMasterSM$SetIpForwardingDisabledErrorState.class
832	Comment:·	832	Comment:·

833	Filename:·com/android/networkstack/tethering/Tethering$TetherMainSM$SetIpForwardingEnabledErrorState.class	833	Filename:·com/android/networkstack/tethering/Tethering$TetherMasterSM$SetIpForwardingEnabledErrorState.class
834	Comment:·	834	Comment:·

835	Filename:·com/android/networkstack/tethering/Tethering$TetherMainSM$StartTetheringErrorState.class	835	Filename:·com/android/networkstack/tethering/Tethering$TetherMasterSM$StartTetheringErrorState.class
836	Comment:·	836	Comment:·

837	Filename:·com/android/networkstack/tethering/Tethering$TetherMainSM$StopTetheringErrorState.class	837	Filename:·com/android/networkstack/tethering/Tethering$TetherMasterSM$StopTetheringErrorState.class
838	Comment:·	838	Comment:·

839	Zip·file·comment:·	839	Zip·file·comment:·


Offset 276, 15 lines modified		Offset 276, 15 lines modified
276	········if·(mUsingCellularAsUpstream)·{	276	········if·(mUsingCellularAsUpstream)·{
277	············this.maybeRunProvisioning(this.mFetcher.fetchTetheringConfiguration());	277	············this.maybeRunProvisioning(this.mFetcher.fetchTetheringConfiguration());
278	········}	278	········}
279	····}	279	····}
280	····	280	····
281	····public·void·reevaluateSimCardProvisioning(final·TetheringConfiguration·tetheringConfiguration)·{	281	····public·void·reevaluateSimCardProvisioning(final·TetheringConfiguration·tetheringConfiguration)·{
282	········if·(!this.mHandler.getLooper().isCurrentThread())·{	282	········if·(!this.mHandler.getLooper().isCurrentThread())·{
283	············this.mLog.log("reevaluateSimCardProvisioning()·don't·run·in·TetherMa~~inSM~~·thread");	283	············this.mLog.log("reevaluateSimCardProvisioning()·don't·run·in·TetherMaster·thread");
284	········}	284	········}
285	········this.mEntitlementCacheValue.clear();	285	········this.mEntitlementCacheValue.clear();
286	········this.mCurrentEntitlementResults.clear();	286	········this.mCurrentEntitlementResults.clear();
287	········if·(tetheringConfiguration.hasMobileHotspotProvisionApp()·&&·!this.carrierConfigAffirmsEntitlementCheckNotRequired(tetheringConfiguration))·{	287	········if·(tetheringConfiguration.hasMobileHotspotProvisionApp()·&&·!this.carrierConfigAffirmsEntitlementCheckNotRequired(tetheringConfiguration))·{
288	············if·(this.mUsingCellularAsUpstream)·{	288	············if·(this.mUsingCellularAsUpstream)·{
289	················this.maybeRunProvisioning(tetheringConfiguration);	289	················this.maybeRunProvisioning(tetheringConfiguration);
290	············}	290	············}


Offset 1, 167 lines modified		Offset 1, 82 lines modified

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

2	import·java.io.PrintWriter;	2	import·java.io.PrintWriter;
3	import·com.android.networkstack.tethering.util.StateMachine;	3	import·com.android.networkstack.tethering.util.StateMachine;
4	import·android.net.~~Netwo~~rkCap~~abi~~lities;	4	import·android.net.LinkProperties;
5	import·andro~~id.ne~~t.Network;	5	import·java.net.UnknownHostException;
6	import·java.ut~~il.HashS~~et;	6	import·java.net.InetAddress;
7	import·java.util.Random;	7	import·java.util.Random;
8	import·com.android.networkstack.tethering.util.IndentingPrintWriter;	8	import·com.android.networkstack.tethering.util.IndentingPrintWriter;
9	import·java.net.Inet4Address;
10	import·android.net.util.PrefixUtils;
11	import·android.net.ip.IpServer;
12	import·java.util.Iterator;
13	import·java.net.InetAddress;
14	import·com.android.networkstack.tethering.util.Inet4AddressUtils;
15	import·java.util.Collection;	9	import·java.util.Collection;
16	import·java.util.ArrayList;
17	import·java.util.Arrays;	10	import·java.util.Arrays;
18	import·android.net.I~~pPrefix~~;	11	import·android.net.Network;
		12	import·java.util.Iterator;
		13	import·java.util.ArrayList;
		14	import·java.util.List;
19	import·android.net.LinkAddress;	15	import·android.net.LinkAddress;
		16	import·android.net.util.PrefixUtils;
		17	import·android.net.ip.IpServer;
20	import·android.content.Context;	18	import·android.content.Context;
21	import·android.util.ArrayMap;	19	import·android.util.ArrayMap;
22	import·~~java~~.ut~~il.List~~;	20	import·android.net.IpPrefix;
23	import·android.util.ArraySet;	21	import·android.util.ArraySet;
24	import·android.net.ConnectivityManager;	22	import·android.net.ConnectivityManager;
25	import·android.util.SparseArray;

26	public·class·PrivateAddressCoordinator	23	public·class·PrivateAddressCoordinator
27	{	24	{
28	····private·final·SparseArray·mCachedAddresses;
29	····private·final·TetheringConfiguration·mConfig;
30	····private·final·ConnectivityManager·mConnectivityMgr;	25	····private·final·ConnectivityManager·mConnectivityMgr;
31	····private·final·ArraySet·mDownstreams;	26	····private·final·ArraySet·mDownstreams;
32	····private·final·~~List~~·mTetheringPrefixes;	27	····private·final·IpPrefix·mTetheringPrefix;
33	····private·final·ArrayMap·mUpstreamPrefixMap;	28	····private·final·ArrayMap·mUpstreamPrefixMap;
34	····	29	····
35	····public·PrivateAddressCoordinator(final·Context·context~~,·final·TetheringConfiguration·mConfig~~)·{	30	····public·PrivateAddressCoordinator(final·Context·context)·{
36	········this.mDownstreams·=·new·ArraySet();	31	········this.mDownstreams·=·new·ArraySet();
37	········this.mUpstreamPrefixMap·=·new·ArrayMap();	32	········this.mUpstreamPrefixMap·=·new·ArrayMap();
		33	········this.mTetheringPrefix·=·new·IpPrefix("192.168.0.0/16");
38	········this.mConnectivityMgr·=·(ConnectivityManager)context.getSystemService("connectivity");	34	········this.mConnectivityMgr·=·(ConnectivityManager)context.getSystemService("connectivity");
39	········this.mConfig·=·mConfig;
40	········(this.mCachedAddresses·=·new·SparseArray()).put(2,·(Object)new·LinkAddress("192.168.44.1/24"));
41	········this.mCachedAddresses.put(3,·(Object)new·LinkAddress("192.168.49.1/24"));
42	········this.mTetheringPrefixes·=·new·ArrayList(Arrays.asList(new·IpPrefix("192.168.0.0/16")));
43	········if·(mConfig.isSelectAllPrefixRangeEnabled())·{
44	············this.mTetheringPrefixes.add(new·IpPrefix("172.16.0.0/12"));
45	············this.mTetheringPrefixes.add(new·IpPrefix("10.0.0.0/8"));
46	········}
47	····}
48	····
49	····private·LinkAddress·chooseDownstreamAddress(IpPrefix·availablePrefixFromRange)·{
50	········final·int·prefixLengthToV4NetmaskIntHTH·=·Inet4AddressUtils.prefixLengthToV4NetmaskIntHTH(availablePrefixFromRange.getPrefixLength());
51	········final·int·prefixBaseAddress·=·this.getPrefixBaseAddress(availablePrefixFromRange);
52	········final·int·prefixLengthToV4NetmaskIntHTH2·=·Inet4AddressUtils.prefixLengthToV4NetmaskIntHTH(24);
53	········final·int·randomInt·=·this.getRandomInt();
54	········final·int·n·=·~prefixLengthToV4NetmaskIntHTH;
55	········final·int·n2·=·randomInt·&·n·&·prefixLengthToV4NetmaskIntHTH2;
56	········final·int·sanitizedSubAddr·=·this.getSanitizedSubAddr(~prefixLengthToV4NetmaskIntHTH2);
57	········final·IpPrefix·availablePrefixFromRange2·=·this.findAvailablePrefixFromRange(n2,·n·+·1,·prefixBaseAddress,·prefixLengthToV4NetmaskIntHTH);
58	········if·(availablePrefixFromRange2·!=·null)·{
59	············return·this.getLinkAddress(availablePrefixFromRange2,·sanitizedSubAddr);
60	········}
61	········availablePrefixFromRange·=·this.findAvailablePrefixFromRange(0,·n2,·prefixBaseAddress,·prefixLengthToV4NetmaskIntHTH);
62	········return·this.getLinkAddress(availablePrefixFromRange,·sanitizedSubAddr);
63	····}
64	····
65	····private·IpPrefix·findAvailablePrefixFromRange(int·i,·final·int·n,·final·int·n2,·final·int·n3)·{
66	········while·(i·<·n)·{
67	············i·\|=·n2;
68	············final·IpPrefix·ipPrefix·=·new·IpPrefix((InetAddress)Inet4AddressUtils.intToInet4AddressHTH(i),·24);
69	············final·IpPrefix·conflictPrefix·=·this.getConflictPrefix(ipPrefix);
70	············if·(conflictPrefix·==·null)·{
71	················return·ipPrefix;
72	············}
73	············i·=·this.getNextSubPrefix(conflictPrefix,·n3);
74	········}
75	········return·null;
76	····}
77	····
78	····private·IpPrefix·getConflictPrefix(final·IpPrefix·ipPrefix)·{
79	········final·IpPrefix·conflictWithUpstream·=·this.getConflictWithUpstream(ipPrefix);
80	········if·(conflictWithUpstream·!=·null)·{
81	············return·conflictWithUpstream;
82	········}
83	········return·this.getInUseDownstreamPrefix(ipPrefix);
84	····}
85	····
86	····private·IpPrefix·getConflictWithUpstream(final·IpPrefix·ipPrefix)·{
87	········for·(int·i·=·0;·i·<·this.mUpstreamPrefixMap.size();·++i)·{
88	············for·(final·IpPrefix·ipPrefix2·:·(List)this.mUpstreamPrefixMap.valueAt(i))·{
89	················if·(this.isConflictPrefix(ipPrefix,·ipPrefix2))·{
90	····················return·ipPrefix2;
91	················}
92	············}
93	········}
94	········return·null;
95	····}	35	····}
96	····	36	····
97	····private·IpPrefix·getDownstreamPrefix(final·IpServer·ipServer)·{	37	····private·IpPrefix·getDownstreamPrefix(final·IpServer·ipServer)·{
98	········r~~eturn~~·~~PrefixUtil~~s.asIpPre~~fix(~~ipServer.getAddress());	38	········final·LinkAddress·address·=·ipServer.getAddress();
99	····}	39	········if·(address·==·null)·{
100	····	40	············return·null;
101	····private·IpPrefix·getInUseDownstreamPrefix(final·IpPrefix·ipPrefix)·{
102	········for·(int·i·=·0;·i·<·this.mCachedAddresses.size();·++i)·{
103	············final·IpPrefix·ipPrefix2·=·PrefixUtils.asIpPrefix((LinkAddress)this.mCachedAddresses.valueAt(i));
104	············if·(this.isConflictPrefix(ipPrefix,·ipPrefix2))·{
105	················return·ipPrefix2;
106	············}
107	········}
108	········final·Iterator·iterator·=·this.mDownstreams.iterator();
109	········while·(iterator.hasNext())·{
110	············final·IpPrefix·downstreamPrefix·=·this.getDownstreamPrefix(iterator.next());
111	············if·(this.isConflictPrefix(ipPrefix,·downstreamPrefix))·{
112	················return·downstreamPrefix;
113	············}
114	········}	41	········}
115	········return·null;	42	········return·PrefixUtils.asIpPrefix(address);
116	····}	43	····}
117	····	44	····
118	····private·ArrayList·getIpv4Prefixes(final·List·list)·{	45	····private·ArrayList·getIpv4Prefixes(final·List·list)·{
... 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 95, 27 lines modified		Offset 95, 27 lines modified
95	····private·final·TetheringNotificationUpdater·mNotificationUpdater;	95	····private·final·TetheringNotificationUpdater·mNotificationUpdater;
96	····private·final·OffloadController·mOffloadController;	96	····private·final·OffloadController·mOffloadController;
97	····private·int·mOffloadStatus;	97	····private·int·mOffloadStatus;
98	····private·final·PrivateAddressCoordinator·mPrivateAddressCoordinator;	98	····private·final·PrivateAddressCoordinator·mPrivateAddressCoordinator;
99	····private·final·Object·mPublicSync;	99	····private·final·Object·mPublicSync;
100	····private·boolean·mRndisEnabled;	100	····private·boolean·mRndisEnabled;
101	····private·final·BroadcastReceiver·mStateReceiver;	101	····private·final·BroadcastReceiver·mStateReceiver;
102	····private·final·StateMachine·mTetherMainSM;	102	····private·final·StateMachine·mTetherMasterSM;
103	····private·final·ArrayMap·mTetherStates;	103	····private·final·ArrayMap·mTetherStates;
104	····private·TetherStatesParcel·mTetherStatesParcel;	104	····private·TetherStatesParcel·mTetherStatesParcel;
105	····private·Network·mTetherUpstream;	105	····private·Network·mTetherUpstream;
106	····private·final·RemoteCallbackList·mTetheringEventCallbacks;	106	····private·final·RemoteCallbackList·mTetheringEventCallbacks;
107	····private·final·Tethering$UserRestrictionActionListener·mTetheringRestriction;	107	····private·final·Tethering$UserRestrictionActionListener·mTetheringRestriction;
108	····private·final·UpstreamNetworkMonitor·mUpstreamNetworkMonitor;	108	····private·final·UpstreamNetworkMonitor·mUpstreamNetworkMonitor;
109	····private·final·UserManager·mUserManager;	109	····private·final·UserManager·mUserManager;
110	····private·String·mWifiP2pTetherInterface;	110	····private·String·mWifiP2pTetherInterface;
111	····private·boolean·mWifiTetherRequested;	111	····private·boolean·mWifiTetherRequested;
112	····	112	····
113	····static·{	113	····static·{
114	········sMagicDecoderRing·=·MessageUtils.findMessageNames(sMessageClasses·=·new·Class[]·{·Tethering.class,·Tethering$TetherMainSM.class,·IpServer.class·});	114	········sMagicDecoderRing·=·MessageUtils.findMessageNames(sMessageClasses·=·new·Class[]·{·Tethering.class,·Tethering$TetherMasterSM.class,·IpServer.class·});
115	····}	115	····}
116	····	116	····
117	····public·Tethering(TetheringDependencies·mDeps)·{	117	····public·Tethering(TetheringDependencies·mDeps)·{
118	········this.mLog·=·new·SharedLog(Tethering.TAG);	118	········this.mLog·=·new·SharedLog(Tethering.TAG);
119	········this.mTetheringEventCallbacks·=·new·RemoteCallbackList();	119	········this.mTetheringEventCallbacks·=·new·RemoteCallbackList();
120	········this.mActiveTetheringRequests·=·new·SparseArray();	120	········this.mActiveTetheringRequests·=·new·SparseArray();
121	········this.mActiveDataSubId·=·-1;	121	········this.mActiveDataSubId·=·-1;
Offset 129, 38 lines modified		Offset 129, 37 lines modified
129	········this.mNetd·=·this.mDeps.getINetd(context);	129	········this.mNetd·=·this.mDeps.getINetd(context);
130	········final·Looper·tetheringLooper·=·this.mDeps.getTetheringLooper();	130	········final·Looper·tetheringLooper·=·this.mDeps.getTetheringLooper();
131	········this.mLooper·=·tetheringLooper;	131	········this.mLooper·=·tetheringLooper;
132	········this.mNotificationUpdater·=·this.mDeps.getNotificationUpdater(this.mContext,·tetheringLooper);	132	········this.mNotificationUpdater·=·this.mDeps.getNotificationUpdater(this.mContext,·tetheringLooper);
133	········this.mPublicSync·=·new·Object();	133	········this.mPublicSync·=·new·Object();
134	········this.mTetherStates·=·new·ArrayMap();	134	········this.mTetherStates·=·new·ArrayMap();
135	········this.mConnectedClientsTracker·=·new·ConnectedClientsTracker();	135	········this.mConnectedClientsTracker·=·new·ConnectedClientsTracker();
136	········(this.mTetherMainSM·=·(StateMachine)new·Tethering$TetherMainSM(this,·"TetherMain",·this.mLooper,·mDeps)).start();	136	········(this.mTetherMasterSM·=·(StateMachine)new·Tethering$TetherMasterSM(this,·"TetherMaster",·this.mLooper,·mDeps)).start();
137	········final·Handler·handler·=·this.mTetherMainSM.getHandler();	137	········final·Handler·handler·=·this.mTetherMasterSM.getHandler();
138	········this.mHandler·=·handler;	138	········this.mHandler·=·handler;
139	········this.mOffloadController·=·this.mDeps.getOffloadController(handler,·this.mLog,·(OffloadController$Dependencies)new·Tethering$1(this));	139	········this.mOffloadController·=·this.mDeps.getOffloadController(handler,·this.mLog,·(OffloadController$Dependencies)new·Tethering$1(this));
140	········mDeps·=·this.mDeps;	140	········mDeps·=·this.mDeps;
141	········this.mUpstreamNetworkMonitor·=·mDeps.getUpstreamNetworkMonitor(this.mContext,·this.mTetherMainSM,·this.mLog,·5);	141	········this.mUpstreamNetworkMonitor·=·mDeps.getUpstreamNetworkMonitor(this.mContext,·this.mTetherMasterSM,·this.mLog,·5);
142	········this.mForwardedDownstreams·=·new·LinkedHashSet();	142	········this.mForwardedDownstreams·=·new·LinkedHashSet();
143	········final·IntentFilter·intentFilter·=·new·IntentFilter();	143	········final·IntentFilter·intentFilter·=·new·IntentFilter();
144	········intentFilter.addAction("android.telephony.action.CARRIER_CONFIG_CHANGED");	144	········intentFilter.addAction("android.telephony.action.CARRIER_CONFIG_CHANGED");
145	········mDeps·=·this.mDeps;	145	········mDeps·=·this.mDeps;
146	········(this.mEntitlementMgr·=·mDeps.getEntitlementManager(this.mContext,·this.mHandler,·this.mLog,·(Runnable)new·-$$Lambda$Tethering$kFbDg5fumH6uWvWOX-JoDKX9Zq4(this))).setOnUiEntitlementFailedListener((EntitlementManager$OnUiEntitlementFailedListener)new·-$$Lambda$Tethering$QFNaW1CjiNjZ1tucwWM4UmgI89c(this));	146	········(this.mEntitlementMgr·=·mDeps.getEntitlementManager(this.mContext,·this.mHandler,·this.mLog,·(Runnable)new·-$$Lambda$Tethering$kFbDg5fumH6uWvWOX-JoDKX9Zq4(this))).setOnUiEntitlementFailedListener((EntitlementManager$OnUiEntitlementFailedListener)new·-$$Lambda$Tethering$QFNaW1CjiNjZ1tucwWM4UmgI89c(this));
147	········this.mEntitlementMgr.setTetheringConfigurationFetcher((EntitlementManager$TetheringConfigurationFetcher)new·-$$Lambda$Tethering$8-Ib-Vl0fbKc9GA57Tv_pqRMDOs(this));	147	········this.mEntitlementMgr.setTetheringConfigurationFetcher((EntitlementManager$TetheringConfigurationFetcher)new·-$$Lambda$Tethering$8-Ib-Vl0fbKc9GA57Tv_pqRMDOs(this));
148	········this.mCarrierConfigChange·=·new·VersionedBroadcastListener("CarrierConfigChangeListener",·this.mContext,·this.mHandler,·intentFilter,·(Consumer)new·-$$Lambda$Tethering$bXlvpAMLdjY8zDVZz31dr37qjos(this));	148	········this.mCarrierConfigChange·=·new·VersionedBroadcastListener("CarrierConfigChangeListener",·this.mContext,·this.mHandler,·intentFilter,·(Consumer)new·-$$Lambda$Tethering$bXlvpAMLdjY8zDVZz31dr37qjos(this));
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	········mDeps·=·this.mDeps;	158	········mDeps·=·this.mDeps;
158	········this.mPrivateAddressCoordinator·=·mDeps.getPrivateAddressCoordinator(this.mContext,·this.mConfig);
159	········mDeps·=·this.mDeps;
160	········this.mBpfCoordinator·=·mDeps.getBpfCoordinator((BpfCoordinator$Dependencies)new·Tethering$2(this));	159	········this.mBpfCoordinator·=·mDeps.getBpfCoordinator((BpfCoordinator$Dependencies)new·Tethering$2(this));
161	········this.startStateMachineUpdaters();	160	········this.startStateMachineUpdaters();
162	····}	161	····}
163	····	162	····
164	····private·static·boolean·argsContain(final·String[]·array,·final·String·s)·{	163	····private·static·boolean·argsContain(final·String[]·array,·final·String·s)·{
165	········for·(int·length·=·array.length,·i·=·0;·i·<·length;·++i)·{	164	········for·(int·length·=·array.length,·i·=·0;·i·<·length;·++i)·{
166	············if·(s.equals(array[i]))·{	165	············if·(s.equals(array[i]))·{
Offset 349, 15 lines modified		Offset 348, 15 lines modified
349	····}	348	····}
350	····	349	····
351	····private·WifiManager·getWifiManager()·{	350	····private·WifiManager·getWifiManager()·{
352	········return·(WifiManager)this.mContext.getSystemService("wifi");	351	········return·(WifiManager)this.mContext.getSystemService("wifi");
353	····}	352	····}
354	····	353	····
355	····private·boolean·hasCallingPermission(final·String·s)·{	354	····private·boolean·hasCallingPermission(final·String·s)·{
356	········return·this.mContext.checkCalling~~OrSelf~~Permission(s)·==·0;	355	········return·this.mContext.checkCallingPermission(s)·==·0;
357	····}	356	····}
358	····	357	····
359	····private·int·ifaceNameToType(final·String·s)·{	358	····private·int·ifaceNameToType(final·String·s)·{
360	········final·TetheringConfiguration·mConfig·=·this.mConfig;	359	········final·TetheringConfiguration·mConfig·=·this.mConfig;
361	········if·(mConfig.isWifi(s))·{	360	········if·(mConfig.isWifi(s))·{
362	············return·0;	361	············return·0;
363	········}	362	········}
Offset 455, 45 lines modified		Offset 454, 45 lines modified
455	············int·n2·=·1;	454	············int·n2·=·1;
456	············array[n2]·=·value;	455	············array[n2]·=·value;
457	············final·Integer·value2·=·lastError;	456	············final·Integer·value2·=·lastError;
458	············final·int·n3·=·2;	457	············final·int·n3·=·2;
459	············array[n3]·=·value2;	458	············array[n3]·=·value2;
460	············((SharedLog)o).log(String.format("OBSERVED·iface=%s·state=%s·error=%s",·array));	459	············((SharedLog)o).log(String.format("OBSERVED·iface=%s·state=%s·error=%s",·array));
461	············if·(lastError·==·5)·{	460	············if·(lastError·==·5)·{
462	················this.mTetherMainSM.sendMessage(6,·(Object)ipServer);	461	················this.mTetherMasterSM.sendMessage(6,·(Object)ipServer);
463	············}	462	············}
464	············if·(lastState·!=·0·&&·lastState·!=·n2)·{	463	············if·(lastState·!=·0·&&·lastState·!=·n2)·{
465	················if·(lastState·!=·n3·&&·lastState·!=·n)·{	464	················if·(lastState·!=·n3·&&·lastState·!=·n)·{
466	····················final·String·tag·=·Tethering.TAG;	465	····················final·String·tag·=·Tethering.TAG;
467	····················final·StringBuilder·sb·=·new·StringBuilder();	466	····················final·StringBuilder·sb·=·new·StringBuilder();
468	····················sb.append("Unknown·interface·state:·");	467	····················sb.append("Unknown·interface·state:·");
469	····················sb.append(lastState);	468	····················sb.append(lastState);
470	····················Log.wtf(tag,·sb.toString());	469	····················Log.wtf(tag,·sb.toString());
471	····················return;	470	····················return;
472	················}	471	················}
473	············}	472	············}
474	············else·{	473	············else·{
475	················n2·=·n3;	474	················n2·=·n3;
476	············}	475	············}
477	············this.mTetherMainSM.sendMessage(n2,·lastState,·0,·(Object)ipServer);	476	············this.mTetherMasterSM.sendMessage(n2,·lastState,·0,·(Object)ipServer);
478	············this.sendTetherStateChangedBroadcast();	477	············this.sendTetherStateChangedBroadcast();
479	········}	478	········}
480	····}	479	····}
481	····	480	····
482	····private·void·notifyLinkPropertiesChanged(final·IpServer·ipServer,·final·LinkProperties·linkProperties)·{	481	····private·void·notifyLinkPropertiesChanged(final·IpServer·ipServer,·final·LinkProperties·linkProperties)·{
483	········final·String·interfaceName·=·ipServer.interfaceName();	482	········final·String·interfaceName·=·ipServer.interfaceName();
484	········Object·o·=·this.mPublicSync;	483	········Object·o·=·this.mPublicSync;
485	········synchronized·(o)·{	484	········synchronized·(o)·{
486	············final·Tethering$TetherState·tethering$TetherState·=·(Tethering$TetherState)this.mTetherStates.get((Object)interfaceName);	485	············final·Tethering$TetherState·tethering$TetherState·=·(Tethering$TetherState)this.mTetherStates.get((Object)interfaceName);
487	············if·(tethering$TetherState·!=·null·&&·tethering$TetherState.ipServer.equals(ipServer))·{	486	············if·(tethering$TetherState·!=·null·&&·tethering$TetherState.ipServer.equals(ipServer))·{
488	················final·int·lastState·=·tethering$TetherState.lastState;	487	················final·int·lastState·=·tethering$TetherState.lastState;
489	················//·monitorexit(o)	488	················//·monitorexit(o)
490	················o·=·this.mLog;	489	················o·=·this.mLog;
491	················((SharedLog)o).log(String.format("OBSERVED·LinkProperties·update·iface=%s·state=%s·lp=%s",·interfaceName,·IpServer.getStateString(lastState),·linkProperties));	490	················((SharedLog)o).log(String.format("OBSERVED·LinkProperties·update·iface=%s·state=%s·lp=%s",·interfaceName,·IpServer.getStateString(lastState),·linkProperties));
492	················this.mTetherMainSM.sendMessage(7,·lastState,·0,·(Object)linkProperties);	491	················this.mTetherMasterSM.sendMessage(7,·lastState,·0,·(Object)linkProperties);
493	················return;	492	················return;
494	············}	493	············}
495	············final·SharedLog·mLog·=·this.mLog;	494	············final·SharedLog·mLog·=·this.mLog;
496	············final·StringBuilder·sb·=·new·StringBuilder();	495	············final·StringBuilder·sb·=·new·StringBuilder();
497	············sb.append("got·notification·from·stale·iface·");	496	············sb.append("got·notification·from·stale·iface·");
... Open expanded diff ...


Offset 1, 8 lines modified		Offset 1, 8 lines modified
1	Zip·file·size:·~~500794~~·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, 47 lines modified		Offset 160, 47 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·····~~7577~~·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, 16 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·mEnableSelectAllPrefixRange;
33	····private·final·boolean·mEnableWifiP2pDedicatedIp;
34	····private·final·int·mOffloadPollInterval;	32	····private·final·int·mOffloadPollInterval;
35	····public·final·Collection·preferredUpstreamIfaceTypes;	33	····public·final·Collection·preferredUpstreamIfaceTypes;
36	····public·final·String[]·provisioningApp;	34	····public·final·String[]·provisioningApp;
37	····public·final·String·provisioningAppNoUi;	35	····public·final·String·provisioningAppNoUi;
38	····public·final·int·provisioningCheckPeriod;	36	····public·final·int·provisioningCheckPeriod;
39	····public·final·String·provisioningResponse;	37	····public·final·String·provisioningResponse;
40	····public·final·String[]·tetherableBluetoothRegexs;	38	····public·final·String[]·tetherableBluetoothRegexs;
Offset 68, 16 lines modified		Offset 66, 14 lines modified
68	········this.mEnableBpfOffload·=·this.getEnableBpfOffload(resources);	66	········this.mEnableBpfOffload·=·this.getEnableBpfOffload(resources);
69	········this.enableLegacyDhcpServer·=·this.getEnableLegacyDhcpServer(resources);	67	········this.enableLegacyDhcpServer·=·this.getEnableLegacyDhcpServer(resources);
70	········this.provisioningApp·=·getResourceStringArray(resources,·R$array.config_mobile_hotspot_provision_app);	68	········this.provisioningApp·=·getResourceStringArray(resources,·R$array.config_mobile_hotspot_provision_app);
71	········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);
72	········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);
73	········this.provisioningResponse·=·getResourceString(resources,·R$string.config_mobile_hotspot_provision_response);	71	········this.provisioningResponse·=·getResourceString(resources,·R$string.config_mobile_hotspot_provision_response);
74	········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);
75	········this.mEnableWifiP2pDedicatedIp·=·getResourceBoolean(resources,·R$bool.config_tether_enable_legacy_wifi_p2p_dedicated_ip,·false);
76	········this.mEnableSelectAllPrefixRange·=·this.getDeviceConfigBoolean("tether_enable_select_all_prefix_ranges",·true);
77	········forSubComponent.log(this.toString());	73	········forSubComponent.log(this.toString());
78	····}	74	····}
79	····	75	····
80	····private·static·void·appendIfNotPresent(final·ArrayList·list,·final·int·n)·{	76	····private·static·void·appendIfNotPresent(final·ArrayList·list,·final·int·n)·{
81	········if·(list.contains(n))·{	77	········if·(list.contains(n))·{
82	············return;	78	············return;
83	········}	79	········}
Offset 308, 18 lines modified		Offset 304, 14 lines modified
308	········dumpStringArray(printWriter,·"provisioningApp",·this.provisioningApp);	304	········dumpStringArray(printWriter,·"provisioningApp",·this.provisioningApp);
309	········printWriter.print("provisioningAppNoUi:·");	305	········printWriter.print("provisioningAppNoUi:·");
310	········printWriter.println(this.provisioningAppNoUi);	306	········printWriter.println(this.provisioningAppNoUi);
311	········printWriter.print("enableBpfOffload:·");	307	········printWriter.print("enableBpfOffload:·");


Offset 328, 15 lines modified		Offset 328, 15 lines modified
328	········}	328	········}
329	········this.stopDhcp();	329	········this.stopDhcp();
330	········return·true;	330	········return·true;
331	····}	331	····}
332	····	332	····
333	····private·boolean·configureIPv4(final·boolean·b)·{	333	····private·boolean·configureIPv4(final·boolean·b)·{
334	········if·(b)·{	334	········if·(b)·{
335	············this.mIpv4Address·=·this.requestIpv4Address(~~true~~);	335	············this.mIpv4Address·=·this.requestIpv4Address();
336	········}	336	········}
337	········final·LinkAddress·mIpv4Address·=·this.mIpv4Address;	337	········final·LinkAddress·mIpv4Address·=·this.mIpv4Address;
338	········if·(mIpv4Address·==·null)·{	338	········if·(mIpv4Address·==·null)·{
339	············this.mLog.e("No·available·ipv4·address");	339	············this.mLog.e("No·available·ipv4·address");
340	············return·false;	340	············return·false;
341	········}	341	········}
342	········final·int·mInterfaceType·=·this.mInterfaceType;	342	········final·int·mInterfaceType·=·this.mInterfaceType;
Offset 533, 15 lines modified		Offset 533, 15 lines modified
533	········}	533	········}
534	····}	534	····}
535	····	535	····
536	····private·void·handleNewPrefixRequest(final·IpPrefix·ipPrefix)·{	536	····private·void·handleNewPrefixRequest(final·IpPrefix·ipPrefix)·{
537	········if·(ipPrefix.contains(this.mIpv4Address.getAddress()))·{	537	········if·(ipPrefix.contains(this.mIpv4Address.getAddress()))·{
538	············if·(ipPrefix.getPrefixLength()·==·this.mIpv4Address.getPrefixLength())·{	538	············if·(ipPrefix.getPrefixLength()·==·this.mIpv4Address.getPrefixLength())·{
539	················final·LinkAddress·mIpv4Address·=·this.mIpv4Address;	539	················final·LinkAddress·mIpv4Address·=·this.mIpv4Address;
540	················final·LinkAddress·requestIpv4Address·=·this.requestIpv4Address(~~false~~);	540	················final·LinkAddress·requestIpv4Address·=·this.requestIpv4Address();
541	················if·((this.mIpv4Address·=·requestIpv4Address)·==·null)·{	541	················if·((this.mIpv4Address·=·requestIpv4Address)·==·null)·{
542	····················this.mLog.e("Fail·to·request·a·new·downstream·prefix");	542	····················this.mLog.e("Fail·to·request·a·new·downstream·prefix");
543	····················return;	543	····················return;
544	················}	544	················}
545	················final·Inet4Address·inet4Address·=·(Inet4Address)requestIpv4Address.getAddress();	545	················final·Inet4Address·inet4Address·=·(Inet4Address)requestIpv4Address.getAddress();
546	················if·(!this.mInterfaceCtrl.addAddress((InetAddress)inet4Address,·ipPrefix.getPrefixLength()))·{	546	················if·(!this.mInterfaceCtrl.addAddress((InetAddress)inet4Address,·ipPrefix.getPrefixLength()))·{
547	····················final·SharedLog·mLog·=·this.mLog;	547	····················final·SharedLog·mLog·=·this.mLog;
Offset 655, 23 lines modified		Offset 655, 23 lines modified
655	········}	655	········}
656	········final·Iterator<RouteInfo>·iterator·=·list.iterator();	656	········final·Iterator<RouteInfo>·iterator·=·list.iterator();
657	········while·(iterator.hasNext())·{	657	········while·(iterator.hasNext())·{
658	············this.mLinkProperties.removeRoute((RouteInfo)iterator.next());	658	············this.mLinkProperties.removeRoute((RouteInfo)iterator.next());
659	········}	659	········}
660	····}	660	····}


Offset 1, 13 lines modified		Offset 1, 13 lines modified

1	package·android.net.dhcp;	1	package·android.net.dhcp;

2	public·abstract·class·DhcpServerCallbacks·extends·IDhcpServerCallbacks$Stub	2	public·abstract·class·DhcpServerCallbacks·extends·IDhcpServerCallbacks$Stub
3	{	3	{
4	····public·String·getInterfaceHash()·{	4	····public·String·getInterfaceHash()·{
5	········return·"f6e2~~137b5~~0~~339~~0~~2774f78726d429399db3b18cab~~";	5	········return·"02cd6fd07d5c04eca0c35a350f7b0be576242883";
6	····}	6	····}
7	····	7	····
8	····public·int·getInterfaceVersion()·{	8	····public·int·getInterfaceVersion()·{
9	········return·8;	9	········return·7;
10	····}	10	····}
11	}	11	}


Offset 55, 18 lines modified		Offset 55, 14 lines modified
55	········return·new·OffloadController(handler,·this.getOffloadHardwareInterface(handler,·sharedLog),·this.getContext().getContentResolver(),·(NetworkStatsManager)this.getContext().getSystemService("netstats"),·sharedLog,·offloadController$Dependencies);	55	········return·new·OffloadController(handler,·this.getOffloadHardwareInterface(handler,·sharedLog),·this.getContext().getContentResolver(),·(NetworkStatsManager)this.getContext().getSystemService("netstats"),·sharedLog,·offloadController$Dependencies);
56	····}	56	····}
57	····	57	····
58	····public·OffloadHardwareInterface·getOffloadHardwareInterface(final·Handler·handler,·final·SharedLog·sharedLog)·{	58	····public·OffloadHardwareInterface·getOffloadHardwareInterface(final·Handler·handler,·final·SharedLog·sharedLog)·{
59	········return·new·OffloadHardwareInterface(handler,·sharedLog);	59	········return·new·OffloadHardwareInterface(handler,·sharedLog);
60	····}	60	····}
61	····	61	····
62	····public·PrivateAddressCoordinator·getPrivateAddressCoordinator(final·Context·context,·final·TetheringConfiguration·tetheringConfiguration)·{
63	········return·new·PrivateAddressCoordinator(context,·tetheringConfiguration);
64	····}
65	····
66	····public·abstract·Looper·getTetheringLooper();	62	····public·abstract·Looper·getTetheringLooper();
67	····	63	····
68	····public·UpstreamNetworkMonitor·getUpstreamNetworkMonitor(final·Context·context,·final·StateMachine·stateMachine,·final·SharedLog·sharedLog,·final·int·n)·{	64	····public·UpstreamNetworkMonitor·getUpstreamNetworkMonitor(final·Context·context,·final·StateMachine·stateMachine,·final·SharedLog·sharedLog,·final·int·n)·{
69	········return·new·UpstreamNetworkMonitor(context,·stateMachine,·sharedLog,·n);	65	········return·new·UpstreamNetworkMonitor(context,·stateMachine,·sharedLog,·n);
70	····}	66	····}
71	····	67	····
72	····public·boolean·isTetheringDenied()·{	68	····public·boolean·isTetheringDenied()·{


Offset 23, 24 lines modified		Offset 23, 8 lines modified
23	············}	23	············}
24	············catch·(UnknownHostException·ex)·{	24	············catch·(UnknownHostException·ex)·{
25	················throw·new·AssertionError();	25	················throw·new·AssertionError();
26	············}	26	············}
27	········}	27	········}
28	········catch·(UnknownHostException·ex2)·{}	28	········catch·(UnknownHostException·ex2)·{}
29	····}	29	····}
30	····
31	····public·static·int·prefixLengthToV4NetmaskIntHTH(int·n)·{
32	········if·(n·>=·0)·{
33	············final·int·n2·=·32;
34	············if·(n·<=·n2)·{
35	················if·(n·==·0)·{
36	····················n·=·0;
37	················}
38	················else·{
39	····················n·=·-1·<<·n2·-·n;
40	················}
41	················return·n;
42	············}
43	········}
44	········throw·new·IllegalArgumentException("Invalid·prefix·length·(0·<=·prefix·<=·32)");
45	····}
46	}	30	}


Offset 27, 19 lines modified		Offset 27, 19 lines modified
27	····final·/·synthetic·/·IpServer·this$0;	27	····final·/·synthetic·/·IpServer·this$0;
28	····	28	····
29	····private·IpServer$DhcpEventCallback(final·IpServer·this$0)·{	29	····private·IpServer$DhcpEventCallback(final·IpServer·this$0)·{
30	········this.this$0·=·this$0;	30	········this.this$0·=·this$0;
31	····}	31	····}
32	····	32	····
33	····public·String·getInterfaceHash()·{	33	····public·String·getInterfaceHash()·{
34	········return·"f6e2~~137b5~~0~~339~~0~~2774f78726d429399db3b18cab~~";	34	········return·"02cd6fd07d5c04eca0c35a350f7b0be576242883";
35	····}	35	····}
36	····	36	····
37	····public·int·getInterfaceVersion()·{	37	····public·int·getInterfaceVersion()·{
38	········return·8;	38	········return·7;
39	····}	39	····}
40	····	40	····
41	····public·void·onLeasesChanged(final·List·list)·{	41	····public·void·onLeasesChanged(final·List·list)·{
42	········final·ArrayList<String>·list2·=·new·ArrayList<String>();	42	········final·ArrayList<String>·list2·=·new·ArrayList<String>();
43	········for·(Object·hostname·:·list)·{	43	········for·(Object·hostname·:·list)·{
44	············final·Inet4Address·intToInet4AddressHTH·=·Inet4AddressUtils.intToInet4AddressHTH(((DhcpLeaseParcelable)hostname).netAddr);	44	············final·Inet4Address·intToInet4AddressHTH·=·Inet4AddressUtils.intToInet4AddressHTH(((DhcpLeaseParcelable)hostname).netAddr);
45	············final·int·prefixLength·=·((DhcpLeaseParcelable)hostname).prefixLength;	45	············final·int·prefixLength·=·((DhcpLeaseParcelable)hostname).prefixLength;


Offset 11, 18 lines modified		Offset 11, 18 lines modified
11	····private·IpServer$OnHandlerStatusCallback(final·IpServer·this$0)·{	11	····private·IpServer$OnHandlerStatusCallback(final·IpServer·this$0)·{
12	········this.this$0·=·this$0;	12	········this.this$0·=·this$0;
13	····}	13	····}
14	····	14	····
15	····public·abstract·void·callback(final·int·p0);	15	····public·abstract·void·callback(final·int·p0);
16	····	16	····
17	····public·String·getInterfaceHash()·{	17	····public·String·getInterfaceHash()·{
18	········return·"f6e2~~137b5~~0~~339~~0~~2774f78726d429399db3b18cab~~";	18	········return·"02cd6fd07d5c04eca0c35a350f7b0be576242883";
19	····}	19	····}
20	····	20	····
21	····public·int·getInterfaceVersion()·{	21	····public·int·getInterfaceVersion()·{
22	········return·8;	22	········return·7;
23	····}	23	····}
24	····	24	····
25	····public·void·onStatusAvailable(final·int·n)·{	25	····public·void·onStatusAvailable(final·int·n)·{
26	········((StateMachine)this.this$0).getHandler().post((Runnable)new·-$$Lambda$IpServer$OnHandlerStatusCallback$czoKoFz-ZQJY8J5O14qT9czTIoo(this,·n));	26	········((StateMachine)this.this$0).getHandler().post((Runnable)new·-$$Lambda$IpServer$OnHandlerStatusCallback$czoKoFz-ZQJY8J5O14qT9czTIoo(this,·n));
27	····}	27	····}
28	}	28	}


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 7, 19 lines modified		Offset 7, 19 lines modified
7	import·android.net.LinkAddress;	7	import·android.net.LinkAddress;
8	import·android.net.IpPrefix;	8	import·android.net.IpPrefix;
9	import·java.util.Collection;	9	import·java.util.Collection;
10	import·android.net.ip.IpServer;	10	import·android.net.ip.IpServer;
11	import·android.net.util.PrefixUtils;	11	import·android.net.util.PrefixUtils;
12	import·java.util.Set;	12	import·java.util.Set;

13	class·Tethering$TetherMainSM$OffloadWrapper	13	class·Tethering$TetherMasterSM$OffloadWrapper
14	{	14	{
15	····final·/·synthetic·/·Tethering$TetherMainSM·this$1;	15	····final·/·synthetic·/·Tethering$TetherMasterSM·this$1;
16	····	16	····
17	····Tethering$TetherMainSM$OffloadWrapper(final·Tethering$TetherMainSM·this$1)·{	17	····Tethering$TetherMasterSM$OffloadWrapper(final·Tethering$TetherMasterSM·this$1)·{
18	········this.this$1·=·this$1;	18	········this.this$1·=·this$1;
19	····}	19	····}
20	····	20	····
21	····private·void·updateOffloadStatus(int·access$5000)·{	21	····private·void·updateOffloadStatus(int·access$5000)·{
22	········if·(access$5000·==·Tethering.access$5000(this.this$1.this$0))·{	22	········if·(access$5000·==·Tethering.access$5000(this.this$1.this$0))·{
23	············return;	23	············return;
24	········}	24	········}
Offset 37, 15 lines modified		Offset 37, 15 lines modified
37	····public·void·sendOffloadExemptPrefixes()·{	37	····public·void·sendOffloadExemptPrefixes()·{
38	········this.sendOffloadExemptPrefixes(Tethering.access$3600(this.this$1.this$0).getLocalPrefixes());	38	········this.sendOffloadExemptPrefixes(Tethering.access$3600(this.this$1.this$0).getLocalPrefixes());
39	····}	39	····}
40	····	40	····
41	····public·void·sendOffloadExemptPrefixes(final·Set·localPrefixes)·{	41	····public·void·sendOffloadExemptPrefixes(final·Set·localPrefixes)·{
42	········PrefixUtils.addNonForwardablePrefixes(localPrefixes);	42	········PrefixUtils.addNonForwardablePrefixes(localPrefixes);
43	········localPrefixes.add(PrefixUtils.DEFAULT_WIFI_P2P_PREFIX);	43	········localPrefixes.add(PrefixUtils.DEFAULT_WIFI_P2P_PREFIX);
44	········for·(final·IpServer·ipServer·:·Tethering$TetherMainSM.access$4700(this.this$1))·{	44	········for·(final·IpServer·ipServer·:·Tethering$TetherMasterSM.access$4700(this.this$1))·{
45	············final·LinkProperties·linkProperties·=·ipServer.linkProperties();	45	············final·LinkProperties·linkProperties·=·ipServer.linkProperties();
46	············final·int·servingMode·=·ipServer.servingMode();	46	············final·int·servingMode·=·ipServer.servingMode();
47	············if·(servingMode·!=·0·&&·servingMode·!=·1)·{	47	············if·(servingMode·!=·0·&&·servingMode·!=·1)·{
48	················if·(servingMode·!=·2)·{	48	················if·(servingMode·!=·2)·{
49	····················if·(servingMode·!=·3)·{	49	····················if·(servingMode·!=·3)·{
50	························continue;	50	························continue;
51	····················}	51	····················}


Offset 19, 60 lines modified		Offset 19, 64 lines modified
19	import·android.util.Log;	19	import·android.util.Log;
20	import·android.net.ip.IpServer;	20	import·android.net.ip.IpServer;
21	import·android.os.Looper;	21	import·android.os.Looper;
22	import·java.util.ArrayList;	22	import·java.util.ArrayList;
23	import·com.android.networkstack.tethering.util.State;	23	import·com.android.networkstack.tethering.util.State;
24	import·com.android.networkstack.tethering.util.StateMachine;	24	import·com.android.networkstack.tethering.util.StateMachine;

25	class·Tethering$TetherMainSM·extends·StateMachine	25	class·Tethering$TetherMasterSM·extends·StateMachine
26	{	26	{
27	····static·final·int·CMD_CLEAR_ERROR·=·6;	27	····static·final·int·CMD_CLEAR_ERROR·=·6;
28	····static·final·int·CMD_RETRY_UPSTREAM·=·4;	28	····static·final·int·CMD_RETRY_UPSTREAM·=·4;
29	····static·final·int·CMD_UPSTREAM_CHANGED·=·3;	29	····static·final·int·CMD_UPSTREAM_CHANGED·=·3;
30	····static·final·int·EVENT_IFACE_SERVING_STATE_ACTIVE·=·1;	30	····static·final·int·EVENT_IFACE_SERVING_STATE_ACTIVE·=·1;
31	····static·final·int·EVENT_IFACE_SERVING_STATE_INACTIVE·=·2;	31	····static·final·int·EVENT_IFACE_SERVING_STATE_INACTIVE·=·2;
32	····static·final·int·EVENT_IFACE_UPDATE_LINKPROPERTIES·=·7;	32	····static·final·int·EVENT_IFACE_UPDATE_LINKPROPERTIES·=·7;
33	····static·final·int·EVENT_UPSTREAM_CALLBACK·=·5;	33	····static·final·int·EVENT_UPSTREAM_CALLBACK·=·5;
34	····static·final·int·EVENT_UPSTREAM_PERMISSION_CHANGED·=·8;	34	····static·final·int·EVENT_UPSTREAM_PERMISSION_CHANGED·=·8;
35	····private·final·IPv6TetheringCoordinator·mIPv6TetheringCoordinator;	35	····private·final·IPv6TetheringCoordinator·mIPv6TetheringCoordinator;
36	····private·final·State·mInitialState;	36	····private·final·State·mInitialState;
37	····private·final·ArrayList·mNotifyList;	37	····private·final·ArrayList·mNotifyList;
38	····private·final·Tethering$TetherMainSM$OffloadWrapper·mOffload;	38	····private·final·Tethering$TetherMasterSM$OffloadWrapper·mOffload;
39	····private·final·State·mSetDnsForwardersErrorState;	39	····private·final·State·mSetDnsForwardersErrorState;
40	····private·final·State·mSetIpForwardingDisabledErrorState;	40	····private·final·State·mSetIpForwardingDisabledErrorState;
41	····private·final·State·mSetIpForwardingEnabledErrorState;	41	····private·final·State·mSetIpForwardingEnabledErrorState;
42	····private·final·State·mStartTetheringErrorState;	42	····private·final·State·mStartTetheringErrorState;
43	····private·final·State·mStopTetheringErrorState;	43	····private·final·State·mStopTetheringErrorState;
44	····private·final·State·mTetherModeAliveState;	44	····private·final·State·mTetherModeAliveState;
45	····final·/·synthetic·/·Tethering·this$0;	45	····final·/·synthetic·/·Tethering·this$0;
46	····	46	····
47	····Tethering$TetherMainSM(final·Tethering·this$0,·final·String·s,·final·Looper·looper,·final·TetheringDependencies·tetheringDependencies)·{	47	····Tethering$TetherMasterSM(final·Tethering·this$0,·final·String·s,·final·Looper·looper,·final·TetheringDependencies·tetheringDependencies)·{
48	········this.this$0·=·this$0;	48	········this.this$0·=·this$0;
49	········super(s,·looper);	49	········super(s,·looper);
50	········this.mInitialState·=·(State)new·Tethering$TetherMainSM$InitialState(this);	50	········this.mInitialState·=·(State)new·Tethering$TetherMasterSM$InitialState(this);
51	········this.mTetherModeAliveState·=·(State)new·Tethering$TetherMainSM$TetherModeAliveState(this);	51	········this.mTetherModeAliveState·=·(State)new·Tethering$TetherMasterSM$TetherModeAliveState(this);
52	········this.mSetIpForwardingEnabledErrorState·=·(State)new·Tethering$TetherMainSM$SetIpForwardingEnabledErrorState(this);	52	········this.mSetIpForwardingEnabledErrorState·=·(State)new·Tethering$TetherMasterSM$SetIpForwardingEnabledErrorState(this);
53	········this.mSetIpForwardingDisabledErrorState·=·(State)new·Tethering$TetherMainSM$SetIpForwardingDisabledErrorState(this);	53	········this.mSetIpForwardingDisabledErrorState·=·(State)new·Tethering$TetherMasterSM$SetIpForwardingDisabledErrorState(this);
54	········this.mStartTetheringErrorState·=·(State)new·Tethering$TetherMainSM$StartTetheringErrorState(this);	54	········this.mStartTetheringErrorState·=·(State)new·Tethering$TetherMasterSM$StartTetheringErrorState(this);
55	········this.mStopTetheringErrorState·=·(State)new·Tethering$TetherMainSM$StopTetheringErrorState(this);	55	········this.mStopTetheringErrorState·=·(State)new·Tethering$TetherMasterSM$StopTetheringErrorState(this);
56	········this.mSetDnsForwardersErrorState·=·(State)new·Tethering$TetherMainSM$SetDnsForwardersErrorState(this);	56	········this.mSetDnsForwardersErrorState·=·(State)new·Tethering$TetherMasterSM$SetDnsForwardersErrorState(this);
57	········this.addState(this.mInitialState);	57	········this.addState(this.mInitialState);
58	········this.addState(this.mTetherModeAliveState);	58	········this.addState(this.mTetherModeAliveState);
59	········this.addState(this.mSetIpForwardingEnabledErrorState);	59	········this.addState(this.mSetIpForwardingEnabledErrorState);
60	········this.addState(this.mSetIpForwardingDisabledErrorState);	60	········this.addState(this.mSetIpForwardingDisabledErrorState);
61	········this.addState(this.mStartTetheringErrorState);	61	········this.addState(this.mStartTetheringErrorState);
62	········this.addState(this.mStopTetheringErrorState);	62	········this.addState(this.mStopTetheringErrorState);
63	········this.addState(this.mSetDnsForwardersErrorState);	63	········this.addState(this.mSetDnsForwardersErrorState);
64	········final·ArrayList·mNotifyList·=·new·ArrayList();	64	········final·ArrayList·mNotifyList·=·new·ArrayList();
65	········this.mNotifyList·=·mNotifyList;	65	········this.mNotifyList·=·mNotifyList;
66	········this.mIPv6TetheringCoordinator·=·tetheringDependencies.getIPv6TetheringCoordinator(mNotifyList,·Tethering.access$600(this$0));	66	········this.mIPv6TetheringCoordinator·=·tetheringDependencies.getIPv6TetheringCoordinator(mNotifyList,·Tethering.access$600(this$0));
67	········this.mOffload·=·new·Tethering$TetherMainSM$OffloadWrapper(this);	67	········this.mOffload·=·new·Tethering$TetherMasterSM$OffloadWrapper(this);
68	········this.setInitialState(this.mInitialState);	68	········this.setInitialState(this.mInitialState);
69	····}	69	····}
70	····	70	····
		71	····private·void·addUpstreamPrefixes(final·UpstreamNetworkState·upstreamNetworkState)·{
		72	········Tethering.access$4300(this.this$0).updateUpstreamPrefix(upstreamNetworkState.network,·upstreamNetworkState.linkProperties);
		73	····}
		74	····
71	····private·void·handleInterfaceServingStateActive(int·n,·final·IpServer·ipServer)·{	75	····private·void·handleInterfaceServingStateActive(int·n,·final·IpServer·ipServer)·{
72	········if·(this.mNotifyList.indexOf(ipServer)·<·0)·{	76	········if·(this.mNotifyList.indexOf(ipServer)·<·0)·{
73	············this.mNotifyList.add(ipServer);	77	············this.mNotifyList.add(ipServer);
74	············this.mIPv6TetheringCoordinator.addActiveDownstream(ipServer,·n);	78	············this.mIPv6TetheringCoordinator.addActiveDownstream(ipServer,·n);
75	········}	79	········}
76	········final·int·n2·=·2;	80	········final·int·n2·=·2;
77	········if·(n·==·n2)·{	81	········if·(n·==·n2)·{
Offset 116, 14 lines modified		Offset 120, 18 lines modified
116	············}	120	············}
117	············else·{	121	············else·{
118	················Tethering.access$4200(this.this$0).updateInterfaceIpState(ipServer.interfaceName(),·-1);	122	················Tethering.access$4200(this.this$0).updateInterfaceIpState(ipServer.interfaceName(),·-1);
119	············}	123	············}
120	········}	124	········}
121	····}	125	····}
122	····	126	····
		127	····private·void·removeUpstreamPrefixes(final·UpstreamNetworkState·upstreamNetworkState)·{
		128	········Tethering.access$4300(this.this$0).removeUpstreamPrefix(upstreamNetworkState.network);
		129	····}
		130	····
123	····protected·void·chooseUpstreamType(final·boolean·b)·{	131	····protected·void·chooseUpstreamType(final·boolean·b)·{
124	········Tethering.access$3500(this.this$0);	132	········Tethering.access$3500(this.this$0);
125	········final·TetheringConfiguration·access$000·=·Tethering.access$000(this.this$0);	133	········final·TetheringConfiguration·access$000·=·Tethering.access$000(this.this$0);
126	········UpstreamNetworkState·upstreamNetwork;	134	········UpstreamNetworkState·upstreamNetwork;
127	········if·(access$000.chooseUpstreamAutomatically)·{	135	········if·(access$000.chooseUpstreamAutomatically)·{
128	············upstreamNetwork·=·Tethering.access$3600(this.this$0).getCurrentPreferredUpstream();	136	············upstreamNetwork·=·Tethering.access$3600(this.this$0).getCurrentPreferredUpstream();
129	········}	137	········}
Offset 164, 19 lines modified		Offset 172, 19 lines modified
164	············return;	172	············return;
165	········}	173	········}
166	········final·UpstreamNetworkState·upstreamNetworkState·=·(UpstreamNetworkState)o;	174	········final·UpstreamNetworkState·upstreamNetworkState·=·(UpstreamNetworkState)o;
167	········final·int·n·=·3;	175	········final·int·n·=·3;
168	········final·int·n2·=·2;	176	········final·int·n2·=·2;
169	········if·(equals·!=·n2)·{	177	········if·(equals·!=·n2)·{
170	············if·(equals·==·n)·{	178	············if·(equals·==·n)·{
171	················~~Tethering.access$4300(this.~~this~~$0)~~.removeUpstreamPrefix(upstreamNetworkStat~~e.n~~e~~twork~~);	179	················this.removeUpstreamPrefixes(upstreamNetworkState);
172	············}	180	············}
173	········}	181	········}
174	········else·{	182	········else·{
175	············~~Tethering.access$4300(this.~~this~~$0)~~.~~upd~~ateUpstreamPrefix(upstreamNetworkState);	183	············this.addUpstreamPrefixes(upstreamNetworkState);
176	········}	184	········}
177	········if·(upstreamNetworkState·!=·null·&&·Tethering.access$3900(this.this$0,·upstreamNetworkState))·{	185	········if·(upstreamNetworkState·!=·null·&&·Tethering.access$3900(this.this$0,·upstreamNetworkState))·{
178	············if·(equals·!=·1)·{	186	············if·(equals·!=·1)·{
179	················if·(equals·!=·n2)·{	187	················if·(equals·!=·n2)·{
180	····················if·(equals·!=·n)·{	188	····················if·(equals·!=·n)·{
181	························final·SharedLog·access$600·=·Tethering.access$600(this.this$0);	189	························final·SharedLog·access$600·=·Tethering.access$600(this.this$0);
182	························o·=·new·StringBuilder();	190	························o·=·new·StringBuilder();
Offset 299, 29 lines modified		Offset 307, 29 lines modified
299	············this.handleNewUpstreamNetworkState(upstreamNetworkState);	307	············this.handleNewUpstreamNetworkState(upstreamNetworkState);
300	········}	308	········}
301	········else·if·(Tethering.access$4000(this.this$0)·==·null)·{	309	········else·if·(Tethering.access$4000(this.this$0)·==·null)·{
302	············this.handleNewUpstreamNetworkState(null);	310	············this.handleNewUpstreamNetworkState(null);
303	········}	311	········}
304	····}	312	····}
305	····	313	····
306	····protected·boolean·turnOffMainTetherSettings()·{	314	····protected·boolean·turnOffMasterTetherSettings()·{
307	········try·{	315	········try·{
308	············final·Tethering·this$0·=·this.this$0;	316	············final·Tethering·this$0·=·this.this$0;
309	············try·{	317	············try·{
310	················final·INetd·access$400·=·Tethering.access$400(this$0);	318	················final·INetd·access$400·=·Tethering.access$400(this$0);
311	················try·{	319	················try·{
312	····················access$400.tetherStop();	320	····················access$400.tetherStop();
313	····················try·{	321	····················try·{
314	························final·Tethering·this$2·=·this.this$0;	322	························final·Tethering·this$2·=·this.this$0;
315	························try·{	323	························try·{
316	····························final·INetd·access$401·=·Tethering.access$400(this$2);	324	····························final·INetd·access$401·=·Tethering.access$400(this$2);
317	····························try·{	325	····························try·{
318	································access$401.ipfwdDisableForwarding(Tethering.access$3400());	326	································access$401.ipfwdDisableForwarding(Tethering.access$3400());
319	································this.transitionTo((IState)this.mInitialState);	327	································this.transitionTo((IState)this.mInitialState);
320	································Tethering.access$600(this.this$0).log("SET·main·tether·settings:·OFF");	328	································Tethering.access$600(this.this$0).log("SET·master·tether·settings:·OFF");
321	································return·true;	329	································return·true;
... Open expanded diff ...


Offset 4, 42 lines modified		Offset 4, 42 lines modified
4	import·com.android.networkstack.tethering.util.StateMachine;	4	import·com.android.networkstack.tethering.util.StateMachine;
5	import·com.android.networkstack.tethering.util.IState;	5	import·com.android.networkstack.tethering.util.IState;
6	import·android.os.Message;	6	import·android.os.Message;
7	import·java.util.Iterator;	7	import·java.util.Iterator;
8	import·android.net.ip.IpServer;	8	import·android.net.ip.IpServer;
9	import·com.android.networkstack.tethering.util.State;	9	import·com.android.networkstack.tethering.util.State;

10	class·Tethering$TetherMainSM$ErrorState·extends·State	10	class·Tethering$TetherMasterSM$ErrorState·extends·State
11	{	11	{
12	····private·int·mErrorNotification;	12	····private·int·mErrorNotification;
13	····final·/·synthetic·/·Tethering$TetherMainSM·this$1;	13	····final·/·synthetic·/·Tethering$TetherMasterSM·this$1;
14	····	14	····
15	····Tethering$TetherMainSM$ErrorState(final·Tethering$TetherMainSM·this$1)·{	15	····Tethering$TetherMasterSM$ErrorState(final·Tethering$TetherMasterSM·this$1)·{
16	········this.this$1·=·this$1;	16	········this.this$1·=·this$1;
17	····}	17	····}
18	····	18	····
19	····void·notify(final·int·mErrorNotification)·{	19	····void·notify(final·int·mErrorNotification)·{
20	········this.mErrorNotification·=·mErrorNotification;	20	········this.mErrorNotification·=·mErrorNotification;
21	········final·Iterator<IpServer>·iterator·=·Tethering$TetherMainSM.access$4700(this.this$1).iterator();	21	········final·Iterator<IpServer>·iterator·=·Tethering$TetherMasterSM.access$4700(this.this$1).iterator();
22	········while·(iterator.hasNext())·{	22	········while·(iterator.hasNext())·{
23	············((StateMachine)iterator.next()).sendMessage(mErrorNotification);	23	············((StateMachine)iterator.next()).sendMessage(mErrorNotification);
24	········}	24	········}
25	····}	25	····}
26	····	26	····
27	····public·boolean·processMessage(final·Message·message)·{	27	····public·boolean·processMessage(final·Message·message)·{
28	········final·int·what·=·message.what;	28	········final·int·what·=·message.what;
29	········boolean·b·=·false;	29	········boolean·b·=·false;
30	········final·boolean·b2·=·true;	30	········final·boolean·b2·=·true;
31	········if·(what·!=·(b2·?·1·:·0))·{	31	········if·(what·!=·(b2·?·1·:·0))·{
32	············if·(what·!=·6)·{	32	············if·(what·!=·6)·{
33	················return·b;	33	················return·b;
34	············}	34	············}
35	············this.mErrorNotification·=·0;	35	············this.mErrorNotification·=·0;
36	············final·Tethering$TetherMainSM·this$1·=·this.this$1;	36	············final·Tethering$TetherMasterSM·this$1·=·this.this$1;
37	············((StateMachine)this$1).transitionTo((IState)Tethering$TetherMainSM.access$4800(this$1));	37	············((StateMachine)this$1).transitionTo((IState)Tethering$TetherMasterSM.access$4800(this$1));
38	········}	38	········}
39	········else·{	39	········else·{
40	············((StateMachine)message.obj).sendMessage(this.mErrorNotification);	40	············((StateMachine)message.obj).sendMessage(this.mErrorNotification);
41	········}	41	········}
42	········b·=·b2;	42	········b·=·b2;
43	········return·b;	43	········return·b;
44	····}	44	····}


Offset 3, 37 lines modified		Offset 3, 37 lines modified

3	import·com.android.networkstack.tethering.util.StateMachine;	3	import·com.android.networkstack.tethering.util.StateMachine;
4	import·com.android.networkstack.tethering.util.IState;	4	import·com.android.networkstack.tethering.util.IState;
5	import·android.net.ip.IpServer;	5	import·android.net.ip.IpServer;
6	import·android.os.Message;	6	import·android.os.Message;
7	import·com.android.networkstack.tethering.util.State;	7	import·com.android.networkstack.tethering.util.State;

8	class·Tethering$TetherMainSM$InitialState·extends·State	8	class·Tethering$TetherMasterSM$InitialState·extends·State
9	{	9	{
10	····final·/·synthetic·/·Tethering$TetherMainSM·this$1;	10	····final·/·synthetic·/·Tethering$TetherMasterSM·this$1;
11	····	11	····
12	····Tethering$TetherMainSM$InitialState(final·Tethering$TetherMainSM·this$1)·{	12	····Tethering$TetherMasterSM$InitialState(final·Tethering$TetherMasterSM·this$1)·{
13	········this.this$1·=·this$1;	13	········this.this$1·=·this$1;
14	····}	14	····}
15	····	15	····
16	····public·boolean·processMessage(final·Message·message)·{	16	····public·boolean·processMessage(final·Message·message)·{
17	········Tethering.access$3000(this.this$1.this$0,·(State)this,·message.what);	17	········Tethering.access$3000(this.this$1.this$0,·(State)this,·message.what);
18	········final·int·what·=·message.what;	18	········final·int·what·=·message.what;
19	········final·boolean·b·=·true;	19	········final·boolean·b·=·true;
20	········if·(what·!=·(b·?·1·:·0))·{	20	········if·(what·!=·(b·?·1·:·0))·{
21	············if·(what·!=·2)·{	21	············if·(what·!=·2)·{
22	················if·(what·!=·7)·{	22	················if·(what·!=·7)·{
23	····················return·false;	23	····················return·false;
24	················}	24	················}
25	············}	25	············}
26	············else·{	26	············else·{
27	················Tethering$TetherMainSM.access$3300(this.this$1,·(IpServer)message.obj);	27	················Tethering$TetherMasterSM.access$3300(this.this$1,·(IpServer)message.obj);
28	············}	28	············}
29	········}	29	········}
30	········else·{	30	········else·{
31	············Tethering$TetherMainSM.access$3100(this.this$1,·message.arg1,·(IpServer)message.obj);	31	············Tethering$TetherMasterSM.access$3100(this.this$1,·message.arg1,·(IpServer)message.obj);
32	············final·Tethering$TetherMainSM·this$1·=·this.this$1;	32	············final·Tethering$TetherMasterSM·this$1·=·this.this$1;
33	············((StateMachine)this$1).transitionTo((IState)Tethering$TetherMainSM.access$3200(this$1));	33	············((StateMachine)this$1).transitionTo((IState)Tethering$TetherMasterSM.access$3200(this$1));
34	········}	34	········}
35	········return·b;	35	········return·b;
36	····}	36	····}
37	}	37	}


Offset 1, 16 lines modified		Offset 1, 16 lines modified

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

2	import·android.util.Log;	2	import·android.util.Log;

3	class·Tethering$TetherMainSM$SetIpForwardingDisabledErrorState·extends·Tethering$TetherMainSM$ErrorState	3	class·Tethering$TetherMasterSM$SetIpForwardingEnabledErrorState·extends·Tethering$TetherMasterSM$ErrorState
4	{	4	{
5	····Tethering$TetherMainSM$SetIpForwardingDisabledErrorState(final·Tethering$TetherMainSM·tethering$TetherMainSM)·{	5	····Tethering$TetherMasterSM$SetIpForwardingEnabledErrorState(final·Tethering$TetherMasterSM·tethering$TetherMasterSM)·{
6	········super(tethering$TetherMainSM);	6	········super(tethering$TetherMasterSM);
7	····}	7	····}
8	····	8	····
9	····public·void·enter()·{	9	····public·void·enter()·{
10	········Log.e(Tethering.access$3400(),·"Error·in·setIpForwardingDisabled");	10	········Log.e(Tethering.access$3400(),·"Error·in·setIpForwardingEnabled");
11	········this.notify(105);	11	········this.notify(104);
12	····}	12	····}
13	}	13	}


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

3	import·android.net.INetd;	3	import·android.net.INetd;
4	import·android.os.ServiceSpecificException;	4	import·android.os.ServiceSpecificException;
5	import·android.os.RemoteException;	5	import·android.os.RemoteException;
6	import·android.util.Log;	6	import·android.util.Log;

7	class·Tethering$TetherMainSM$StopTetheringErrorState·extends·Tethering$TetherMainSM$ErrorState	7	class·Tethering$TetherMasterSM$StartTetheringErrorState·extends·Tethering$TetherMasterSM$ErrorState
8	{	8	{
9	····final·/·synthetic·/·Tethering$TetherMainSM·this$1;	9	····final·/·synthetic·/·Tethering$TetherMasterSM·this$1;
10	····	10	····
11	····Tethering$TetherMainSM$StopTetheringErrorState(final·Tethering$TetherMainSM·this$1)·{	11	····Tethering$TetherMasterSM$StartTetheringErrorState(final·Tethering$TetherMasterSM·this$1)·{
12	········this.this$1·=·this$1;	12	········this.this$1·=·this$1;
13	········super(this$1);	13	········super(this$1);
14	····}	14	····}
15	····	15	····
16	····public·void·enter()·{	16	····public·void·enter()·{
17	········Log.e(Tethering.access$3400(),·"Error·in·stopTethering");	17	········Log.e(Tethering.access$3400(),·"Error·in·startTethering");
18	········this.notify(107);	18	········this.notify(106);
19	········try·{	19	········try·{
20	············final·Tethering$TetherMainSM·this$1·=·this.this$1;	20	············final·Tethering$TetherMasterSM·this$1·=·this.this$1;
21	············try·{	21	············try·{
22	················final·Tethering·this$2·=·this$1.this$0;	22	················final·Tethering·this$2·=·this$1.this$0;
23	················try·{	23	················try·{
24	····················final·INetd·access$400·=·Tethering.access$400(this$2);	24	····················final·INetd·access$400·=·Tethering.access$400(this$2);
25	····················try·{	25	····················try·{
26	························access$400.ipfwdDisableForwarding(Tethering.access$3400());	26	························access$400.ipfwdDisableForwarding(Tethering.access$3400());
27	····················}	27	····················}


Offset 1, 10 lines modified		Offset 1, 10 lines modified
00000000:·0200·0c00·e4db·0100·0100·0000·0100·1c00··................		00000000:·0200·0c00·78db·0100·0100·0000·0100·1c00··....x...........
00000010:·f0d0·0000·4603·0000·0000·0000·0001·0000··....F...........		00000010:·e0d0·0000·4703·0000·0000·0000·0001·0000··....G...........
00000020:·340d·0000·0000·0000·0000·0000·0300·0000··4...............		00000020:·380d·0000·0000·0000·0000·0000·0300·0000··8...............
00000030:·2400·0000·4100·0000·5200·0000·6a00·0000··$...A...R...j...		00000030:·2400·0000·4100·0000·5200·0000·6a00·0000··$...A...R...j...
00000040:·8800·0000·9100·0000·c300·0000·d200·0000··................		00000040:·8800·0000·9100·0000·c300·0000·d200·0000··................
00000050:·da00·0000·0f01·0000·4201·0000·7101·0000··........B...q...		00000050:·da00·0000·0f01·0000·4201·0000·7101·0000··........B...q...
00000060:·a601·0000·d901·0000·0802·0000·3d02·0000··............=...		00000060:·a601·0000·d901·0000·0802·0000·3d02·0000··............=...
00000070:·7002·0000·9f02·0000·d502·0000·0903·0000··p...............		00000070:·7002·0000·9f02·0000·d502·0000·0903·0000··p...............
00000080:·3903·0000·7003·0000·a503·0000·d603·0000··9...p...........		00000080:·3903·0000·7003·0000·a503·0000·d603·0000··9...p...........
00000090:·e003·0000·eb03·0000·f303·0000·fd03·0000··................		00000090:·e003·0000·eb03·0000·f303·0000·fd03·0000··................
Offset 86, 7469 lines modified		Offset 86, 7469 lines modified
00000550:·284b·0000·994b·0000·da4b·0000·654c·0000··(K...K...K..eL..		00000550:·284b·0000·994b·0000·da4b·0000·654c·0000··(K...K...K..eL..
00000560:·974c·0000·bd4c·0000·e84c·0000·084d·0000··.L...L...L...M..		00000560:·974c·0000·bd4c·0000·e84c·0000·084d·0000··.L...L...L...M..
00000570:·294d·0000·734d·0000·d54d·0000·064e·0000··)M..sM...M...N..		00000570:·294d·0000·734d·0000·d54d·0000·064e·0000··)M..sM...M...N..
00000580:·444e·0000·ac4e·0000·e04e·0000·f74e·0000··DN...N...N...N..		00000580:·444e·0000·ac4e·0000·e04e·0000·f74e·0000··DN...N...N...N..
00000590:·274f·0000·674f·0000·9c4f·0000·e84f·0000··'O..gO...O...O..		00000590:·274f·0000·674f·0000·9c4f·0000·e84f·0000··'O..gO...O...O..
000005a0:·0250·0000·2850·0000·4c50·0000·6e50·0000··.P..(P..LP..nP..		000005a0:·0250·0000·2850·0000·4c50·0000·6e50·0000··.P..(P..LP..nP..
000005b0:·9d50·0000·c050·0000·f050·0000·1051·0000··.P...P...P...Q..		000005b0:·9d50·0000·c050·0000·f050·0000·1051·0000··.P...P...P...Q..
000005c0:·4951·0000·7051·0000·a851·0000·1d52·0000··IQ..pQ...Q...R..		000005c0:·4951·0000·7051·0000·a851·0000·e751·0000··IQ..pQ...Q...Q..
000005d0:·8852·0000·c752·0000·e452·0000·1153·0000··.R...R...R...S..		000005d0:·2c52·0000·6f52·0000·8c52·0000·b952·0000··,R..oR...R...R..
000005e0:·3c53·0000·6653·0000·9c53·0000·e253·0000··<S..fS...S...S..		000005e0:·e452·0000·0e53·0000·4453·0000·8a53·0000··.R...S..DS...S..
000005f0:·1554·0000·6c54·0000·9a54·0000·ca54·0000··.T..lT...T...T..		000005f0:·bd53·0000·1454·0000·4254·0000·7254·0000··.S...T..BT..rT..
00000600:·2655·0000·5955·0000·be55·0000·ee55·0000··&U..YU...U...U..		00000600:·ce54·0000·0155·0000·6655·0000·9655·0000··.T...U..fU...U..
00000610:·3f56·0000·8856·0000·5357·0000·ec57·0000··?V...V..SW...W..		00000610:·e755·0000·3056·0000·fb56·0000·9457·0000··.U..0V...V...W..
00000620:·9e58·0000·2259·0000·3f59·0000·5859·0000··.X.."Y..?Y..XY..		00000620:·4658·0000·ca58·0000·e758·0000·0059·0000··FX...X...X...Y..
00000630:·7e59·0000·ac59·0000·cc59·0000·ed59·0000··~Y...Y...Y...Y..		00000630:·2659·0000·5459·0000·7459·0000·9559·0000··&Y..TY..tY...Y..
00000640:·0e5a·0000·305a·0000·485a·0000·825a·0000··.Z..0Z..HZ...Z..		00000640:·b659·0000·d859·0000·f059·0000·2a5a·0000··.Y...Y...Y..*Z..
00000650:·a15a·0000·e75a·0000·215b·0000·4a5b·0000··.Z...Z..![..J[..		00000650:·495a·0000·8f5a·0000·c95a·0000·f25a·0000··IZ...Z...Z...Z..
00000660:·655b·0000·6a5b·0000·bb5b·0000·ff5b·0000··e[..j[...[...[..		00000660:·0d5b·0000·125b·0000·635b·0000·a75b·0000··.[...[..c[...[..
00000670:·2a5c·0000·655c·0000·af5c·0000·0c5d·0000··*\..e\...\...]..		00000670:·d25b·0000·0d5c·0000·575c·0000·b45c·0000··.[...\..W\...\..
00000680:·595d·0000·9a5d·0000·d65d·0000·245e·0000··Y]...]...]..$^..		00000680:·015d·0000·425d·0000·7e5d·0000·cc5d·0000··.]..B]..~]...]..
00000690:·425e·0000·5a5e·0000·7b5e·0000·a55e·0000··B^..Z^..{^...^..		00000690:·ea5d·0000·025e·0000·235e·0000·4d5e·0000··.]...^..#^..M^..
000006a0:·bd5e·0000·f05e·0000·085f·0000·265f·0000··.^...^..._..&_..		000006a0:·655e·0000·985e·0000·b05e·0000·ce5e·0000··e^...^...^...^..
000006b0:·3e5f·0000·5f5f·0000·865f·0000·c95f·0000··>_..__..._..._..		000006b0:·e65e·0000·075f·0000·2e5f·0000·715f·0000··.^..._..._..q_..
000006c0:·~~0c60~~·0000·~~3560~~·0000·7260·0000·af60·0000··.`..5`..r`...`..		000006c0:·b45f·0000·dd5f·0000·1a60·0000·5760·0000··._..._...`..W`..
000006d0:·df60·0000·2261·0000·6061·0000·8761·0000··.`.."a..`a...a..		000006d0:·8760·0000·ca60·0000·0861·0000·2f61·0000··.`...`...a../a..
000006e0:·9f61·0000·c961·0000·e761·0000·0562·0000··.a...a...a...b..		000006e0:·4761·0000·7161·0000·8f61·0000·ad61·0000··Ga..qa...a...a..
000006f0:·3262·0000·4c62·0000·6962·0000·8562·0000··2b..Lb..ib...b..		000006f0:·da61·0000·f461·0000·1162·0000·2d62·0000··.a...a...b..-b..
00000700:·9a62·0000·bf62·0000·f362·0000·1b63·0000··.b...b...b...c..		00000700:·4262·0000·6762·0000·9b62·0000·c362·0000··Bb..gb...b...b..
00000710:·5e63·0000·9f63·0000·b563·0000·ed63·0000··^c...c...c...c..		00000710:·0663·0000·4763·0000·5d63·0000·9563·0000··.c..Gc..]c...c..
00000720:·1464·0000·3b64·0000·6564·0000·c064·0000··.d..;d..ed...d..		00000720:·bc63·0000·e363·0000·0d64·0000·6864·0000··.c...c...d..hd..
00000730:·1c65·0000·5f65·0000·9065·0000·e665·0000··.e.._e...e...e..		00000730:·c464·0000·0765·0000·3865·0000·8e65·0000··.d...e..8e...e..
00000740:·2766·0000·6f66·0000·9266·0000·b966·0000··'f..of...f...f..		00000740:·cf65·0000·1766·0000·3a66·0000·6166·0000··.e...f..:f..af..
00000750:·0167·0000·7667·0000·2d68·0000·6768·0000··.g..vg..-h..gh..		00000750:·a966·0000·1e67·0000·d567·0000·0f68·0000··.f...g...g...h..
00000760:·cb68·0000·2f69·0000·8e69·0000·ba69·0000··.h../i...i...i..		00000760:·7368·0000·d768·0000·3669·0000·6269·0000··sh...h..6i..bi..
00000770:·0d6a·0000·746a·0000·c06a·0000·246b·0000··.j..tj...j..$k..		00000770:·b569·0000·1c6a·0000·686a·0000·cc6a·0000··.i...j..hj...j..
00000780:·696b·0000·bc6b·0000·596c·0000·ef6c·0000··ik...k..Yl...l..		00000780:·116b·0000·646b·0000·016c·0000·976c·0000··.k..dk...l...l..
00000790:·0d6d·0000·386d·0000·526d·0000·7c6d·0000··.m..8m..Rm..\|m..		00000790:·b56c·0000·e06c·0000·fa6c·0000·246d·0000··.l...l...l..$m..
000007a0:·af6d·0000·dc6d·0000·166e·0000·876e·0000··.m...m...n...n..		000007a0:·576d·0000·846d·0000·be6d·0000·2f6e·0000··Wm...m...m../n..
000007b0:·f06e·0000·326f·0000·6d6f·0000·946f·0000··.n..2o..mo...o..		000007b0:·986e·0000·da6e·0000·156f·0000·3c6f·0000··.n...n...o..<o..
000007c0:·bb6f·0000·d46f·0000·fb6f·0000·~~4b70~~·0000··.o...o...o..Kp..		000007c0:·636f·0000·7c6f·0000·a36f·0000·f36f·0000··co..\|o...o...o..
000007d0:·cf70·0000·1d71·0000·a671·0000·ec71·0000··.p...q...q...q..		000007d0:·7770·0000·c570·0000·4e71·0000·9471·0000··wp...p..Nq...q..
000007e0:·6572·0000·a672·0000·f772·0000·8673·0000··er...r...r...s..		000007e0:·0d72·0000·4e72·0000·9f72·0000·2e73·0000··.r..Nr...r...s..
000007f0:·f073·0000·1e74·0000·3574·0000·5474·0000··.s...t..5t..Tt..		000007f0:·9873·0000·c673·0000·dd73·0000·fc73·0000··.s...s...s...s..
00000800:·7674·0000·9574·0000·0d75·0000·3c75·0000··vt...t...u..<u..		00000800:·1e74·0000·3d74·0000·b574·0000·e474·0000··.t..=t...t...t..
00000810:·7d75·0000·d275·0000·2276·0000·bf76·0000··}u...u.."v...v..		00000810:·2575·0000·7a75·0000·ca75·0000·6776·0000··%u..zu...u..gv..
00000820:·3177·0000·9a77·0000·df77·0000·8278·0000··1w...w...w...x..		00000820:·d976·0000·4277·0000·8777·0000·2a78·0000··.v..Bw...w..*x..
00000830:·a378·0000·d178·0000·fb78·0000·2579·0000··.x...x...x..%y..		00000830:·4b78·0000·7978·0000·a378·0000·cd78·0000··Kx..yx...x...x..
00000840:·4a79·0000·7979·0000·cc79·0000·197a·0000··Jy..yy...y...z..		00000840:·f278·0000·2179·0000·7479·0000·c179·0000··.x..!y..ty...y..
00000850:·897a·0000·d57a·0000·267b·0000·767b·0000··.z...z..&{..v{..		00000850:·317a·0000·7d7a·0000·ce7a·0000·1e7b·0000··1z..}z...z...{..
00000860:·be7b·0000·2a7c·0000·907c·0000·d27c·0000··.{..*\|...\|...\|..		00000860:·667b·0000·d27b·0000·387c·0000·7a7c·0000··f{...{..8\|..z\|..
00000870:·ff7c·0000·347d·0000·5b7d·0000·a37d·0000··.\|..4}..[}...}..		00000870:·a77c·0000·dc7c·0000·037d·0000·4b7d·0000··.\|...\|...}..K}..
00000880:·f47d·0000·5b7e·0000·7f7e·0000·bb7e·0000··.}..[~...~...~..		00000880:·9c7d·0000·037e·0000·277e·0000·637e·0000··.}...~..'~..c~..
00000890:·057f·0000·417f·0000·777f·0000·db7f·0000··....A...w.......		00000890:·ad7e·0000·e97e·0000·1f7f·0000·837f·0000··.~...~..........
000008a0:·~~4880~~·0000·8080·0000·a680·0000·e780·0000··H...............		000008a0:·f07f·0000·2880·0000·4e80·0000·8f80·0000··....(...N.......
000008b0:·1181·0000·2681·0000·4981·0000·9881·0000··....&...I.......		000008b0:·b980·0000·ce80·0000·f180·0000·4081·0000··............@...
000008c0:·d681·0000·5782·0000·ab82·0000·1d83·0000··....W...........		000008c0:·7e81·0000·ff81·0000·5382·0000·c582·0000··~.......S.......
000008d0:·5283·0000·9d83·0000·0c84·0000·6084·0000··R...........`...		000008d0:·fa82·0000·4583·0000·b483·0000·0884·0000··....E...........
000008e0:·af84·0000·d984·0000·fb84·0000·3285·0000··............2...		000008e0:·5784·0000·8184·0000·a384·0000·da84·0000··W...............
000008f0:·5d85·0000·9185·0000·f085·0000·4086·0000··]...........@...		000008f0:·0585·0000·3985·0000·9885·0000·e885·0000··....9...........
00000900:·7486·0000·0087·0000·7b87·0000·a487·0000··t.......{.......		00000900:·1c86·0000·a886·0000·2387·0000·4c87·0000··........#...L...
00000910:·e787·0000·0e88·0000·2e88·0000·4788·0000··............G...		00000910:·8f87·0000·b687·0000·d687·0000·ef87·0000··................
00000920:·6f88·0000·bb88·0000·d888·0000·0189·0000··o...............		00000920:·1788·0000·6388·0000·8088·0000·a988·0000··....c...........
00000930:·1689·0000·6689·0000·a589·0000·db89·0000··....f...........		00000930:·be88·0000·0e89·0000·4d89·0000·8389·0000··........M.......
00000940:·0e8a·0000·2e8a·0000·518a·0000·688a·0000··........Q...h...		00000940:·b689·0000·d689·0000·f989·0000·108a·0000··................
00000950:·8b8a·0000·cd8a·0000·ee8a·0000·268b·0000··............&...		00000950:·338a·0000·758a·0000·968a·0000·ce8a·0000··3...u...........
00000960:·698b·0000·a88b·0000·ca8b·0000·308c·0000··i...........0...		00000960:·118b·0000·508b·0000·728b·0000·d88b·0000··....P...r.......
00000970:·878c·0000·ae8c·0000·fc8c·0000·578d·0000··............W...		00000970:·2f8c·0000·568c·0000·a48c·0000·ff8c·0000··/...V...........
00000980:·c78d·0000·428e·0000·748e·0000·c38e·0000··....B...t.......		00000980:·6f8d·0000·ea8d·0000·1c8e·0000·6b8e·0000··o...........k...
00000990:·388f·0000·818f·0000·af8f·0000·ce8f·0000··8...............		00000990:·e08e·0000·298f·0000·578f·0000·768f·0000··....)...W...v...
000009a0:·e68f·0000·0890·0000·~~3290~~·0000·6790·0000··........2...g...		000009a0:·8e8f·0000·b08f·0000·da8f·0000·0f90·0000··................
000009b0:·e690·0000·7d91·0000·e391·0000·4a92·0000··....}.......J...		000009b0:·8e90·0000·2591·0000·8b91·0000·f291·0000··....%...........
000009c0:·7792·0000·ab92·0000·0b93·0000·6893·0000··w...........h...		000009c0:·1f92·0000·5392·0000·b392·0000·1093·0000··....S...........
000009d0:·b493·0000·d893·0000·1894·0000·3294·0000··............2...		000009d0:·5c93·0000·8093·0000·c093·0000·da93·0000··\...............
000009e0:·6694·0000·8a94·0000·e194·0000·1495·0000··f...............		000009e0:·0e94·0000·3294·0000·8994·0000·bc94·0000··....2...........
000009f0:·9595·0000·e995·0000·5796·0000·7c96·0000··........W...\|...		000009f0:·3d95·0000·9195·0000·ff95·0000·2496·0000··=...........$...
00000a00:·9e96·0000·c696·0000·ec96·0000·1d97·0000··................		00000a00:·4696·0000·6e96·0000·9496·0000·c596·0000··F...n...........
00000a10:·5597·0000·7b97·0000·9a97·0000·df97·0000··U...{...........		00000a10:·fd96·0000·2397·0000·4297·0000·8797·0000··....#...B.......
00000a20:·0198·0000·1d98·0000·4498·0000·8e98·0000··........D.......		00000a20:·a997·0000·c597·0000·ec97·0000·3698·0000··............6...
00000a30:·d298·0000·0f99·0000·5c99·0000·8299·0000··........\.......		00000a30:·7a98·0000·b798·0000·0499·0000·2a99·0000··z...........*...
00000a40:·c399·0000·eb99·0000·269a·0000·4d9a·0000··........&...M...		00000a40:·6b99·0000·9399·0000·ce99·0000·f599·0000··k...............
00000a50:·729a·0000·9c9a·0000·d69a·0000·f59a·0000··r...............		00000a50:·1a9a·0000·449a·0000·7e9a·0000·9d9a·0000··....D...~.......
00000a60:·219b·0000·629b·0000·b49b·0000·2e9c·0000··!...b...........		00000a60:·c99a·0000·0a9b·0000·5c9b·0000·d69b·0000··........\.......
00000a70:·869c·0000·f79c·0000·2c9d·0000·959d·0000··........,.......		00000a70:·2e9c·0000·9f9c·0000·d49c·0000·3d9d·0000··............=...
00000a80:·169e·0000·6b9e·0000·939e·0000·db9e·0000··....k...........		00000a80:·be9d·0000·139e·0000·3b9e·0000·839e·0000··........;.......
00000a90:·179f·0000·5b9f·0000·9e9f·0000·b79f·0000··....[...........		00000a90:·bf9e·0000·039f·0000·469f·0000·5f9f·0000··........F..._...
00000aa0:·e29f·0000·~~05a0~~·0000·~~2ba0~~·0000·~~53a0~~·0000··........+...S...		00000aa0:·8a9f·0000·ad9f·0000·d39f·0000·fb9f·0000··................
00000ab0:·6da0·0000·a0a0·0000·c0a0·0000·d4a0·0000··m...............		00000ab0:·15a0·0000·48a0·0000·68a0·0000·7ca0·0000··....H...h...\|...
00000ac0:·fea0·0000·2ba1·0000·7ca1·0000·99a1·0000··....+...\|.......		00000ac0:·a6a0·0000·d3a0·0000·24a1·0000·41a1·0000··........$...A...
00000ad0:·cca1·0000·fca1·0000·26a2·0000·68a2·0000··........&...h...		00000ad0:·74a1·0000·a4a1·0000·cea1·0000·10a2·0000··t...............
00000ae0:·b9a2·0000·03a3·0000·82a3·0000·a9a3·0000··................		00000ae0:·61a2·0000·aba2·0000·2aa3·0000·51a3·0000··a.......*...Q...
00000af0:·d4a3·0000·ffa3·0000·3fa4·0000·64a4·0000··........?...d...		00000af0:·7ca3·0000·a7a3·0000·e7a3·0000·0ca4·0000··\|...............
00000b00:·a0a4·0000·cba4·0000·dfa4·0000·04a5·0000··................		00000b00:·48a4·0000·73a4·0000·87a4·0000·aca4·0000··H...s...........
00000b10:·4aa5·0000·73a5·0000·ada5·0000·e0a5·0000··J...s...........		00000b10:·f2a4·0000·1ba5·0000·55a5·0000·88a5·0000··........U.......
00000b20:·0aa6·0000·22a6·0000·4ca6·0000·65a6·0000··...."...L...e...		00000b20:·b2a5·0000·caa5·0000·f4a5·0000·0da6·0000··................
00000b30:·95a6·0000·c7a6·0000·dca6·0000·f8a6·0000··................		00000b30:·3da6·0000·6fa6·0000·84a6·0000·a0a6·0000··=...o...........
00000b40:·1ba7·0000·47a7·0000·6ca7·0000·99a7·0000··....G...l.......		00000b40:·c3a6·0000·efa6·0000·14a7·0000·41a7·0000··............A...
00000b50:·b3a7·0000·e7a7·0000·07a8·0000·20a8·0000··............·...		00000b50:·5ba7·0000·8fa7·0000·afa7·0000·c8a7·0000··[...............
00000b60:·3da8·0000·64a8·0000·96a8·0000·d8a8·0000··=...d...........		00000b60:·e5a7·0000·0ca8·0000·3ea8·0000·80a8·0000··........>.......
00000b70:·06a9·0000·25a9·0000·5fa9·0000·a9a9·0000··....%..._.......		00000b70:·aea8·0000·cda8·0000·07a9·0000·51a9·0000··............Q...
00000b80:·02aa·0000·1aaa·0000·47aa·0000·67aa·0000··........G...g...		00000b80:·aaa9·0000·c2a9·0000·efa9·0000·0faa·0000··................
00000b90:·98aa·0000·bfaa·0000·ffaa·0000·2aab·0000··............*...		00000b90:·40aa·0000·67aa·0000·a7aa·0000·d2aa·0000··@...g...........
00000ba0:·48ab·0000·85ab·0000·c3ab·0000·22ac·0000··H..........."...		00000ba0:·f0aa·0000·2dab·0000·6bab·0000·caab·0000··....-...k.......
00000bb0:·99ac·0000·e5ac·0000·47ad·0000·cdad·0000··........G.......		00000bb0:·41ac·0000·8dac·0000·efac·0000·75ad·0000··A...........u...
00000bc0:·05ae·0000·2cae·0000·4fae·0000·85ae·0000··....,...O.......		00000bc0:·adad·0000·d4ad·0000·f7ad·0000·2dae·0000··............-...
00000bd0:·b5ae·0000·01af·0000·95af·0000·d7af·0000··................		00000bd0:·5dae·0000·a9ae·0000·3daf·0000·7faf·0000··].......=.......
00000be0:·~~04b0~~·0000·63b0·0000·85b0·0000·bfb0·0000··....c...........		00000be0:·acaf·0000·0bb0·0000·2db0·0000·67b0·0000··........-...g...
00000bf0:·ebb0·0000·22b1·0000·49b1·0000·70b1·0000··...."...I...p...		00000bf0:·93b0·0000·cab0·0000·f1b0·0000·18b1·0000··................
00000c00:·85b1·0000·9fb1·0000·c6b1·0000·04b2·0000··................		00000c00:·2db1·0000·47b1·0000·6eb1·0000·acb1·0000··-...G...n.......
00000c10:·40b2·0000·5eb2·0000·7bb2·0000·aab2·0000··@...^...{.......		00000c10:·e8b1·0000·06b2·0000·23b2·0000·52b2·0000··........#...R...
00000c20:·dbb2·0000·63b3·0000·a7b3·0000·e2b3·0000··....c...........		00000c20:·83b2·0000·0bb3·0000·4fb3·0000·8ab3·0000··........O.......
00000c30:·16b4·0000·9ab4·0000·dab4·0000·f9b4·0000··................		00000c30:·beb3·0000·01b4·0000·41b4·0000·60b4·0000··........A...`...
00000c40:·2bb5·0000·66b5·0000·8db5·0000·b8b5·0000··+...f...........		00000c40:·92b4·0000·cdb4·0000·f4b4·0000·1fb5·0000··................
00000c50:·fdb5·0000·3ab6·0000·69b6·0000·c3b6·0000··....:...i.......		00000c50:·64b5·0000·a1b5·0000·d0b5·0000·2ab6·0000··d...........*...
00000c60:·0bb7·0000·58b7·0000·81b7·0000·c8b7·0000··....X...........		00000c60:·72b6·0000·bfb6·0000·e8b6·0000·2fb7·0000··r.........../...
00000c70:·f9b7·0000·3ab8·0000·01b9·0000·88b9·0000··....:...........		00000c70:·60b7·0000·a1b7·0000·68b8·0000·efb8·0000··`.......h.......
00000c80:·31ba·0000·efba·0000·13bb·0000·33bb·0000··1...........3...		00000c80:·98b9·0000·56ba·0000·7aba·0000·9aba·0000··....V...z.......
... Open expanded diff (truncated) ...


Offset 25, 130 lines modified		Offset 25, 130 lines modified
25	.field·private·mRemote:Landroid/os/IBinder;	25	.field·private·mRemote:Landroid/os/IBinder;


26	#·direct·methods	26	#·direct·methods
27	.method·constructor·<init>(Landroid/os/IBinder;)V	27	.method·constructor·<init>(Landroid/os/IBinder;)V
28	····.locals·0	28	····.locals·0

29	····.line·171	29	····.line·158
30	····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V	30	····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V

31	····.line·172	31	····.line·159
32	····iput-object·p1,·p0,·Landroid/net/INetworkStackConnector$Stub$Proxy;->mRemote:Landroid/os/IBinder;	32	····iput-object·p1,·p0,·Landroid/net/INetworkStackConnector$Stub$Proxy;->mRemote:Landroid/os/IBinder;

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


35	#·virtual·methods	35	#·virtual·methods
36	.method·public·asBinder()Landroid/os/IBinder;	36	.method·public·asBinder()Landroid/os/IBinder;
37	····.locals·0	37	····.locals·0

38	····.line·178	38	····.line·165
39	····iget-object·p0,·p0,·Landroid/net/INetworkStackConnector$Stub$Proxy;->mRemote:Landroid/os/IBinder;	39	····iget-object·p0,·p0,·Landroid/net/INetworkStackConnector$Stub$Proxy;->mRemote:Landroid/os/IBinder;

40	····return-object·p0	40	····return-object·p0
41	.end·method	41	.end·method

42	.method·public·makeDhcpServer(Ljava/lang/String;Landroid/net/dhcp/DhcpServingParamsParcel;Landroid/net/dhcp/IDhcpServerCallbacks;)V	42	.method·public·makeDhcpServer(Ljava/lang/String;Landroid/net/dhcp/DhcpServingParamsParcel;Landroid/net/dhcp/IDhcpServerCallbacks;)V
43	····.locals·4	43	····.locals·4
44	····.annotation·system·Ldalvik/annotation/Throws;	44	····.annotation·system·Ldalvik/annotation/Throws;
45	········value·=·{	45	········value·=·{
46	············Landroid/os/RemoteException;	46	············Landroid/os/RemoteException;
47	········}	47	········}
48	····.end·annotation	48	····.end·annotation

49	····.line·186	49	····.line·173
50	····invoke-static·{},·Landroid/os/Parcel;->obtain()Landroid/os/Parcel;	50	····invoke-static·{},·Landroid/os/Parcel;->obtain()Landroid/os/Parcel;

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

52	····.line·188	52	····.line·175
53	····:try_start_0	53	····:try_start_0
54	····invoke-static·{},·Landroid/net/INetworkStackConnector$Stub;->access$000()Ljava/lang/String;	54	····invoke-static·{},·Landroid/net/INetworkStackConnector$Stub;->access$000()Ljava/lang/String;

55	····move-result-object·v1	55	····move-result-object·v1

56	····invoke-virtual·{v0,·v1},·Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V	56	····invoke-virtual·{v0,·v1},·Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V

57	····.line·189	57	····.line·176
58	····invoke-virtual·{v0,·p1},·Landroid/os/Parcel;->writeString(Ljava/lang/String;)V	58	····invoke-virtual·{v0,·p1},·Landroid/os/Parcel;->writeString(Ljava/lang/String;)V

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

60	····const/4·v2,·0x1	60	····const/4·v2,·0x1

61	····if-eqz·p2,·:cond_0	61	····if-eqz·p2,·:cond_0

62	····.line·191	62	····.line·178
63	····invoke-virtual·{v0,·v2},·Landroid/os/Parcel;->writeInt(I)V	63	····invoke-virtual·{v0,·v2},·Landroid/os/Parcel;->writeInt(I)V

64	····.line·192	64	····.line·179
65	····invoke-virtual·{p2,·v0,·v1},·Landroid/net/dhcp/DhcpServingParamsParcel;->writeToParcel(Landroid/os/Parcel;I)V	65	····invoke-virtual·{p2,·v0,·v1},·Landroid/net/dhcp/DhcpServingParamsParcel;->writeToParcel(Landroid/os/Parcel;I)V

66	····goto·:goto_0	66	····goto·:goto_0

67	····.line·195	67	····.line·182
68	····:cond_0	68	····:cond_0
69	····invoke-virtual·{v0,·v1},·Landroid/os/Parcel;->writeInt(I)V	69	····invoke-virtual·{v0,·v1},·Landroid/os/Parcel;->writeInt(I)V

70	····:goto_0	70	····:goto_0
71	····const/4·v1,·0x0	71	····const/4·v1,·0x0

72	····if-eqz·p3,·:cond_1	72	····if-eqz·p3,·:cond_1

73	····.line·197	73	····.line·184
74	····invoke-interface·{p3},·Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;	74	····invoke-interface·{p3},·Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;

75	····move-result-object·v3	75	····move-result-object·v3

76	····goto·:goto_1	76	····goto·:goto_1

77	····:cond_1	77	····:cond_1
78	····move-object·v3,·v1	78	····move-object·v3,·v1

79	····:goto_1	79	····:goto_1
80	····invoke-virtual·{v0,·v3},·Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V	80	····invoke-virtual·{v0,·v3},·Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V

81	····.line·198	81	····.line·185
82	····iget-object·p0,·p0,·Landroid/net/INetworkStackConnector$Stub$Proxy;->mRemote:Landroid/os/IBinder;	82	····iget-object·p0,·p0,·Landroid/net/INetworkStackConnector$Stub$Proxy;->mRemote:Landroid/os/IBinder;

83	····invoke-interface·{p0,·v2,·v0,·v1,·v2},·Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z	83	····invoke-interface·{p0,·v2,·v0,·v1,·v2},·Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z

84	····move-result·p0	84	····move-result·p0

85	····if-nez·p0,·:cond_2	85	····if-nez·p0,·:cond_2

86	····.line·199	86	····.line·186
87	····invoke-static·{},·Landroid/net/INetworkStackConnector$Stub;->getDefaultImpl()Landroid/net/INetworkStackConnector;	87	····invoke-static·{},·Landroid/net/INetworkStackConnector$Stub;->getDefaultImpl()Landroid/net/INetworkStackConnector;

88	····move-result-object·p0	88	····move-result-object·p0

89	····if-eqz·p0,·:cond_2	89	····if-eqz·p0,·:cond_2

90	····.line·~~200~~	90	····.line·187
91	····invoke-static·{},·Landroid/net/INetworkStackConnector$Stub;->getDefaultImpl()Landroid/net/INetworkStackConnector;	91	····invoke-static·{},·Landroid/net/INetworkStackConnector$Stub;->getDefaultImpl()Landroid/net/INetworkStackConnector;

92	····move-result-object·p0	92	····move-result-object·p0

93	····invoke-interface·{p0,·p1,·p2,·p3},·Landroid/net/INetworkStackConnector;->makeDhcpServer(Ljava/lang/String;Landroid/net/dhcp/DhcpServingParamsParcel;Landroid/net/dhcp/IDhcpServerCallbacks;)V	93	····invoke-interface·{p0,·p1,·p2,·p3},·Landroid/net/INetworkStackConnector;->makeDhcpServer(Ljava/lang/String;Landroid/net/dhcp/DhcpServingParamsParcel;Landroid/net/dhcp/IDhcpServerCallbacks;)V
94	····:try_end_0	94	····:try_end_0
95	····.catchall·{:try_start_0·..·:try_end_0}·:catchall_0	95	····.catchall·{:try_start_0·..·:try_end_0}·:catchall_0

96	····.line·~~205~~	96	····.line·192
97	····invoke-virtual·{v0},·Landroid/os/Parcel;->recycle()V	97	····invoke-virtual·{v0},·Landroid/os/Parcel;->recycle()V

98	····return-void	98	····return-void

99	····:cond_2	99	····:cond_2
100	····invoke-virtual·{v0},·Landroid/os/Parcel;->recycle()V	100	····invoke-virtual·{v0},·Landroid/os/Parcel;->recycle()V

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

102	····:catchall_0	102	····:catchall_0
103	····move-exception·p0	103	····move-exception·p0

104	····invoke-virtual·{v0},·Landroid/os/Parcel;->recycle()V	104	····invoke-virtual·{v0},·Landroid/os/Parcel;->recycle()V

... Open expanded diff ...


Offset 33, 72 lines modified		Offset 33, 72 lines modified

33	····const-string·v0,·"android$net$INetworkStackConnector"	33	····const-string·v0,·"android$net$INetworkStackConnector"

34	····const/16·v1,·0x24	34	····const/16·v1,·0x24

35	····const/16·v2,·0x2e	35	····const/16·v2,·0x2e

36	····.line·50	36	····.line·47
37	····invoke-virtual·{v0,·v1,·v2},·Ljava/lang/String;->replace(CC)Ljava/lang/String;	37	····invoke-virtual·{v0,·v1,·v2},·Ljava/lang/String;->replace(CC)Ljava/lang/String;

38	····move-result-object·v0	38	····move-result-object·v0

39	····sput-object·v0,·Landroid/net/INetworkStackConnector$Stub;->DESCRIPTOR:Ljava/lang/String;	39	····sput-object·v0,·Landroid/net/INetworkStackConnector$Stub;->DESCRIPTOR:Ljava/lang/String;

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

42	.method·static·synthetic·access$000()Ljava/lang/String;	42	.method·static·synthetic·access$000()Ljava/lang/String;
43	····.locals·1	43	····.locals·1

44	····.line·48	44	····.line·45
45	····sget-object·v0,·Landroid/net/INetworkStackConnector$Stub;->DESCRIPTOR:Ljava/lang/String;	45	····sget-object·v0,·Landroid/net/INetworkStackConnector$Stub;->DESCRIPTOR:Ljava/lang/String;

46	····return-object·v0	46	····return-object·v0
47	.end·method	47	.end·method

48	.method·public·static·asInterface(Landroid/os/IBinder;)Landroid/net/INetworkStackConnector;	48	.method·public·static·asInterface(Landroid/os/IBinder;)Landroid/net/INetworkStackConnector;
49	····.locals·2	49	····.locals·2

50	····if-nez·p0,·:cond_0	50	····if-nez·p0,·:cond_0

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

52	····return-object·p0	52	····return-object·p0

53	····.line·65	53	····.line·62
54	····:cond_0	54	····:cond_0
55	····sget-object·v0,·Landroid/net/INetworkStackConnector$Stub;->DESCRIPTOR:Ljava/lang/String;	55	····sget-object·v0,·Landroid/net/INetworkStackConnector$Stub;->DESCRIPTOR:Ljava/lang/String;

56	····invoke-interface·{p0,·v0},·Landroid/os/IBinder;->queryLocalInterface(Ljava/lang/String;)Landroid/os/IInterface;	56	····invoke-interface·{p0,·v0},·Landroid/os/IBinder;->queryLocalInterface(Ljava/lang/String;)Landroid/os/IInterface;

57	····move-result-object·v0	57	····move-result-object·v0

58	····if-eqz·v0,·:cond_1	58	····if-eqz·v0,·:cond_1

59	····.line·66	59	····.line·63
60	····instance-of·v1,·v0,·Landroid/net/INetworkStackConnector;	60	····instance-of·v1,·v0,·Landroid/net/INetworkStackConnector;

61	····if-eqz·v1,·:cond_1	61	····if-eqz·v1,·:cond_1

62	····.line·67	62	····.line·64
63	····check-cast·v0,·Landroid/net/INetworkStackConnector;	63	····check-cast·v0,·Landroid/net/INetworkStackConnector;

64	····return-object·v0	64	····return-object·v0

65	····.line·69	65	····.line·66
66	····:cond_1	66	····:cond_1
67	····new-instance·v0,·Landroid/net/INetworkStackConnector$Stub$Proxy;	67	····new-instance·v0,·Landroid/net/INetworkStackConnector$Stub$Proxy;

68	····invoke-direct·{v0,·p0},·Landroid/net/INetworkStackConnector$Stub$Proxy;-><init>(Landroid/os/IBinder;)V	68	····invoke-direct·{v0,·p0},·Landroid/net/INetworkStackConnector$Stub$Proxy;-><init>(Landroid/os/IBinder;)V

69	····return-object·v0	69	····return-object·v0
70	.end·method	70	.end·method

71	.method·public·static·getDefaultImpl()Landroid/net/INetworkStackConnector;	71	.method·public·static·getDefaultImpl()Landroid/net/INetworkStackConnector;
72	····.locals·1	72	····.locals·1

73	····.line·349	73	····.line·318
74	····sget-object·v0,·Landroid/net/INetworkStackConnector$Stub$Proxy;->sDefaultImpl:Landroid/net/INetworkStackConnector;	74	····sget-object·v0,·Landroid/net/INetworkStackConnector$Stub$Proxy;->sDefaultImpl:Landroid/net/INetworkStackConnector;

75	····return-object·v0	75	····return-object·v0
76	.end·method	76	.end·method


Offset 14, 19 lines modified		Offset 14, 19 lines modified
14	.end·method	14	.end·method


15	#·virtual·methods	15	#·virtual·methods
16	.method·public·getInterfaceHash()Ljava/lang/String;	16	.method·public·getInterfaceHash()Ljava/lang/String;
17	····.locals·0	17	····.locals·0

18	····const-string·p0,·"f6e2~~137b5~~0~~339~~0~~2774f78726d429399db3b18cab~~"	18	····const-string·p0,·"02cd6fd07d5c04eca0c35a350f7b0be576242883"

19	····return-object·p0	19	····return-object·p0
20	.end·method	20	.end·method

21	.method·public·getInterfaceVersion()I	21	.method·public·getInterfaceVersion()I
22	····.locals·0	22	····.locals·0

23	····const/16·p0,·0x8	23	····const/4·p0,·0x7

24	····return·p0	24	····return·p0
25	.end·method	25	.end·method


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·1047	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·1050	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·1055	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·1056	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·1076	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·1073	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·1058	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·1059	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·1069	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·1061	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·1062	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~~207~~	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·1226	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·1228	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·1229	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·1230	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·1239	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·1241	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·1244	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·1246	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·1171	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·1174	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·1175	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·1176	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·1180	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·1185	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·1187	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·1188	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·1190	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·448	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·452	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·453	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 173, 92 lines modified		Offset 173, 92 lines modified

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

175	.method·public·constructor·<init>(Ljava/lang/String;Landroid/os/Looper;ILandroid/net/util/SharedLog;Landroid/net/INetd;Lcom/android/networkstack/tethering/BpfCoordinator;Landroid/net/ip/IpServer$Callback;ZZLcom/android/networkstack/tethering/PrivateAddressCoordinator;Landroid/net/ip/IpServer$Dependencies;)V	175	.method·public·constructor·<init>(Ljava/lang/String;Landroid/os/Looper;ILandroid/net/util/SharedLog;Landroid/net/INetd;Lcom/android/networkstack/tethering/BpfCoordinator;Landroid/net/ip/IpServer$Callback;ZZLcom/android/networkstack/tethering/PrivateAddressCoordinator;Landroid/net/ip/IpServer$Dependencies;)V
176	····.locals·1	176	····.locals·1

177	····.line·290	177	····.line·286
178	····invoke-direct·{p0,·p1,·p2},·Lcom/android/networkstack/tethering/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Looper;)V	178	····invoke-direct·{p0,·p1,·p2},·Lcom/android/networkstack/tethering/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Looper;)V

179	····const/4·p2,·0x0	179	····const/4·p2,·0x0

180	····.line·261	180	····.line·257
181	····iput·p2,·p0,·Landroid/net/ip/IpServer;->mDhcpServerStartIndex:I	181	····iput·p2,·p0,·Landroid/net/ip/IpServer;->mDhcpServerStartIndex:I

182	····.line·269	182	····.line·265
183	····invoke-static·{},·Ljava/util/Collections;->emptyList()Ljava/util/List;	183	····invoke-static·{},·Ljava/util/Collections;->emptyList()Ljava/util/List;

184	····move-result-object·v0	184	····move-result-object·v0

185	····iput-object·v0,·p0,·Landroid/net/ip/IpServer;->mDhcpLeases:Ljava/util/List;	185	····iput-object·v0,·p0,·Landroid/net/ip/IpServer;->mDhcpLeases:Ljava/util/List;

186	····.line·271	186	····.line·267
187	····iput·p2,·p0,·Landroid/net/ip/IpServer;->mLastIPv6UpstreamIfindex:I	187	····iput·p2,·p0,·Landroid/net/ip/IpServer;->mLastIPv6UpstreamIfindex:I

188	····.line·291	188	····.line·287
189	····invoke-virtual·{p4,·p1},·Landroid/net/util/SharedLog;->forSubComponent(Ljava/lang/String;)Landroid/net/util/SharedLog;	189	····invoke-virtual·{p4,·p1},·Landroid/net/util/SharedLog;->forSubComponent(Ljava/lang/String;)Landroid/net/util/SharedLog;

190	····move-result-object·p4	190	····move-result-object·p4

191	····iput-object·p4,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog;	191	····iput-object·p4,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog;

192	····.line·292	192	····.line·288
193	····iput-object·p5,·p0,·Landroid/net/ip/IpServer;->mNetd:Landroid/net/INetd;	193	····iput-object·p5,·p0,·Landroid/net/ip/IpServer;->mNetd:Landroid/net/INetd;

194	····.line·293	194	····.line·289
195	····iput-object·p6,·p0,·Landroid/net/ip/IpServer;->mBpfCoordinator:Lcom/android/networkstack/tethering/BpfCoordinator;	195	····iput-object·p6,·p0,·Landroid/net/ip/IpServer;->mBpfCoordinator:Lcom/android/networkstack/tethering/BpfCoordinator;

196	····.line·294	196	····.line·290
197	····iput-object·p7,·p0,·Landroid/net/ip/IpServer;->mCallback:Landroid/net/ip/IpServer$Callback;	197	····iput-object·p7,·p0,·Landroid/net/ip/IpServer;->mCallback:Landroid/net/ip/IpServer$Callback;

198	····.line·295	198	····.line·291
199	····new-instance·p6,·Landroid/net/ip/InterfaceController;	199	····new-instance·p6,·Landroid/net/ip/InterfaceController;

200	····invoke-direct·{p6,·p1,·p5,·p4},·Landroid/net/ip/InterfaceController;-><init>(Ljava/lang/String;Landroid/net/INetd;Landroid/net/util/SharedLog;)V	200	····invoke-direct·{p6,·p1,·p5,·p4},·Landroid/net/ip/InterfaceController;-><init>(Ljava/lang/String;Landroid/net/INetd;Landroid/net/util/SharedLog;)V

201	····iput-object·p6,·p0,·Landroid/net/ip/IpServer;->mInterfaceCtrl:Landroid/net/ip/InterfaceController;	201	····iput-object·p6,·p0,·Landroid/net/ip/IpServer;->mInterfaceCtrl:Landroid/net/ip/InterfaceController;

202	····.line·296	202	····.line·292
203	····iput-object·p1,·p0,·Landroid/net/ip/IpServer;->mIfaceName:Ljava/lang/String;	203	····iput-object·p1,·p0,·Landroid/net/ip/IpServer;->mIfaceName:Ljava/lang/String;

204	····.line·297	204	····.line·293
205	····iput·p3,·p0,·Landroid/net/ip/IpServer;->mInterfaceType:I	205	····iput·p3,·p0,·Landroid/net/ip/IpServer;->mInterfaceType:I

206	····.line·298	206	····.line·294
207	····new-instance·p1,·Landroid/net/LinkProperties;	207	····new-instance·p1,·Landroid/net/LinkProperties;

208	····invoke-direct·{p1},·Landroid/net/LinkProperties;-><init>()V	208	····invoke-direct·{p1},·Landroid/net/LinkProperties;-><init>()V

209	····iput-object·p1,·p0,·Landroid/net/ip/IpServer;->mLinkProperties:Landroid/net/LinkProperties;	209	····iput-object·p1,·p0,·Landroid/net/ip/IpServer;->mLinkProperties:Landroid/net/LinkProperties;

210	····.line·299	210	····.line·295
211	····iput-boolean·p8,·p0,·Landroid/net/ip/IpServer;->mUsingLegacyDhcp:Z	211	····iput-boolean·p8,·p0,·Landroid/net/ip/IpServer;->mUsingLegacyDhcp:Z

212	····.line·~~300~~	212	····.line·296
213	····iput-boolean·p9,·p0,·Landroid/net/ip/IpServer;->mUsingBpfOffload:Z	213	····iput-boolean·p9,·p0,·Landroid/net/ip/IpServer;->mUsingBpfOffload:Z

214	····.line·~~301~~	214	····.line·297
215	····iput-object·p10,·p0,·Landroid/net/ip/IpServer;->mPrivateAddressCoordinator:Lcom/android/networkstack/tethering/PrivateAddressCoordinator;	215	····iput-object·p10,·p0,·Landroid/net/ip/IpServer;->mPrivateAddressCoordinator:Lcom/android/networkstack/tethering/PrivateAddressCoordinator;

216	····.line·~~302~~	216	····.line·298
217	····iput-object·p11,·p0,·Landroid/net/ip/IpServer;->mDeps:Landroid/net/ip/IpServer$Dependencies;	217	····iput-object·p11,·p0,·Landroid/net/ip/IpServer;->mDeps:Landroid/net/ip/IpServer$Dependencies;

218	····.line·~~303~~	218	····.line·299
219	····invoke-direct·{p0},·Landroid/net/ip/IpServer;->resetLinkProperties()V	219	····invoke-direct·{p0},·Landroid/net/ip/IpServer;->resetLinkProperties()V

220	····.line·304	220	····.line·300
221	····iput·p2,·p0,·Landroid/net/ip/IpServer;->mLastError:I	221	····iput·p2,·p0,·Landroid/net/ip/IpServer;->mLastError:I

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

223	····.line·305	223	····.line·301
224	····iput·p1,·p0,·Landroid/net/ip/IpServer;->mServingMode:I	224	····iput·p1,·p0,·Landroid/net/ip/IpServer;->mServingMode:I

225	····.line·307	225	····.line·303
226	····iget-object·p1,·p0,·Landroid/net/ip/IpServer;->mDeps:Landroid/net/ip/IpServer$Dependencies;	226	····iget-object·p1,·p0,·Landroid/net/ip/IpServer;->mDeps:Landroid/net/ip/IpServer$Dependencies;

227	····invoke-virtual·{p0},·Lcom/android/networkstack/tethering/util/StateMachine;->getHandler()Landroid/os/Handler;	227	····invoke-virtual·{p0},·Lcom/android/networkstack/tethering/util/StateMachine;->getHandler()Landroid/os/Handler;

228	····move-result-object·p2	228	····move-result-object·p2

229	····iget-object·p3,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog;	229	····iget-object·p3,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog;
Offset 271, 26 lines modified		Offset 271, 26 lines modified

271	····invoke-virtual·{p1,·p2,·p3,·p4},·Landroid/net/ip/IpServer$Dependencies;->getIpNeighborMonitor(Landroid/os/Handler;Landroid/net/util/SharedLog;Landroid/net/ip/IpNeighborMonitor$NeighborEventConsumer;)Landroid/net/ip/IpNeighborMonitor;	271	····invoke-virtual·{p1,·p2,·p3,·p4},·Landroid/net/ip/IpServer$Dependencies;->getIpNeighborMonitor(Landroid/os/Handler;Landroid/net/util/SharedLog;Landroid/net/ip/IpNeighborMonitor$NeighborEventConsumer;)Landroid/net/ip/IpNeighborMonitor;

272	····move-result-object·p1	272	····move-result-object·p1

273	····iput-object·p1,·p0,·Landroid/net/ip/IpServer;->mIpNeighborMonitor:Landroid/net/ip/IpNeighborMonitor;	273	····iput-object·p1,·p0,·Landroid/net/ip/IpServer;->mIpNeighborMonitor:Landroid/net/ip/IpNeighborMonitor;

274	····.line·314	274	····.line·310
275	····iget-boolean·p2,·p0,·Landroid/net/ip/IpServer;->mUsingBpfOffload:Z	275	····iget-boolean·p2,·p0,·Landroid/net/ip/IpServer;->mUsingBpfOffload:Z

276	····if-eqz·p2,·:cond_0	276	····if-eqz·p2,·:cond_0

277	····invoke-virtual·{p1},·Landroid/net/util/FdEventsReader;->start()Z	277	····invoke-virtual·{p1},·Landroid/net/util/FdEventsReader;->start()Z

278	····move-result·p1	278	····move-result·p1

279	····if-nez·p1,·:cond_0	279	····if-nez·p1,·:cond_0

280	····.line·315	280	····.line·311
281	····iget-object·p1,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog;	281	····iget-object·p1,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog;

282	····new-instance·p2,·Ljava/lang/StringBuilder;	282	····new-instance·p2,·Ljava/lang/StringBuilder;

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

284	····const-string·p3,·"Failed·to·create·IpNeighborMonitor·on·"	284	····const-string·p3,·"Failed·to·create·IpNeighborMonitor·on·"
Offset 303, 78 lines modified		Offset 303, 78 lines modified

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

304	····move-result-object·p2	304	····move-result-object·p2

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

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