/usr/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-12.0.0_r21_raven-user_Google__android-12.0.0_r21_aosp_raven-user_docker-Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.diffoscope.json --html-dir /home/dev/aosp/diff/android-12.0.0_r21_raven-user_Google__android-12.0.0_r21_aosp_raven-user_docker-Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.diffoscope.html-dir /home/dev/aosp/build/android-12.0.0_r21/raven-user/Google/system.img.apexes/com.google.android.tethering.apex-apex_payload.img.mount /home/dev/aosp/build/android-12.0.0_r21/aosp_raven-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex

⊟

388 KB

/home/dev/aosp/build/android-12.0.0_r21/raven-user/Google/system.img.apexes/com.google.android.tethering.apex-apex_payload.img.mount vs.

/home/dev/aosp/build/android-12.0.0_r21/aosp_raven-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.mount ¶

⊟

550 B

file list ¶

⊟

1010 B

/home/dev/aosp/build/android-12.0.0_r21/raven-user/Google/system.img.apexes/com.google.android.tethering.apex-apex_payload.img.mount/apex_manifest.pb vs.

/home/dev/aosp/build/android-12.0.0_r21/aosp_raven-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.mount/apex_manifest.pb ¶

⊟

15.4 KB

/home/dev/aosp/build/android-12.0.0_r21/raven-user/Google/system.img.apexes/com.google.android.tethering.apex-apex_payload.img.mount/etc vs.

/home/dev/aosp/build/android-12.0.0_r21/aosp_raven-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.mount/etc ¶

⊟

15.1 KB

/home/dev/aosp/build/android-12.0.0_r21/raven-user/Google/system.img.apexes/com.google.android.tethering.apex-apex_payload.img.mount/etc/bpf vs.

/home/dev/aosp/build/android-12.0.0_r21/aosp_raven-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.mount/etc/bpf ¶

⊟

14.8 KB

/home/dev/aosp/build/android-12.0.0_r21/raven-user/Google/system.img.apexes/com.google.android.tethering.apex-apex_payload.img.mount/etc/bpf/offload.o vs.

/home/dev/aosp/build/android-12.0.0_r21/aosp_raven-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.mount/etc/bpf/offload.o ¶

⊟

858 B

readelf --wide --file-header {} ¶

⊟

13.4 KB

readelf --wide --sections {} ¶

⊟

305 B

stat {} ¶

⊟

359 KB

/home/dev/aosp/build/android-12.0.0_r21/raven-user/Google/system.img.apexes/com.google.android.tethering.apex-apex_payload.img.mount/javalib vs.

/home/dev/aosp/build/android-12.0.0_r21/aosp_raven-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.mount/javalib ¶

⊟

13.4 KB

/home/dev/aosp/build/android-12.0.0_r21/raven-user/Google/system.img.apexes/com.google.android.tethering.apex-apex_payload.img.mount/javalib/framework-connectivity.jar vs.

/home/dev/aosp/build/android-12.0.0_r21/aosp_raven-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.mount/javalib/framework-connectivity.jar ¶

⊟

481 B

zipinfo {} ¶

⊟

12.3 KB

classes.dex ¶

⊟

12.3 KB

classes.jar ¶

⊟

6.86 KB

zipinfo {} ¶

⊟

1.55 KB

android/net/NetworkCapabilities.class ¶

⊟

1.48 KB

procyon -ec {} ¶

⊟

887 B

android/net/connectivity/framework/util/NetworkCapabilitiesUtils.class ¶

⊟

747 B

procyon -ec {} ¶

⊟

1.86 KB

android/net/connectivity/framework/util/NetworkStackConstants.class ¶

⊟

1.73 KB

procyon -ec {} ¶

⊟

1.13 KB

android/net/util/MultinetworkPolicyTracker.class ¶

⊟

1.03 KB

procyon -ec {} ¶

⊟

305 B

stat {} ¶

⊟

345 KB

/home/dev/aosp/build/android-12.0.0_r21/raven-user/Google/system.img.apexes/com.google.android.tethering.apex-apex_payload.img.mount/javalib/service-connectivity.jar vs.

/home/dev/aosp/build/android-12.0.0_r21/aosp_raven-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.mount/javalib/service-connectivity.jar ¶

⊟

1.49 KB

zipinfo {} ¶

⊟

865 B

zipnote «TEMP»/diffoscope_9blhfqbc_mimgapexes/tmptyyyviq3.zip ¶

⊟

342 KB

classes.dex ¶

⊟

342 KB

classes.jar ¶

⊟

39.9 KB

zipinfo {} ¶

⊟

10.1 KB

zipnote «TEMP»/diffoscope_9blhfqbc_mimgapexes/tmp44cpls56.zip ¶

⊟

1.5 KB

com/android/connectivity/android/net/INetworkMonitor.class ¶

⊟

1.38 KB

procyon -ec {} ¶

⊟

804 B

com/android/connectivity/android/net/INetworkMonitorCallbacks.class ¶

⊟

670 B

procyon -ec {} ¶

⊟

968 B

com/android/connectivity/android/net/INetworkStackConnector.class ¶

⊟

838 B

procyon -ec {} ¶

⊟

822 B

com/android/connectivity/android/net/INetworkStackStatusCallback.class ¶

⊟

682 B

procyon -ec {} ¶

⊟

8.05 KB

com/android/connectivity/android/net/ProvisioningConfigurationParcelable.class ¶

⊟

7.9 KB

procyon -ec {} ¶

⊟

812 B

com/android/connectivity/android/net/dhcp/IDhcpEventCallbacks.class ¶

⊟

678 B

procyon -ec {} ¶

⊟

1.0 KB

com/android/connectivity/android/net/dhcp/IDhcpServer.class ¶

⊟

908 B

procyon -ec {} ¶

⊟

838 B

com/android/connectivity/android/net/dhcp/IDhcpServerCallbacks.class ¶

⊟

702 B

procyon -ec {} ¶

⊟

1.27 KB

com/android/connectivity/android/net/ip/IIpClient.class ¶

⊟

1.16 KB

procyon -ec {} ¶

⊟

858 B

com/android/connectivity/android/net/ip/IIpClientCallbacks.class ¶

⊟

730 B

procyon -ec {} ¶

⊟

3.12 KB

com/android/connectivity/android/net/shared/NetworkMonitorUtils.class ¶

⊟

2.98 KB

procyon -ec {} ¶

⊟

2.55 KB

com/android/connectivity/android/net/shared/ProvisioningConfiguration$Builder.class ¶

⊟

2.39 KB

procyon -ec {} ¶

⊟

18.4 KB

com/android/connectivity/android/net/shared/ProvisioningConfiguration.class ¶

⊟

18.3 KB

procyon -ec {} ¶

⊟

913 B

com/android/connectivity/com/android/net/module/util/NetworkCapabilitiesUtils.class ¶

⊟

747 B

procyon -ec {} ¶

⊟

1.88 KB

com/android/connectivity/com/android/net/module/util/NetworkStackConstants.class ¶

⊟

1.73 KB

procyon -ec {} ¶

⊟

1.69 KB

com/android/server/ConnectivityService$2.class ¶

⊟

1.6 KB

procyon -ec {} ¶

⊟

1.24 KB

com/android/server/ConnectivityService$3.class ¶

⊟

1.15 KB

procyon -ec {} ¶

⊟

1.23 KB

com/android/server/ConnectivityService$CaptivePortalImpl.class ¶

⊟

1.11 KB

procyon -ec {} ¶

⊟

4.19 KB

com/android/server/ConnectivityService$ConnectivityDiagnosticsCallbackInfo.class ¶

⊟

4.03 KB

javap -verbose -constants -s -l -private {} ¶

⊟

3.06 KB

com/android/server/ConnectivityService$ConnectivityDiagnosticsHandler.class ¶

⊟

2.92 KB

procyon -ec {} ¶

⊟

3.88 KB

com/android/server/ConnectivityService$ConnectivityReportEvent.class ¶

⊟

3.74 KB

javap -verbose -constants -s -l -private {} ¶

⊟

912 B

com/android/server/ConnectivityService$Dependencies.class ¶

⊟

798 B

procyon -ec {} ¶

⊟

8.83 KB

com/android/server/ConnectivityService$InternalHandler.class ¶

⊟

8.72 KB

procyon -ec {} ¶

⊟

1.49 KB

com/android/server/ConnectivityService$LegacyNetworkActivityTracker.class ¶

⊟

1.35 KB

procyon -ec {} ¶

⊟

2.89 KB

com/android/server/ConnectivityService$NetworkOfferInfo.class ¶

⊟

2.77 KB

javap -verbose -constants -s -l -private {} ¶

⊟

2.69 KB

com/android/server/ConnectivityService$NetworkReassignment.class ¶

⊟

2.57 KB

javap -verbose -constants -s -l -private {} ¶

⊟

7.94 KB

com/android/server/ConnectivityService$NetworkRequestInfo.class ¶

⊟

7.82 KB

procyon -ec {} ¶

⊟

1.17 KB

com/android/server/ConnectivityService$NetworkStateTrackerHandler.class ¶

⊟

1.04 KB

procyon -ec {} ¶

⊟

4.97 KB

com/android/server/ConnectivityService$OemNetworkRequestFactory.class ¶

⊟

4.83 KB

procyon -ec {} ¶

⊟

55.7 KB

com/android/server/ConnectivityService.class ¶

⊟

55.6 KB

procyon -ec {} ¶

⊟

1.82 KB

com/android/server/connectivity/FullScore.class ¶

⊟

1.73 KB

procyon -ec {} ¶

⊟

691 B

com/android/connectivity/com/android/net/module/util/structs/NsHeader.class ¶

⊟

541 B

procyon -ec {} ¶

⊟

1.51 KB

com/android/server/connectivity/NetworkAgentInfo.class ¶

⊟

1.41 KB

procyon -ec {} ¶

⊟

817 B

com/android/connectivity/android/net/ip/IpClientUtil$IpClientCallbacksProxy.class ¶

⊟

655 B

procyon -ec {} ¶

⊟

4.16 KB

com/android/server/ConnectivityService$NetworkMonitorCallbacks.class ¶

⊟

4.03 KB

procyon -ec {} ¶

⊟

963 B

com/android/server/ConnectivityService$NetdCallback.class ¶

⊟

849 B

procyon -ec {} ¶

⊟

515 B

com/android/connectivity/com/android/net/module/util/netlink/ConntrackMessage$Tuple.class vs.

com/android/connectivity/android/net/netlink/ConntrackMessage$Tuple.class ¶

Files 21% similar despite different names

⊟

312 B

procyon -ec {} ¶

⊟

526 B

com/android/connectivity/com/android/net/module/util/netlink/NdOption.class vs.

com/android/connectivity/android/net/netlink/NdOption.class ¶

Files 20% similar despite different names

⊟

351 B

procyon -ec {} ¶

⊟

510 B

com/android/connectivity/com/android/net/module/util/netlink/NetlinkConstants.class vs.

com/android/connectivity/android/net/netlink/NetlinkConstants.class ¶

Files 1% similar despite different names

⊟

320 B

procyon -ec {} ¶

⊟

1.0 KB

com/android/connectivity/com/android/net/module/util/netlink/NetlinkSocket.class vs.

com/android/connectivity/android/net/netlink/NetlinkSocket.class ¶

Files 18% similar despite different names

⊟

842 B

procyon -ec {} ¶

⊟

533 B

com/android/connectivity/com/android/net/module/util/netlink/StructInetDiagMsg.class vs.

com/android/connectivity/android/net/netlink/StructInetDiagMsg.class ¶

Files 16% similar despite different names

⊟

340 B

procyon -ec {} ¶

⊟

539 B

com/android/connectivity/com/android/net/module/util/netlink/StructInetDiagReqV2.class vs.

com/android/connectivity/android/net/netlink/StructInetDiagReqV2.class ¶

Files 12% similar despite different names

⊟

342 B

procyon -ec {} ¶

⊟

16.4 KB

com/android/connectivity/com/android/net/module/util/netlink/StructNdMsg.class vs.

com/android/connectivity/android/net/netlink/StructNdMsg.class ¶

Files 16% similar despite different names

⊟

16.2 KB

javap -verbose -constants -s -l -private {} ¶

⊟

498 B

com/android/connectivity/com/android/net/module/util/netlink/StructNdaCacheInfo.class vs.

com/android/connectivity/android/net/netlink/StructNdaCacheInfo.class ¶

Files 5% similar despite different names

⊟

304 B

procyon -ec {} ¶

⊟

479 B

com/android/connectivity/com/android/net/module/util/netlink/StructNfGenMsg.class vs.

com/android/connectivity/android/net/netlink/StructNfGenMsg.class ¶

Files 12% similar despite different names

⊟

292 B

procyon -ec {} ¶

⊟

533 B

com/android/connectivity/com/android/net/module/util/netlink/StructNlAttr.class vs.

com/android/connectivity/android/net/netlink/StructNlAttr.class ¶

Files 8% similar despite different names

⊟

351 B

procyon -ec {} ¶

⊟

13.4 KB

com/android/connectivity/com/android/net/module/util/netlink/StructNlMsgHdr.class vs.

com/android/connectivity/android/net/netlink/StructNlMsgHdr.class ¶

Files 14% similar despite different names

⊟

13.2 KB

javap -verbose -constants -s -l -private {} ¶

⊟

93.9 KB

com/android/connectivity/com/android/net/module/util/netlink/ConntrackMessage.class vs.

com/android/connectivity/android/net/netlink/ConntrackMessage.class ¶

Files 22% similar despite different names

⊟

93.7 KB

javap -verbose -constants -s -l -private {} ¶

⊟

6.56 KB

com/android/connectivity/com/android/net/module/util/netlink/InetDiagMessage.class vs.

com/android/connectivity/android/net/netlink/InetDiagMessage.class ¶

Files 24% similar despite different names

⊟

6.38 KB

procyon -ec {} ¶

⊟

542 B

com/android/connectivity/com/android/net/module/util/netlink/NduseroptMessage.class vs.

com/android/connectivity/android/net/netlink/NduseroptMessage.class ¶

Files 21% similar despite different names

⊟

351 B

procyon -ec {} ¶

⊟

543 B

com/android/connectivity/com/android/net/module/util/netlink/StructNdOptPref64.class vs.

com/android/connectivity/android/net/netlink/StructNdOptPref64.class ¶

Files 4% similar despite different names

⊟

351 B

procyon -ec {} ¶

⊟

148 B

com/android/internal/util/StateMachine.uau vs.

com/android/connectivity/com/android/internal/util/StateMachine.uau ¶

Files identical despite different names

⊟

134 B

com/android/internal/util/State.uau vs.

com/android/connectivity/com/android/internal/util/State.uau ¶

Files identical despite different names

⊟

164 B

com/android/internal/util/IndentingPrintWriter.uau vs.

com/android/connectivity/com/android/internal/util/IndentingPrintWriter.uau ¶

Files identical despite different names

⊟

305 B

stat {} ¶

⊟

11.0 KB

/home/dev/aosp/build/android-12.0.0_r21/raven-user/Google/system.img.apexes/com.google.android.tethering.apex-apex_payload.img.mount/lib64 vs.

/home/dev/aosp/build/android-12.0.0_r21/aosp_raven-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.mount/lib64 ¶

⊟

3.84 KB

/home/dev/aosp/build/android-12.0.0_r21/raven-user/Google/system.img.apexes/com.google.android.tethering.apex-apex_payload.img.mount/lib64/libframework-connectivity-jni.so vs.

/home/dev/aosp/build/android-12.0.0_r21/aosp_raven-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.mount/lib64/libframework-connectivity-jni.so ¶

⊟

1.26 KB

readelf --wide --program-header {} ¶

⊟

1.66 KB

readelf --wide --sections {} ¶

⊟

601 B

readelf --wide --notes {} ¶

⊟

6.85 KB

/home/dev/aosp/build/android-12.0.0_r21/raven-user/Google/system.img.apexes/com.google.android.tethering.apex-apex_payload.img.mount/lib64/libservice-connectivity.so vs.

/home/dev/aosp/build/android-12.0.0_r21/aosp_raven-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.mount/lib64/libservice-connectivity.so ¶

⊟

867 B

readelf --wide --file-header {} ¶

⊟

1.59 KB

readelf --wide --program-header {} ¶

⊟

3.2 KB

readelf --wide --sections {} ¶

⊟

601 B

readelf --wide --notes {} ¶

⊟

305 B

stat {} ¶

⊟

613 B

/home/dev/aosp/build/android-12.0.0_r21/raven-user/Google/system.img.apexes/com.google.android.tethering.apex-apex_payload.img.mount/priv-app vs.

/home/dev/aosp/build/android-12.0.0_r21/aosp_raven-user/Ubuntu18.04/system.img.apexes/com.android.tethering.apex-apex_payload.img.mount/priv-app ¶

⊟

328 B

file list ¶


Offset 1, 9 lines modified		Offset 1, 9 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·~~c2cd~~·a694·0142·0d6c··thering......B.l		00000010:·7468·6572·696e·6710·9c9f·cb98·0142·0d6c··thering......B.l
00000020:·6962·616e·6472·6f69·642e·736f·4207·6c69··ibandroid.soB.li		00000020:·6962·616e·6472·6f69·642e·736f·4207·6c69··ibandroid.soB.li
00000030:·6263·2e73·6f42·086c·6962·646c·2e73·6f42··bc.soB.libdl.soB		00000030:·6263·2e73·6f42·086c·6962·646c·2e73·6f42··bc.soB.libdl.soB
00000040:·096c·6962·6c6f·672e·736f·4207·6c69·626d··.liblog.soB.libm		00000040:·096c·6962·6c6f·672e·736f·4207·6c69·626d··.liblog.soB.libm
00000050:·2e73·6f42·126c·6962·6e61·7469·7665·6865··.soB.libnativehe		00000050:·2e73·6f42·126c·6962·6e61·7469·7665·6865··.soB.libnativehe
00000060:·6c70·6572·2e73·6f4a·206c·6962·6672·616d··lper.soJ·libfram		00000060:·6c70·6572·2e73·6f4a·206c·6962·6672·616d··lper.soJ·libfram
00000070:·6577·6f72·6b2d·636f·6e6e·6563·7469·7669··ework-connectivi		00000070:·6577·6f72·6b2d·636f·6e6e·6563·7469·7669··ework-connectivi
00000080:·7479·2d6a·6e69·2e73·6f4a·1a6c·6962·7365··ty-jni.soJ.libse		00000080:·7479·2d6a·6e69·2e73·6f4a·1a6c·6962·7365··ty-jni.soJ.libse


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

1	··Size:·99~~736~~·····» Blocks:·200········IO·Block:·4096···regular·file	1	··Size:·99640·····» Blocks:·200········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, 4 lines modified		Offset 1, 4 lines modified
1	Zip·file·size:·415593·bytes,·number·of·entries:·2	1	Zip·file·size:·415393·bytes,·number·of·entries:·2
2	-rw----·····2.0·fat·······45·b-·defN·08-Jan-01·00:00·META-INF/MANIFEST.MF	2	-rw----·····2.0·fat·······45·b-·defN·08-Jan-01·00:00·META-INF/MANIFEST.MF
3	-rw-r--r--··2.0·unx···415308·b-·stor·08-Jan-01·00:00·classes.dex	3	-rw-r--r--··2.0·unx···415108·b-·stor·08-Jan-01·00:00·classes.dex
4	2·files,·415353·bytes·uncompressed,·415355·bytes·compressed:··0.0%	4	2·files,·415153·bytes·uncompressed,·415155·bytes·compressed:··0.0%


Offset 13, 11 lines modified		Offset 13, 11 lines modified
13	lib	13	lib
14	lib/libframework-connectivity-jni.so	14	lib/libframework-connectivity-jni.so
15	lib64	15	lib64
16	lib64/libframework-connectivity-jni.so	16	lib64/libframework-connectivity-jni.so
17	lib64/libservice-connectivity.so	17	lib64/libservice-connectivity.so
18	lost+found	18	lost+found
19	priv-app	19	priv-app
20	priv-app/ServiceConnectivityResources~~Google~~	20	priv-app/ServiceConnectivityResources
21	priv-app/ServiceConnectivityResources~~Google~~/ServiceConnectivityResources~~Google~~.apk	21	priv-app/ServiceConnectivityResources/ServiceConnectivityResources.apk
22	priv-app/Tethering~~Google~~	22	priv-app/Tethering
23	priv-app/Tethering~~Google~~/Tetherin~~gGoo~~gle.apk	23	priv-app/Tethering/Tethering.apk


Offset 6, 15 lines modified		Offset 6, 15 lines modified
6	··OS/ABI:····························UNIX·-·System·V	6	··OS/ABI:····························UNIX·-·System·V
7	··ABI·Version:·······················0	7	··ABI·Version:·······················0
8	··Type:······························REL·(Relocatable·file)	8	··Type:······························REL·(Relocatable·file)
9	··Machine:···························Linux·BPF	9	··Machine:···························Linux·BPF
10	··Version:···························0x1	10	··Version:···························0x1
11	··Entry·point·address:···············0x0	11	··Entry·point·address:···············0x0
12	··Start·of·program·headers:··········0·(bytes·into·file)	12	··Start·of·program·headers:··········0·(bytes·into·file)
13	··Start·of·section·headers:··········95704·(bytes·into·file)	13	··Start·of·section·headers:··········95608·(bytes·into·file)
14	··Flags:·····························0x0	14	··Flags:·····························0x0
15	··Size·of·this·header:···············64·(bytes)	15	··Size·of·this·header:···············64·(bytes)
16	··Size·of·program·headers:···········0·(bytes)	16	··Size·of·program·headers:···········0·(bytes)
17	··Number·of·program·headers:·········0	17	··Number·of·program·headers:·········0
18	··Size·of·section·headers:···········64·(bytes)	18	··Size·of·section·headers:···········64·(bytes)
19	··Number·of·section·headers:·········63	19	··Number·of·section·headers:·········63
20	··Section·header·string·table·index:·1	20	··Section·header·string·table·index:·1


Offset 1, 72 lines modified		Offset 1, 72 lines modified
1	There·are·63·section·headers,·starting·at·offset·0x175d8:	1	There·are·63·section·headers,·starting·at·offset·0x17578:

2	Section·Headers:	2	Section·Headers:
3	··[Nr]·Name··············Type············Address··········Off····Size···ES·Flg·Lk·Inf·Al	3	··[Nr]·Name··············Type············Address··········Off····Size···ES·Flg·Lk·Inf·Al
4	··[·0]···················NULL············0000000000000000·000000·000000·00······0···0··0	4	··[·0]···················NULL············0000000000000000·000000·000000·00······0···0··0
5	··[·1]·.strtab···········STRTAB··········0000000000000000·015616·001fc2·00······0···0··1	5	··[·1]·.strtab···········STRTAB··········0000000000000000·0155b6·001fc2·00······0···0··1
6	··[·2]·.text·············PROGBITS········0000000000000000·000040·000000·00··AX··0···0··4	6	··[·2]·.text·············PROGBITS········0000000000000000·000040·000000·00··AX··0···0··4
7	··[·3]·schedcls/tether_downstream6_ether·PROGBITS········0000000000000000·000040·0008b0·00··AX··0···0··8	7	··[·3]·schedcls/tether_downstream6_ether·PROGBITS········0000000000000000·000040·0008a8·00··AX··0···0··8
8	··[·4]·.relschedcls/tether_downstream6_ether·REL·············0000000000000000·013f90·0000d0·10·····62···3··8	8	··[·4]·.relschedcls/tether_downstream6_ether·REL·············0000000000000000·013f30·0000d0·10·····62···3··8
9	··[·5]·schedcls/tether_upstream6_ether·PROGBITS········0000000000000000·0008f0·0008d8·00··AX··0···0··8	9	··[·5]·schedcls/tether_upstream6_ether·PROGBITS········0000000000000000·0008e8·0008d0·00··AX··0···0··8
10	··[·6]·.relschedcls/tether_upstream6_ether·REL·············0000000000000000·014060·0000e0·10·····62···5··8	10	··[·6]·.relschedcls/tether_upstream6_ether·REL·············0000000000000000·014000·0000e0·10·····62···5··8
11	··[·7]·schedcls/tether_downstream6_rawip$5_4·PROGBITS········0000000000000000·0011c8·000928·00··AX··0···0··8	11	··[·7]·schedcls/tether_downstream6_rawip$5_4·PROGBITS········0000000000000000·0011b8·000920·00··AX··0···0··8
12	··[·8]·.relschedcls/tether_downstream6_rawip$5_4·REL·············0000000000000000·014140·0000f0·10·····62···7··8	12	··[·8]·.relschedcls/tether_downstream6_rawip$5_4·REL·············0000000000000000·0140e0·0000f0·10·····62···7··8
13	··[·9]·schedcls/tether_upstream6_rawip$5_4·PROGBITS········0000000000000000·001af0·000958·00··AX··0···0··8	13	··[·9]·schedcls/tether_upstream6_rawip$5_4·PROGBITS········0000000000000000·001ad8·000950·00··AX··0···0··8
14	··[10]·.relschedcls/tether_upstream6_rawip$5_4·REL·············0000000000000000·014230·000100·10·····62···9··8	14	··[10]·.relschedcls/tether_upstream6_rawip$5_4·REL·············0000000000000000·0141d0·000100·10·····62···9··8
15	··[11]·schedcls/tether_downstream6_rawip$4_14·PROGBITS········0000000000000000·002448·000928·00··AX··0···0··8	15	··[11]·schedcls/tether_downstream6_rawip$4_14·PROGBITS········0000000000000000·002428·000920·00··AX··0···0··8
16	··[12]·.relschedcls/tether_downstream6_rawip$4_14·REL·············0000000000000000·014330·0000f0·10·····62··11··8	16	··[12]·.relschedcls/tether_downstream6_rawip$4_14·REL·············0000000000000000·0142d0·0000f0·10·····62··11··8
17	··[13]·schedcls/tether_upstream6_rawip$4_14·PROGBITS········0000000000000000·002d70·000958·00··AX··0···0··8	17	··[13]·schedcls/tether_upstream6_rawip$4_14·PROGBITS········0000000000000000·002d48·000950·00··AX··0···0··8
18	··[14]·.relschedcls/tether_upstream6_rawip$4_14·REL·············0000000000000000·014420·000100·10·····62··13··8	18	··[14]·.relschedcls/tether_upstream6_rawip$4_14·REL·············0000000000000000·0143c0·000100·10·····62··13··8
19	··[15]·schedcls/tether_downstream6_rawip$stub·PROGBITS········0000000000000000·0036c8·000010·00··AX··0···0··8	19	··[15]·schedcls/tether_downstream6_rawip$stub·PROGBITS········0000000000000000·003698·000010·00··AX··0···0··8
20	··[16]·schedcls/tether_upstream6_rawip$stub·PROGBITS········0000000000000000·0036d8·000010·00··AX··0···0··8	20	··[16]·schedcls/tether_upstream6_rawip$stub·PROGBITS········0000000000000000·0036a8·000010·00··AX··0···0··8
21	··[17]·schedcls/tether_downstream4_rawip$5_8·PROGBITS········0000000000000000·0036e8·000f90·00··AX··0···0··8	21	··[17]·schedcls/tether_downstream4_rawip$5_8·PROGBITS········0000000000000000·0036b8·000f90·00··AX··0···0··8
22	··[18]·.relschedcls/tether_downstream4_rawip$5_8·REL·············0000000000000000·014520·000140·10·····62··17··8	22	··[18]·.relschedcls/tether_downstream4_rawip$5_8·REL·············0000000000000000·0144c0·000140·10·····62··17··8
23	··[19]·schedcls/tether_upstream4_rawip$5_8·PROGBITS········0000000000000000·004678·000f90·00··AX··0···0··8	23	··[19]·schedcls/tether_upstream4_rawip$5_8·PROGBITS········0000000000000000·004648·000f90·00··AX··0···0··8
24	··[20]·.relschedcls/tether_upstream4_rawip$5_8·REL·············0000000000000000·014660·000140·10·····62··19··8	24	··[20]·.relschedcls/tether_upstream4_rawip$5_8·REL·············0000000000000000·014600·000140·10·····62··19··8
25	··[21]·schedcls/tether_downstream4_ether$5_8·PROGBITS········0000000000000000·005608·000f08·00··AX··0···0··8	25	··[21]·schedcls/tether_downstream4_ether$5_8·PROGBITS········0000000000000000·0055d8·000f08·00··AX··0···0··8
26	··[22]·.relschedcls/tether_downstream4_ether$5_8·REL·············0000000000000000·0147a0·000120·10·····62··21··8	26	··[22]·.relschedcls/tether_downstream4_ether$5_8·REL·············0000000000000000·014740·000120·10·····62··21··8
27	··[23]·schedcls/tether_upstream4_ether$5_8·PROGBITS········0000000000000000·006510·000f08·00··AX··0···0··8	27	··[23]·schedcls/tether_upstream4_ether$5_8·PROGBITS········0000000000000000·0064e0·000f08·00··AX··0···0··8
28	··[24]·.relschedcls/tether_upstream4_ether$5_8·REL·············0000000000000000·0148c0·000120·10·····62··23··8	28	··[24]·.relschedcls/tether_upstream4_ether$5_8·REL·············0000000000000000·014860·000120·10·····62··23··8
29	··[25]·schedcls/tether_downstream4_rawip$opt·PROGBITS········0000000000000000·007418·000f90·00··AX··0···0··8	29	··[25]·schedcls/tether_downstream4_rawip$opt·PROGBITS········0000000000000000·0073e8·000f90·00··AX··0···0··8
30	··[26]·.relschedcls/tether_downstream4_rawip$opt·REL·············0000000000000000·0149e0·000140·10·····62··25··8	30	··[26]·.relschedcls/tether_downstream4_rawip$opt·REL·············0000000000000000·014980·000140·10·····62··25··8
31	··[27]·schedcls/tether_upstream4_rawip$opt·PROGBITS········0000000000000000·0083a8·000f90·00··AX··0···0··8	31	··[27]·schedcls/tether_upstream4_rawip$opt·PROGBITS········0000000000000000·008378·000f90·00··AX··0···0··8
32	··[28]·.relschedcls/tether_upstream4_rawip$opt·REL·············0000000000000000·014b20·000140·10·····62··27··8	32	··[28]·.relschedcls/tether_upstream4_rawip$opt·REL·············0000000000000000·014ac0·000140·10·····62··27··8
33	··[29]·schedcls/tether_downstream4_ether$opt·PROGBITS········0000000000000000·009338·000f08·00··AX··0···0··8	33	··[29]·schedcls/tether_downstream4_ether$opt·PROGBITS········0000000000000000·009308·000f08·00··AX··0···0··8
34	··[30]·.relschedcls/tether_downstream4_ether$opt·REL·············0000000000000000·014c60·000120·10·····62··29··8	34	··[30]·.relschedcls/tether_downstream4_ether$opt·REL·············0000000000000000·014c00·000120·10·····62··29··8
35	··[31]·schedcls/tether_upstream4_ether$opt·PROGBITS········0000000000000000·00a240·000f08·00··AX··0···0··8	35	··[31]·schedcls/tether_upstream4_ether$opt·PROGBITS········0000000000000000·00a210·000f08·00··AX··0···0··8
36	··[32]·.relschedcls/tether_upstream4_ether$opt·REL·············0000000000000000·014d80·000120·10·····62··31··8	36	··[32]·.relschedcls/tether_upstream4_ether$opt·REL·············0000000000000000·014d20·000120·10·····62··31··8
37	··[33]·schedcls/tether_downstream4_rawip$5_4·PROGBITS········0000000000000000·00b148·000dc8·00··AX··0···0··8	37	··[33]·schedcls/tether_downstream4_rawip$5_4·PROGBITS········0000000000000000·00b118·000dc0·00··AX··0···0··8
38	··[34]·.relschedcls/tether_downstream4_rawip$5_4·REL·············0000000000000000·014ea0·000130·10·····62··33··8	38	··[34]·.relschedcls/tether_downstream4_rawip$5_4·REL·············0000000000000000·014e40·000130·10·····62··33··8
39	··[35]·schedcls/tether_upstream4_rawip$5_4·PROGBITS········0000000000000000·00b~~f10~~·000dc8·00··AX··0···0··8	39	··[35]·schedcls/tether_upstream4_rawip$5_4·PROGBITS········0000000000000000·00bed8·000dc0·00··AX··0···0··8
40	··[36]·.relschedcls/tether_upstream4_rawip$5_4·REL·············0000000000000000·014fd0·000130·10·····62··35··8	40	··[36]·.relschedcls/tether_upstream4_rawip$5_4·REL·············0000000000000000·014f70·000130·10·····62··35··8
41	··[37]·schedcls/tether_downstream4_rawip$4_14·PROGBITS········0000000000000000·00ccd8·000dc8·00··AX··0···0··8	41	··[37]·schedcls/tether_downstream4_rawip$4_14·PROGBITS········0000000000000000·00cc98·000dc0·00··AX··0···0··8
42	··[38]·.relschedcls/tether_downstream4_rawip$4_14·REL·············0000000000000000·015100·000130·10·····62··37··8	42	··[38]·.relschedcls/tether_downstream4_rawip$4_14·REL·············0000000000000000·0150a0·000130·10·····62··37··8
43	··[39]·schedcls/tether_upstream4_rawip$4_14·PROGBITS········0000000000000000·00daa0·000dc8·00··AX··0···0··8	43	··[39]·schedcls/tether_upstream4_rawip$4_14·PROGBITS········0000000000000000·00da58·000dc0·00··AX··0···0··8
44	··[40]·.relschedcls/tether_upstream4_rawip$4_14·REL·············0000000000000000·015230·000130·10·····62··39··8	44	··[40]·.relschedcls/tether_upstream4_rawip$4_14·REL·············0000000000000000·0151d0·000130·10·····62··39··8
45	··[41]·schedcls/tether_downstream4_ether$4_14·PROGBITS········0000000000000000·00e868·000d60·00··AX··0···0··8	45	··[41]·schedcls/tether_downstream4_ether$4_14·PROGBITS········0000000000000000·00e818·000d58·00··AX··0···0··8
46	··[42]·.relschedcls/tether_downstream4_ether$4_14·REL·············0000000000000000·015360·000110·10·····62··41··8	46	··[42]·.relschedcls/tether_downstream4_ether$4_14·REL·············0000000000000000·015300·000110·10·····62··41··8
47	··[43]·schedcls/tether_upstream4_ether$4_14·PROGBITS········0000000000000000·00f5c8·000d60·00··AX··0···0··8	47	··[43]·schedcls/tether_upstream4_ether$4_14·PROGBITS········0000000000000000·00f570·000d58·00··AX··0···0··8
48	··[44]·.relschedcls/tether_upstream4_ether$4_14·REL·············0000000000000000·015470·000110·10·····62··43··8	48	··[44]·.relschedcls/tether_upstream4_ether$4_14·REL·············0000000000000000·015410·000110·10·····62··43··8
49	··[45]·schedcls/tether_downstream4_rawip$stub·PROGBITS········0000000000000000·010328·000010·00··AX··0···0··8	49	··[45]·schedcls/tether_downstream4_rawip$stub·PROGBITS········0000000000000000·0102c8·000010·00··AX··0···0··8
50	··[46]·schedcls/tether_upstream4_rawip$stub·PROGBITS········0000000000000000·010338·000010·00··AX··0···0··8	50	··[46]·schedcls/tether_upstream4_rawip$stub·PROGBITS········0000000000000000·0102d8·000010·00··AX··0···0··8
51	··[47]·schedcls/tether_downstream4_ether$stub·PROGBITS········0000000000000000·010348·000010·00··AX··0···0··8	51	··[47]·schedcls/tether_downstream4_ether$stub·PROGBITS········0000000000000000·0102e8·000010·00··AX··0···0··8
52	··[48]·schedcls/tether_upstream4_ether$stub·PROGBITS········0000000000000000·010358·000010·00··AX··0···0··8	52	··[48]·schedcls/tether_upstream4_ether$stub·PROGBITS········0000000000000000·0102f8·000010·00··AX··0···0··8
53	··[49]·xdp/tether_downstream_ether·PROGBITS········0000000000000000·010368·000010·00··AX··0···0··8	53	··[49]·xdp/tether_downstream_ether·PROGBITS········0000000000000000·010308·000010·00··AX··0···0··8
54	··[50]·xdp/tether_downstream_rawip·PROGBITS········0000000000000000·010378·000010·00··AX··0···0··8	54	··[50]·xdp/tether_downstream_rawip·PROGBITS········0000000000000000·010318·000010·00··AX··0···0··8
55	··[51]·xdp/tether_upstream_ether·PROGBITS········0000000000000000·010388·000010·00··AX··0···0··8	55	··[51]·xdp/tether_upstream_ether·PROGBITS········0000000000000000·010328·000010·00··AX··0···0··8
56	··[52]·xdp/tether_upstream_rawip·PROGBITS········0000000000000000·010398·000010·00··AX··0···0··8	56	··[52]·xdp/tether_upstream_rawip·PROGBITS········0000000000000000·010338·000010·00··AX··0···0··8
57	··[53]·maps··············PROGBITS········0000000000000000·0103a8·0001b0·00···A··0···0··4	57	··[53]·maps··············PROGBITS········0000000000000000·010348·0001b0·00···A··0···0··4
58	··[54]·progs·············PROGBITS········0000000000000000·010558·000348·00···A··0···0··4	58	··[54]·progs·············PROGBITS········0000000000000000·0104f8·000348·00···A··0···0··4
59	··[55]·bpfloader_min_ver·PROGBITS········0000000000000000·0108a0·000004·00··WA··0···0··4	59	··[55]·bpfloader_min_ver·PROGBITS········0000000000000000·010840·000004·00··WA··0···0··4
60	··[56]·bpfloader_max_ver·PROGBITS········0000000000000000·0108a4·000004·00··WA··0···0··4	60	··[56]·bpfloader_max_ver·PROGBITS········0000000000000000·010844·000004·00··WA··0···0··4
61	··[57]·size_of_bpf_map_def·PROGBITS········0000000000000000·0108a8·000008·00··WA··0···0··8	61	··[57]·size_of_bpf_map_def·PROGBITS········0000000000000000·010848·000008·00··WA··0···0··8
62	··[58]·size_of_bpf_prog_def·PROGBITS········0000000000000000·0108b0·000008·00··WA··0···0··8	62	··[58]·size_of_bpf_prog_def·PROGBITS········0000000000000000·010850·000008·00··WA··0···0··8
63	··[59]·license···········PROGBITS········0000000000000000·0108b8·00000b·00··WA··0···0··1	63	··[59]·license···········PROGBITS········0000000000000000·010858·00000b·00··WA··0···0··1
64	··[60]·critical··········PROGBITS········0000000000000000·0108c3·00000a·00··WA··0···0··1	64	··[60]·critical··········PROGBITS········0000000000000000·010863·00000a·00··WA··0···0··1
65	··[61]·.llvm_addrsig·····LOOS+0xfff4c03··0000000000000000·015580·000096·00···E·62···0··1	65	··[61]·.llvm_addrsig·····LOOS+0xfff4c03··0000000000000000·015520·000096·00···E·62···0··1
66	··[62]·.symtab···········SYMTAB··········0000000000000000·0108d0·0036c0·18······1·509··8	66	··[62]·.symtab···········SYMTAB··········0000000000000000·010870·0036c0·18······1·509··8
67	Key·to·Flags:	67	Key·to·Flags:
68	··W·(write),·A·(alloc),·X·(execute),·M·(merge),·S·(strings),·I·(info),	68	··W·(write),·A·(alloc),·X·(execute),·M·(merge),·S·(strings),·I·(info),
69	··L·(link·order),·O·(extra·OS·processing·required),·G·(group),·T·(TLS),	69	··L·(link·order),·O·(extra·OS·processing·required),·G·(group),·T·(TLS),
70	··C·(compressed),·x·(unknown),·o·(OS·specific),·E·(exclude),	70	··C·(compressed),·x·(unknown),·o·(OS·specific),·E·(exclude),
71	··p·(processor·specific)	71	··p·(processor·specific)


Offset 1, 8 lines modified		Offset 1, 8 lines modified
1	Zip·file·size:·545555·bytes,·number·of·entries:·322	1	Zip·file·size:·545451·bytes,·number·of·entries:·322
2	?rwxrwxr-x··2.0·unx······662·b-·stor·80-Jan-01·00:00·android/net/CaptivePortal$1.class	2	?rwxrwxr-x··2.0·unx······662·b-·stor·80-Jan-01·00:00·android/net/CaptivePortal$1.class
3	?rwxrwxr-x··2.0·unx·····1517·b-·stor·80-Jan-01·00:00·android/net/CaptivePortal.class	3	?rwxrwxr-x··2.0·unx·····1517·b-·stor·80-Jan-01·00:00·android/net/CaptivePortal.class
4	?rwxrwxr-x··2.0·unx······629·b-·stor·80-Jan-01·00:00·android/net/CaptivePortalData$1.class	4	?rwxrwxr-x··2.0·unx······629·b-·stor·80-Jan-01·00:00·android/net/CaptivePortalData$1.class
5	?rwxrwxr-x··2.0·unx·····2431·b-·stor·80-Jan-01·00:00·android/net/CaptivePortalData$Builder.class	5	?rwxrwxr-x··2.0·unx·····2431·b-·stor·80-Jan-01·00:00·android/net/CaptivePortalData$Builder.class
6	?rwxrwxr-x··2.0·unx······144·b-·stor·80-Jan-01·00:00·android/net/CaptivePortalData$CaptivePortalDataSource.class	6	?rwxrwxr-x··2.0·unx······144·b-·stor·80-Jan-01·00:00·android/net/CaptivePortalData$CaptivePortalDataSource.class
7	?rwxrwxr-x··2.0·unx·····5011·b-·stor·80-Jan-01·00:00·android/net/CaptivePortalData.class	7	?rwxrwxr-x··2.0·unx·····5011·b-·stor·80-Jan-01·00:00·android/net/CaptivePortalData.class
8	?rwxrwxr-x··2.0·unx·····1133·b-·stor·80-Jan-01·00:00·android/net/ConnectionInfo$1.class	8	?rwxrwxr-x··2.0·unx·····1133·b-·stor·80-Jan-01·00:00·android/net/ConnectionInfo$1.class
Offset 134, 15 lines modified		Offset 134, 15 lines modified
134	?rwxrwxr-x··2.0·unx·····3833·b-·stor·80-Jan-01·00:00·android/net/NetworkAgentConfig.class	134	?rwxrwxr-x··2.0·unx·····3833·b-·stor·80-Jan-01·00:00·android/net/NetworkAgentConfig.class
135	?rwxrwxr-x··2.0·unx·····2612·b-·stor·80-Jan-01·00:00·android/net/NetworkCapabilities$1.class	135	?rwxrwxr-x··2.0·unx·····2612·b-·stor·80-Jan-01·00:00·android/net/NetworkCapabilities$1.class
136	?rwxrwxr-x··2.0·unx·····3002·b-·stor·80-Jan-01·00:00·android/net/NetworkCapabilities$Builder.class	136	?rwxrwxr-x··2.0·unx·····3002·b-·stor·80-Jan-01·00:00·android/net/NetworkCapabilities$Builder.class
137	?rwxrwxr-x··2.0·unx······131·b-·stor·80-Jan-01·00:00·android/net/NetworkCapabilities$NameOf.class	137	?rwxrwxr-x··2.0·unx······131·b-·stor·80-Jan-01·00:00·android/net/NetworkCapabilities$NameOf.class
138	?rwxrwxr-x··2.0·unx······136·b-·stor·80-Jan-01·00:00·android/net/NetworkCapabilities$NetCapability.class	138	?rwxrwxr-x··2.0·unx······136·b-·stor·80-Jan-01·00:00·android/net/NetworkCapabilities$NetCapability.class
139	?rwxrwxr-x··2.0·unx······136·b-·stor·80-Jan-01·00:00·android/net/NetworkCapabilities$RedactionType.class	139	?rwxrwxr-x··2.0·unx······136·b-·stor·80-Jan-01·00:00·android/net/NetworkCapabilities$RedactionType.class
140	?rwxrwxr-x··2.0·unx······132·b-·stor·80-Jan-01·00:00·android/net/NetworkCapabilities$Transport.class	140	?rwxrwxr-x··2.0·unx······132·b-·stor·80-Jan-01·00:00·android/net/NetworkCapabilities$Transport.class
141	?rwxrwxr-x··2.0·unx····24~~230~~·b-·defN·80-Jan-01·00:00·android/net/NetworkCapabilities.class	141	?rwxrwxr-x··2.0·unx····24142·b-·defN·80-Jan-01·00:00·android/net/NetworkCapabilities.class
142	?rwxrwxr-x··2.0·unx······952·b-·stor·80-Jan-01·00:00·android/net/NetworkConfig.class	142	?rwxrwxr-x··2.0·unx······952·b-·stor·80-Jan-01·00:00·android/net/NetworkConfig.class
143	?rwxrwxr-x··2.0·unx·····1557·b-·stor·80-Jan-01·00:00·android/net/NetworkInfo$1.class	143	?rwxrwxr-x··2.0·unx·····1557·b-·stor·80-Jan-01·00:00·android/net/NetworkInfo$1.class
144	?rwxrwxr-x··2.0·unx·····1491·b-·stor·80-Jan-01·00:00·android/net/NetworkInfo$DetailedState.class	144	?rwxrwxr-x··2.0·unx·····1491·b-·stor·80-Jan-01·00:00·android/net/NetworkInfo$DetailedState.class
145	?rwxrwxr-x··2.0·unx·····1001·b-·stor·80-Jan-01·00:00·android/net/NetworkInfo$State.class	145	?rwxrwxr-x··2.0·unx·····1001·b-·stor·80-Jan-01·00:00·android/net/NetworkInfo$State.class
146	?rwxrwxr-x··2.0·unx·····7105·b-·stor·80-Jan-01·00:00·android/net/NetworkInfo.class	146	?rwxrwxr-x··2.0·unx·····7105·b-·stor·80-Jan-01·00:00·android/net/NetworkInfo.class
147	?rwxrwxr-x··2.0·unx·····1196·b-·stor·80-Jan-01·00:00·android/net/NetworkProvider$1.class	147	?rwxrwxr-x··2.0·unx·····1196·b-·stor·80-Jan-01·00:00·android/net/NetworkProvider$1.class
148	?rwxrwxr-x··2.0·unx······188·b-·stor·80-Jan-01·00:00·android/net/NetworkProvider$NetworkOfferCallback.class	148	?rwxrwxr-x··2.0·unx······188·b-·stor·80-Jan-01·00:00·android/net/NetworkProvider$NetworkOfferCallback.class
Offset 234, 30 lines modified		Offset 234, 30 lines modified
234	?rwxrwxr-x··2.0·unx·····1643·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/LinkPropertiesUtils$CompareOrUpdateResult.class	234	?rwxrwxr-x··2.0·unx·····1643·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/LinkPropertiesUtils$CompareOrUpdateResult.class
235	?rwxrwxr-x··2.0·unx·····1198·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/LinkPropertiesUtils$CompareResult.class	235	?rwxrwxr-x··2.0·unx·····1198·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/LinkPropertiesUtils$CompareResult.class
236	?rwxrwxr-x··2.0·unx·····1679·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/LinkPropertiesUtils.class	236	?rwxrwxr-x··2.0·unx·····1679·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/LinkPropertiesUtils.class
237	?rwxrwxr-x··2.0·unx······186·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/LocationPermissionChecker$LocationPermissionCheckStatus.class	237	?rwxrwxr-x··2.0·unx······186·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/LocationPermissionChecker$LocationPermissionCheckStatus.class
238	?rwxrwxr-x··2.0·unx·····4980·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/LocationPermissionChecker.class	238	?rwxrwxr-x··2.0·unx·····4980·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/LocationPermissionChecker.class
239	?rwxrwxr-x··2.0·unx·····2287·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/MacAddressUtils.class	239	?rwxrwxr-x··2.0·unx·····2287·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/MacAddressUtils.class
240	?rwxrwxr-x··2.0·unx·····1899·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/NetUtils.class	240	?rwxrwxr-x··2.0·unx·····1899·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/NetUtils.class
241	?rwxrwxr-x··2.0·unx·····1~~769~~·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/NetworkCapabilitiesUtils.class	241	?rwxrwxr-x··2.0·unx·····1806·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/NetworkCapabilitiesUtils.class
242	?rwxrwxr-x··2.0·unx······771·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/NetworkIdentityUtils.class	242	?rwxrwxr-x··2.0·unx······771·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/NetworkIdentityUtils.class
243	?rwxrwxr-x··2.0·unx·····4~~790~~·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/NetworkStackConstants.class	243	?rwxrwxr-x··2.0·unx·····4673·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/NetworkStackConstants.class
244	?rwxrwxr-x··2.0·unx·····1562·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/PermissionUtils.class	244	?rwxrwxr-x··2.0·unx·····1562·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/PermissionUtils.class
245	?rwxrwxr-x··2.0·unx·····2423·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/ProxyUtils.class	245	?rwxrwxr-x··2.0·unx·····2423·b-·stor·80-Jan-01·00:00·android/net/connectivity/framework/util/ProxyUtils.class
246	?rwxrwxr-x··2.0·unx······797·b-·stor·80-Jan-01·00:00·android/net/util/DnsUtils$Rfc6724Comparator.class	246	?rwxrwxr-x··2.0·unx······797·b-·stor·80-Jan-01·00:00·android/net/util/DnsUtils$Rfc6724Comparator.class
247	?rwxrwxr-x··2.0·unx······889·b-·stor·80-Jan-01·00:00·android/net/util/DnsUtils$SortableAddress.class	247	?rwxrwxr-x··2.0·unx······889·b-·stor·80-Jan-01·00:00·android/net/util/DnsUtils$SortableAddress.class
248	?rwxrwxr-x··2.0·unx·····5309·b-·stor·80-Jan-01·00:00·android/net/util/DnsUtils.class	248	?rwxrwxr-x··2.0·unx·····5309·b-·stor·80-Jan-01·00:00·android/net/util/DnsUtils.class
249	?rwxrwxr-x··2.0·unx······223·b-·stor·80-Jan-01·00:00·android/net/util/KeepaliveUtils$KeepaliveDeviceConfigurationException.class	249	?rwxrwxr-x··2.0·unx······223·b-·stor·80-Jan-01·00:00·android/net/util/KeepaliveUtils$KeepaliveDeviceConfigurationException.class
250	?rwxrwxr-x··2.0·unx·····2427·b-·stor·80-Jan-01·00:00·android/net/util/KeepaliveUtils.class	250	?rwxrwxr-x··2.0·unx·····2427·b-·stor·80-Jan-01·00:00·android/net/util/KeepaliveUtils.class
251	?rwxrwxr-x··2.0·unx······474·b-·stor·80-Jan-01·00:00·android/net/util/MultinetworkPolicyTracker$$ExternalSyntheticLambda0.class	251	?rwxrwxr-x··2.0·unx······474·b-·stor·80-Jan-01·00:00·android/net/util/MultinetworkPolicyTracker$$ExternalSyntheticLambda0.class
252	?rwxrwxr-x··2.0·unx······477·b-·stor·80-Jan-01·00:00·android/net/util/MultinetworkPolicyTracker$1.class	252	?rwxrwxr-x··2.0·unx······477·b-·stor·80-Jan-01·00:00·android/net/util/MultinetworkPolicyTracker$1.class
253	?rwxrwxr-x··2.0·unx······645·b-·stor·80-Jan-01·00:00·android/net/util/MultinetworkPolicyTracker$ActiveDataSubscriptionIdListener.class	253	?rwxrwxr-x··2.0·unx······645·b-·stor·80-Jan-01·00:00·android/net/util/MultinetworkPolicyTracker$ActiveDataSubscriptionIdListener.class
254	?rwxrwxr-x··2.0·unx······802·b-·stor·80-Jan-01·00:00·android/net/util/MultinetworkPolicyTracker$HandlerExecutor.class	254	?rwxrwxr-x··2.0·unx······802·b-·stor·80-Jan-01·00:00·android/net/util/MultinetworkPolicyTracker$HandlerExecutor.class
255	?rwxrwxr-x··2.0·unx·····1130·b-·stor·80-Jan-01·00:00·android/net/util/MultinetworkPolicyTracker$SettingObserver.class	255	?rwxrwxr-x··2.0·unx·····1130·b-·stor·80-Jan-01·00:00·android/net/util/MultinetworkPolicyTracker$SettingObserver.class
256	?rwxrwxr-x··2.0·unx·····6263·b-·stor·80-Jan-01·00:00·android/net/util/MultinetworkPolicyTracker.class	256	?rwxrwxr-x··2.0·unx·····6270·b-·stor·80-Jan-01·00:00·android/net/util/MultinetworkPolicyTracker.class
257	?rwxrwxr-x··2.0·unx·····1242·b-·stor·80-Jan-01·00:00·android/net/ConnectivityManager$LegacyRequest$1.class	257	?rwxrwxr-x··2.0·unx·····1242·b-·stor·80-Jan-01·00:00·android/net/ConnectivityManager$LegacyRequest$1.class
258	?rwxrwxr-x··2.0·unx·····1579·b-·stor·80-Jan-01·00:00·android/net/DnsResolver$DnsAddressAnswer.class	258	?rwxrwxr-x··2.0·unx·····1579·b-·stor·80-Jan-01·00:00·android/net/DnsResolver$DnsAddressAnswer.class
259	?rwxrwxr-x··2.0·unx·····2212·b-·stor·80-Jan-01·00:00·android/net/DnsResolver$InetAddressAnswerAccumulator.class	259	?rwxrwxr-x··2.0·unx·····2212·b-·stor·80-Jan-01·00:00·android/net/DnsResolver$InetAddressAnswerAccumulator.class
260	?rwxrwxr-x··2.0·unx······335·b-·stor·80-Jan-01·00:00·android/net/ICaptivePortal$Default.class	260	?rwxrwxr-x··2.0·unx······335·b-·stor·80-Jan-01·00:00·android/net/ICaptivePortal$Default.class
261	?rwxrwxr-x··2.0·unx·····1251·b-·stor·80-Jan-01·00:00·android/net/ICaptivePortal$Stub$Proxy.class	261	?rwxrwxr-x··2.0·unx·····1251·b-·stor·80-Jan-01·00:00·android/net/ICaptivePortal$Stub$Proxy.class
262	?rwxrwxr-x··2.0·unx·····1562·b-·stor·80-Jan-01·00:00·android/net/ICaptivePortal$Stub.class	262	?rwxrwxr-x··2.0·unx·····1562·b-·stor·80-Jan-01·00:00·android/net/ICaptivePortal$Stub.class
263	?rwxrwxr-x··2.0·unx······614·b-·stor·80-Jan-01·00:00·android/net/IConnectivityDiagnosticsCallback$Default.class	263	?rwxrwxr-x··2.0·unx······614·b-·stor·80-Jan-01·00:00·android/net/IConnectivityDiagnosticsCallback$Default.class
Offset 317, 8 lines modified		Offset 317, 8 lines modified
317	?rwxrwxr-x··2.0·unx······777·b-·stor·80-Jan-01·00:00·android/net/ConnectivityManager$6.class	317	?rwxrwxr-x··2.0·unx······777·b-·stor·80-Jan-01·00:00·android/net/ConnectivityManager$6.class
318	?rwxrwxr-x··2.0·unx······777·b-·stor·80-Jan-01·00:00·android/net/ConnectivityManager$7.class	318	?rwxrwxr-x··2.0·unx······777·b-·stor·80-Jan-01·00:00·android/net/ConnectivityManager$7.class
319	?rwxrwxr-x··2.0·unx·····2860·b-·stor·80-Jan-01·00:00·android/net/ConnectivityManager$PacketKeepalive$1.class	319	?rwxrwxr-x··2.0·unx·····2860·b-·stor·80-Jan-01·00:00·android/net/ConnectivityManager$PacketKeepalive$1.class
320	?rwxrwxr-x··2.0·unx·····2837·b-·stor·80-Jan-01·00:00·android/net/NetworkAgent$NetworkAgentBinder.class	320	?rwxrwxr-x··2.0·unx·····2837·b-·stor·80-Jan-01·00:00·android/net/NetworkAgent$NetworkAgentBinder.class
321	?rwxrwxr-x··2.0·unx·····1339·b-·stor·80-Jan-01·00:00·android/net/NetworkProvider$NetworkOfferCallbackProxy.class	321	?rwxrwxr-x··2.0·unx·····1339·b-·stor·80-Jan-01·00:00·android/net/NetworkProvider$NetworkOfferCallbackProxy.class
322	?rwxrwxr-x··2.0·unx·····2874·b-·stor·80-Jan-01·00:00·android/net/QosCallbackConnection.class	322	?rwxrwxr-x··2.0·unx·····2874·b-·stor·80-Jan-01·00:00·android/net/QosCallbackConnection.class
323	?rwxrwxr-x··2.0·unx·····2422·b-·stor·80-Jan-01·00:00·android/net/SocketKeepalive$1.class	323	?rwxrwxr-x··2.0·unx·····2422·b-·stor·80-Jan-01·00:00·android/net/SocketKeepalive$1.class
324	322·files,·592~~291~~·bytes·uncompressed,·489~~291~~·bytes·compressed:··17.4%	324	322·files,·592130·bytes·uncompressed,·489187·bytes·compressed:··17.4%


Offset 937, 29 lines modified		Offset 937, 25 lines modified
937	····public·NetworkCapabilities·removeTransportType(final·int·n)·{	937	····public·NetworkCapabilities·removeTransportType(final·int·n)·{
938	········checkValidTransportType(n);	938	········checkValidTransportType(n);
939	········this.mTransportTypes·&=·~(1·<<·n);	939	········this.mTransportTypes·&=·~(1·<<·n);
940	········this.setNetworkSpecifier(this.mNetworkSpecifier);	940	········this.setNetworkSpecifier(this.mNetworkSpecifier);
941	········return·this;	941	········return·this;
942	····}	942	····}
943	····	943	····
944	····public·void·restrictCapabilitesForTestNetwork(final·int·n)·{
945	········this.restrictCapabilitiesForTestNetwork(n);
946	····}
947	····
948	····public·void·restrictCapabilitiesForTestNetwork(final·int·ownerUid)·{	944	····public·void·restrictCapabilitesForTestNetwork(final·int·ownerUid)·{
949	········final·long·mNetworkCapabilities·=·this.mNetworkCapabilities;	945	········final·long·mNetworkCapabilities·=·this.mNetworkCapabilities;
950	········final·long·mTransportTypes·=·this.mTransportTypes;	946	········final·long·mTransportTypes·=·this.mTransportTypes;
951	········final·NetworkSpecifier·mNetworkSpecifier·=·this.mNetworkSpecifier;	947	········final·NetworkSpecifier·mNetworkSpecifier·=·this.mNetworkSpecifier;
952	········final·int·mSignalStrength·=·this.mSignalStrength;	948	········final·int·mSignalStrength·=·this.mSignalStrength;
953	········final·int·ownerUid2·=·this.getOwnerUid();	949	········final·int·ownerUid2·=·this.getOwnerUid();
954	········final·int[]·administratorUids·=·this.getAdministratorUids();	950	········final·int[]·administratorUids·=·this.getAdministratorUids();
955	········final·TransportInfo·transportInfo·=·this.getTransportInfo();	951	········final·TransportInfo·transportInfo·=·this.getTransportInfo();
956	········final·Set·subscriptionIds·=·this.getSubscriptionIds();	952	········final·Set·subscriptionIds·=·this.getSubscriptionIds();
957	········this.clearAll();	953	········this.clearAll();
958	········final·long·n·=·lcmp(0L,·~~0x2000L~~·&·mNetworkCapabilities);	954	········final·long·n·=·lcmp(0L,·(long)13·&·mNetworkCapabilities);
959	········final·long·n2·=·128L;	955	········final·long·n2·=·128L;
960	········if·(n·!=·0)·{	956	········if·(n·!=·0)·{
961	············this.mTransportTypes·=·((0x98L·&·mTransportTypes)·\|·n2);	957	············this.mTransportTypes·=·((0x98L·&·mTransportTypes)·\|·n2);
962	············this.setSubscriptionIds(subscriptionIds);	958	············this.setSubscriptionIds(subscriptionIds);
963	········}	959	········}
964	········else·{	960	········else·{
965	············this.mTransportTypes·=·(mTransportTypes·\|·n2);	961	············this.mTransportTypes·=·(mTransportTypes·\|·n2);


Offset 10, 14 lines modified		Offset 10, 15 lines modified
10	····public·static·final·int·NET_CAPABILITY_BIP·=·31;	10	····public·static·final·int·NET_CAPABILITY_BIP·=·31;
11	····public·static·final·int·NET_CAPABILITY_ENTERPRISE·=·29;	11	····public·static·final·int·NET_CAPABILITY_ENTERPRISE·=·29;
12	····public·static·final·int·NET_CAPABILITY_NOT_VCN_MANAGED·=·28;	12	····public·static·final·int·NET_CAPABILITY_NOT_VCN_MANAGED·=·28;
13	····public·static·final·int·NET_CAPABILITY_OEM_PRIVATE·=·26;	13	····public·static·final·int·NET_CAPABILITY_OEM_PRIVATE·=·26;
14	····public·static·final·int·NET_CAPABILITY_VEHICLE_INTERNAL·=·27;	14	····public·static·final·int·NET_CAPABILITY_VEHICLE_INTERNAL·=·27;
15	····public·static·final·int·NET_CAPABILITY_VSIM·=·30;	15	····public·static·final·int·NET_CAPABILITY_VSIM·=·30;
16	····static·final·long·RESTRICTED_CAPABILITIES·=·3900704700L;	16	····static·final·long·RESTRICTED_CAPABILITIES·=·3900704700L;
		17	····public·static·final·int·TRANSPORT_USB·=·8;
17	····static·final·long·UNRESTRICTED_CAPABILITIES·=·4163L;	18	····static·final·long·UNRESTRICTED_CAPABILITIES·=·4163L;
18	····	19	····
19	····static·{	20	····static·{
20	········final·int[]·array;	21	········final·int[]·array;
21	········final·int[]·display_TRANSPORT_PRIORITIES·=·array·=·new·int[7];	22	········final·int[]·display_TRANSPORT_PRIORITIES·=·array·=·new·int[7];
22	········array[0]·=·4;	23	········array[0]·=·4;
23	········array[1]·=·0;	24	········array[1]·=·0;


Offset 28, 30 lines modified		Offset 28, 27 lines modified
28	····public·static·final·int·ETHER_TYPE_IPV6·=·34525;	28	····public·static·final·int·ETHER_TYPE_IPV6·=·34525;
29	····public·static·final·int·ETHER_TYPE_LENGTH·=·2;	29	····public·static·final·int·ETHER_TYPE_LENGTH·=·2;
30	····public·static·final·int·ETHER_TYPE_OFFSET·=·12;	30	····public·static·final·int·ETHER_TYPE_OFFSET·=·12;
31	····public·static·final·int·ICMPV6_CHECKSUM_OFFSET·=·2;	31	····public·static·final·int·ICMPV6_CHECKSUM_OFFSET·=·2;
32	····public·static·final·int·ICMPV6_ECHO_REPLY_TYPE·=·129;	32	····public·static·final·int·ICMPV6_ECHO_REPLY_TYPE·=·129;
33	····public·static·final·int·ICMPV6_ECHO_REQUEST_TYPE·=·128;	33	····public·static·final·int·ICMPV6_ECHO_REQUEST_TYPE·=·128;
34	····public·static·final·int·ICMPV6_HEADER_MIN_LEN·=·4;	34	····public·static·final·int·ICMPV6_HEADER_MIN_LEN·=·4;
35	····public·static·final·int·ICMPV6_NA_HEADER_LEN·=·24;
36	····public·static·final·int·ICMPV6_ND_OPTION_LENGTH_SCALING_FACTOR·=·8;	35	····public·static·final·int·ICMPV6_ND_OPTION_LENGTH_SCALING_FACTOR·=·8;
37	····public·static·final·int·ICMPV6_ND_OPTION_MIN_LENGTH·=·8;	36	····public·static·final·int·ICMPV6_ND_OPTION_MIN_LENGTH·=·8;
38	····public·static·final·int·ICMPV6_ND_OPTION_MTU·=·5;	37	····public·static·final·int·ICMPV6_ND_OPTION_MTU·=·5;
39	····public·static·final·int·ICMPV6_ND_OPTION_PIO·=·3;	38	····public·static·final·int·ICMPV6_ND_OPTION_PIO·=·3;
40	····public·static·final·int·ICMPV6_ND_OPTION_PREF64·=·38;	39	····public·static·final·int·ICMPV6_ND_OPTION_PREF64·=·38;
41	····public·static·final·int·ICMPV6_ND_OPTION_RDNSS·=·25;	40	····public·static·final·int·ICMPV6_ND_OPTION_RDNSS·=·25;
42	····public·static·final·int·ICMPV6_ND_OPTION_SLLA·=·1;	41	····public·static·final·int·ICMPV6_ND_OPTION_SLLA·=·1;
43	····public·static·final·int·ICMPV6_ND_OPTION_TLLA·=·2;	42	····public·static·final·int·ICMPV6_ND_OPTION_TLLA·=·2;
44	····public·static·final·int·ICMPV6_NEIGHBOR_ADVERTISEMENT·=·136;	43	····public·static·final·int·ICMPV6_NEIGHBOR_ADVERTISEMENT·=·136;
45	····public·static·final·int·ICMPV6_NEIGHBOR_SOLICITATION·=·135;	44	····public·static·final·int·ICMPV6_NEIGHBOR_SOLICITATION·=·135;
46	····public·static·final·int·ICMPV6_NS_HEADER_LEN·=·24;
47	····public·static·final·int·ICMPV6_RA_HEADER_LEN·=·16;	45	····public·static·final·int·ICMPV6_RA_HEADER_LEN·=·16;
48	····public·static·final·int·ICMPV6_ROUTER_ADVERTISEMENT·=·134;	46	····public·static·final·int·ICMPV6_ROUTER_ADVERTISEMENT·=·134;
49	····public·static·final·int·ICMPV6_ROUTER_SOLICITATION·=·133;	47	····public·static·final·int·ICMPV6_ROUTER_SOLICITATION·=·133;
50	····public·static·final·int·ICMPV6_RS_HEADER_LEN·=·8;
51	····public·static·final·int·INFINITE_LEASE·=·255;	48	····public·static·final·int·INFINITE_LEASE·=·255;
52	····public·static·final·Inet4Address·IPV4_ADDR_ALL;	49	····public·static·final·Inet4Address·IPV4_ADDR_ALL;
53	····public·static·final·Inet4Address·IPV4_ADDR_ANY;	50	····public·static·final·Inet4Address·IPV4_ADDR_ANY;
54	····public·static·final·int·IPV4_ADDR_BITS·=·32;	51	····public·static·final·int·IPV4_ADDR_BITS·=·32;
55	····public·static·final·int·IPV4_ADDR_LEN·=·4;	52	····public·static·final·int·IPV4_ADDR_LEN·=·4;
56	····public·static·final·int·IPV4_CONFLICT_ANNOUNCE_NUM·=·2;	53	····public·static·final·int·IPV4_CONFLICT_ANNOUNCE_NUM·=·2;
57	····public·static·final·int·IPV4_CONFLICT_PROBE_NUM·=·3;	54	····public·static·final·int·IPV4_CONFLICT_PROBE_NUM·=·3;


Offset 107, 21 lines modified		Offset 107, 21 lines modified
107	········return·SubscriptionManager.getResourcesForSubId(this.mResources.getResourcesContext(),·this.mActiveSubId);	107	········return·SubscriptionManager.getResourcesForSubId(this.mResources.getResourcesContext(),·this.mActiveSubId);
108	····}	108	····}
109	····	109	····
110	····public·void·reevaluate()·{	110	····public·void·reevaluate()·{
111	········this.mHandler.post((Runnable)new·MultinetworkPolicyTracker$$ExternalSyntheticLambda0(this));	111	········this.mHandler.post((Runnable)new·MultinetworkPolicyTracker$$ExternalSyntheticLambda0(this));
112	····}	112	····}
113	····	113	····
114	····public·void·setTestAllowBadWifiUntil(final·long·n)·{	114	····public·void·setTestAllowBadWifiUntil(final·long·mTestAllowBadWifiUntilMs)·{
115	········final·String·tag·=·MultinetworkPolicyTracker.TAG;	115	········final·String·tag·=·MultinetworkPolicyTracker.TAG;
116	········final·StringBuilder·sb·=·new·StringBuilder();	116	········final·StringBuilder·sb·=·new·StringBuilder();
117	········sb.append("setTestAllowBadWifiUntil:·");	117	········sb.append("setTestAllowBadWifiUntil:·");
118	········sb.append(n);	118	········sb.append(this.mTestAllowBadWifiUntilMs);
119	········Log.d(tag,·sb.toString());	119	········Log.d(tag,·sb.toString());
120	········this.mTestAllowBadWifiUntilMs·=·n;	120	········this.mTestAllowBadWifiUntilMs·=·mTestAllowBadWifiUntilMs;
121	········this.reevaluateInternal();	121	········this.reevaluateInternal();
122	····}	122	····}
123	····	123	····
124	····public·boolean·shouldNotifyWifiUnvalidated()·{	124	····public·boolean·shouldNotifyWifiUnvalidated()·{
125	········return·this.configRestrictsAvoidBadWifi()·&&·this.getAvoidBadWifiSetting()·==·null;	125	········return·this.configRestrictsAvoidBadWifi()·&&·this.getAvoidBadWifiSetting()·==·null;
126	····}	126	····}
127	····	127	····


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

1	··Size:·415593····» Blocks:·816········IO·Block:·4096···regular·file	1	··Size:·415393····» Blocks:·816········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, 10 lines modified		Offset 1, 10 lines modified
1	Zip·file·size:·8~~90313~~·bytes,·number·of·entries:·8	1	Zip·file·size:·886937·bytes,·number·of·entries:·8
2	-rw-r--r--··2.0·unx···88~~7612~~·b-·stor·08-Jan-01·00:00·classes.dex	2	-rw-r--r--··2.0·unx···884036·b-·stor·08-Jan-01·00:00·classes.dex
3	-rw----·····2.0·fat·····2907·b-·defN·08-Jan-01·00:00·com/android/internal/util/StateMachine.uau	3	-rw----·····2.0·fat·····2907·b-·defN·08-Jan-01·00:00·com/android/connectivity/com/android/internal/util/StateMachine.uau
4	-rw----·····2.0·fat······741·b-·defN·08-Jan-01·00:00·com/android/internal/util/State.uau	4	-rw----·····2.0·fat······741·b-·defN·08-Jan-01·00:00·com/android/connectivity/com/android/internal/util/State.uau
5	-rw----·····2.0·fat······768·b-·defN·08-Jan-01·00:00·com/android/internal/util/IndentingPrintWriter.uau	5	-rw----·····2.0·fat······768·b-·defN·08-Jan-01·00:00·com/android/connectivity/com/android/internal/util/IndentingPrintWriter.uau
6	-rw----·····2.0·fat······200·b-·defN·08-Jan-01·00:00·com/android/internal/util/IState.uau	6	-rw----·····2.0·fat······200·b-·defN·08-Jan-01·00:00·com/android/connectivity/com/android/internal/util/IState.uau
7	-rw----·····2.0·fat······627·b-·defN·08-Jan-01·00:00·android/util/LocalLog.uau	7	-rw----·····2.0·fat······627·b-·defN·08-Jan-01·00:00·android/util/LocalLog.uau
8	-rw----·····2.0·fat······279·b-·defN·08-Jan-01·00:00·android/util/LocalLog.ReadOnlyLocalLog.uau	8	-rw----·····2.0·fat······279·b-·defN·08-Jan-01·00:00·android/util/LocalLog.ReadOnlyLocalLog.uau
9	-rw----·····2.0·fat·······45·b-·defN·08-Jan-01·00:00·META-INF/MANIFEST.MF	9	-rw----·····2.0·fat·······45·b-·defN·08-Jan-01·00:00·META-INF/MANIFEST.MF
10	8·files,·8~~93179~~·bytes·uncompressed,·889158·bytes·compressed:··0.5%	10	8·files,·889603·bytes·uncompressed,·885582·bytes·compressed:··0.5%


Offset 1, 20 lines modified		Offset 1, 20 lines modified
1	Filename:·classes.dex	1	Filename:·classes.dex
2	Comment:·	2	Comment:·

3	Filename:·com/android/internal/util/StateMachine.uau	3	Filename:·com/android/connectivity/com/android/internal/util/StateMachine.uau
4	Comment:·	4	Comment:·

5	Filename:·com/android/internal/util/State.uau	5	Filename:·com/android/connectivity/com/android/internal/util/State.uau
6	Comment:·	6	Comment:·

7	Filename:·com/android/internal/util/IndentingPrintWriter.uau	7	Filename:·com/android/connectivity/com/android/internal/util/IndentingPrintWriter.uau
8	Comment:·	8	Comment:·

9	Filename:·com/android/internal/util/IState.uau	9	Filename:·com/android/connectivity/com/android/internal/util/IState.uau
10	Comment:·	10	Comment:·

11	Filename:·android/util/LocalLog.uau	11	Filename:·android/util/LocalLog.uau
12	Comment:·	12	Comment:·

13	Filename:·android/util/LocalLog.ReadOnlyLocalLog.uau	13	Filename:·android/util/LocalLog.ReadOnlyLocalLog.uau
14	Comment:·	14	Comment:·


Offset 1, 8 lines modified		Offset 1, 8 lines modified
1	Zip·file·size:·13~~25179~~·bytes,·number·of·entries:·681	1	Zip·file·size:·1318814·bytes,·number·of·entries:·678
2	?rwxrwxr-x··2.0·unx······117·b-·stor·80-Jan-01·00:00·android/annotation/AnimRes.class	2	?rwxrwxr-x··2.0·unx······117·b-·stor·80-Jan-01·00:00·android/annotation/AnimRes.class
3	?rwxrwxr-x··2.0·unx······121·b-·stor·80-Jan-01·00:00·android/annotation/AnimatorRes.class	3	?rwxrwxr-x··2.0·unx······121·b-·stor·80-Jan-01·00:00·android/annotation/AnimatorRes.class
4	?rwxrwxr-x··2.0·unx······116·b-·stor·80-Jan-01·00:00·android/annotation/AnyRes.class	4	?rwxrwxr-x··2.0·unx······116·b-·stor·80-Jan-01·00:00·android/annotation/AnyRes.class
5	?rwxrwxr-x··2.0·unx······119·b-·stor·80-Jan-01·00:00·android/annotation/AnyThread.class	5	?rwxrwxr-x··2.0·unx······119·b-·stor·80-Jan-01·00:00·android/annotation/AnyThread.class
6	?rwxrwxr-x··2.0·unx······118·b-·stor·80-Jan-01·00:00·android/annotation/AppIdInt.class	6	?rwxrwxr-x··2.0·unx······118·b-·stor·80-Jan-01·00:00·android/annotation/AppIdInt.class
7	?rwxrwxr-x··2.0·unx······118·b-·stor·80-Jan-01·00:00·android/annotation/ArrayRes.class	7	?rwxrwxr-x··2.0·unx······118·b-·stor·80-Jan-01·00:00·android/annotation/ArrayRes.class
8	?rwxrwxr-x··2.0·unx······117·b-·stor·80-Jan-01·00:00·android/annotation/AttrRes.class	8	?rwxrwxr-x··2.0·unx······117·b-·stor·80-Jan-01·00:00·android/annotation/AttrRes.class
Offset 18, 15 lines modified		Offset 18, 14 lines modified
18	?rwxrwxr-x··2.0·unx······118·b-·stor·80-Jan-01·00:00·android/annotation/ColorRes.class	18	?rwxrwxr-x··2.0·unx······118·b-·stor·80-Jan-01·00:00·android/annotation/ColorRes.class
19	?rwxrwxr-x··2.0·unx······119·b-·stor·80-Jan-01·00:00·android/annotation/Condemned.class	19	?rwxrwxr-x··2.0·unx······119·b-·stor·80-Jan-01·00:00·android/annotation/Condemned.class
20	?rwxrwxr-x··2.0·unx······131·b-·stor·80-Jan-01·00:00·android/annotation/CurrentTimeMillisLong.class	20	?rwxrwxr-x··2.0·unx······131·b-·stor·80-Jan-01·00:00·android/annotation/CurrentTimeMillisLong.class
21	?rwxrwxr-x··2.0·unx······132·b-·stor·80-Jan-01·00:00·android/annotation/CurrentTimeSecondsLong.class	21	?rwxrwxr-x··2.0·unx······132·b-·stor·80-Jan-01·00:00·android/annotation/CurrentTimeSecondsLong.class
22	?rwxrwxr-x··2.0·unx······118·b-·stor·80-Jan-01·00:00·android/annotation/DimenRes.class	22	?rwxrwxr-x··2.0·unx······118·b-·stor·80-Jan-01·00:00·android/annotation/DimenRes.class
23	?rwxrwxr-x··2.0·unx······124·b-·stor·80-Jan-01·00:00·android/annotation/Dimension$Unit.class	23	?rwxrwxr-x··2.0·unx······124·b-·stor·80-Jan-01·00:00·android/annotation/Dimension$Unit.class
24	?rwxrwxr-x··2.0·unx······238·b-·stor·80-Jan-01·00:00·android/annotation/Dimension.class	24	?rwxrwxr-x··2.0·unx······238·b-·stor·80-Jan-01·00:00·android/annotation/Dimension.class
25	?rwxrwxr-x··2.0·unx······162·b-·stor·80-Jan-01·00:00·android/annotation/Discouraged.class
26	?rwxrwxr-x··2.0·unx······124·b-·stor·80-Jan-01·00:00·android/annotation/DisplayContext.class	25	?rwxrwxr-x··2.0·unx······124·b-·stor·80-Jan-01·00:00·android/annotation/DisplayContext.class
27	?rwxrwxr-x··2.0·unx······121·b-·stor·80-Jan-01·00:00·android/annotation/DrawableRes.class	26	?rwxrwxr-x··2.0·unx······121·b-·stor·80-Jan-01·00:00·android/annotation/DrawableRes.class
28	?rwxrwxr-x··2.0·unx······128·b-·stor·80-Jan-01·00:00·android/annotation/DurationMillisLong.class	27	?rwxrwxr-x··2.0·unx······128·b-·stor·80-Jan-01·00:00·android/annotation/DurationMillisLong.class
29	?rwxrwxr-x··2.0·unx······129·b-·stor·80-Jan-01·00:00·android/annotation/ElapsedRealtimeLong.class	28	?rwxrwxr-x··2.0·unx······129·b-·stor·80-Jan-01·00:00·android/annotation/ElapsedRealtimeLong.class
30	?rwxrwxr-x··2.0·unx······206·b-·stor·80-Jan-01·00:00·android/annotation/FloatRange.class	29	?rwxrwxr-x··2.0·unx······206·b-·stor·80-Jan-01·00:00·android/annotation/FloatRange.class
31	?rwxrwxr-x··2.0·unx······117·b-·stor·80-Jan-01·00:00·android/annotation/FontRes.class	30	?rwxrwxr-x··2.0·unx······117·b-·stor·80-Jan-01·00:00·android/annotation/FontRes.class
32	?rwxrwxr-x··2.0·unx······121·b-·stor·80-Jan-01·00:00·android/annotation/FractionRes.class	31	?rwxrwxr-x··2.0·unx······121·b-·stor·80-Jan-01·00:00·android/annotation/FractionRes.class
Offset 82, 15 lines modified		Offset 81, 15 lines modified
82	?rwxrwxr-x··2.0·unx······737·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/DhcpResultsParcelable$1.class	81	?rwxrwxr-x··2.0·unx······737·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/DhcpResultsParcelable$1.class
83	?rwxrwxr-x··2.0·unx·····3471·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/DhcpResultsParcelable.class	82	?rwxrwxr-x··2.0·unx·····3471·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/DhcpResultsParcelable.class
84	?rwxrwxr-x··2.0·unx·····2744·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/IDnsResolver.class	83	?rwxrwxr-x··2.0·unx·····2744·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/IDnsResolver.class
85	?rwxrwxr-x··2.0·unx·····1787·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/IIpMemoryStore.class	84	?rwxrwxr-x··2.0·unx·····1787·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/IIpMemoryStore.class
86	?rwxrwxr-x··2.0·unx······672·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/IIpMemoryStoreCallbacks.class	85	?rwxrwxr-x··2.0·unx······672·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/IIpMemoryStoreCallbacks.class
87	?rwxrwxr-x··2.0·unx·····7858·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/INetd.class	86	?rwxrwxr-x··2.0·unx·····7858·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/INetd.class
88	?rwxrwxr-x··2.0·unx·····1230·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/INetdUnsolicitedEventListener.class	87	?rwxrwxr-x··2.0·unx·····1230·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/INetdUnsolicitedEventListener.class
89	?rwxrwxr-x··2.0·unx·····1~~737~~·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/INetworkMonitor.class	88	?rwxrwxr-x··2.0·unx·····1685·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/INetworkMonitor.class
90	?rwxrwxr-x··2.0·unx·····1297·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/INetworkMonitorCallbacks.class	89	?rwxrwxr-x··2.0·unx·····1297·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/INetworkMonitorCallbacks.class
91	?rwxrwxr-x··2.0·unx·····1195·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/INetworkStackConnector.class	90	?rwxrwxr-x··2.0·unx·····1195·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/INetworkStackConnector.class
92	?rwxrwxr-x··2.0·unx······623·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/INetworkStackStatusCallback.class	91	?rwxrwxr-x··2.0·unx······623·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/INetworkStackStatusCallback.class
93	?rwxrwxr-x··2.0·unx······765·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/InformationElementParcelable$1.class	92	?rwxrwxr-x··2.0·unx······765·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/InformationElementParcelable$1.class
94	?rwxrwxr-x··2.0·unx·····2049·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/InformationElementParcelable.class	93	?rwxrwxr-x··2.0·unx·····2049·b-·stor·80-Jan-01·00:00·com/android/connectivity/android/net/InformationElementParcelable.class


Offset 63, 17 lines modified		Offset 63, 14 lines modified

63	Filename:·android/annotation/Dimension$Unit.class	63	Filename:·android/annotation/Dimension$Unit.class
64	Comment:·	64	Comment:·

65	Filename:·android/annotation/Dimension.class	65	Filename:·android/annotation/Dimension.class
66	Comment:·	66	Comment:·

67	Filename:·android/annotation/Discouraged.class
68	Comment:·

69	Filename:·android/annotation/DisplayContext.class	67	Filename:·android/annotation/DisplayContext.class
70	Comment:·	68	Comment:·

71	Filename:·android/annotation/DrawableRes.class	69	Filename:·android/annotation/DrawableRes.class
72	Comment:·	70	Comment:·

73	Filename:·android/annotation/DurationMillisLong.class	71	Filename:·android/annotation/DurationMillisLong.class
Offset 570, 14 lines modified		Offset 567, 62 lines modified

570	Filename:·com/android/connectivity/android/net/netd/aidl/NativeUidRangeConfig$Builder.class	567	Filename:·com/android/connectivity/android/net/netd/aidl/NativeUidRangeConfig$Builder.class
571	Comment:·	568	Comment:·

572	Filename:·com/android/connectivity/android/net/netd/aidl/NativeUidRangeConfig.class	569	Filename:·com/android/connectivity/android/net/netd/aidl/NativeUidRangeConfig.class
573	Comment:·	570	Comment:·

		571	Filename:·com/android/connectivity/android/net/netlink/ConntrackMessage$Tuple.class
		572	Comment:·

		573	Filename:·com/android/connectivity/android/net/netlink/ConntrackMessage$TupleIpv4.class
		574	Comment:·

		575	Filename:·com/android/connectivity/android/net/netlink/ConntrackMessage$TupleProto.class
		576	Comment:·

		577	Filename:·com/android/connectivity/android/net/netlink/NdOption.class
		578	Comment:·

		579	Filename:·com/android/connectivity/android/net/netlink/NetlinkConstants.class


Offset 4, 27 lines modified		Offset 4, 26 lines modified
4	import·android.net.NetworkCapabilities;	4	import·android.net.NetworkCapabilities;
5	import·android.net.LinkProperties;	5	import·android.net.LinkProperties;
6	import·android.os.IInterface;	6	import·android.os.IInterface;

7	public·interface·INetworkMonitor·extends·IInterface	7	public·interface·INetworkMonitor·extends·IInterface
8	{	8	{
9	····public·static·final·String·DESCRIPTOR·=·"android$net$INetworkMonitor".replace('$',·'.');	9	····public·static·final·String·DESCRIPTOR·=·"android$net$INetworkMonitor".replace('$',·'.');
10	····public·static·final·String·HASH·=·"ca534~~b24~~b~~8f1~~e946a3~~6977f3~~91a15~~6016ea7ef~~4a";	10	····public·static·final·String·HASH·=·"4925f4fdbb270e4f35cc5519a15ed8dd8c69a549";
11	····public·static·final·int·NETWORK_TEST_RESULT_INVALID·=·1;	11	····public·static·final·int·NETWORK_TEST_RESULT_INVALID·=·1;
12	····public·static·final·int·NETWORK_TEST_RESULT_PARTIAL_CONNECTIVITY·=·2;	12	····public·static·final·int·NETWORK_TEST_RESULT_PARTIAL_CONNECTIVITY·=·2;
13	····public·static·final·int·NETWORK_TEST_RESULT_VALID·=·0;	13	····public·static·final·int·NETWORK_TEST_RESULT_VALID·=·0;
14	····public·static·final·int·NETWORK_VALIDATION_PROBE_DNS·=·4;	14	····public·static·final·int·NETWORK_VALIDATION_PROBE_DNS·=·4;
15	····public·static·final·int·NETWORK_VALIDATION_PROBE_FALLBACK·=·32;	15	····public·static·final·int·NETWORK_VALIDATION_PROBE_FALLBACK·=·32;
16	····public·static·final·int·NETWORK_VALIDATION_PROBE_HTTP·=·8;	16	····public·static·final·int·NETWORK_VALIDATION_PROBE_HTTP·=·8;
17	····public·static·final·int·NETWORK_VALIDATION_PROBE_HTTPS·=·16;	17	····public·static·final·int·NETWORK_VALIDATION_PROBE_HTTPS·=·16;
18	····public·static·final·int·NETWORK_VALIDATION_PROBE_PRIVDNS·=·64;	18	····public·static·final·int·NETWORK_VALIDATION_PROBE_PRIVDNS·=·64;
19	····public·static·final·int·NETWORK_VALIDATION_RESULT_PARTIAL·=·2;	19	····public·static·final·int·NETWORK_VALIDATION_RESULT_PARTIAL·=·2;
20	····public·static·final·int·NETWORK_VALIDATION_RESULT_SKIPPED·=·4;
21	····public·static·final·int·NETWORK_VALIDATION_RESULT_VALID·=·1;	20	····public·static·final·int·NETWORK_VALIDATION_RESULT_VALID·=·1;
22	····public·static·final·int·VERSION·=·12;	21	····public·static·final·int·VERSION·=·10;
23	····	22	····
24	····void·forceReevaluation(final·int·p0);	23	····void·forceReevaluation(final·int·p0);
25	····	24	····
26	····String·getInterfaceHash();	25	····String·getInterfaceHash();
27	····	26	····
28	····int·getInterfaceVersion();	27	····int·getInterfaceVersion();
29	····	28	····


Offset 3, 16 lines modified		Offset 3, 16 lines modified

3	import·android.net.CaptivePortalData;	3	import·android.net.CaptivePortalData;
4	import·android.os.IInterface;	4	import·android.os.IInterface;

5	public·interface·INetworkMonitorCallbacks·extends·IInterface	5	public·interface·INetworkMonitorCallbacks·extends·IInterface
6	{	6	{
7	····public·static·final·String·DESCRIPTOR·=·"android$net$INetworkMonitorCallbacks".replace('$',·'.');	7	····public·static·final·String·DESCRIPTOR·=·"android$net$INetworkMonitorCallbacks".replace('$',·'.');
8	····public·static·final·String·HASH·=·"ca534~~b24~~b~~8f1~~e946a3~~6977f3~~91a15~~6016ea7ef~~4a";	8	····public·static·final·String·HASH·=·"4925f4fdbb270e4f35cc5519a15ed8dd8c69a549";
9	····public·static·final·int·VERSION·=·12;	9	····public·static·final·int·VERSION·=·10;
10	····	10	····
11	····String·getInterfaceHash();	11	····String·getInterfaceHash();
12	····	12	····
13	····int·getInterfaceVersion();	13	····int·getInterfaceVersion();
14	····	14	····
15	····void·hideProvisioningNotification();	15	····void·hideProvisioningNotification();
16	····	16	····


Offset 6, 16 lines modified		Offset 6, 16 lines modified
6	import·com.android.connectivity.android.net.dhcp.IDhcpServerCallbacks;	6	import·com.android.connectivity.android.net.dhcp.IDhcpServerCallbacks;
7	import·com.android.connectivity.android.net.dhcp.DhcpServingParamsParcel;	7	import·com.android.connectivity.android.net.dhcp.DhcpServingParamsParcel;
8	import·android.os.IInterface;	8	import·android.os.IInterface;

9	public·interface·INetworkStackConnector·extends·IInterface	9	public·interface·INetworkStackConnector·extends·IInterface
10	{	10	{
11	····public·static·final·String·DESCRIPTOR·=·"android$net$INetworkStackConnector".replace('$',·'.');	11	····public·static·final·String·DESCRIPTOR·=·"android$net$INetworkStackConnector".replace('$',·'.');
12	····public·static·final·String·HASH·=·"ca534~~b24~~b~~8f1~~e946a3~~6977f3~~91a15~~6016ea7ef~~4a";	12	····public·static·final·String·HASH·=·"4925f4fdbb270e4f35cc5519a15ed8dd8c69a549";
13	····public·static·final·int·VERSION·=·12;	13	····public·static·final·int·VERSION·=·10;
14	····	14	····
15	····void·allowTestUid(final·int·p0,·final·INetworkStackStatusCallback·p1);	15	····void·allowTestUid(final·int·p0,·final·INetworkStackStatusCallback·p1);
16	····	16	····
17	····void·fetchIpMemoryStore(final·IIpMemoryStoreCallbacks·p0);	17	····void·fetchIpMemoryStore(final·IIpMemoryStoreCallbacks·p0);
18	····	18	····
19	····String·getInterfaceHash();	19	····String·getInterfaceHash();
20	····	20	····


Offset 2, 16 lines modified		Offset 2, 16 lines modified
2	package·com.android.connectivity.android.net;	2	package·com.android.connectivity.android.net;

3	import·android.os.IInterface;	3	import·android.os.IInterface;

4	public·interface·INetworkStackStatusCallback·extends·IInterface	4	public·interface·INetworkStackStatusCallback·extends·IInterface
5	{	5	{
6	····public·static·final·String·DESCRIPTOR·=·"android$net$INetworkStackStatusCallback".replace('$',·'.');	6	····public·static·final·String·DESCRIPTOR·=·"android$net$INetworkStackStatusCallback".replace('$',·'.');
7	····public·static·final·String·HASH·=·"ca534~~b24~~b~~8f1~~e946a3~~6977f3~~91a15~~6016ea7ef~~4a";	7	····public·static·final·String·HASH·=·"4925f4fdbb270e4f35cc5519a15ed8dd8c69a549";
8	····public·static·final·int·VERSION·=·12;	8	····public·static·final·int·VERSION·=·10;
9	····	9	····
10	····String·getInterfaceHash();	10	····String·getInterfaceHash();
11	····	11	····
12	····int·getInterfaceVersion();	12	····int·getInterfaceVersion();
13	····	13	····
14	····void·onStatusAvailable(final·int·p0);	14	····void·onStatusAvailable(final·int·p0);
15	}	15	}


Offset 20, 17 lines modified		Offset 20, 15 lines modified
20	····public·static·final·Parcelable$Creator·CREATOR;	20	····public·static·final·Parcelable$Creator·CREATOR;
21	····public·ApfCapabilities·apfCapabilities;	21	····public·ApfCapabilities·apfCapabilities;
22	····public·String·displayName;	22	····public·String·displayName;
23	····public·boolean·enableIPv4;	23	····public·boolean·enableIPv4;
24	····public·boolean·enableIPv6;	24	····public·boolean·enableIPv6;
25	····public·boolean·enablePreconnection;	25	····public·boolean·enablePreconnection;
26	····public·InitialConfigurationParcelable·initialConfig;	26	····public·InitialConfigurationParcelable·initialConfig;
27	····public·int·ipv4ProvisioningMode;
28	····public·int·ipv6AddrGenMode;	27	····public·int·ipv6AddrGenMode;
29	····public·int·ipv6ProvisioningMode;
30	····public·Layer2InformationParcelable·layer2Info;	28	····public·Layer2InformationParcelable·layer2Info;
31	····public·Network·network;	29	····public·Network·network;
32	····public·List·options;	30	····public·List·options;
33	····public·int·provisioningTimeoutMs;	31	····public·int·provisioningTimeoutMs;
34	····public·int·requestedPreDhcpActionMs;	32	····public·int·requestedPreDhcpActionMs;
35	····public·ScanResultInfoParcelable·scanResultInfo;	33	····public·ScanResultInfoParcelable·scanResultInfo;
36	····public·StaticIpConfiguration·staticIpConfig;	34	····public·StaticIpConfiguration·staticIpConfig;
Offset 46, 16 lines modified		Offset 44, 14 lines modified
46	········this.enableIPv6·=·false;	44	········this.enableIPv6·=·false;
47	········this.usingMultinetworkPolicyTracker·=·false;	45	········this.usingMultinetworkPolicyTracker·=·false;
48	········this.usingIpReachabilityMonitor·=·false;	46	········this.usingIpReachabilityMonitor·=·false;
49	········this.requestedPreDhcpActionMs·=·0;	47	········this.requestedPreDhcpActionMs·=·0;
50	········this.provisioningTimeoutMs·=·0;	48	········this.provisioningTimeoutMs·=·0;
51	········this.ipv6AddrGenMode·=·0;	49	········this.ipv6AddrGenMode·=·0;
52	········this.enablePreconnection·=·false;	50	········this.enablePreconnection·=·false;
53	········this.ipv4ProvisioningMode·=·0;
54	········this.ipv6ProvisioningMode·=·0;
55	····}	51	····}
56	····	52	····
57	····private·int·describeContents(final·Object·o)·{	53	····private·int·describeContents(final·Object·o)·{
58	········if·(o·==·null)·{	54	········if·(o·==·null)·{
59	············return·0;	55	············return·0;
60	········}	56	········}
61	········if·(o·instanceof·Collection)·{	57	········if·(o·instanceof·Collection)·{
Offset 281, 42 lines modified		Offset 277, 20 lines modified
281	····················································································parcel.setDataPosition(dataPosition·+·int1);	277	····················································································parcel.setDataPosition(dataPosition·+·int1);
282	····················································································return;	278	····················································································return;
283	················································································}	279	················································································}
284	················································································throw·new·BadParcelableException(s);	280	················································································throw·new·BadParcelableException(s);
285	············································································}	281	············································································}
286	············································································else·{	282	············································································else·{
287	················································································this.options·=·parcel.createTypedArrayList(DhcpOption.CREATOR);	283	················································································this.options·=·parcel.createTypedArrayList(DhcpOption.CREATOR);
288	················································································if·(parcel.dataPosition()·-·dataPosition·>=·int1)·{
289	················································································~~····~~n·-=·int1;	284	················································································n·-=·int1;
290	················································································~~····~~if·(dataPosition·<=·n)·{	285	················································································if·(dataPosition·<=·n)·{
291	····················································································~~····~~parcel.setDataPosition(dataPosition·+·int1);	286	····················································································parcel.setDataPosition(dataPosition·+·int1);
292	····················································································~~····~~return;	287	····················································································return;
293	····················································································}
294	····················································································throw·new·BadParcelableException(s);
295	················································································}
296	················································································else·{
297	····················································································this.ipv4ProvisioningMode·=·parcel.readInt();
298	····················································································if·(parcel.dataPosition()·-·dataPosition·>=·int1)·{
299	························································································n·-=·int1;
300	························································································if·(dataPosition·<=·n)·{
301	····························································································parcel.setDataPosition(dataPosition·+·int1);
302	····························································································return;
303	························································································}
304	························································································throw·new·BadParcelableException(s);
305	····················································································}
306	····················································································else·{
307	························································································this.ipv6ProvisioningMode·=·parcel.readInt();
308	························································································n·-=·int1;
309	························································································if·(dataPosition·<=·n)·{
310	····························································································parcel.setDataPosition(dataPosition·+·int1);
311	····························································································return;
312	························································································}
313	························································································throw·new·BadParcelableException(s);
314	····················································································}
315	················································································}	288	················································································}
		289	················································································throw·new·BadParcelableException(s);
316	············································································}	290	············································································}
317	········································································}	291	········································································}
318	····································································}	292	····································································}
319	································································}	293	································································}
320	····························································}	294	····························································}
321	························································}	295	························································}
322	····················································}	296	····················································}
Offset 402, 25 lines modified		Offset 376, 17 lines modified
402	········sb15.append(Objects.toString((Object)this.layer2Info));	376	········sb15.append(Objects.toString((Object)this.layer2Info));
403	········stringJoiner.add(sb15.toString());	377	········stringJoiner.add(sb15.toString());
404	········final·StringBuilder·sb16·=·new·StringBuilder();	378	········final·StringBuilder·sb16·=·new·StringBuilder();
405	········sb16.append("options:·");	379	········sb16.append("options:·");
406	········sb16.append(Objects.toString((Object)this.options));	380	········sb16.append(Objects.toString((Object)this.options));
407	········stringJoiner.add(sb16.toString());	381	········stringJoiner.add(sb16.toString());
408	········final·StringBuilder·sb17·=·new·StringBuilder();	382	········final·StringBuilder·sb17·=·new·StringBuilder();
409	········sb17.append("ipv4ProvisioningMode:·");
410	········sb17.append(this.ipv4ProvisioningMode);
411	········stringJoiner.add(sb17.toString());
412	········final·StringBuilder·sb18·=·new·StringBuilder();
413	········sb18.append("ipv6ProvisioningMode:·");
414	········sb18.append(this.ipv6ProvisioningMode);
415	········stringJoiner.add(sb18.toString());
416	········final·StringBuilder·sb19·=·new·StringBuilder();
417	········sb19.append("com.android.connectivity.android.net.ProvisioningConfigurationParcelable");	383	········sb17.append("com.android.connectivity.android.net.ProvisioningConfigurationParcelable");
418	········sb19.append(stringJoiner.toString());	384	········sb17.append(stringJoiner.toString());
419	········return·sb19.toString();	385	········return·sb17.toString();
420	····}	386	····}
421	····	387	····
422	····public·final·void·writeToParcel(final·Parcel·parcel,·final·int·n)·{	388	····public·final·void·writeToParcel(final·Parcel·parcel,·final·int·n)·{
423	········final·int·dataPosition·=·parcel.dataPosition();	389	········final·int·dataPosition·=·parcel.dataPosition();
424	········parcel.writeInt(0);	390	········parcel.writeInt(0);
425	········parcel.writeInt((int)(this.enableIPv4·?·1·:·0));	391	········parcel.writeInt((int)(this.enableIPv4·?·1·:·0));
426	········parcel.writeInt((int)(this.enableIPv6·?·1·:·0));	392	········parcel.writeInt((int)(this.enableIPv6·?·1·:·0));
Offset 472, 15 lines modified		Offset 438, 13 lines modified
472	············parcel.writeInt(n2);	438	············parcel.writeInt(n2);
473	············this.layer2Info.writeToParcel(parcel,·0);	439	············this.layer2Info.writeToParcel(parcel,·0);
474	········}	440	········}
475	········else·{	441	········else·{
476	············parcel.writeInt(0);	442	············parcel.writeInt(0);
477	········}	443	········}
478	········parcel.writeTypedList(this.options);	444	········parcel.writeTypedList(this.options);
479	········parcel.writeInt(this.ipv4ProvisioningMode);
480	········parcel.writeInt(this.ipv6ProvisioningMode);
481	········final·int·dataPosition2·=·parcel.dataPosition();	445	········final·int·dataPosition2·=·parcel.dataPosition();
482	········parcel.setDataPosition(dataPosition);	446	········parcel.setDataPosition(dataPosition);
483	········parcel.writeInt(dataPosition2·-·dataPosition);	447	········parcel.writeInt(dataPosition2·-·dataPosition);
484	········parcel.setDataPosition(dataPosition2);	448	········parcel.setDataPosition(dataPosition2);
485	····}	449	····}
486	}	450	}


Offset 4, 16 lines modified		Offset 4, 16 lines modified
4	import·android.net.IpPrefix;	4	import·android.net.IpPrefix;
5	import·java.util.List;	5	import·java.util.List;
6	import·android.os.IInterface;	6	import·android.os.IInterface;

7	public·interface·IDhcpEventCallbacks·extends·IInterface	7	public·interface·IDhcpEventCallbacks·extends·IInterface
8	{	8	{
9	····public·static·final·String·DESCRIPTOR·=·"android$net$dhcp$IDhcpEventCallbacks".replace('$',·'.');	9	····public·static·final·String·DESCRIPTOR·=·"android$net$dhcp$IDhcpEventCallbacks".replace('$',·'.');
10	····public·static·final·String·HASH·=·"ca534~~b24~~b~~8f1~~e946a3~~6977f3~~91a15~~6016ea7ef~~4a";	10	····public·static·final·String·HASH·=·"4925f4fdbb270e4f35cc5519a15ed8dd8c69a549";
11	····public·static·final·int·VERSION·=·12;	11	····public·static·final·int·VERSION·=·10;
12	····	12	····
13	····String·getInterfaceHash();	13	····String·getInterfaceHash();
14	····	14	····
15	····int·getInterfaceVersion();	15	····int·getInterfaceVersion();
16	····	16	····
17	····void·onLeasesChanged(final·List·p0);	17	····void·onLeasesChanged(final·List·p0);
18	····	18	····


Offset 3, 20 lines modified		Offset 3, 20 lines modified

3	import·com.android.connectivity.android.net.INetworkStackStatusCallback;	3	import·com.android.connectivity.android.net.INetworkStackStatusCallback;
4	import·android.os.IInterface;	4	import·android.os.IInterface;

5	public·interface·IDhcpServer·extends·IInterface	5	public·interface·IDhcpServer·extends·IInterface
6	{	6	{
7	····public·static·final·String·DESCRIPTOR·=·"android$net$dhcp$IDhcpServer".replace('$',·'.');	7	····public·static·final·String·DESCRIPTOR·=·"android$net$dhcp$IDhcpServer".replace('$',·'.');
8	····public·static·final·String·HASH·=·"ca534~~b24~~b~~8f1~~e946a3~~6977f3~~91a15~~6016ea7ef~~4a";	8	····public·static·final·String·HASH·=·"4925f4fdbb270e4f35cc5519a15ed8dd8c69a549";
9	····public·static·final·int·STATUS_INVALID_ARGUMENT·=·2;	9	····public·static·final·int·STATUS_INVALID_ARGUMENT·=·2;
10	····public·static·final·int·STATUS_SUCCESS·=·1;	10	····public·static·final·int·STATUS_SUCCESS·=·1;
11	····public·static·final·int·STATUS_UNKNOWN·=·0;	11	····public·static·final·int·STATUS_UNKNOWN·=·0;
12	····public·static·final·int·STATUS_UNKNOWN_ERROR·=·3;	12	····public·static·final·int·STATUS_UNKNOWN_ERROR·=·3;
13	····public·static·final·int·VERSION·=·12;	13	····public·static·final·int·VERSION·=·10;
14	····	14	····
15	····String·getInterfaceHash();	15	····String·getInterfaceHash();
16	····	16	····
17	····int·getInterfaceVersion();	17	····int·getInterfaceVersion();
18	····	18	····
19	····void·start(final·INetworkStackStatusCallback·p0);	19	····void·start(final·INetworkStackStatusCallback·p0);
20	····	20	····


Offset 7, 22 lines modified		Offset 7, 16 lines modified
7	import·com.android.connectivity.android.net.NattKeepalivePacketDataParcelable;	7	import·com.android.connectivity.android.net.NattKeepalivePacketDataParcelable;
8	import·com.android.connectivity.android.net.TcpKeepalivePacketDataParcelable;	8	import·com.android.connectivity.android.net.TcpKeepalivePacketDataParcelable;
9	import·android.os.IInterface;	9	import·android.os.IInterface;

10	public·interface·IIpClient·extends·IInterface	10	public·interface·IIpClient·extends·IInterface
11	{	11	{
12	····public·static·final·String·DESCRIPTOR·=·"android$net$ip$IIpClient".replace('$',·'.');	12	····public·static·final·String·DESCRIPTOR·=·"android$net$ip$IIpClient".replace('$',·'.');
		13	····public·static·final·String·HASH·=·"4925f4fdbb270e4f35cc5519a15ed8dd8c69a549";
13	····public·static·final·String·HASH·=·"ca534b24b8f1e946a36977f391a156016ea7ef4a";
14	····public·static·final·int·PROV_IPV4_DHCP·=·2;
15	····public·static·final·int·PROV_IPV4_DISABLED·=·0;
16	····public·static·final·int·PROV_IPV4_STATIC·=·1;
17	····public·static·final·int·PROV_IPV6_DISABLED·=·0;
18	····public·static·final·int·PROV_IPV6_LINKLOCAL·=·2;
19	····public·static·final·int·PROV_IPV6_SLAAC·=·1;
20	····public·static·final·int·VERSION·=·12;	14	····public·static·final·int·VERSION·=·10;
21	····	15	····
22	····void·addKeepalivePacketFilter(final·int·p0,·final·TcpKeepalivePacketDataParcelable·p1);	16	····void·addKeepalivePacketFilter(final·int·p0,·final·TcpKeepalivePacketDataParcelable·p1);
23	····	17	····
24	····void·addNattKeepalivePacketFilter(final·int·p0,·final·NattKeepalivePacketDataParcelable·p1);	18	····void·addNattKeepalivePacketFilter(final·int·p0,·final·NattKeepalivePacketDataParcelable·p1);
25	····	19	····
26	····void·completedPreDhcpAction();	20	····void·completedPreDhcpAction();
27	····	21	····


Offset 5, 16 lines modified		Offset 5, 16 lines modified
5	import·com.android.connectivity.android.net.DhcpResultsParcelable;	5	import·com.android.connectivity.android.net.DhcpResultsParcelable;
6	import·android.net.LinkProperties;	6	import·android.net.LinkProperties;
7	import·android.os.IInterface;	7	import·android.os.IInterface;

8	public·interface·IIpClientCallbacks·extends·IInterface	8	public·interface·IIpClientCallbacks·extends·IInterface
9	{	9	{
10	····public·static·final·String·DESCRIPTOR·=·"android$net$ip$IIpClientCallbacks".replace('$',·'.');	10	····public·static·final·String·DESCRIPTOR·=·"android$net$ip$IIpClientCallbacks".replace('$',·'.');
11	····public·static·final·String·HASH·=·"ca534~~b24~~b~~8f1~~e946a3~~6977f3~~91a15~~6016ea7ef~~4a";	11	····public·static·final·String·HASH·=·"4925f4fdbb270e4f35cc5519a15ed8dd8c69a549";
12	····public·static·final·int·VERSION·=·12;	12	····public·static·final·int·VERSION·=·10;
13	····	13	····
14	····String·getInterfaceHash();	14	····String·getInterfaceHash();
15	····	15	····
16	····int·getInterfaceVersion();	16	····int·getInterfaceVersion();
17	····	17	····
18	····void·installPacketFilter(final·byte[]·p0);	18	····void·installPacketFilter(final·byte[]·p0);
19	····	19	····


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

1	package·com.android.connectivity.android.net.shared;	1	package·com.android.connectivity.android.net.shared;

2	import·com.android.connectivity.com.android.modules.utils.build.SdkLevel;
3	import·android.net.NetworkCapabilities;	2	import·android.net.NetworkCapabilities;

4	public·class·NetworkMonitorUtils	3	public·class·NetworkMonitorUtils
5	{	4	{
6	····public·static·final·String·ACTION_NETWORK_CONDITIONS_MEASURED·=·"android.net.conn.NETWORK_CONDITIONS_MEASURED";	5	····public·static·final·String·ACTION_NETWORK_CONDITIONS_MEASURED·=·"android.net.conn.NETWORK_CONDITIONS_MEASURED";
7	····public·static·final·String·EXTRA_BSSID·=·"extra_bssid";	6	····public·static·final·String·EXTRA_BSSID·=·"extra_bssid";
8	····public·static·final·String·EXTRA_CELL_ID·=·"extra_cellid";	7	····public·static·final·String·EXTRA_CELL_ID·=·"extra_cellid";
Offset 20, 43 lines modified		Offset 19, 25 lines modified
20	····public·static·final·String·PERMISSION_ACCESS_NETWORK_CONDITIONS·=·"android.permission.ACCESS_NETWORK_CONDITIONS";	19	····public·static·final·String·PERMISSION_ACCESS_NETWORK_CONDITIONS·=·"android.permission.ACCESS_NETWORK_CONDITIONS";
21	····private·static·final·int·TRANSPORT_TEST·=·7;	20	····private·static·final·int·TRANSPORT_TEST·=·7;
22	····	21	····
23	····public·static·boolean·isPrivateDnsValidationRequired(final·NetworkCapabilities·networkCapabilities)·{	22	····public·static·boolean·isPrivateDnsValidationRequired(final·NetworkCapabilities·networkCapabilities)·{
24	········if·(networkCapabilities·==·null)·{	23	········if·(networkCapabilities·==·null)·{
25	············return·false;	24	············return·false;
26	········}	25	········}
27	········final·boolean·a~~tLe~~astS·=·Sdk~~Leve~~l.is~~AtLe~~astS();	26	········final·boolean·hasCapability·=·networkCapabilities.hasCapability(28);
28	········final·int·n·=·1;	27	········final·int·n·=·1;
		28	········final·boolean·b·=·((hasCapability·?·1·:·0)·^·n)·!=·0x0;
29	········int·n2;
30	········if·(atLeastS·&&·!networkCapabilities.hasCapability(28))·{
31	············n2·=·n;
32	········}
33	········else·{
34	············n2·=·0;
35	········}
36	········final·boolean·hasCapability·=·networkCapabilities.hasCapability(22);	29	········final·boolean·hasCapability2·=·networkCapabilities.hasCapability(22);
37	········final·int·n3·=·14;	30	········final·int·n2·=·14;
38	········int·n4;
39	········if·(hasCapability·&&·networkCapabilities.hasCapability(n3))·{	31	········final·boolean·b2·=·hasCapability2·&&·networkCapabilities.hasCapability(n2)·&&·n;
40	············n4·=·n;
41	········}
42	········else·{
43	············n4·=·0;
44	········}
45	········final·int·n5·=·13;	32	········final·int·n3·=·13;
46	········int·n6;
47	········if·(networkCapabilities.hasCapability(n5)·&&·networkCapabilities.hasCapability(n3))·{	33	········final·boolean·b3·=·networkCapabilities.hasCapability(n3)·&&·networkCapabilities.hasCapability(n2)·&&·n;
48	············n6·=·n;
49	········}
50	········else·{
51	············n6·=·0;
52	········}
53	········if·(networkCapabilities.hasCapability(12)·&&·(~~n2·!=·~~0·\|\|~~·n4~~·!=·0·\|\|~~·n6~~·!=·0))·{	34	········if·(networkCapabilities.hasCapability(12)·&&·(b·\|\|·b2·\|\|·b3))·{
54	············return·n·!=·0;	35	············return·n·!=·0;
55	········}	36	········}
56	········return·networkCapabilities.hasTransport(7)·&&·networkCapabilities.hasCapability(n5)·&&·(networkCapabilities.hasTransport(n)·\|\|·networkCapabilities.hasTransport(0)·\|\|·networkCapabilities.hasTransport(2)·\|\|·networkCapabilities.hasTransport(3))·&&·n;	37	········return·networkCapabilities.hasTransport(7)·&&·networkCapabilities.hasCapability(n3)·&&·(networkCapabilities.hasTransport(n)·\|\|·networkCapabilities.hasTransport(0)·\|\|·networkCapabilities.hasTransport(2)·\|\|·networkCapabilities.hasTransport(3))·&&·n;
57	····}	38	····}
58	····	39	····
59	····public·static·boolean·isValidationRequired(final·NetworkCapabilities·networkCapabilities)·{	40	····public·static·boolean·isValidationRequired(final·NetworkCapabilities·networkCapabilities)·{
60	········return·isPrivateDnsValidationRequired(networkCapabilities)·&&·networkCapabilities.hasCapability(15);	41	········return·isPrivateDnsValidationRequired(networkCapabilities)·&&·networkCapabilities.hasCapability(15);
61	····}	42	····}
62	}	43	}


Offset 11, 17 lines modified		Offset 11, 14 lines modified
11	····protected·ProvisioningConfiguration·mConfig;	11	····protected·ProvisioningConfiguration·mConfig;
12	····	12	····
13	····public·ProvisioningConfiguration$Builder()·{	13	····public·ProvisioningConfiguration$Builder()·{
14	········this.mConfig·=·new·ProvisioningConfiguration();	14	········this.mConfig·=·new·ProvisioningConfiguration();
15	····}	15	····}
16	····	16	····
17	····public·ProvisioningConfiguration·build()·{	17	····public·ProvisioningConfiguration·build()·{
18	········if·(this.mConfig.mIPv6ProvisioningMode·==·2·&&·this.mConfig.mIPv4ProvisioningMode·!=·0)·{
19	············throw·new·IllegalArgumentException("IPv4·must·be·disabled·in·IPv6·link-localonly·mode.");
20	········}
21	········return·new·ProvisioningConfiguration(this.mConfig);	18	········return·new·ProvisioningConfiguration(this.mConfig);
22	····}	19	····}
23	····	20	····
24	····public·ProvisioningConfiguration$Builder·withApfCapabilities(final·ApfCapabilities·mApfCapabilities)·{	21	····public·ProvisioningConfiguration$Builder·withApfCapabilities(final·ApfCapabilities·mApfCapabilities)·{
25	········this.mConfig.mApfCapabilities·=·mApfCapabilities;	22	········this.mConfig.mApfCapabilities·=·mApfCapabilities;
26	········return·this;	23	········return·this;
27	····}	24	····}
Offset 37, 19 lines modified		Offset 34, 14 lines modified
37	····}	34	····}
38	····	35	····
39	····public·ProvisioningConfiguration$Builder·withInitialConfiguration(final·InitialConfiguration·mInitialConfig)·{	36	····public·ProvisioningConfiguration$Builder·withInitialConfiguration(final·InitialConfiguration·mInitialConfig)·{
40	········this.mConfig.mInitialConfig·=·mInitialConfig;	37	········this.mConfig.mInitialConfig·=·mInitialConfig;
41	········return·this;	38	········return·this;
42	····}	39	····}
43	····	40	····
44	····public·ProvisioningConfiguration$Builder·withIpv6LinkLocalOnly()·{
45	········this.mConfig.mIPv6ProvisioningMode·=·2;
46	········return·this;
47	····}
48	····
49	····public·ProvisioningConfiguration$Builder·withLayer2Information(final·Layer2Information·mLayer2Info)·{	41	····public·ProvisioningConfiguration$Builder·withLayer2Information(final·Layer2Information·mLayer2Info)·{
50	········this.mConfig.mLayer2Info·=·mLayer2Info;	42	········this.mConfig.mLayer2Info·=·mLayer2Info;
51	········return·this;	43	········return·this;
52	····}	44	····}
53	····	45	····
54	····public·ProvisioningConfiguration$Builder·withNetwork(final·Network·mNetwork)·{	46	····public·ProvisioningConfiguration$Builder·withNetwork(final·Network·mNetwork)·{
55	········this.mConfig.mNetwork·=·mNetwork;	47	········this.mConfig.mNetwork·=·mNetwork;
Offset 88, 26 lines modified		Offset 80, 25 lines modified
88	····	80	····
89	····public·ProvisioningConfiguration$Builder·withStableMacAddress()·{	81	····public·ProvisioningConfiguration$Builder·withStableMacAddress()·{
90	········this.mConfig.mIPv6AddrGenMode·=·2;	82	········this.mConfig.mIPv6AddrGenMode·=·2;
91	········return·this;	83	········return·this;
92	····}	84	····}
93	····	85	····
94	····public·ProvisioningConfiguration$Builder·withStaticConfiguration(final·StaticIpConfiguration·mStaticIpConfig)·{	86	····public·ProvisioningConfiguration$Builder·withStaticConfiguration(final·StaticIpConfiguration·mStaticIpConfig)·{
95	········this.mConfig.mIPv4ProvisioningMode·=·1;
96	········this.mConfig.mStaticIpConfig·=·mStaticIpConfig;	87	········this.mConfig.mStaticIpConfig·=·mStaticIpConfig;
97	········return·this;	88	········return·this;
98	····}	89	····}
99	····	90	····
100	····public·ProvisioningConfiguration$Builder·withoutIPv4()·{	91	····public·ProvisioningConfiguration$Builder·withoutIPv4()·{
101	········this.mConfig.mIP~~v4ProvisioningMod~~e~~·=·0~~;	92	········this.mConfig.mEnableIPv4·=·false;
102	········return·this;	93	········return·this;
103	····}	94	····}
104	····	95	····
105	····public·ProvisioningConfiguration$Builder·withoutIPv6()·{	96	····public·ProvisioningConfiguration$Builder·withoutIPv6()·{
106	········this.mConfig.mIP~~v6ProvisioningMod~~e~~·=·0~~;	97	········this.mConfig.mEnableIPv6·=·false;
107	········return·this;	98	········return·this;
108	····}	99	····}
109	····	100	····
110	····public·ProvisioningConfiguration$Builder·withoutIpReachabilityMonitor()·{	101	····public·ProvisioningConfiguration$Builder·withoutIpReachabilityMonitor()·{
111	········this.mConfig.mUsingIpReachabilityMonitor·=·false;	102	········this.mConfig.mUsingIpReachabilityMonitor·=·false;
112	········return·this;	103	········return·this;
113	····}	104	····}


Offset 18, 59 lines modified		Offset 18, 58 lines modified

18	public·class·ProvisioningConfiguration	18	public·class·ProvisioningConfiguration
19	{	19	{
20	····private·static·final·int·DEFAULT_TIMEOUT_MS·=·18000;	20	····private·static·final·int·DEFAULT_TIMEOUT_MS·=·18000;
21	····public·static·final·int·IPV6_ADDR_GEN_MODE_EUI64·=·0;	21	····public·static·final·int·IPV6_ADDR_GEN_MODE_EUI64·=·0;
22	····public·static·final·int·IPV6_ADDR_GEN_MODE_STABLE_PRIVACY·=·2;	22	····public·static·final·int·IPV6_ADDR_GEN_MODE_STABLE_PRIVACY·=·2;
23	····private·static·final·String·TAG·=·"ProvisioningConfiguration";	23	····private·static·final·String·TAG·=·"ProvisioningConfiguration";
24	····public·static·final·int·VERSION_ADDED_PROVISIONING_ENUM·=·12;
25	····public·ApfCapabilities·mApfCapabilities;	24	····public·ApfCapabilities·mApfCapabilities;
26	····public·List·mDhcpOptions;	25	····public·List·mDhcpOptions;
27	····public·String·mDisplayName;	26	····public·String·mDisplayName;
		27	····public·boolean·mEnableIPv4;
		28	····public·boolean·mEnableIPv6;
28	····public·boolean·mEnablePreconnection;	29	····public·boolean·mEnablePreconnection;
29	····public·int·mIPv4ProvisioningMode;
30	····public·int·mIPv6AddrGenMode;	30	····public·int·mIPv6AddrGenMode;
31	····public·int·mIPv6ProvisioningMode;
32	····public·InitialConfiguration·mInitialConfig;	31	····public·InitialConfiguration·mInitialConfig;
33	····public·Layer2Information·mLayer2Info;	32	····public·Layer2Information·mLayer2Info;
34	····public·Network·mNetwork;	33	····public·Network·mNetwork;
35	····public·int·mProvisioningTimeoutMs;	34	····public·int·mProvisioningTimeoutMs;
36	····public·int·mRequestedPreDhcpActionMs;	35	····public·int·mRequestedPreDhcpActionMs;
37	····public·ProvisioningConfiguration$ScanResultInfo·mScanResultInfo;	36	····public·ProvisioningConfiguration$ScanResultInfo·mScanResultInfo;
38	····public·StaticIpConfiguration·mStaticIpConfig;	37	····public·StaticIpConfiguration·mStaticIpConfig;
39	····public·boolean·mUsingIpReachabilityMonitor;	38	····public·boolean·mUsingIpReachabilityMonitor;
40	····public·boolean·mUsingMultinetworkPolicyTracker;	39	····public·boolean·mUsingMultinetworkPolicyTracker;
41	····	40	····
42	····public·ProvisioningConfiguration()·{	41	····public·ProvisioningConfiguration()·{
		42	········final·boolean·b·=·true;
		43	········this.mEnableIPv4·=·b;
		44	········this.mEnableIPv6·=·b;
43	········this.mEnablePreconnection·=·false;	45	········this.mEnablePreconnection·=·false;
44	········final·boolean·miPv6ProvisioningMode·=·true;
45	········this.mUsingMultinetworkPolicyTracker·=·~~miPv6ProvisioningMod~~e;	46	········this.mUsingMultinetworkPolicyTracker·=·b;
46	········this.mUsingIpReachabilityMonitor·=·~~miPv6ProvisioningMod~~e;	47	········this.mUsingIpReachabilityMonitor·=·b;
47	········this.mProvisioningTimeoutMs·=·18000;	48	········this.mProvisioningTimeoutMs·=·18000;
48	········final·int·n·=·2;
49	········this.mIPv6AddrGenMode·=·n;	49	········this.mIPv6AddrGenMode·=·2;
50	········this.mNetwork·=·null;	50	········this.mNetwork·=·null;
51	········this.mDisplayName·=·null;	51	········this.mDisplayName·=·null;
52	········this.mIPv4ProvisioningMode·=·n;
53	········this.mIPv6ProvisioningMode·=·(miPv6ProvisioningMode·?·1·:·0);
54	····}	52	····}
55	····	53	····
56	····public·ProvisioningConfiguration(final·ProvisioningConfiguration·provisioningConfiguration)·{	54	····public·ProvisioningConfiguration(final·ProvisioningConfiguration·provisioningConfiguration)·{
		55	········final·boolean·b·=·true;
		56	········this.mEnableIPv4·=·b;
		57	········this.mEnableIPv6·=·b;
57	········this.mEnablePreconnection·=·false;	58	········this.mEnablePreconnection·=·false;
58	········final·boolean·miPv6ProvisioningMode·=·true;
59	········this.mUsingMultinetworkPolicyTracker·=·~~miPv6ProvisioningMod~~e;	59	········this.mUsingMultinetworkPolicyTracker·=·b;
60	········this.mUsingIpReachabilityMonitor·=·~~miPv6ProvisioningMod~~e;	60	········this.mUsingIpReachabilityMonitor·=·b;
61	········this.mProvisioningTimeoutMs·=·18000;	61	········this.mProvisioningTimeoutMs·=·18000;
62	········final·int·n·=·2;
63	········this.mIPv6AddrGenMode·=·n;	62	········this.mIPv6AddrGenMode·=·2;
64	········StaticIpConfiguration·mStaticIpConfig·=·null;	63	········StaticIpConfiguration·mStaticIpConfig·=·null;
65	········this.mNetwork·=·null;	64	········this.mNetwork·=·null;
66	········this.mDisplayName·=·null;	65	········this.mDisplayName·=·null;
67	········this.mIPv4ProvisioningMode·=·n;
68	········this.mIPv6ProvisioningMo~~de·=·~~(miPv6ProvisioningM~~ode·?·1·:·0)~~;	66	········this.mEnableIPv4·=·provisioningConfiguration.mEnableIPv4;
		67	········this.mEnableIPv6·=·provisioningConfiguration.mEnableIPv6;
69	········this.mEnablePreconnection·=·provisioningConfiguration.mEnablePreconnection;	68	········this.mEnablePreconnection·=·provisioningConfiguration.mEnablePreconnection;
70	········this.mUsingMultinetworkPolicyTracker·=·provisioningConfiguration.mUsingMultinetworkPolicyTracker;	69	········this.mUsingMultinetworkPolicyTracker·=·provisioningConfiguration.mUsingMultinetworkPolicyTracker;
71	········this.mUsingIpReachabilityMonitor·=·provisioningConfiguration.mUsingIpReachabilityMonitor;	70	········this.mUsingIpReachabilityMonitor·=·provisioningConfiguration.mUsingIpReachabilityMonitor;
72	········this.mRequestedPreDhcpActionMs·=·provisioningConfiguration.mRequestedPreDhcpActionMs;	71	········this.mRequestedPreDhcpActionMs·=·provisioningConfiguration.mRequestedPreDhcpActionMs;
73	········this.mInitialConfig·=·InitialConfiguration.copy(provisioningConfiguration.mInitialConfig);	72	········this.mInitialConfig·=·InitialConfiguration.copy(provisioningConfiguration.mInitialConfig);
74	········if·(provisioningConfiguration.mStaticIpConfig·!=·null)·{	73	········if·(provisioningConfiguration.mStaticIpConfig·!=·null)·{
75	············mStaticIpConfig·=·new·StaticIpConfiguration(provisioningConfiguration.mStaticIpConfig);	74	············mStaticIpConfig·=·new·StaticIpConfiguration(provisioningConfiguration.mStaticIpConfig);
Offset 80, 16 lines modified		Offset 79, 14 lines modified
80	········this.mProvisioningTimeoutMs·=·provisioningConfiguration.mProvisioningTimeoutMs;	79	········this.mProvisioningTimeoutMs·=·provisioningConfiguration.mProvisioningTimeoutMs;
81	········this.mIPv6AddrGenMode·=·provisioningConfiguration.mIPv6AddrGenMode;	80	········this.mIPv6AddrGenMode·=·provisioningConfiguration.mIPv6AddrGenMode;
82	········this.mNetwork·=·provisioningConfiguration.mNetwork;	81	········this.mNetwork·=·provisioningConfiguration.mNetwork;
83	········this.mDisplayName·=·provisioningConfiguration.mDisplayName;	82	········this.mDisplayName·=·provisioningConfiguration.mDisplayName;
84	········this.mScanResultInfo·=·provisioningConfiguration.mScanResultInfo;	83	········this.mScanResultInfo·=·provisioningConfiguration.mScanResultInfo;
85	········this.mLayer2Info·=·provisioningConfiguration.mLayer2Info;	84	········this.mLayer2Info·=·provisioningConfiguration.mLayer2Info;
86	········this.mDhcpOptions·=·provisioningConfiguration.mDhcpOptions;	85	········this.mDhcpOptions·=·provisioningConfiguration.mDhcpOptions;
87	········this.mIPv4ProvisioningMode·=·provisioningConfiguration.mIPv4ProvisioningMode;
88	········this.mIPv6ProvisioningMode·=·provisioningConfiguration.mIPv6ProvisioningMode;
89	····}	86	····}
90	····	87	····
91	····private·static·boolean·dhcpOptionEquals(final·DhcpOption·dhcpOption,·final·DhcpOption·dhcpOption2)·{	88	····private·static·boolean·dhcpOptionEquals(final·DhcpOption·dhcpOption,·final·DhcpOption·dhcpOption2)·{
92	········boolean·b·=·true;	89	········boolean·b·=·true;
93	········if·(dhcpOption·==·dhcpOption2)·{	90	········if·(dhcpOption·==·dhcpOption2)·{
94	············return·b;	91	············return·b;
95	········}	92	········}
Offset 117, 20 lines modified		Offset 114, 22 lines modified
117	············if·(!dhcpOptionEquals(list.get(i),·list2.get(i)))·{	114	············if·(!dhcpOptionEquals(list.get(i),·list2.get(i)))·{
118	················return·false;	115	················return·false;
119	············}	116	············}
120	········}	117	········}
121	········return·b;	118	········return·b;
122	····}	119	····}
123	····	120	····
124	····public·static·ProvisioningConfiguration·fromStableParcelable(final·ProvisioningConfigurationParcelable·provisioningConfigurationParcelable~~,·final·int·n~~)·{	121	····public·static·ProvisioningConfiguration·fromStableParcelable(final·ProvisioningConfigurationParcelable·provisioningConfigurationParcelable)·{
125	········List·mDhcpOptions·=·null;	122	········List·mDhcpOptions·=·null;
126	········if·(provisioningConfigurationParcelable·==·null)·{	123	········if·(provisioningConfigurationParcelable·==·null)·{
127	············return·null;	124	············return·null;
128	········}	125	········}
129	········final·ProvisioningConfiguration·provisioningConfiguration·=·new·ProvisioningConfiguration();	126	········final·ProvisioningConfiguration·provisioningConfiguration·=·new·ProvisioningConfiguration();
		127	········provisioningConfiguration.mEnableIPv4·=·provisioningConfigurationParcelable.enableIPv4;
		128	········provisioningConfiguration.mEnableIPv6·=·provisioningConfigurationParcelable.enableIPv6;
130	········provisioningConfiguration.mEnablePreconnection·=·provisioningConfigurationParcelable.enablePreconnection;	129	········provisioningConfiguration.mEnablePreconnection·=·provisioningConfigurationParcelable.enablePreconnection;
131	········provisioningConfiguration.mUsingMultinetworkPolicyTracker·=·provisioningConfigurationParcelable.usingMultinetworkPolicyTracker;	130	········provisioningConfiguration.mUsingMultinetworkPolicyTracker·=·provisioningConfigurationParcelable.usingMultinetworkPolicyTracker;
132	········provisioningConfiguration.mUsingIpReachabilityMonitor·=·provisioningConfigurationParcelable.usingIpReachabilityMonitor;	131	········provisioningConfiguration.mUsingIpReachabilityMonitor·=·provisioningConfigurationParcelable.usingIpReachabilityMonitor;
133	········provisioningConfiguration.mRequestedPreDhcpActionMs·=·provisioningConfigurationParcelable.requestedPreDhcpActionMs;	132	········provisioningConfiguration.mRequestedPreDhcpActionMs·=·provisioningConfigurationParcelable.requestedPreDhcpActionMs;
134	········provisioningConfiguration.mInitialConfig·=·InitialConfiguration.fromStableParcelable(provisioningConfigurationParcelable.initialConfig);	133	········provisioningConfiguration.mInitialConfig·=·InitialConfiguration.fromStableParcelable(provisioningConfigurationParcelable.initialConfig);
135	········StaticIpConfiguration·mStaticIpConfig;	134	········StaticIpConfiguration·mStaticIpConfig;
136	········if·(provisioningConfigurationParcelable.staticIpConfig·==·null)·{	135	········if·(provisioningConfigurationParcelable.staticIpConfig·==·null)·{
Offset 147, 95 lines modified		Offset 146, 39 lines modified
147	········provisioningConfiguration.mDisplayName·=·provisioningConfigurationParcelable.displayName;	146	········provisioningConfiguration.mDisplayName·=·provisioningConfigurationParcelable.displayName;
148	········provisioningConfiguration.mScanResultInfo·=·ProvisioningConfiguration$ScanResultInfo.fromStableParcelable(provisioningConfigurationParcelable.scanResultInfo);	147	········provisioningConfiguration.mScanResultInfo·=·ProvisioningConfiguration$ScanResultInfo.fromStableParcelable(provisioningConfigurationParcelable.scanResultInfo);
149	········provisioningConfiguration.mLayer2Info·=·Layer2Information.fromStableParcelable(provisioningConfigurationParcelable.layer2Info);	148	········provisioningConfiguration.mLayer2Info·=·Layer2Information.fromStableParcelable(provisioningConfigurationParcelable.layer2Info);
150	········if·(provisioningConfigurationParcelable.options·!=·null)·{	149	········if·(provisioningConfigurationParcelable.options·!=·null)·{
151	············mDhcpOptions·=·new·ArrayList(provisioningConfigurationParcelable.options);	150	············mDhcpOptions·=·new·ArrayList(provisioningConfigurationParcelable.options);
152	········}	151	········}
153	········provisioningConfiguration.mDhcpOptions·=·mDhcpOptions;	152	········provisioningConfiguration.mDhcpOptions·=·mDhcpOptions;
154	········if·(n·<·12)·{
155	············int·miPv4ProvisioningMode;
156	············if·(provisioningConfigurationParcelable.enableIPv4)·{
157	················miPv4ProvisioningMode·=·2;
158	············}
159	············else·{
160	················miPv4ProvisioningMode·=·0;
161	············}
162	············provisioningConfiguration.mIPv4ProvisioningMode·=·miPv4ProvisioningMode;
163	············provisioningConfiguration.mIPv6ProvisioningMode·=·(provisioningConfigurationParcelable.enableIPv6·?·1·:·0);
164	········}
... Open expanded diff ...


Offset 12, 30 lines modified		Offset 12, 30 lines modified
12	····final·/·synthetic·/·ConnectivityService·this$0;	12	····final·/·synthetic·/·ConnectivityService·this$0;
13	····	13	····
14	····ConnectivityService$2(final·ConnectivityService·this$0)·{	14	····ConnectivityService$2(final·ConnectivityService·this$0)·{
15	········this.this$0·=·this$0;	15	········this.this$0·=·this$0;
16	····}	16	····}
17	····	17	····
18	····public·void·onReceive(final·Context·context,·final·Intent·intent)·{	18	····public·void·onReceive(final·Context·context,·final·Intent·intent)·{
19	········ConnectivityService.access$8400(this.this$0);	19	········ConnectivityService.access$8200(this.this$0);
20	········final·String·action·=·intent.getAction();	20	········final·String·action·=·intent.getAction();
21	········final·UserHandle·userHandle·=·(UserHandle)intent.getParcelableExtra("android.intent.extra.USER");	21	········final·UserHandle·userHandle·=·(UserHandle)intent.getParcelableExtra("android.intent.extra.USER");
22	········if·(userHandle·==·null)·{	22	········if·(userHandle·==·null)·{
23	············final·String·access$500·=·ConnectivityService.access$500();	23	············final·String·access$500·=·ConnectivityService.access$500();
24	············final·StringBuilder·sb·=·new·StringBuilder();	24	············final·StringBuilder·sb·=·new·StringBuilder();
25	············sb.append(intent.getAction());	25	············sb.append(intent.getAction());
26	············sb.append("·broadcast·without·EXTRA_USER");	26	············sb.append("·broadcast·without·EXTRA_USER");
27	············Log.wtf(access$500,·sb.toString());	27	············Log.wtf(access$500,·sb.toString());
28	············return;	28	············return;
29	········}	29	········}
30	········if·("android.intent.action.USER_ADDED".equals(action))·{	30	········if·("android.intent.action.USER_ADDED".equals(action))·{
31	············ConnectivityService.access$8500(this.this$0,·userHandle);	31	············ConnectivityService.access$8300(this.this$0,·userHandle);
32	········}	32	········}
33	········else·if·("android.intent.action.USER_REMOVED".equals(action))·{	33	········else·if·("android.intent.action.USER_REMOVED".equals(action))·{
34	············ConnectivityService.access$8600(this.this$0,·userHandle);	34	············ConnectivityService.access$8400(this.this$0,·userHandle);
35	········}	35	········}
36	········else·{	36	········else·{
37	············final·String·access$501·=·ConnectivityService.access$500();	37	············final·String·access$501·=·ConnectivityService.access$500();
38	············final·StringBuilder·sb2·=·new·StringBuilder();	38	············final·StringBuilder·sb2·=·new·StringBuilder();
39	············sb2.append("received·unexpected·intent:·");	39	············sb2.append("received·unexpected·intent:·");
40	············sb2.append(action);	40	············sb2.append(action);
41	············Log.wtf(access$501,·sb2.toString());	41	············Log.wtf(access$501,·sb2.toString());


Offset 11, 15 lines modified		Offset 11, 15 lines modified
11	····final·/·synthetic·/·ConnectivityService·this$0;	11	····final·/·synthetic·/·ConnectivityService·this$0;
12	····	12	····
13	····ConnectivityService$3(final·ConnectivityService·this$0)·{	13	····ConnectivityService$3(final·ConnectivityService·this$0)·{
14	········this.this$0·=·this$0;	14	········this.this$0·=·this$0;
15	····}	15	····}
16	····	16	····
17	····public·void·onReceive(final·Context·context,·final·Intent·intent)·{	17	····public·void·onReceive(final·Context·context,·final·Intent·intent)·{
18	········ConnectivityService.access$8400(this.this$0);	18	········ConnectivityService.access$8200(this.this$0);
19	········final·String·action·=·intent.getAction();	19	········final·String·action·=·intent.getAction();
20	········int·n·=·0;	20	········int·n·=·0;
21	········Label_0133:·{	21	········Label_0133:·{
22	············switch·(action.hashCode())·{	22	············switch·(action.hashCode())·{
23	················case·1544582882:·{	23	················case·1544582882:·{
24	····················if·(action.equals("android.intent.action.PACKAGE_ADDED"))·{	24	····················if·(action.equals("android.intent.action.PACKAGE_ADDED"))·{
25	························n·=·0;	25	························n·=·0;
Offset 52, 13 lines modified		Offset 52, 13 lines modified
52	················sb.append(intent.getAction());	52	················sb.append(intent.getAction());
53	················Log.wtf(access$500,·sb.toString());	53	················Log.wtf(access$500,·sb.toString());
54	················break;	54	················break;
55	············}	55	············}
56	············case·0:	56	············case·0:
57	············case·1:	57	············case·1:
58	············case·2:·{	58	············case·2:·{
59	················ConnectivityService.access$8700(this.this$0,·intent.getData().getSchemeSpecificPart());	59	················ConnectivityService.access$8500(this.this$0,·intent.getData().getSchemeSpecificPart());
60	················break;	60	················break;
61	············}	61	············}
62	········}	62	········}
63	····}	63	····}
64	}	64	}


Offset 26, 22 lines modified		Offset 26, 22 lines modified
26	····	26	····
27	····public·void·appRequest(final·int·n)·{	27	····public·void·appRequest(final·int·n)·{
28	········final·NetworkMonitorManager·networkMonitorManager·=·this.getNetworkMonitorManager(this.mNetwork);	28	········final·NetworkMonitorManager·networkMonitorManager·=·this.getNetworkMonitorManager(this.mNetwork);
29	········if·(networkMonitorManager·==·null)·{	29	········if·(networkMonitorManager·==·null)·{
30	············return;	30	············return;
31	········}	31	········}
32	········if·(n·==·100)·{	32	········if·(n·==·100)·{
33	············ConnectivityService.access$5500(this.this$0);	33	············ConnectivityService.access$5400(this.this$0);
34	············networkMonitorManager.forceReevaluation(ConnectivityService.access$5600(this.this$0).getCallingUid());	34	············networkMonitorManager.forceReevaluation(ConnectivityService.access$5500(this.this$0).getCallingUid());
35	········}	35	········}
36	····}	36	····}
37	····	37	····
38	····public·void·appResponse(final·int·n)·{	38	····public·void·appResponse(final·int·n)·{
39	········if·(n·==·2)·{	39	········if·(n·==·2)·{
40	············ConnectivityService.access$5400(this.this$0);	40	············ConnectivityService.access$5300(this.this$0);
41	········}	41	········}
42	········final·NetworkMonitorManager·networkMonitorManager·=·this.getNetworkMonitorManager(this.mNetwork);	42	········final·NetworkMonitorManager·networkMonitorManager·=·this.getNetworkMonitorManager(this.mNetwork);
43	········if·(networkMonitorManager·==·null)·{	43	········if·(networkMonitorManager·==·null)·{
44	············return;	44	············return;
45	········}	45	········}
46	········networkMonitorManager.notifyCaptivePortalAppFinished(n);	46	········networkMonitorManager.notifyCaptivePortalAppFinished(n);
47	····}	47	····}


Offset 42, 19 lines modified		Offset 42, 19 lines modified
42	··#34·=·Methodref··········#30.#33········//·com/android/server/ConnectivityService.access$300:(Ljava/lang/String;)V	42	··#34·=·Methodref··········#30.#33········//·com/android/server/ConnectivityService.access$300:(Ljava/lang/String;)V
43	··#35·=·Utf8···············unregisterConnectivityDiagnosticsCallback	43	··#35·=·Utf8···············unregisterConnectivityDiagnosticsCallback
44	··#36·=·Utf8···············(Landroid/net/IConnectivityDiagnosticsCallback;)V	44	··#36·=·Utf8···············(Landroid/net/IConnectivityDiagnosticsCallback;)V
45	··#37·=·NameAndType········#35:#36········//·unregisterConnectivityDiagnosticsCallback:(Landroid/net/IConnectivityDiagnosticsCallback;)V	45	··#37·=·NameAndType········#35:#36········//·unregisterConnectivityDiagnosticsCallback:(Landroid/net/IConnectivityDiagnosticsCallback;)V
46	··#38·=·Methodref··········#30.#37········//·com/android/server/ConnectivityService.unregisterConnectivityDiagnosticsCallback:(Landroid/net/IConnectivityDiagnosticsCallback;)V	46	··#38·=·Methodref··········#30.#37········//·com/android/server/ConnectivityService.unregisterConnectivityDiagnosticsCallback:(Landroid/net/IConnectivityDiagnosticsCallback;)V
47	··#39·=·Utf8···············Code	47	··#39·=·Utf8···············Code
48	··#40·=·Utf8···············(Lcom/android/server/ConnectivityService;Landroid/net/IConnectivityDiagnosticsCallback;Lcom/android/server/ConnectivityService$NetworkRequestInfo;Ljava/lang/String;)V	48	··#40·=·Utf8···············(Lcom/android/server/ConnectivityService;Landroid/net/IConnectivityDiagnosticsCallback;Lcom/android/server/ConnectivityService$NetworkRequestInfo;Ljava/lang/String;)V
49	··#41·=·Utf8···············access$10200	49	··#41·=·Utf8···············access$10000
50	··#42·=·Utf8···············(Lcom/android/server/ConnectivityService$ConnectivityDiagnosticsCallbackInfo;)Landroid/net/IConnectivityDiagnosticsCallback;	50	··#42·=·Utf8···············(Lcom/android/server/ConnectivityService$ConnectivityDiagnosticsCallbackInfo;)Landroid/net/IConnectivityDiagnosticsCallback;
51	··#43·=·Utf8···············access$10300	51	··#43·=·Utf8···············access$10100
52	··#44·=·Utf8···············(Lcom/android/server/ConnectivityService$ConnectivityDiagnosticsCallbackInfo;)Lcom/android/server/ConnectivityService$NetworkRequestInfo;	52	··#44·=·Utf8···············(Lcom/android/server/ConnectivityService$ConnectivityDiagnosticsCallbackInfo;)Lcom/android/server/ConnectivityService$NetworkRequestInfo;
53	··#45·=·Utf8···············access$10400	53	··#45·=·Utf8···············access$10200
54	··#46·=·Utf8···············(Lcom/android/server/ConnectivityService$ConnectivityDiagnosticsCallbackInfo;)Ljava/lang/String;	54	··#46·=·Utf8···············(Lcom/android/server/ConnectivityService$ConnectivityDiagnosticsCallbackInfo;)Ljava/lang/String;
55	··#47·=·Utf8···············binderDied	55	··#47·=·Utf8···············binderDied
56	{	56	{
57	··private·final·java.lang.String·mCallingPackageName;	57	··private·final·java.lang.String·mCallingPackageName;
58	····descriptor:·Ljava/lang/String;	58	····descriptor:·Ljava/lang/String;
59	····flags:·(0x0012)·ACC_PRIVATE,·ACC_FINAL	59	····flags:·(0x0012)·ACC_PRIVATE,·ACC_FINAL

Offset 87, 33 lines modified		Offset 87, 33 lines modified
87	········15:·aload_3	87	········15:·aload_3
88	········16:·putfield······#24·················//·Field·mRequestInfo:Lcom/android/server/ConnectivityService$NetworkRequestInfo;	88	········16:·putfield······#24·················//·Field·mRequestInfo:Lcom/android/server/ConnectivityService$NetworkRequestInfo;
89	········19:·aload_0	89	········19:·aload_0
90	········20:·aload·········4	90	········20:·aload·········4
91	········22:·putfield······#26·················//·Field·mCallingPackageName:Ljava/lang/String;	91	········22:·putfield······#26·················//·Field·mCallingPackageName:Ljava/lang/String;
92	········25:·return	92	········25:·return

93	··static·android.net.IConnectivityDiagnosticsCallback·access$10200(com.android.server.ConnectivityService$ConnectivityDiagnosticsCallbackInfo);	93	··static·android.net.IConnectivityDiagnosticsCallback·access$10000(com.android.server.ConnectivityService$ConnectivityDiagnosticsCallbackInfo);
94	····descriptor:·(Lcom/android/server/ConnectivityService$ConnectivityDiagnosticsCallbackInfo;)Landroid/net/IConnectivityDiagnosticsCallback;	94	····descriptor:·(Lcom/android/server/ConnectivityService$ConnectivityDiagnosticsCallbackInfo;)Landroid/net/IConnectivityDiagnosticsCallback;
95	····flags:·(0x1008)·ACC_STATIC,·ACC_SYNTHETIC	95	····flags:·(0x1008)·ACC_STATIC,·ACC_SYNTHETIC
96	····Code:	96	····Code:
97	······stack=300,·locals=1,·args_size=1	97	······stack=300,·locals=1,·args_size=1
98	·········0:·aload_0	98	·········0:·aload_0
99	·········1:·getfield······#22·················//·Field·mCb:Landroid/net/IConnectivityDiagnosticsCallback;	99	·········1:·getfield······#22·················//·Field·mCb:Landroid/net/IConnectivityDiagnosticsCallback;
100	·········4:·areturn	100	·········4:·areturn

101	··static·com.android.server.ConnectivityService$NetworkRequestInfo·access$10300(com.android.server.ConnectivityService$ConnectivityDiagnosticsCallbackInfo);	101	··static·com.android.server.ConnectivityService$NetworkRequestInfo·access$10100(com.android.server.ConnectivityService$ConnectivityDiagnosticsCallbackInfo);
102	····descriptor:·(Lcom/android/server/ConnectivityService$ConnectivityDiagnosticsCallbackInfo;)Lcom/android/server/ConnectivityService$NetworkRequestInfo;	102	····descriptor:·(Lcom/android/server/ConnectivityService$ConnectivityDiagnosticsCallbackInfo;)Lcom/android/server/ConnectivityService$NetworkRequestInfo;
103	····flags:·(0x1008)·ACC_STATIC,·ACC_SYNTHETIC	103	····flags:·(0x1008)·ACC_STATIC,·ACC_SYNTHETIC
104	····Code:	104	····Code:
105	······stack=300,·locals=1,·args_size=1	105	······stack=300,·locals=1,·args_size=1
106	·········0:·aload_0	106	·········0:·aload_0
107	·········1:·getfield······#24·················//·Field·mRequestInfo:Lcom/android/server/ConnectivityService$NetworkRequestInfo;	107	·········1:·getfield······#24·················//·Field·mRequestInfo:Lcom/android/server/ConnectivityService$NetworkRequestInfo;
108	·········4:·areturn	108	·········4:·areturn

109	··static·java.lang.String·access$10400(com.android.server.ConnectivityService$ConnectivityDiagnosticsCallbackInfo);	109	··static·java.lang.String·access$10200(com.android.server.ConnectivityService$ConnectivityDiagnosticsCallbackInfo);
110	····descriptor:·(Lcom/android/server/ConnectivityService$ConnectivityDiagnosticsCallbackInfo;)Ljava/lang/String;	110	····descriptor:·(Lcom/android/server/ConnectivityService$ConnectivityDiagnosticsCallbackInfo;)Ljava/lang/String;
111	····flags:·(0x1008)·ACC_STATIC,·ACC_SYNTHETIC	111	····flags:·(0x1008)·ACC_STATIC,·ACC_SYNTHETIC
112	····Code:	112	····Code:
113	······stack=300,·locals=1,·args_size=1	113	······stack=300,·locals=1,·args_size=1
114	·········0:·aload_0	114	·········0:·aload_0
115	·········1:·getfield······#26·················//·Field·mCallingPackageName:Ljava/lang/String;	115	·········1:·getfield······#26·················//·Field·mCallingPackageName:Ljava/lang/String;
116	·········4:·areturn	116	·········4:·areturn


Offset 1, 14 lines modified		Offset 1, 14 lines modified

1	package·com.android.server;	1	package·com.android.server;

2	import·com.android.server.connectivity.NetworkAgentInfo;
3	import·android.net.IConnectivityDiagnosticsCallback;	2	import·android.net.IConnectivityDiagnosticsCallback;
4	import·android.os.PersistableBundle;	3	import·android.os.PersistableBundle;
5	import·android.util.Pair;	4	import·android.util.Pair;
		5	import·com.android.server.connectivity.NetworkAgentInfo;
6	import·android.util.Log;	6	import·android.util.Log;
7	import·android.os.Message;	7	import·android.os.Message;
8	import·android.os.Looper;	8	import·android.os.Looper;
9	import·android.os.Handler;	9	import·android.os.Handler;

10	class·ConnectivityService$ConnectivityDiagnosticsHandler·extends·Handler	10	class·ConnectivityService$ConnectivityDiagnosticsHandler·extends·Handler
11	{	11	{
Offset 34, 34 lines modified		Offset 34, 34 lines modified
34	················sb.append("Unrecognized·event·in·ConnectivityDiagnostics:·");	34	················sb.append("Unrecognized·event·in·ConnectivityDiagnostics:·");
35	················sb.append(message.what);	35	················sb.append(message.what);
36	················Log.e(mTag,·sb.toString());	36	················Log.e(mTag,·sb.toString());
37	················break;	37	················break;
38	············}	38	············}
39	············case·41:·{	39	············case·41:·{
40	················final·ConnectivityService$ConnectivityReportEvent·connectivityService$ConnectivityReportEvent·=·(ConnectivityService$ConnectivityReportEvent)message.obj;	40	················final·ConnectivityService$ConnectivityReportEvent·connectivityService$ConnectivityReportEvent·=·(ConnectivityService$ConnectivityReportEvent)message.obj;
41	················ConnectivityService.access$9900(this.this$0,·connectivityService$ConnectivityReportEvent,·ConnectivityService$ConnectivityReportEvent.access$9800(connectivityService$ConnectivityReportEvent));	41	················ConnectivityService.access$9700(this.this$0,·connectivityService$ConnectivityReportEvent,·ConnectivityService$ConnectivityReportEvent.access$9600(connectivityService$ConnectivityReportEvent));
42	················break;	42	················break;
43	············}	43	············}
44	············case·5:·{	44	············case·5:·{
45	················ConnectivityService.access$10100(this.this$0,·(~~Con~~nect~~ivityS~~e~~rvice$R~~e~~port~~edN~~etwork~~Connectivity~~Info)~~message.~~obj~~);	45	················ConnectivityService.access$9900(this.this$0,·(NetworkAgentInfo)message.obj,·ConnectivityService.access$2600(message.arg1));
46	················break;	46	················break;
47	············}	47	············}
48	············case·4:·{	48	············case·4:·{
49	················final·NetworkAgentInfo·access$1600·=·ConnectivityService.access$1600(this.this$0,·message.arg2);	49	················final·NetworkAgentInfo·access$1600·=·ConnectivityService.access$1600(this.this$0,·message.arg2);
50	················final·Pair·pair·=·(Pair)message.obj;	50	················final·Pair·pair·=·(Pair)message.obj;
51	················if·(access$1600·==·null)·{	51	················if·(access$1600·==·null)·{
52	····················break;	52	····················break;
53	················}	53	················}
54	················ConnectivityService.access$10000(this.this$0,·access$1600,·(long)(Long)pair.first,·message.arg1,·(PersistableBundle)pair.second);	54	················ConnectivityService.access$9800(this.this$0,·access$1600,·(long)(Long)pair.first,·message.arg1,·(PersistableBundle)pair.second);
55	················break;	55	················break;
56	············}	56	············}
57	············case·2:·{	57	············case·2:·{
58	················ConnectivityService.access$9700(this.this$0,·(IConnectivityDiagnosticsCallback)message.obj,·message.arg1);	58	················ConnectivityService.access$9500(this.this$0,·(IConnectivityDiagnosticsCallback)message.obj,·message.arg1);
59	················break;	59	················break;
60	············}	60	············}
61	············case·1:·{	61	············case·1:·{
62	················ConnectivityService.access$9600(this.this$0,·(ConnectivityService$ConnectivityDiagnosticsCallbackInfo)message.obj);	62	················ConnectivityService.access$9400(this.this$0,·(ConnectivityService$ConnectivityDiagnosticsCallbackInfo)message.obj);
63	················break;	63	················break;
64	············}	64	············}
65	········}	65	········}
66	····}	66	····}
67	}	67	}


Offset 27, 19 lines modified		Offset 27, 19 lines modified
27	··#19·=·NameAndType········#5:#6··········//·mExtras:Landroid/os/PersistableBundle;	27	··#19·=·NameAndType········#5:#6··········//·mExtras:Landroid/os/PersistableBundle;
28	··#20·=·Fieldref···········#2.#19·········//·com/android/server/ConnectivityService$ConnectivityReportEvent.mExtras:Landroid/os/PersistableBundle;	28	··#20·=·Fieldref···········#2.#19·········//·com/android/server/ConnectivityService$ConnectivityReportEvent.mExtras:Landroid/os/PersistableBundle;
29	··#21·=·Utf8···············(JLcom/android/server/connectivity/NetworkAgentInfo;Landroid/os/PersistableBundle;)V	29	··#21·=·Utf8···············(JLcom/android/server/connectivity/NetworkAgentInfo;Landroid/os/PersistableBundle;)V
30	··#22·=·NameAndType········#11:#21········//·"<init>":(JLcom/android/server/connectivity/NetworkAgentInfo;Landroid/os/PersistableBundle;)V	30	··#22·=·NameAndType········#11:#21········//·"<init>":(JLcom/android/server/connectivity/NetworkAgentInfo;Landroid/os/PersistableBundle;)V
31	··#23·=·Methodref··········#2.#22·········//·com/android/server/ConnectivityService$ConnectivityReportEvent."<init>":(JLcom/android/server/connectivity/NetworkAgentInfo;Landroid/os/PersistableBundle;)V	31	··#23·=·Methodref··········#2.#22·········//·com/android/server/ConnectivityService$ConnectivityReportEvent."<init>":(JLcom/android/server/connectivity/NetworkAgentInfo;Landroid/os/PersistableBundle;)V
32	··#24·=·Utf8···············Code	32	··#24·=·Utf8···············Code
33	··#25·=·Utf8···············(JLcom/android/server/connectivity/NetworkAgentInfo;Landroid/os/PersistableBundle;Lcom/android/server/ConnectivityService$1;)V	33	··#25·=·Utf8···············(JLcom/android/server/connectivity/NetworkAgentInfo;Landroid/os/PersistableBundle;Lcom/android/server/ConnectivityService$1;)V
34	··#26·=·Utf8···············access$10500	34	··#26·=·Utf8···············access$10300
35	··#27·=·Utf8···············(Lcom/android/server/ConnectivityService$ConnectivityReportEvent;)Lcom/android/server/connectivity/NetworkAgentInfo;	35	··#27·=·Utf8···············(Lcom/android/server/ConnectivityService$ConnectivityReportEvent;)Lcom/android/server/connectivity/NetworkAgentInfo;
36	··#28·=·Utf8···············access$10600	36	··#28·=·Utf8···············access$10400
37	··#29·=·Utf8···············(Lcom/android/server/ConnectivityService$ConnectivityReportEvent;)J	37	··#29·=·Utf8···············(Lcom/android/server/ConnectivityService$ConnectivityReportEvent;)J
38	··#30·=·Utf8···············access$9800	38	··#30·=·Utf8···············access$9600
39	··#31·=·Utf8···············(Lcom/android/server/ConnectivityService$ConnectivityReportEvent;)Landroid/os/PersistableBundle;	39	··#31·=·Utf8···············(Lcom/android/server/ConnectivityService$ConnectivityReportEvent;)Landroid/os/PersistableBundle;
40	{	40	{
41	··private·final·android.os.PersistableBundle·mExtras;	41	··private·final·android.os.PersistableBundle·mExtras;
42	····descriptor:·Landroid/os/PersistableBundle;	42	····descriptor:·Landroid/os/PersistableBundle;
43	····flags:·(0x0012)·ACC_PRIVATE,·ACC_FINAL	43	····flags:·(0x0012)·ACC_PRIVATE,·ACC_FINAL

44	··private·final·com.android.server.connectivity.NetworkAgentInfo·mNai;	44	··private·final·com.android.server.connectivity.NetworkAgentInfo·mNai;
Offset 76, 33 lines modified		Offset 76, 33 lines modified
76	·········0:·aload_0	76	·········0:·aload_0
77	·········1:·lload_1	77	·········1:·lload_1
78	·········2:·aload_3	78	·········2:·aload_3
79	·········3:·aload·········4	79	·········3:·aload·········4
80	·········5:·invokespecial·#23·················//·Method·"<init>":(JLcom/android/server/connectivity/NetworkAgentInfo;Landroid/os/PersistableBundle;)V	80	·········5:·invokespecial·#23·················//·Method·"<init>":(JLcom/android/server/connectivity/NetworkAgentInfo;Landroid/os/PersistableBundle;)V
81	·········8:·return	81	·········8:·return

82	··static·com.android.server.connectivity.NetworkAgentInfo·access$10500(com.android.server.ConnectivityService$ConnectivityReportEvent);	82	··static·com.android.server.connectivity.NetworkAgentInfo·access$10300(com.android.server.ConnectivityService$ConnectivityReportEvent);
83	····descriptor:·(Lcom/android/server/ConnectivityService$ConnectivityReportEvent;)Lcom/android/server/connectivity/NetworkAgentInfo;	83	····descriptor:·(Lcom/android/server/ConnectivityService$ConnectivityReportEvent;)Lcom/android/server/connectivity/NetworkAgentInfo;
84	····flags:·(0x1008)·ACC_STATIC,·ACC_SYNTHETIC	84	····flags:·(0x1008)·ACC_STATIC,·ACC_SYNTHETIC
85	····Code:	85	····Code:
86	······stack=300,·locals=1,·args_size=1	86	······stack=300,·locals=1,·args_size=1
87	·········0:·aload_0	87	·········0:·aload_0
88	·········1:·getfield······#18·················//·Field·mNai:Lcom/android/server/connectivity/NetworkAgentInfo;	88	·········1:·getfield······#18·················//·Field·mNai:Lcom/android/server/connectivity/NetworkAgentInfo;
89	·········4:·areturn	89	·········4:·areturn

90	··static·long·access$10600(com.android.server.ConnectivityService$ConnectivityReportEvent);	90	··static·long·access$10400(com.android.server.ConnectivityService$ConnectivityReportEvent);
91	····descriptor:·(Lcom/android/server/ConnectivityService$ConnectivityReportEvent;)J	91	····descriptor:·(Lcom/android/server/ConnectivityService$ConnectivityReportEvent;)J
92	····flags:·(0x1008)·ACC_STATIC,·ACC_SYNTHETIC	92	····flags:·(0x1008)·ACC_STATIC,·ACC_SYNTHETIC
93	····Code:	93	····Code:
94	······stack=300,·locals=1,·args_size=1	94	······stack=300,·locals=1,·args_size=1
95	·········0:·aload_0	95	·········0:·aload_0
96	·········1:·getfield······#16·················//·Field·mTimestampMillis:J	96	·········1:·getfield······#16·················//·Field·mTimestampMillis:J
97	·········4:·lreturn	97	·········4:·lreturn

98	··static·android.os.PersistableBundle·access$9800(com.android.server.ConnectivityService$ConnectivityReportEvent);	98	··static·android.os.PersistableBundle·access$9600(com.android.server.ConnectivityService$ConnectivityReportEvent);
99	····descriptor:·(Lcom/android/server/ConnectivityService$ConnectivityReportEvent;)Landroid/os/PersistableBundle;	99	····descriptor:·(Lcom/android/server/ConnectivityService$ConnectivityReportEvent;)Landroid/os/PersistableBundle;
100	····flags:·(0x1008)·ACC_STATIC,·ACC_SYNTHETIC	100	····flags:·(0x1008)·ACC_STATIC,·ACC_SYNTHETIC
101	····Code:	101	····Code:
102	······stack=300,·locals=1,·args_size=1	102	······stack=300,·locals=1,·args_size=1
103	·········0:·aload_0	103	·········0:·aload_0
104	·········1:·getfield······#20·················//·Field·mExtras:Landroid/os/PersistableBundle;	104	·········1:·getfield······#20·················//·Field·mExtras:Landroid/os/PersistableBundle;
105	·········4:·areturn	105	·········4:·areturn


Offset 10, 15 lines modified		Offset 10, 15 lines modified
10	import·android.os.HandlerThread;	10	import·android.os.HandlerThread;
11	import·android.app.PendingIntent;	11	import·android.app.PendingIntent;
12	import·com.android.server.connectivity.MockableSystemProperties;	12	import·com.android.server.connectivity.MockableSystemProperties;
13	import·android.net.ConnectivityResources;	13	import·android.net.ConnectivityResources;
14	import·android.content.Context;	14	import·android.content.Context;
15	import·com.android.connectivity.android.net.networkstack.ModuleNetworkStackClient;	15	import·com.android.connectivity.android.net.networkstack.ModuleNetworkStackClient;
16	import·com.android.connectivity.android.net.networkstack.NetworkStackClientBase;	16	import·com.android.connectivity.android.net.networkstack.NetworkStackClientBase;
17	import·com.android.connectivity.~~com.~~android.n~~et.modul~~e.util.netlink.InetDiagMessage;	17	import·com.android.connectivity.android.net.netlink.InetDiagMessage;
18	import·java.net.InetSocketAddress;	18	import·java.net.InetSocketAddress;
19	import·com.android.connectivity.android.sysprop.NetworkProperties;	19	import·com.android.connectivity.android.sysprop.NetworkProperties;
20	import·android.os.Binder;	20	import·android.os.Binder;

21	public·class·ConnectivityService$Dependencies	21	public·class·ConnectivityService$Dependencies
22	{	22	{
23	····public·int·getCallingUid()·{	23	····public·int·getCallingUid()·{


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

1	package·com.android.server;	1	package·com.android.server;

2	import·android.net.ProxyInfo;	2	import·android.net.ProxyInfo;
3	import·com.android.connectivity.android.net.INetworkMonitor;	3	import·com.android.connectivity.android.net.INetworkMonitor;
		4	import·com.android.server.connectivity.NetworkAgentInfo;
4	import·android.net.NetworkRequest;	5	import·android.net.NetworkRequest;
5	import·android.os.Messenger;	6	import·android.os.Messenger;
6	import·android.app.PendingIntent;	7	import·android.app.PendingIntent;
7	import·com.android.server.connectivity.NetworkAgentInfo;
8	import·com.android.server.connectivity.DnsManager$PrivateDnsValidationUpdate;	8	import·com.android.server.connectivity.DnsManager$PrivateDnsValidationUpdate;
9	import·android.net.UidRange;	9	import·android.net.UidRange;
10	import·android.net.OemNetworkPreferences;	10	import·android.net.OemNetworkPreferences;
11	import·android.net.IOnCompleteListener;	11	import·android.net.IOnCompleteListener;
12	import·com.android.server.connectivity.ProfileNetworkPreferences$Preference;	12	import·com.android.server.connectivity.ProfileNetworkPreferences$Preference;
13	import·android.util.Pair;	13	import·android.util.Pair;
14	import·com.android.server.connectivity.NetworkOffer;	14	import·com.android.server.connectivity.NetworkOffer;
Offset 40, 127 lines modified		Offset 40, 127 lines modified
40	················break;	40	················break;
41	············}	41	············}
42	············case·55:·{	42	············case·55:·{
43	················this.this$0.mMultinetworkPolicyTracker.setTestAllowBadWifiUntil((long)(Long)message.obj);	43	················this.this$0.mMultinetworkPolicyTracker.setTestAllowBadWifiUntil((long)(Long)message.obj);
44	················break;	44	················break;
45	············}	45	············}
46	············case·54:·{	46	············case·54:·{
47	················ConnectivityService.access$8200(this.this$0);	47	················ConnectivityService.access$8100(this.this$0);
48	················break;	48	················break;
49	············}	49	············}
50	············case·53:·{	50	············case·53:·{
51	················final·ConnectivityService$NetworkOfferInfo·access$6200·=·ConnectivityService.access$6200(this.this$0,·(INetworkOfferCallback)message.obj);	51	················final·ConnectivityService$NetworkOfferInfo·access$6100·=·ConnectivityService.access$6100(this.this$0,·(INetworkOfferCallback)message.obj);
52	················if·(access$6200·!=·null)·{	52	················if·(access$6100·!=·null)·{
53	····················ConnectivityService.access$6300(this.this$0,·access$6200);	53	····················ConnectivityService.access$6200(this.this$0,·access$6100);
54	····················break;	54	····················break;
55	················}	55	················}
56	················break;	56	················break;
57	············}	57	············}
58	············case·52:·{	58	············case·52:·{
59	················ConnectivityService.access$6100(this.this$0,·(NetworkOffer)message.obj);	59	················ConnectivityService.access$6000(this.this$0,·(NetworkOffer)message.obj);
60	················break;	60	················break;
61	············}	61	············}
62	············case·51:·{	62	············case·51:·{
63	················ConnectivityService.access$7700(this.this$0,·message.arg1,·message.arg2);	63	················ConnectivityService.access$7600(this.this$0,·message.arg1,·message.arg2);
64	················break;	64	················break;
65	············}	65	············}
66	············case·50:·{	66	············case·50:·{
67	················final·Pair·pair·=·(Pair)message.obj;	67	················final·Pair·pair·=·(Pair)message.obj;
68	················ConnectivityService.access$8000(this.this$0,·(ProfileNetworkPreferences$Preference)pair.first,·(IOnCompleteListener)pair.second);	68	················ConnectivityService.access$7900(this.this$0,·(ProfileNetworkPreferences$Preference)pair.first,·(IOnCompleteListener)pair.second);
69	················break;	69	················break;
70	············}	70	············}
71	············case·49:·{	71	············case·49:·{
72	················ConnectivityService.access$8100(this.this$0).handleReportNetworkActivity();	72	················ConnectivityService.access$8000(this.this$0).handleReportNetworkActivity();
73	················break;	73	················break;
74	············}	74	············}
75	············case·48:·{	75	············case·48:·{
76	················final·Pair·pair2·=·(Pair)message.obj;	76	················final·Pair·pair2·=·(Pair)message.obj;
77	················ConnectivityService.access$7900(this.this$0,·(OemNetworkPreferences)pair2.first,·(IOnCompleteListener)pair2.second);	77	················ConnectivityService.access$7800(this.this$0,·(OemNetworkPreferences)pair2.first,·(IOnCompleteListener)pair2.second);
78	················break;	78	················break;
79	············}	79	············}
80	············case·47:·{	80	············case·47:·{
81	················ConnectivityService.access$7800(this.this$0,·ConnectivityService.access$2600(message.arg1),·(UidRange[])message.obj);	81	················ConnectivityService.access$7700(this.this$0,·ConnectivityService.access$2600(message.arg1),·(UidRange[])message.obj);
82	················break;	82	················break;
83	············}	83	············}
84	············case·44:·{	84	············case·44:·{
85	················ConnectivityService.access$7100(this.this$0,·(Network)message.obj,·ConnectivityService.access$2600(message.arg1),·ConnectivityService.access$2600(message.arg2));	85	················ConnectivityService.access$7000(this.this$0,·(Network)message.obj,·ConnectivityService.access$2600(message.arg1),·ConnectivityService.access$2600(message.arg2));
86	················break;	86	················break;
87	············}	87	············}
88	············case·38:·{	88	············case·38:·{
89	················ConnectivityService.access$7600(this.this$0,·(DnsManager$PrivateDnsValidationUpdate)message.obj);	89	················ConnectivityService.access$7500(this.this$0,·(DnsManager$PrivateDnsValidationUpdate)message.obj);
90	················break;	90	················break;
91	············}	91	············}
92	············case·37:·{	92	············case·37:·{
93	················ConnectivityService.access$7500(this.this$0);	93	················ConnectivityService.access$7400(this.this$0);
94	················break;	94	················break;
95	············}	95	············}
96	············case·36:·{	96	············case·36:·{
97	················ConnectivityService.access$7400(this.this$0,·(Network~~AgentInfo~~)message.obj,·message.arg1,·ConnectivityService.access$2600(message.arg2));	97	················ConnectivityService.access$7300(this.this$0,·(Network)message.obj,·message.arg1,·ConnectivityService.access$2600(message.arg2));
98	················break;	98	················break;
99	············}	99	············}
100	············case·35:·{	100	············case·35:·{
101	················ConnectivityService.access$7200(this.this$0,·(Network)message.obj);	101	················ConnectivityService.access$7100(this.this$0,·(Network)message.obj);
102	················break;	102	················break;
103	············}	103	············}
104	············case·30:·{	104	············case·30:·{
105	················ConnectivityService.access$7300(this.this$0);	105	················ConnectivityService.access$7200(this.this$0);
106	················break;	106	················break;
107	············}	107	············}
108	············case·29:·{	108	············case·29:·{
109	················ConnectivityService.access$4100(this.this$0,·(Network)message.obj);	109	················ConnectivityService.access$4100(this.this$0,·(Network)message.obj);
110	················break;	110	················break;
111	············}	111	············}
112	············case·28:·{	112	············case·28:·{
113	················ConnectivityService.access$7000(this.this$0,·(Network)message.obj,·ConnectivityService.access$2600(message.arg1),·ConnectivityService.access$2600(message.arg2));	113	················ConnectivityService.access$6900(this.this$0,·(Network)message.obj,·ConnectivityService.access$2600(message.arg1),·ConnectivityService.access$2600(message.arg2));
114	················break;	114	················break;
115	············}	115	············}
116	············case·27:·{	116	············case·27:·{
117	················ConnectivityService.access$6800(this.this$0,·(PendingIntent)message.obj,·message.arg1);	117	················ConnectivityService.access$6700(this.this$0,·(PendingIntent)message.obj,·message.arg1);
118	················break;	118	················break;
119	············}	119	············}
120	············case·26:	120	············case·26:
121	············case·31:·{	121	············case·31:·{
122	················ConnectivityService.access$6600(this.this$0,·message);	122	················ConnectivityService.access$6500(this.this$0,·message);
123	················break;	123	················break;
124	············}	124	············}
125	············case·23:·{	125	············case·23:·{
126	················ConnectivityService.access$6000(this.this$0,·(Messenger)message.obj);	126	················ConnectivityService.access$5900(this.this$0,·(Messenger)message.obj);
127	················break;	127	················break;
128	············}	128	············}
129	············case·22:·{	129	············case·22:·{
130	················ConnectivityService.access$6900(this.this$0,·(NetworkRequest)message.obj,·message.arg1,·false);	130	················ConnectivityService.access$6800(this.this$0,·(NetworkRequest)message.obj,·message.arg1,·false);
131	················break;	131	················break;
132	············}	132	············}
133	············case·20:·{	133	············case·20:·{
134	················ConnectivityService.access$6700(this.this$0,·(ConnectivityService$NetworkRequestInfo)message.obj);	134	················ConnectivityService.access$6600(this.this$0,·(ConnectivityService$NetworkRequestInfo)message.obj);
135	················break;	135	················break;
136	············}	136	············}
137	············case·19:	137	············case·19:
138	············case·21:·{	138	············case·21:·{
139	················ConnectivityService.access$6500(this.this$0,·(ConnectivityService$NetworkRequestInfo)message.obj);	139	················ConnectivityService.access$6400(this.this$0,·(ConnectivityService$NetworkRequestInfo)message.obj);
140	················break;	140	················break;
141	············}	141	············}
142	············case·18:·{	142	············case·18:·{
143	················final·Pair·pair3·=·(Pair)message.obj;	143	················final·Pair·pair3·=·(Pair)message.obj;
144	················ConnectivityService.access$6400(this.this$0,·(NetworkAgentInfo)pair3.first,·(INetworkMonitor)pair3.second);	144	················ConnectivityService.access$6300(this.this$0,·(NetworkAgentInfo)pair3.first,·(INetworkMonitor)pair3.second);
145	················break;	145	················break;
146	············}	146	············}
147	············case·17:·{	147	············case·17:·{
148	················ConnectivityService.access$5900(this.this$0,·(ConnectivityService$NetworkProviderInfo)message.obj);	148	················ConnectivityService.access$5800(this.this$0,·(ConnectivityService$NetworkProviderInfo)message.obj);
... Open expanded diff ...


Offset 74, 15 lines modified		Offset 74, 15 lines modified
74	············}	74	············}
75	········}	75	········}
76	········catch·(Exception·ex)·{}	76	········catch·(Exception·ex)·{}
77	····}	77	····}
78	····	78	····
79	····private·void·reportNetworkActive()·{	79	····private·void·reportNetworkActive()·{
80	········final·int·beginBroadcast·=·this.mNetworkActivityListeners.beginBroadcast();	80	········final·int·beginBroadcast·=·this.mNetworkActivityListeners.beginBroadcast();
81	········if·(ConnectivityService.access$10700())·{	81	········if·(ConnectivityService.access$10500())·{
82	············final·StringBuilder·sb·=·new·StringBuilder();	82	············final·StringBuilder·sb·=·new·StringBuilder();
83	············sb.append("reportNetworkActive,·notify·");	83	············sb.append("reportNetworkActive,·notify·");
84	············sb.append(beginBroadcast);	84	············sb.append(beginBroadcast);
85	············sb.append("·listeners");	85	············sb.append("·listeners");
86	············ConnectivityService.access$300(sb.toString());	86	············ConnectivityService.access$300(sb.toString());
87	········}	87	········}
88	········for·(int·i·=·0;·i·<·beginBroadcast;·++i)·{	88	········for·(int·i·=·0;·i·<·beginBroadcast;·++i)·{
Offset 186, 15 lines modified		Offset 186, 15 lines modified
186	········final·BatteryStatsManager·batteryStatsManager·=·(BatteryStatsManager)this.mContext.getSystemService((Class)BatteryStatsManager.class);	186	········final·BatteryStatsManager·batteryStatsManager·=·(BatteryStatsManager)this.mContext.getSystemService((Class)BatteryStatsManager.class);
187	········final·int·n·=·-1;	187	········final·int·n·=·-1;
188	········switch·(i)·{	188	········switch·(i)·{
189	············default:·{	189	············default:·{
190	················final·StringBuilder·sb·=·new·StringBuilder();	190	················final·StringBuilder·sb·=·new·StringBuilder();
191	················sb.append("Untracked·transport·type:");	191	················sb.append("Untracked·transport·type:");
192	················sb.append(i);	192	················sb.append(i);
193	················ConnectivityService.access$10800(sb.toString());	193	················ConnectivityService.access$10600(sb.toString());
194	················break;	194	················break;
195	············}	195	············}
196	············case·1:·{	196	············case·1:·{
197	················batteryStatsManager.reportWifiRadioPowerState(b,·n);	197	················batteryStatsManager.reportWifiRadioPowerState(b,·n);
198	················break;	198	················break;
199	············}	199	············}
200	············case·0:·{	200	············case·0:·{