Offset 1, 17 lines modified | Offset 1, 17 lines modified | ||
1 | apex_manifest.pb | 1 | apex_manifest.pb |
2 | app | 2 | app |
3 | app/OsuLogin | 3 | app/OsuLogin |
4 | app/OsuLogin | 4 | app/OsuLogin/OsuLogin.apk |
5 | etc | 5 | etc |
6 | etc/security | 6 | etc/security |
7 | etc/security/cacerts_wfa | 7 | etc/security/cacerts_wfa |
8 | etc/security/cacerts_wfa/21125ccd.0 | 8 | etc/security/cacerts_wfa/21125ccd.0 |
9 | etc/security/cacerts_wfa/674b5f5b.0 | 9 | etc/security/cacerts_wfa/674b5f5b.0 |
10 | etc/security/cacerts_wfa/ea93cb5b.0 | 10 | etc/security/cacerts_wfa/ea93cb5b.0 |
11 | javalib | 11 | javalib |
12 | javalib/framework-wifi.jar | 12 | javalib/framework-wifi.jar |
13 | javalib/service-wifi.jar | 13 | javalib/service-wifi.jar |
14 | lost+found | 14 | lost+found |
15 | priv-app | 15 | priv-app |
16 | priv-app/ServiceWifiResources | 16 | priv-app/ServiceWifiResources |
17 | priv-app/ServiceWifiResources | 17 | priv-app/ServiceWifiResources/ServiceWifiResources.apk |
Offset 1, 2 lines modified | Offset 1, 2 lines modified | ||
00000000:·0a10·636f·6d2e·616e·6472·6f69·642e·7769··..com.android.wi | 00000000:·0a10·636f·6d2e·616e·6472·6f69·642e·7769··..com.android.wi | ||
00000010:·6669·10 | 00000010:·6669·1080·c686·8f01······················fi...... |
Offset 1, 2 lines modified | Offset 1, 2 lines modified | ||
1 | OsuLogin | 1 | OsuLogin |
2 | OsuLogin | 2 | OsuLogin/OsuLogin.apk |
Offset 1, 1 lines modified | Offset 1, 1 lines modified | ||
1 | OsuLogin | 1 | OsuLogin.apk |
Offset 1, 10 lines modified | Offset 1, 9 lines modified | ||
1 | Zip·file·size:· | 1 | Zip·file·size:·236890·bytes,·number·of·entries:·78 |
2 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.activity_activity.version | 2 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.activity_activity.version |
3 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.annotation_annotation-experimental.version | ||
4 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.arch.core_core-runtime.version | 3 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.arch.core_core-runtime.version |
5 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.asynclayoutinflater_asynclayoutinflater.version | 4 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.asynclayoutinflater_asynclayoutinflater.version |
6 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.coordinatorlayout_coordinatorlayout.version | 5 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.coordinatorlayout_coordinatorlayout.version |
7 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.core_core.version | 6 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.core_core.version |
8 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.cursoradapter_cursoradapter.version | 7 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.cursoradapter_cursoradapter.version |
9 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.customview_customview.version | 8 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.customview_customview.version |
10 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.documentfile_documentfile.version | 9 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.documentfile_documentfile.version |
Offset 15, 22 lines modified | Offset 14, 22 lines modified | ||
15 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.legacy_legacy-support-core-utils.version | 14 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.legacy_legacy-support-core-utils.version |
16 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.lifecycle_lifecycle-livedata-core.version | 15 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.lifecycle_lifecycle-livedata-core.version |
17 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.lifecycle_lifecycle-runtime.version | 16 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.lifecycle_lifecycle-runtime.version |
18 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.lifecycle_lifecycle-viewmodel-savedstate.version | 17 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.lifecycle_lifecycle-viewmodel-savedstate.version |
19 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.lifecycle_lifecycle-viewmodel.version | 18 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.lifecycle_lifecycle-viewmodel.version |
20 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.loader_loader.version | 19 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.loader_loader.version |
21 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.localbroadcastmanager_localbroadcastmanager.version | 20 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.localbroadcastmanager_localbroadcastmanager.version |
22 | -rw----·····1.0·fat·······1 | 21 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.media_media.version |
23 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.print_print.version | 22 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.print_print.version |
24 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.savedstate_savedstate.version | 23 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.savedstate_savedstate.version |
25 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.slidingpanelayout_slidingpanelayout.version | 24 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.slidingpanelayout_slidingpanelayout.version |
26 | -rw----·····1.0·fat·······1 | 25 | -rw----·····1.0·fat·······11·bx·stor·09-Jan-01·00:00·META-INF/androidx.swiperefreshlayout_swiperefreshlayout.version |
27 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.versionedparcelable_versionedparcelable.version | 26 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.versionedparcelable_versionedparcelable.version |
28 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.viewpager_viewpager.version | 27 | -rw----·····1.0·fat·······14·bx·stor·09-Jan-01·00:00·META-INF/androidx.viewpager_viewpager.version |
29 | -rw----·····1.0·fat··· | 28 | -rw----·····1.0·fat···149572·bx·stor·09-Jan-01·00:00·classes.dex |
30 | -rw----·····1.0·fat······212·bx·stor·09-Jan-01·00:00·res/drawable-hdpi-v4/notification_bg_low_normal.9.png | 29 | -rw----·····1.0·fat······212·bx·stor·09-Jan-01·00:00·res/drawable-hdpi-v4/notification_bg_low_normal.9.png |
31 | -rw----·····1.0·fat······225·bx·stor·09-Jan-01·00:00·res/drawable-hdpi-v4/notification_bg_low_pressed.9.png | 30 | -rw----·····1.0·fat······225·bx·stor·09-Jan-01·00:00·res/drawable-hdpi-v4/notification_bg_low_pressed.9.png |
32 | -rw----·····1.0·fat······212·bx·stor·09-Jan-01·00:00·res/drawable-hdpi-v4/notification_bg_normal.9.png | 31 | -rw----·····1.0·fat······212·bx·stor·09-Jan-01·00:00·res/drawable-hdpi-v4/notification_bg_normal.9.png |
33 | -rw----·····1.0·fat······225·bx·stor·09-Jan-01·00:00·res/drawable-hdpi-v4/notification_bg_normal_pressed.9.png | 32 | -rw----·····1.0·fat······225·bx·stor·09-Jan-01·00:00·res/drawable-hdpi-v4/notification_bg_normal_pressed.9.png |
34 | -rw----·····1.0·fat······107·bx·stor·09-Jan-01·00:00·res/drawable-hdpi-v4/notify_panel_notification_icon_bg.png | 33 | -rw----·····1.0·fat······107·bx·stor·09-Jan-01·00:00·res/drawable-hdpi-v4/notify_panel_notification_icon_bg.png |
35 | -rw----·····1.0·fat······215·bx·stor·09-Jan-01·00:00·res/drawable-mdpi-v4/notification_bg_low_normal.9.png | 34 | -rw----·····1.0·fat······215·bx·stor·09-Jan-01·00:00·res/drawable-mdpi-v4/notification_bg_low_normal.9.png |
36 | -rw----·····1.0·fat······223·bx·stor·09-Jan-01·00:00·res/drawable-mdpi-v4/notification_bg_low_pressed.9.png | 35 | -rw----·····1.0·fat······223·bx·stor·09-Jan-01·00:00·res/drawable-mdpi-v4/notification_bg_low_pressed.9.png |
Offset 39, 18 lines modified | Offset 38, 16 lines modified | ||
39 | -rw----·····1.0·fat·······98·bx·stor·09-Jan-01·00:00·res/drawable-mdpi-v4/notify_panel_notification_icon_bg.png | 38 | -rw----·····1.0·fat·······98·bx·stor·09-Jan-01·00:00·res/drawable-mdpi-v4/notify_panel_notification_icon_bg.png |
40 | -rw----·····1.0·fat······221·bx·stor·09-Jan-01·00:00·res/drawable-xhdpi-v4/notification_bg_low_normal.9.png | 39 | -rw----·····1.0·fat······221·bx·stor·09-Jan-01·00:00·res/drawable-xhdpi-v4/notification_bg_low_normal.9.png |
41 | -rw----·····1.0·fat······252·bx·stor·09-Jan-01·00:00·res/drawable-xhdpi-v4/notification_bg_low_pressed.9.png | 40 | -rw----·····1.0·fat······252·bx·stor·09-Jan-01·00:00·res/drawable-xhdpi-v4/notification_bg_low_pressed.9.png |
42 | -rw----·····1.0·fat······221·bx·stor·09-Jan-01·00:00·res/drawable-xhdpi-v4/notification_bg_normal.9.png | 41 | -rw----·····1.0·fat······221·bx·stor·09-Jan-01·00:00·res/drawable-xhdpi-v4/notification_bg_normal.9.png |
43 | -rw----·····1.0·fat······247·bx·stor·09-Jan-01·00:00·res/drawable-xhdpi-v4/notification_bg_normal_pressed.9.png | 42 | -rw----·····1.0·fat······247·bx·stor·09-Jan-01·00:00·res/drawable-xhdpi-v4/notification_bg_normal_pressed.9.png |
44 | -rw----·····1.0·fat······138·bx·stor·09-Jan-01·00:00·res/drawable-xhdpi-v4/notify_panel_notification_icon_bg.png | 43 | -rw----·····1.0·fat······138·bx·stor·09-Jan-01·00:00·res/drawable-xhdpi-v4/notify_panel_notification_icon_bg.png |
45 | -rw----·····1.0·fat····37712·bx·stor·09-Jan-01·00:00·resources.arsc | 44 | -rw----·····1.0·fat····37712·bx·stor·09-Jan-01·00:00·resources.arsc |
46 | -rw----·····2.0·fat····· | 45 | -rw----·····2.0·fat·····2896·bl·defN·09-Jan-01·00:00·AndroidManifest.xml |
47 | -rw----·····2.0·fat·······16·bl·defN·09-Jan-01·00:00·META-INF/annotation-experimental_release.kotlin_module | ||
48 | -rw----·····2.0·fat······339·bl·defN·09-Jan-01·00:00·META-INF/proguard/androidx-annotations.pro | 46 | -rw----·····2.0·fat······339·bl·defN·09-Jan-01·00:00·META-INF/proguard/androidx-annotations.pro |
49 | -rw----·····2.0·fat···150032·bl·defN·09-Jan-01·00:00·classes.dex | ||
50 | -rw----·····2.0·fat······364·bl·defN·09-Jan-01·00:00·res/anim-v21/fragment_fast_out_extra_slow_in.xml | 47 | -rw----·····2.0·fat······364·bl·defN·09-Jan-01·00:00·res/anim-v21/fragment_fast_out_extra_slow_in.xml |
51 | -rw----·····2.0·fat·····1076·bl·defN·09-Jan-01·00:00·res/anim/fragment_close_enter.xml | 48 | -rw----·····2.0·fat·····1076·bl·defN·09-Jan-01·00:00·res/anim/fragment_close_enter.xml |
52 | -rw----·····2.0·fat·····1120·bl·defN·09-Jan-01·00:00·res/anim/fragment_close_exit.xml | 49 | -rw----·····2.0·fat·····1120·bl·defN·09-Jan-01·00:00·res/anim/fragment_close_exit.xml |
53 | -rw----·····2.0·fat······388·bl·defN·09-Jan-01·00:00·res/anim/fragment_fade_enter.xml | 50 | -rw----·····2.0·fat······388·bl·defN·09-Jan-01·00:00·res/anim/fragment_fade_enter.xml |
54 | -rw----·····2.0·fat······388·bl·defN·09-Jan-01·00:00·res/anim/fragment_fade_exit.xml | 51 | -rw----·····2.0·fat······388·bl·defN·09-Jan-01·00:00·res/anim/fragment_fade_exit.xml |
55 | -rw----·····2.0·fat·····1076·bl·defN·09-Jan-01·00:00·res/anim/fragment_open_enter.xml | 52 | -rw----·····2.0·fat·····1076·bl·defN·09-Jan-01·00:00·res/anim/fragment_open_enter.xml |
56 | -rw----·····2.0·fat·····1076·bl·defN·09-Jan-01·00:00·res/anim/fragment_open_exit.xml | 53 | -rw----·····2.0·fat·····1076·bl·defN·09-Jan-01·00:00·res/anim/fragment_open_exit.xml |
Offset 73, 12 lines modified | Offset 70, 11 lines modified | ||
73 | -rw----·····2.0·fat·····2872·bl·defN·09-Jan-01·00:00·res/layout/notification_template_lines_media.xml | 70 | -rw----·····2.0·fat·····2872·bl·defN·09-Jan-01·00:00·res/layout/notification_template_lines_media.xml |
74 | -rw----·····2.0·fat·····1292·bl·defN·09-Jan-01·00:00·res/layout/notification_template_media.xml | 71 | -rw----·····2.0·fat·····1292·bl·defN·09-Jan-01·00:00·res/layout/notification_template_media.xml |
75 | -rw----·····2.0·fat·····2756·bl·defN·09-Jan-01·00:00·res/layout/notification_template_media_custom.xml | 72 | -rw----·····2.0·fat·····2756·bl·defN·09-Jan-01·00:00·res/layout/notification_template_media_custom.xml |
76 | -rw----·····2.0·fat······440·bl·defN·09-Jan-01·00:00·res/layout/notification_template_part_chronometer.xml | 73 | -rw----·····2.0·fat······440·bl·defN·09-Jan-01·00:00·res/layout/notification_template_part_chronometer.xml |
77 | -rw----·····2.0·fat······440·bl·defN·09-Jan-01·00:00·res/layout/notification_template_part_time.xml | 74 | -rw----·····2.0·fat······440·bl·defN·09-Jan-01·00:00·res/layout/notification_template_part_time.xml |
78 | -rw----·····2.0·fat·····1372·bl·defN·09-Jan-01·00:00·res/layout/osu_web_view.xml | 75 | -rw----·····2.0·fat·····1372·bl·defN·09-Jan-01·00:00·res/layout/osu_web_view.xml |
79 | -rw----·····2.0·fat······556·bl·defN·09-Jan-01·00:00·res/xml/network_security_config.xml | 76 | -rw----·····2.0·fat······556·bl·defN·09-Jan-01·00:00·res/xml/network_security_config.xml |
80 | -rw----·····2.0·fat····· | 77 | -rw----·····2.0·fat·····9088·bl·defN·09-Jan-01·00:00·META-INF/CERT.SF |
81 | -rw----·····2.0·fat····· | 78 | -rw----·····2.0·fat·····2349·bl·defN·09-Jan-01·00:00·META-INF/CERT.RSA |
82 | -rw----·····2.0·fat····· | 79 | -rw----·····2.0·fat·····8976·bl·defN·09-Jan-01·00:00·META-INF/MANIFEST.MF |
83 | 80 | 78·files,·249887·bytes·uncompressed,·214225·bytes·compressed:··14.3% | |
84 | 82·files,·257691·bytes·uncompressed,·136349·bytes·compressed:··47.1% |
Offset 1, 16 lines modified | Offset 1, 15 lines modified | ||
1 | <?xml·version="1.0"·encoding="utf-8"?> | 1 | <?xml·version="1.0"·encoding="utf-8"?> |
2 | <manifest·android:compileSdkVersion="30"·android:compileSdkVersionCodename="11"·android:versionCode="30"·android:versionName="11 | 2 | <manifest·android:compileSdkVersion="30"·android:compileSdkVersionCodename="11"·android:versionCode="30"·android:versionName="11"·package="com.android.hotspot2.osulogin"·platformBuildVersionCode="30"·platformBuildVersionName="11"·xmlns:android="http://schemas.android.com/apk/res/android"> |
3 | ··<uses-sdk·android:minSdkVersion="30"·android:targetSdkVersion="30"/> | 3 | ··<uses-sdk·android:minSdkVersion="30"·android:targetSdkVersion="30"/> |
4 | ··<uses-permission·android:name="android.permission.ACCESS_NETWORK_STATE"/> | 4 | ··<uses-permission·android:name="android.permission.ACCESS_NETWORK_STATE"/> |
5 | ··<uses-permission·android:name="android.permission.CHANGE_WIFI_STATE"/> | 5 | ··<uses-permission·android:name="android.permission.CHANGE_WIFI_STATE"/> |
6 | ··<uses-permission·android:name="android.permission.INTERNET"/> | 6 | ··<uses-permission·android:name="android.permission.INTERNET"/> |
7 | ··<application·android:appComponentFactory="androidx.core.app.CoreComponentFactory"·android:configChanges="keyboardHidden|orientation|screenSize"·android:enabled="true"·android:extractNativeLibs="false"·android:label="@string/app_name"·android:networkSecurityConfig="@xml/network_security_config"·android:supportsRtl="true"> | 7 | ··<application·android:appComponentFactory="androidx.core.app.CoreComponentFactory"·android:configChanges="keyboardHidden|orientation|screenSize"·android:enabled="true"·android:extractNativeLibs="false"·android:label="@string/app_name"·android:networkSecurityConfig="@xml/network_security_config"·android:supportsRtl="true"> |
8 | ····<activity·android:configChanges="keyboardHidden|orientation|screenSize"·android:label="@string/action_bar_label"·android:name="com.android.hotspot2.osulogin.OsuLoginActivity"·android:theme="@style/AppTheme"> | 8 | ····<activity·android:configChanges="keyboardHidden|orientation|screenSize"·android:label="@string/action_bar_label"·android:name="com.android.hotspot2.osulogin.OsuLoginActivity"·android:theme="@style/AppTheme"> |
9 | ······<intent-filter> | 9 | ······<intent-filter> |
10 | ········<action·android:name="android.net.wifi.action.PASSPOINT_LAUNCH_OSU_VIEW"/> | 10 | ········<action·android:name="android.net.wifi.action.PASSPOINT_LAUNCH_OSU_VIEW"/> |
11 | ········<category·android:name="android.intent.category.DEFAULT"/> | 11 | ········<category·android:name="android.intent.category.DEFAULT"/> |
12 | ······</intent-filter> | 12 | ······</intent-filter> |
13 | ····</activity> | 13 | ····</activity> |
14 | ····<meta-data·android:name="android.content.pm.LOGGING_PARENT"·android:value="com.google.android.modulemetadata"/> | ||
15 | ··</application> | 14 | ··</application> |
16 | </manifest> | 15 | </manifest> |
Offset 1, 13 lines modified | Offset 1, 13 lines modified | ||
1 | !!brut.androlib.meta.MetaInfo | 1 | !!brut.androlib.meta.MetaInfo |
2 | compressionType:·false | 2 | compressionType:·false |
3 | doNotCompress: | 3 | doNotCompress: |
4 | -·dex | ||
4 | -·arsc | 5 | -·arsc |
5 | -·META-INF/androidx.activity_activity.version | 6 | -·META-INF/androidx.activity_activity.version |
6 | -·META-INF/androidx.annotation_annotation-experimental.version | ||
7 | -·META-INF/androidx.arch.core_core-runtime.version | 7 | -·META-INF/androidx.arch.core_core-runtime.version |
8 | -·META-INF/androidx.asynclayoutinflater_asynclayoutinflater.version | 8 | -·META-INF/androidx.asynclayoutinflater_asynclayoutinflater.version |
9 | -·META-INF/androidx.coordinatorlayout_coordinatorlayout.version | 9 | -·META-INF/androidx.coordinatorlayout_coordinatorlayout.version |
10 | -·META-INF/androidx.core_core.version | 10 | -·META-INF/androidx.core_core.version |
11 | -·META-INF/androidx.cursoradapter_cursoradapter.version | 11 | -·META-INF/androidx.cursoradapter_cursoradapter.version |
12 | -·META-INF/androidx.customview_customview.version | 12 | -·META-INF/androidx.customview_customview.version |
13 | -·META-INF/androidx.documentfile_documentfile.version | 13 | -·META-INF/androidx.documentfile_documentfile.version |
Offset 25, 15 lines modified | Offset 25, 14 lines modified | ||
25 | -·META-INF/androidx.media_media.version | 25 | -·META-INF/androidx.media_media.version |
26 | -·META-INF/androidx.print_print.version | 26 | -·META-INF/androidx.print_print.version |
27 | -·META-INF/androidx.savedstate_savedstate.version | 27 | -·META-INF/androidx.savedstate_savedstate.version |
28 | -·META-INF/androidx.slidingpanelayout_slidingpanelayout.version | 28 | -·META-INF/androidx.slidingpanelayout_slidingpanelayout.version |
29 | -·META-INF/androidx.swiperefreshlayout_swiperefreshlayout.version | 29 | -·META-INF/androidx.swiperefreshlayout_swiperefreshlayout.version |
30 | -·META-INF/androidx.versionedparcelable_versionedparcelable.version | 30 | -·META-INF/androidx.versionedparcelable_versionedparcelable.version |
31 | -·META-INF/androidx.viewpager_viewpager.version | 31 | -·META-INF/androidx.viewpager_viewpager.version |
32 | -·assets/NOTICE.html.gz | ||
33 | -·res/drawable-hdpi-v4/notification_bg_low_normal.9.png | 32 | -·res/drawable-hdpi-v4/notification_bg_low_normal.9.png |
34 | -·res/drawable-hdpi-v4/notification_bg_low_pressed.9.png | 33 | -·res/drawable-hdpi-v4/notification_bg_low_pressed.9.png |
35 | -·res/drawable-hdpi-v4/notification_bg_normal.9.png | 34 | -·res/drawable-hdpi-v4/notification_bg_normal.9.png |
36 | -·res/drawable-hdpi-v4/notification_bg_normal_pressed.9.png | 35 | -·res/drawable-hdpi-v4/notification_bg_normal_pressed.9.png |
37 | -·png | 36 | -·png |
38 | -·res/drawable-mdpi-v4/notification_bg_low_normal.9.png | 37 | -·res/drawable-mdpi-v4/notification_bg_low_normal.9.png |
39 | -·res/drawable-mdpi-v4/notification_bg_low_pressed.9.png | 38 | -·res/drawable-mdpi-v4/notification_bg_low_pressed.9.png |
Offset 46, 17 lines modified | Offset 45, 16 lines modified | ||
46 | isFrameworkApk:·false | 45 | isFrameworkApk:·false |
47 | packageInfo:·null | 46 | packageInfo:·null |
48 | sdkInfo: | 47 | sdkInfo: |
49 | ··minSdkVersion:·'30' | 48 | ··minSdkVersion:·'30' |
50 | ··targetSdkVersion:·'30' | 49 | ··targetSdkVersion:·'30' |
51 | sharedLibrary:·false | 50 | sharedLibrary:·false |
52 | sparseResources:·false | 51 | sparseResources:·false |
53 | unknownFiles: | 52 | unknownFiles:·{} |
54 | ··stamp-cert-sha256:·'8' | ||
55 | usesFramework: | 53 | usesFramework: |
56 | ··ids: | 54 | ··ids: |
57 | ··-·1 | 55 | ··-·1 |
58 | ··tag:·null | 56 | ··tag:·null |
59 | version:·2.3.4-dirty | 57 | version:·2.3.4-dirty |
60 | versionInfo: | 58 | versionInfo: |
61 | ··versionCode:·'30' | 59 | ··versionCode:·'30' |
62 | ··versionName:· | 60 | ··versionName:·'11' |
Offset 1, 8 lines modified | Offset 1, 8 lines modified | ||
1 | Zip·file·size:·25 | 1 | Zip·file·size:·254646·bytes,·number·of·entries:·184 |
2 | ?rwxrwxr-x··2.0·unx······242·b-·stor·80-Jan-01·00:00·android/support/v4/media/MediaBrowserCompat$CustomActionCallback.class | 2 | ?rwxrwxr-x··2.0·unx······242·b-·stor·80-Jan-01·00:00·android/support/v4/media/MediaBrowserCompat$CustomActionCallback.class |
3 | ?rwxrwxr-x··2.0·unx······234·b-·stor·80-Jan-01·00:00·android/support/v4/media/MediaBrowserCompat$ItemCallback.class | 3 | ?rwxrwxr-x··2.0·unx······234·b-·stor·80-Jan-01·00:00·android/support/v4/media/MediaBrowserCompat$ItemCallback.class |
4 | ?rwxrwxr-x··2.0·unx······691·b-·stor·80-Jan-01·00:00·android/support/v4/media/MediaBrowserCompat$MediaItem$1.class | 4 | ?rwxrwxr-x··2.0·unx······691·b-·stor·80-Jan-01·00:00·android/support/v4/media/MediaBrowserCompat$MediaItem$1.class |
5 | ?rwxrwxr-x··2.0·unx·····1383·b-·stor·80-Jan-01·00:00·android/support/v4/media/MediaBrowserCompat$MediaItem.class | 5 | ?rwxrwxr-x··2.0·unx·····1383·b-·stor·80-Jan-01·00:00·android/support/v4/media/MediaBrowserCompat$MediaItem.class |
6 | ?rwxrwxr-x··2.0·unx······255·b-·stor·80-Jan-01·00:00·android/support/v4/media/MediaBrowserCompat$SearchCallback.class | 6 | ?rwxrwxr-x··2.0·unx······255·b-·stor·80-Jan-01·00:00·android/support/v4/media/MediaBrowserCompat$SearchCallback.class |
7 | ?rwxrwxr-x··2.0·unx······956·b-·stor·80-Jan-01·00:00·android/support/v4/media/MediaDescriptionCompat$1.class | 7 | ?rwxrwxr-x··2.0·unx······956·b-·stor·80-Jan-01·00:00·android/support/v4/media/MediaDescriptionCompat$1.class |
8 | ?rwxrwxr-x··2.0·unx·····1702·b-·stor·80-Jan-01·00:00·android/support/v4/media/MediaDescriptionCompat$Builder.class | 8 | ?rwxrwxr-x··2.0·unx·····1702·b-·stor·80-Jan-01·00:00·android/support/v4/media/MediaDescriptionCompat$Builder.class |
Offset 75, 15 lines modified | Offset 75, 16 lines modified | ||
75 | ?rwxrwxr-x··2.0·unx······671·b-·stor·80-Jan-01·00:00·androidx/core/widget/NestedScrollView$SavedState$1.class | 75 | ?rwxrwxr-x··2.0·unx······671·b-·stor·80-Jan-01·00:00·androidx/core/widget/NestedScrollView$SavedState$1.class |
76 | ?rwxrwxr-x··2.0·unx·····1088·b-·stor·80-Jan-01·00:00·androidx/core/widget/NestedScrollView$SavedState.class | 76 | ?rwxrwxr-x··2.0·unx·····1088·b-·stor·80-Jan-01·00:00·androidx/core/widget/NestedScrollView$SavedState.class |
77 | ?rwxrwxr-x··2.0·unx·····1118·b-·stor·80-Jan-01·00:00·androidx/customview/view/AbsSavedState$2.class | 77 | ?rwxrwxr-x··2.0·unx·····1118·b-·stor·80-Jan-01·00:00·androidx/customview/view/AbsSavedState$2.class |
78 | ?rwxrwxr-x··2.0·unx·····1023·b-·stor·80-Jan-01·00:00·androidx/customview/view/AbsSavedState.class | 78 | ?rwxrwxr-x··2.0·unx·····1023·b-·stor·80-Jan-01·00:00·androidx/customview/view/AbsSavedState.class |
79 | ?rwxrwxr-x··2.0·unx······969·b-·stor·80-Jan-01·00:00·androidx/drawerlayout/widget/DrawerLayout$SavedState$1.class | 79 | ?rwxrwxr-x··2.0·unx······969·b-·stor·80-Jan-01·00:00·androidx/drawerlayout/widget/DrawerLayout$SavedState$1.class |
80 | ?rwxrwxr-x··2.0·unx······623·b-·stor·80-Jan-01·00:00·androidx/fragment/app/BackStackState$1.class | 80 | ?rwxrwxr-x··2.0·unx······623·b-·stor·80-Jan-01·00:00·androidx/fragment/app/BackStackState$1.class |
81 | ?rwxrwxr-x··2.0·unx·····2028·b-·stor·80-Jan-01·00:00·androidx/fragment/app/BackStackState.class | 81 | ?rwxrwxr-x··2.0·unx·····2028·b-·stor·80-Jan-01·00:00·androidx/fragment/app/BackStackState.class |
82 | ?rwxrwxr-x··2.0·unx·······84·b-·stor·80-Jan-01·00:00·androidx/fragment/app/Fragment$ | 82 | ?rwxrwxr-x··2.0·unx·······84·b-·stor·80-Jan-01·00:00·androidx/fragment/app/Fragment$2.class |
83 | ?rwxrwxr-x··2.0·unx·······84·b-·stor·80-Jan-01·00:00·androidx/fragment/app/Fragment$7.class | ||
83 | ?rwxrwxr-x··2.0·unx······914·b-·stor·80-Jan-01·00:00·androidx/fragment/app/Fragment$SavedState$1.class | 84 | ?rwxrwxr-x··2.0·unx······914·b-·stor·80-Jan-01·00:00·androidx/fragment/app/Fragment$SavedState$1.class |
84 | ?rwxrwxr-x··2.0·unx······801·b-·stor·80-Jan-01·00:00·androidx/fragment/app/Fragment$SavedState.class | 85 | ?rwxrwxr-x··2.0·unx······801·b-·stor·80-Jan-01·00:00·androidx/fragment/app/Fragment$SavedState.class |
85 | ?rwxrwxr-x··2.0·unx·······91·b-·stor·80-Jan-01·00:00·androidx/fragment/app/FragmentManager$6.class | 86 | ?rwxrwxr-x··2.0·unx·······91·b-·stor·80-Jan-01·00:00·androidx/fragment/app/FragmentManager$6.class |
86 | ?rwxrwxr-x··2.0·unx······711·b-·stor·80-Jan-01·00:00·androidx/fragment/app/FragmentManager$LaunchedFragmentInfo$1.class | 87 | ?rwxrwxr-x··2.0·unx······711·b-·stor·80-Jan-01·00:00·androidx/fragment/app/FragmentManager$LaunchedFragmentInfo$1.class |
87 | ?rwxrwxr-x··2.0·unx······822·b-·stor·80-Jan-01·00:00·androidx/fragment/app/FragmentManager$LaunchedFragmentInfo.class | 88 | ?rwxrwxr-x··2.0·unx······822·b-·stor·80-Jan-01·00:00·androidx/fragment/app/FragmentManager$LaunchedFragmentInfo.class |
88 | ?rwxrwxr-x··2.0·unx······647·b-·stor·80-Jan-01·00:00·androidx/fragment/app/FragmentManagerState$1.class | 89 | ?rwxrwxr-x··2.0·unx······647·b-·stor·80-Jan-01·00:00·androidx/fragment/app/FragmentManagerState$1.class |
89 | ?rwxrwxr-x··2.0·unx·····1895·b-·stor·80-Jan-01·00:00·androidx/fragment/app/FragmentManagerState.class | 90 | ?rwxrwxr-x··2.0·unx·····1895·b-·stor·80-Jan-01·00:00·androidx/fragment/app/FragmentManagerState.class |
Offset 162, 24 lines modified | Offset 163, 24 lines modified | ||
162 | ?rwxrwxr-x··2.0·unx······478·b-·stor·80-Jan-01·00:00·androidx/core/view/ViewCompat$3.class | 163 | ?rwxrwxr-x··2.0·unx······478·b-·stor·80-Jan-01·00:00·androidx/core/view/ViewCompat$3.class |
163 | ?rwxrwxr-x··2.0·unx······226·b-·stor·80-Jan-01·00:00·androidx/customview/view/AbsSavedState$1.class | 164 | ?rwxrwxr-x··2.0·unx······226·b-·stor·80-Jan-01·00:00·androidx/customview/view/AbsSavedState$1.class |
164 | ?rwxrwxr-x··2.0·unx······865·b-·stor·80-Jan-01·00:00·androidx/drawerlayout/widget/DrawerLayout$SavedState.class | 165 | ?rwxrwxr-x··2.0·unx······865·b-·stor·80-Jan-01·00:00·androidx/drawerlayout/widget/DrawerLayout$SavedState.class |
165 | ?rwxrwxr-x··2.0·unx······129·b-·stor·80-Jan-01·00:00·androidx/lifecycle/LiveData$LifecycleBoundObserver.class | 166 | ?rwxrwxr-x··2.0·unx······129·b-·stor·80-Jan-01·00:00·androidx/lifecycle/LiveData$LifecycleBoundObserver.class |
166 | ?rwxrwxr-x··2.0·unx·····2683·b-·stor·80-Jan-01·00:00·androidx/media/AudioAttributesCompat.class | 167 | ?rwxrwxr-x··2.0·unx·····2683·b-·stor·80-Jan-01·00:00·androidx/media/AudioAttributesCompat.class |
167 | ?rwxrwxr-x··2.0·unx······142·b-·stor·80-Jan-01·00:00·androidx/media/AudioAttributesImpl.class | 168 | ?rwxrwxr-x··2.0·unx······142·b-·stor·80-Jan-01·00:00·androidx/media/AudioAttributesImpl.class |
168 | ?rwxrwxr-x··2.0·unx······842·b-·stor·80-Jan-01·00:00·androidx/media/AudioAttributesImplApi21$Builder.class | 169 | ?rwxrwxr-x··2.0·unx······842·b-·stor·80-Jan-01·00:00·androidx/media/AudioAttributesImplApi21$Builder.class |
169 | ?rwxrwxr-x··2.0·unx····· | 170 | ?rwxrwxr-x··2.0·unx······922·b-·stor·80-Jan-01·00:00·androidx/media/AudioAttributesImplBase$Builder.class |
170 | ?rwxrwxr-x··2.0·unx······672·b-·stor·80-Jan-01·00:00·androidx/slidingpanelayout/widget/SlidingPaneLayout$SavedState.class | 171 | ?rwxrwxr-x··2.0·unx······672·b-·stor·80-Jan-01·00:00·androidx/slidingpanelayout/widget/SlidingPaneLayout$SavedState.class |
171 | ?rwxrwxr-x··2.0·unx······225·b-·stor·80-Jan-01·00:00·androidx/versionedparcelable/CustomVersionedParcelable.class | 172 | ?rwxrwxr-x··2.0·unx······225·b-·stor·80-Jan-01·00:00·androidx/versionedparcelable/CustomVersionedParcelable.class |
172 | ?rwxrwxr-x··2.0·unx·····3612·b-·stor·80-Jan-01·00:00·androidx/versionedparcelable/VersionedParcelParcel.class | 173 | ?rwxrwxr-x··2.0·unx·····3612·b-·stor·80-Jan-01·00:00·androidx/versionedparcelable/VersionedParcelParcel.class |
173 | ?rwxrwxr-x··2.0·unx·····1398·b-·stor·80-Jan-01·00:00·androidx/viewpager/widget/ViewPager$SavedState.class | 174 | ?rwxrwxr-x··2.0·unx·····1398·b-·stor·80-Jan-01·00:00·androidx/viewpager/widget/ViewPager$SavedState.class |
174 | ?rwxrwxr-x··2.0·unx······557·b-·stor·80-Jan-01·00:00·com/android/hotspot2/osulogin/-$$Lambda$OsuLoginActivity$utd7sjVqarzYe7IGZp_jikgo8fA.class | 175 | ?rwxrwxr-x··2.0·unx······557·b-·stor·80-Jan-01·00:00·com/android/hotspot2/osulogin/-$$Lambda$OsuLoginActivity$utd7sjVqarzYe7IGZp_jikgo8fA.class |
175 | ?rwxrwxr-x··2.0·unx·····2390·b-·stor·80-Jan-01·00:00·android/support/v4/media/session/MediaControllerCompat$Callback$StubCompat.class | 176 | ?rwxrwxr-x··2.0·unx·····2390·b-·stor·80-Jan-01·00:00·android/support/v4/media/session/MediaControllerCompat$Callback$StubCompat.class |
176 | ?rwxrwxr-x··2.0·unx······722·b-·stor·80-Jan-01·00:00·android/support/v4/os/ResultReceiver$MyResultReceiver.class | 177 | ?rwxrwxr-x··2.0·unx······722·b-·stor·80-Jan-01·00:00·android/support/v4/os/ResultReceiver$MyResultReceiver.class |
177 | ?rwxrwxr-x··2.0·unx·····6274·b-·stor·80-Jan-01·00:00·androidx/core/graphics/drawable/IconCompat.class | 178 | ?rwxrwxr-x··2.0·unx·····6274·b-·stor·80-Jan-01·00:00·androidx/core/graphics/drawable/IconCompat.class |
178 | ?rwxrwxr-x··2.0·unx······199·b-·stor·80-Jan-01·00:00·androidx/core/view/NestedScrollingParent3.class | 179 | ?rwxrwxr-x··2.0·unx······199·b-·stor·80-Jan-01·00:00·androidx/core/view/NestedScrollingParent3.class |
179 | ?rwxrwxr-x··2.0·unx······980·b-·stor·80-Jan-01·00:00·androidx/media/AudioAttributesImplApi21.class | 180 | ?rwxrwxr-x··2.0·unx······980·b-·stor·80-Jan-01·00:00·androidx/media/AudioAttributesImplApi21.class |
180 | ?rwxrwxr-x··2.0·unx······534·b-·stor·80-Jan-01·00:00·androidx/media/AudioAttributesImplApi26$Builder.class | 181 | ?rwxrwxr-x··2.0·unx······534·b-·stor·80-Jan-01·00:00·androidx/media/AudioAttributesImplApi26$Builder.class |
181 | ?rwxrwxr-x··2.0·unx·····1 | 182 | ?rwxrwxr-x··2.0·unx·····1781·b-·stor·80-Jan-01·00:00·androidx/media/AudioAttributesImplBase.class |
182 | ?rwxrwxr-x··2.0·unx······904·b-·stor·80-Jan-01·00:00·android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$ExtraCallback.class | 183 | ?rwxrwxr-x··2.0·unx······904·b-·stor·80-Jan-01·00:00·android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$ExtraCallback.class |
183 | ?rwxrwxr-x··2.0·unx······295·b-·stor·80-Jan-01·00:00·androidx/media/AudioAttributesImplApi26.class | 184 | ?rwxrwxr-x··2.0·unx······295·b-·stor·80-Jan-01·00:00·androidx/media/AudioAttributesImplApi26.class |
184 | ?rwxrwxr-x··2.0·unx····161 | 185 | ?rwxrwxr-x··2.0·unx····16185·b-·defN·80-Jan-01·00:00·androidx/swiperefreshlayout/widget/SwipeRefreshLayout.class |
185 | 18 | 186 | 184·files,·228559·bytes·uncompressed,·220054·bytes·compressed:··3.7% |
Offset 234, 15 lines modified | Offset 234, 18 lines modified | ||
234 | Filename:·androidx/fragment/app/BackStackState$1.class | 234 | Filename:·androidx/fragment/app/BackStackState$1.class |
235 | Comment:· | 235 | Comment:· |
236 | Filename:·androidx/fragment/app/BackStackState.class | 236 | Filename:·androidx/fragment/app/BackStackState.class |
237 | Comment:· | 237 | Comment:· |
238 | Filename:·androidx/fragment/app/Fragment$ | 238 | Filename:·androidx/fragment/app/Fragment$2.class |
239 | Comment:· | ||
240 | Filename:·androidx/fragment/app/Fragment$7.class | ||
239 | Comment:· | 241 | Comment:· |
240 | Filename:·androidx/fragment/app/Fragment$SavedState$1.class | 242 | Filename:·androidx/fragment/app/Fragment$SavedState$1.class |
241 | Comment:· | 243 | Comment:· |
242 | Filename:·androidx/fragment/app/Fragment$SavedState.class | 244 | Filename:·androidx/fragment/app/Fragment$SavedState.class |
243 | Comment:· | 245 | Comment:· |
Offset 1, 93 lines modified | Offset 1, 29 lines modified | ||
1 | package·androidx.media; | 1 | package·androidx.media; |
2 | import·android.util.Log; | ||
3 | class·AudioAttributesImplBase$Builder·implements·AudioAttributesImpl$Builder | 2 | class·AudioAttributesImplBase$Builder·implements·AudioAttributesImpl$Builder |
4 | { | 3 | { |
5 | ····private·int·mContentType; | 4 | ····private·int·mContentType; |
6 | ····private·int·mFlags; | 5 | ····private·int·mFlags; |
7 | ····private·int·mLegacyStream; | 6 | ····private·int·mLegacyStream; |
8 | ····private·int·mUsage; | 7 | ····private·int·mUsage; |
9 | ···· | 8 | ···· |
10 | ····AudioAttributesImplBase$Builder()·{ | 9 | ····AudioAttributesImplBase$Builder()·{ |
11 | ········this.mUsage·=·0; | 10 | ········this.mUsage·=·0; |
12 | ········this.mContentType·=·0; | 11 | ········this.mContentType·=·0; |
13 | ········this.mFlags·=·0; | 12 | ········this.mFlags·=·0; |
14 | ········this.mLegacyStream·=·-1; | 13 | ········this.mLegacyStream·=·-1; |
15 | ····} | 14 | ····} |
16 | ···· | 15 | ···· |
17 | ····private·AudioAttributesImplBase$Builder·setInternalLegacyStreamType(int·usageForStreamType)·{ | ||
18 | ········final·boolean·mContentType·=·true; | ||
19 | ········final·int·n·=·4; | ||
20 | ········switch·(usageForStreamType)·{ | ||
21 | ············default:·{ | ||
22 | ················final·StringBuilder·sb·=·new·StringBuilder(); | ||
23 | ················sb.append("Invalid·stream·type·"); | ||
24 | ················sb.append(usageForStreamType); | ||
25 | ················sb.append("·for·AudioAttributesCompat"); | ||
26 | ················Log.e("AudioAttributesCompat",·sb.toString()); | ||
27 | ················break; | ||
28 | ············} | ||
29 | ············case·10:·{ | ||
30 | ················this.mContentType·=·(mContentType·?·1·:·0); | ||
31 | ················break; | ||
32 | ············} | ||
33 | ············case·9:·{ | ||
34 | ················this.mContentType·=·n; | ||
35 | ················break; | ||
36 | ············} | ||
37 | ············case·8:·{ | ||
38 | ················this.mContentType·=·n; | ||
39 | ················break; | ||
40 | ············} | ||
41 | ············case·6:·{ | ||
42 | ················this.mContentType·=·(mContentType·?·1·:·0); | ||
43 | ················this.mFlags·|=·n; | ||
44 | ················break; | ||
45 | ············} | ||
46 | ············case·5:·{ | ||
47 | ················this.mContentType·=·n; | ||
48 | ················break; | ||
49 | ············} | ||
50 | ············case·4:·{ | ||
51 | ················this.mContentType·=·n; | ||
52 | ················break; | ||
53 | ············} | ||
54 | ············case·3:·{ | ||
55 | ················this.mContentType·=·2; | ||
56 | ················break; | ||
57 | ············} | ||
58 | ············case·2:·{ | ||
59 | ················this.mContentType·=·n; | ||
60 | ················break; | ||
61 | ············} | ||
62 | ············case·7:·{ | ||
63 | ················this.mFlags·|=·(mContentType·?·1·:·0); | ||
64 | ············} | ||
65 | ············case·1:·{ | ||
66 | ················this.mContentType·=·n; | ||
67 | ················break; | ||
68 | ············} | ||
69 | ············case·0:·{ | ||
70 | ················this.mContentType·=·(mContentType·?·1·:·0); | ||
71 | ················break; | ||
72 | ············} | ||
73 | ········} | ||
74 | ········usageForStreamType·=·AudioAttributesImplBase.usageForStreamType(usageForStreamType); | ||
75 | ········this.mUsage·=·usageForStreamType; | ||
76 | ········return·this; | ||
77 | ····} | ||
78 | ···· | ||
79 | ····public·AudioAttributesImpl·build()·{ | 16 | ····public·AudioAttributesImpl·build()·{ |
80 | ········return·(AudioAttributesImpl)new·AudioAttributesImplBase(this.mContentType,·this.mFlags,·this.mUsage,·this.mLegacyStream); | 17 | ········return·(AudioAttributesImpl)new·AudioAttributesImplBase(this.mContentType,·this.mFlags,·this.mUsage,·this.mLegacyStream); |
81 | ····} | 18 | ····} |
82 | ···· | 19 | ···· |
83 | ····public·AudioAttributesImplBase$Builder·setLegacyStreamType(final·int·mLegacyStream)·{ | 20 | ····public·AudioAttributesImplBase$Builder·setLegacyStreamType(final·int·mLegacyStream)·{ |
84 | ········if·(mLegacyStream·!=·10)·{ | 21 | ········if·(mLegacyStream·!=·10)·{ |
85 | ············this. | 22 | ············this.mLegacyStream·=·mLegacyStream; |
86 | ············return·this; | 23 | ············return·this; |
87 | ········} | 24 | ········} |
88 | ········throw·new·IllegalArgumentException("STREAM_ACCESSIBILITY·is·not·a·legacy·stream·type·that·was·used·for·audio·playback"); | 25 | ········throw·new·IllegalArgumentException("STREAM_ACCESSIBILITY·is·not·a·legacy·stream·type·that·was·used·for·audio·playback"); |
89 | ····} | 26 | ····} |
90 | } | 27 | } |
Offset 24, 51 lines modified | Offset 24, 14 lines modified | ||
24 | ········this.mLegacyStream·=·-1; | 24 | ········this.mLegacyStream·=·-1; |
25 | ········this.mContentType·=·mContentType; | 25 | ········this.mContentType·=·mContentType; |
26 | ········this.mFlags·=·mFlags; | 26 | ········this.mFlags·=·mFlags; |
27 | ········this.mUsage·=·mUsage; | 27 | ········this.mUsage·=·mUsage; |
28 | ········this.mLegacyStream·=·mLegacyStream; | 28 | ········this.mLegacyStream·=·mLegacyStream; |
29 | ····} | 29 | ····} |
30 | ···· | 30 | ···· |
31 | ····static·int·usageForStreamType(final·int·n)·{ | ||
32 | ········final·int·n2·=·2; | ||
33 | ········switch·(n)·{ | ||
34 | ············default:·{ | ||
35 | ················return·0; | ||
36 | ············} | ||
37 | ············case·10:·{ | ||
38 | ················return·11; | ||
39 | ············} | ||
40 | ············case·8:·{ | ||
41 | ················return·3; | ||
42 | ············} | ||
43 | ············case·6:·{ | ||
44 | ················return·n2; | ||
45 | ············} | ||
46 | ············case·5:·{ | ||
47 | ················return·5; | ||
48 | ············} | ||
49 | ············case·4:·{ | ||
50 | ················return·4; | ||
51 | ············} | ||
52 | ············case·3:·{ | ||
53 | ················return·1; | ||
54 | ············} | ||
55 | ············case·2:·{ | ||
56 | ················return·6; | ||
57 | ············} | ||
58 | ············case·1: | ||
59 | ············case·7:·{ | ||
60 | ················return·13; | ||
61 | ············} | ||
62 | ············case·0:·{ | ||
63 | ················return·n2; | ||
64 | ············} | ||
65 | ········} | ||
66 | ····} | ||
67 | ···· | ||
68 | ····public·boolean·equals(final·Object·o)·{ | 31 | ····public·boolean·equals(final·Object·o)·{ |
69 | ········final·boolean·b·=·o·instanceof·AudioAttributesImplBase; | 32 | ········final·boolean·b·=·o·instanceof·AudioAttributesImplBase; |
70 | ········boolean·b2·=·false; | 33 | ········boolean·b2·=·false; |
71 | ········if·(!b)·{ | 34 | ········if·(!b)·{ |
72 | ············return·false; | 35 | ············return·false; |
73 | ········} | 36 | ········} |
74 | ········final·AudioAttributesImplBase·audioAttributesImplBase·=·(AudioAttributesImplBase)o; | 37 | ········final·AudioAttributesImplBase·audioAttributesImplBase·=·(AudioAttributesImplBase)o; |
Offset 1, 12 lines modified | Offset 1, 13 lines modified | ||
1 | package·androidx.swiperefreshlayout.widget; | 1 | package·androidx.swiperefreshlayout.widget; |
2 | import·android.view.View$BaseSavedState; | 2 | import·android.view.View$BaseSavedState; |
3 | import·android.widget.ImageView; | 3 | import·android.widget.ImageView; |
4 | import·android.view.ViewParent; | ||
4 | import·androidx.core.view.ViewCompat; | 5 | import·androidx.core.view.ViewCompat; |
5 | import·android.widget.AbsListView; | 6 | import·android.widget.AbsListView; |
6 | import·android.os.Build$VERSION; | 7 | import·android.os.Build$VERSION; |
7 | import·android.os.Parcelable; | 8 | import·android.os.Parcelable; |
8 | import·android.view.View$MeasureSpec; | 9 | import·android.view.View$MeasureSpec; |
9 | import·android.util.Log; | 10 | import·android.util.Log; |
10 | import·androidx.core.widget.ListViewCompat; | 11 | import·androidx.core.widget.ListViewCompat; |
Offset 718, 26 lines modified | Offset 719, 27 lines modified | ||
718 | ············} | 719 | ············} |
719 | ············return·b; | 720 | ············return·b; |
720 | ········} | 721 | ········} |
721 | ········return·false; | 722 | ········return·false; |
722 | ····} | 723 | ····} |
723 | ···· | 724 | ···· |
724 | ····public·void·requestDisallowInterceptTouchEvent(final·boolean·b)·{ | 725 | ····public·void·requestDisallowInterceptTouchEvent(final·boolean·b)·{ |
725 | ········ | 726 | ········if·(Build$VERSION.SDK_INT·>=·21·||·!(this.mTarget·instanceof·AbsListView))·{ |
726 | ············ | 727 | ············final·View·mTarget·=·this.mTarget; |
727 | ············ | 728 | ············if·(mTarget·==·null·||·ViewCompat.isNestedScrollingEnabled(mTarget))·{ |
728 | ················ | 729 | ················super.requestDisallowInterceptTouchEvent(b); |
729 | ····················if·(mTarget·==·null·||·ViewCompat.isNestedScrollingEnabled(mTarget))·{ | ||
730 | ························break·Label_0059; | ||
731 | ····················} | ||
732 | ················} | ||
733 | ················return; | 730 | ················return; |
734 | ············} | 731 | ············} |
735 | ········} | 732 | ········} |
736 | ········s | 733 | ········if·(!this.mEnableLegacyRequestDisallowInterceptTouch)·{ |
734 | ············final·ViewParent·parent·=·this.getParent(); | ||
735 | ············if·(parent·!=·null)·{ | ||
736 | ················parent.requestDisallowInterceptTouchEvent(b); | ||
737 | ············} | ||
738 | ········} | ||
737 | ····} | 739 | ····} |
738 | ···· | 740 | ···· |
739 | ····void·reset()·{ | 741 | ····void·reset()·{ |
740 | ········((ImageView)this.mCircleView).clearAnimation(); | 742 | ········((ImageView)this.mCircleView).clearAnimation(); |
741 | ········this.mProgress.stop(); | 743 | ········this.mProgress.stop(); |
742 | ········((ImageView)this.mCircleView).setVisibility(8); | 744 | ········((ImageView)this.mCircleView).setVisibility(8); |
743 | ········this.setColorViewAlpha(255); | 745 | ········this.setColorViewAlpha(255); |
Offset 552, 19 lines modified | Offset 552, 19 lines modified | ||
00002270:·2069·6e73·6372·69c3·a7c3·a36f·2e00·1012···inscri....o.... | 00002270:·2069·6e73·6372·69c3·a7c3·a36f·2e00·1012···inscri....o.... | ||
00002280:·496e·7363·7269·c3a7·c3a3·6f20·6f6e·6c69··Inscri....o·onli | 00002280:·496e·7363·7269·c3a7·c3a3·6f20·6f6e·6c69··Inscri....o·onli | ||
00002290:·6e65·000e·0e4f·6e6c·696e·6520·7369·676e··ne...Online·sign | 00002290:·6e65·000e·0e4f·6e6c·696e·6520·7369·676e··ne...Online·sign | ||
000022a0:·2d75·7000·0e0e·5369·676e·2d75·7020·6661··-up...Sign-up·fa | 000022a0:·2d75·7000·0e0e·5369·676e·2d75·7020·6661··-up...Sign-up·fa | ||
000022b0:·696c·6564·0004·0ce7·b79a·e4b8·8ae8·a8bb··iled............ | 000022b0:·696c·6564·0004·0ce7·b79a·e4b8·8ae8·a8bb··iled............ | ||
000022c0:·e586·8a00·040c·e8a8·bbe5·868a·e5a4·b1e6··................ | 000022c0:·e586·8a00·040c·e8a8·bbe5·868a·e5a4·b1e6··................ | ||
000022d0:·9597·0000·0002·2001·7c70·0000·7f00·0000··......·.|p...... | 000022d0:·9597·0000·0002·2001·7c70·0000·7f00·0000··......·.|p...... | ||
000022e0:·6300·6f00·6d00·2e00·6 | 000022e0:·6300·6f00·6d00·2e00·6100·6e00·6400·7200··c.o.m...a.n.d.r. | ||
000022f0:·6 | 000022f0:·6f00·6900·6400·2e00·6800·6f00·7400·7300··o.i.d...h.o.t.s. | ||
00002300:· | 00002300:·7000·6f00·7400·3200·2e00·6f00·7300·7500··p.o.t.2...o.s.u. | ||
00002310:·6 | 00002310:·6c00·6f00·6700·6900·6e00·0000·0000·0000··l.o.g.i.n....... | ||
00002320:· | 00002320:·0000·0000·0000·0000·0000·0000·0000·0000··................ | ||
00002330:·0000·0000·0000·0000·0000·0000·0000·0000··................ | 00002330:·0000·0000·0000·0000·0000·0000·0000·0000··................ | ||
00002340:·0000·0000·0000·0000·0000·0000·0000·0000··................ | 00002340:·0000·0000·0000·0000·0000·0000·0000·0000··................ | ||
00002350:·0000·0000·0000·0000·0000·0000·0000·0000··................ | 00002350:·0000·0000·0000·0000·0000·0000·0000·0000··................ | ||
00002360:·0000·0000·0000·0000·0000·0000·0000·0000··................ | 00002360:·0000·0000·0000·0000·0000·0000·0000·0000··................ | ||
00002370:·0000·0000·0000·0000·0000·0000·0000·0000··................ | 00002370:·0000·0000·0000·0000·0000·0000·0000·0000··................ | ||
00002380:·0000·0000·0000·0000·0000·0000·0000·0000··................ | 00002380:·0000·0000·0000·0000·0000·0000·0000·0000··................ | ||
00002390:·0000·0000·0000·0000·0000·0000·0000·0000··................ | 00002390:·0000·0000·0000·0000·0000·0000·0000·0000··................ |
Offset 26, 56 lines modified | Offset 26, 56 lines modified | ||
26 | .end·annotation | 26 | .end·annotation |
27 | #·direct·methods | 27 | #·direct·methods |
28 | .method·constructor·<init>()V | 28 | .method·constructor·<init>()V |
29 | ····.locals·0 | 29 | ····.locals·0 |
30 | ····.line·230 | 30 | ····.line·2306 |
31 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V | 31 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V |
32 | ····return-void | 32 | ····return-void |
33 | .end·method | 33 | .end·method |
34 | #·virtual·methods | 34 | #·virtual·methods |
35 | .method·public·createFromParcel(Landroid/os/Parcel;)Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper; | 35 | .method·public·createFromParcel(Landroid/os/Parcel;)Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper; |
36 | ····.locals·0 | 36 | ····.locals·0 |
37 | ····.line·23 | 37 | ····.line·2309 |
38 | ····new-instance·p0,·Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper; | 38 | ····new-instance·p0,·Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper; |
39 | ····invoke-direct·{p0,·p1},·Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper;-><init>(Landroid/os/Parcel;)V | 39 | ····invoke-direct·{p0,·p1},·Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper;-><init>(Landroid/os/Parcel;)V |
40 | ····return-object·p0 | 40 | ····return-object·p0 |
41 | .end·method | 41 | .end·method |
42 | .method·public·bridge·synthetic·createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object; | 42 | .method·public·bridge·synthetic·createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object; |
43 | ····.locals·0 | 43 | ····.locals·0 |
44 | ····.line·230 | 44 | ····.line·2306 |
45 | ····invoke-virtual·{p0,·p1},·Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper$1;->createFromParcel(Landroid/os/Parcel;)Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper; | 45 | ····invoke-virtual·{p0,·p1},·Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper$1;->createFromParcel(Landroid/os/Parcel;)Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper; |
46 | ····move-result-object·p0 | 46 | ····move-result-object·p0 |
47 | ····return-object·p0 | 47 | ····return-object·p0 |
48 | .end·method | 48 | .end·method |
49 | .method·public·newArray(I)[Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper; | 49 | .method·public·newArray(I)[Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper; |
50 | ····.locals·0 | 50 | ····.locals·0 |
51 | ····.line·231 | 51 | ····.line·2314 |
52 | ····new-array·p0,·p1,·[Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper; | 52 | ····new-array·p0,·p1,·[Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper; |
53 | ····return-object·p0 | 53 | ····return-object·p0 |
54 | .end·method | 54 | .end·method |
55 | .method·public·bridge·synthetic·newArray(I)[Ljava/lang/Object; | 55 | .method·public·bridge·synthetic·newArray(I)[Ljava/lang/Object; |
56 | ····.locals·0 | 56 | ····.locals·0 |
57 | ····.line·230 | 57 | ····.line·2306 |
58 | ····invoke-virtual·{p0,·p1},·Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper$1;->newArray(I)[Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper; | 58 | ····invoke-virtual·{p0,·p1},·Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper$1;->newArray(I)[Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper; |
59 | ····move-result-object·p0 | 59 | ····move-result-object·p0 |
60 | ····return-object·p0 | 60 | ····return-object·p0 |
61 | .end·method | 61 | .end·method |
Offset 43, 52 lines modified | Offset 43, 52 lines modified | ||
43 | .field·private·final·mLock:Ljava/lang/Object; | 43 | .field·private·final·mLock:Ljava/lang/Object; |
44 | #·direct·methods | 44 | #·direct·methods |
45 | .method·static·constructor·<clinit>()V | 45 | .method·static·constructor·<clinit>()V |
46 | ····.locals·1 | 46 | ····.locals·1 |
47 | ····.line·211 | 47 | ····.line·2111 |
48 | ····new-instance·v0,·Landroid/support/v4/media/session/MediaSessionCompat$Token$1; | 48 | ····new-instance·v0,·Landroid/support/v4/media/session/MediaSessionCompat$Token$1; |
49 | ····invoke-direct·{v0},·Landroid/support/v4/media/session/MediaSessionCompat$Token$1;-><init>()V | 49 | ····invoke-direct·{v0},·Landroid/support/v4/media/session/MediaSessionCompat$Token$1;-><init>()V |
50 | ····sput-object·v0,·Landroid/support/v4/media/session/MediaSessionCompat$Token;->CREATOR:Landroid/os/Parcelable$Creator; | 50 | ····sput-object·v0,·Landroid/support/v4/media/session/MediaSessionCompat$Token;->CREATOR:Landroid/os/Parcelable$Creator; |
51 | ····return-void | 51 | ····return-void |
52 | .end·method | 52 | .end·method |
53 | .method·constructor·<init>(Ljava/lang/Object;)V | 53 | .method·constructor·<init>(Ljava/lang/Object;)V |
54 | ····.locals·1 | 54 | ····.locals·1 |
55 | ····const/4·v0,·0x0 | 55 | ····const/4·v0,·0x0 |
56 | ····.line·192 | 56 | ····.line·1926 |
57 | ····invoke-direct·{p0,·p1,·v0,·v0},·Landroid/support/v4/media/session/MediaSessionCompat$Token;-><init>(Ljava/lang/Object;Landroid/support/v4/media/session/IMediaSession;Landroidx/versionedparcelable/VersionedParcelable;)V | 57 | ····invoke-direct·{p0,·p1,·v0,·v0},·Landroid/support/v4/media/session/MediaSessionCompat$Token;-><init>(Ljava/lang/Object;Landroid/support/v4/media/session/IMediaSession;Landroidx/versionedparcelable/VersionedParcelable;)V |
58 | ····return-void | 58 | ····return-void |
59 | .end·method | 59 | .end·method |
60 | .method·constructor·<init>(Ljava/lang/Object;Landroid/support/v4/media/session/IMediaSession;Landroidx/versionedparcelable/VersionedParcelable;)V | 60 | .method·constructor·<init>(Ljava/lang/Object;Landroid/support/v4/media/session/IMediaSession;Landroidx/versionedparcelable/VersionedParcelable;)V |
61 | ····.locals·0 | 61 | ····.locals·0 |
62 | ····.line·193 | 62 | ····.line·1933 |
63 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V | 63 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V |
64 | ····.line·191 | 64 | ····.line·1917 |
65 | ····new-instance·p3,·Ljava/lang/Object; | 65 | ····new-instance·p3,·Ljava/lang/Object; |
66 | ····invoke-direct·{p3},·Ljava/lang/Object;-><init>()V | 66 | ····invoke-direct·{p3},·Ljava/lang/Object;-><init>()V |
67 | ····iput-object·p3,·p0,·Landroid/support/v4/media/session/MediaSessionCompat$Token;->mLock:Ljava/lang/Object; | 67 | ····iput-object·p3,·p0,·Landroid/support/v4/media/session/MediaSessionCompat$Token;->mLock:Ljava/lang/Object; |
68 | ····.line·193 | 68 | ····.line·1934 |
69 | ····iput-object·p1,·p0,·Landroid/support/v4/media/session/MediaSessionCompat$Token;->mInner:Ljava/lang/Object; | 69 | ····iput-object·p1,·p0,·Landroid/support/v4/media/session/MediaSessionCompat$Token;->mInner:Ljava/lang/Object; |
70 | ····.line·193 | 70 | ····.line·1935 |
71 | ····iput-object·p2,·p0,·Landroid/support/v4/media/session/MediaSessionCompat$Token;->mExtraBinder:Landroid/support/v4/media/session/IMediaSession; | 71 | ····iput-object·p2,·p0,·Landroid/support/v4/media/session/MediaSessionCompat$Token;->mExtraBinder:Landroid/support/v4/media/session/IMediaSession; |
72 | ····return-void | 72 | ····return-void |
73 | .end·method | 73 | .end·method |
74 | #·virtual·methods | 74 | #·virtual·methods |
Offset 105, 124 lines modified | Offset 105, 124 lines modified | ||
105 | ····const/4·v0,·0x1 | 105 | ····const/4·v0,·0x1 |
106 | ····if-ne·p0,·p1,·:cond_0 | 106 | ····if-ne·p0,·p1,·:cond_0 |
107 | ····return·v0 | 107 | ····return·v0 |
108 | ····.line·200 | 108 | ····.line·2006 |
109 | ····:cond_0 | 109 | ····:cond_0 |
110 | ····instance-of·v1,·p1,·Landroid/support/v4/media/session/MediaSessionCompat$Token; | 110 | ····instance-of·v1,·p1,·Landroid/support/v4/media/session/MediaSessionCompat$Token; |
111 | ····const/4·v2,·0x0 | 111 | ····const/4·v2,·0x0 |
112 | ····if-nez·v1,·:cond_1 | 112 | ····if-nez·v1,·:cond_1 |
113 | ····return·v2 | 113 | ····return·v2 |
114 | ····.line·201 | 114 | ····.line·2010 |
115 | ····:cond_1 | 115 | ····:cond_1 |
116 | ····check-cast·p1,·Landroid/support/v4/media/session/MediaSessionCompat$Token; | 116 | ····check-cast·p1,·Landroid/support/v4/media/session/MediaSessionCompat$Token; |
117 | ····.line·201 | 117 | ····.line·2011 |
118 | ····iget-object·p0,·p0,·Landroid/support/v4/media/session/MediaSessionCompat$Token;->mInner:Ljava/lang/Object; | 118 | ····iget-object·p0,·p0,·Landroid/support/v4/media/session/MediaSessionCompat$Token;->mInner:Ljava/lang/Object; |
119 | ····if-nez·p0,·:cond_3 | 119 | ····if-nez·p0,·:cond_3 |
120 | ····.line·201 | 120 | ····.line·2012 |
121 | ····iget-object·p0,·p1,·Landroid/support/v4/media/session/MediaSessionCompat$Token;->mInner:Ljava/lang/Object; | 121 | ····iget-object·p0,·p1,·Landroid/support/v4/media/session/MediaSessionCompat$Token;->mInner:Ljava/lang/Object; |
122 | ····if-nez·p0,·:cond_2 | 122 | ····if-nez·p0,·:cond_2 |
123 | ····goto·:goto_0 | 123 | ····goto·:goto_0 |
124 | ····:cond_2 | 124 | ····:cond_2 |
125 | ····move·v0,·v2 | 125 | ····move·v0,·v2 |
126 | ····:goto_0 | 126 | ····:goto_0 |
127 | ····return·v0 | 127 | ····return·v0 |
128 | ····.line·201 | 128 | ····.line·2014 |
129 | ····:cond_3 | 129 | ····:cond_3 |
130 | ····iget-object·p1,·p1,·Landroid/support/v4/media/session/MediaSessionCompat$Token;->mInner:Ljava/lang/Object; | 130 | ····iget-object·p1,·p1,·Landroid/support/v4/media/session/MediaSessionCompat$Token;->mInner:Ljava/lang/Object; |
131 | ····if-nez·p1,·:cond_4 | 131 | ····if-nez·p1,·:cond_4 |
132 | ····return·v2 | 132 | ····return·v2 |
133 | ····.line·201 | 133 | ····.line·2017 |
134 | ····:cond_4 | 134 | ····:cond_4 |
135 | ····invoke-virtual·{p0,·p1},·Ljava/lang/Object;->equals(Ljava/lang/Object;)Z | 135 | ····invoke-virtual·{p0,·p1},·Ljava/lang/Object;->equals(Ljava/lang/Object;)Z |
136 | ····move-result·p0 | 136 | ····move-result·p0 |
137 | ····return·p0 | 137 | ····return·p0 |
138 | .end·method | 138 | .end·method |
139 | .method·public·getExtraBinder()Landroid/support/v4/media/session/IMediaSession; | 139 | .method·public·getExtraBinder()Landroid/support/v4/media/session/IMediaSession; |
140 | ····.locals·1 | 140 | ····.locals·1 |
141 | ····.line·20 | 141 | ····.line·2038 |
142 | ····iget-object·v0,·p0,·Landroid/support/v4/media/session/MediaSessionCompat$Token;->mLock:Ljava/lang/Object; | 142 | ····iget-object·v0,·p0,·Landroid/support/v4/media/session/MediaSessionCompat$Token;->mLock:Ljava/lang/Object; |
143 | ····monitor-enter·v0 | 143 | ····monitor-enter·v0 |
144 | ····.line·20 | 144 | ····.line·2039 |
145 | ····:try_start_0 | 145 | ····:try_start_0 |
146 | ····iget-object·p0,·p0,·Landroid/support/v4/media/session/MediaSessionCompat$Token;->mExtraBinder:Landroid/support/v4/media/session/IMediaSession; | 146 | ····iget-object·p0,·p0,·Landroid/support/v4/media/session/MediaSessionCompat$Token;->mExtraBinder:Landroid/support/v4/media/session/IMediaSession; |
147 | ····monitor-exit·v0 | 147 | ····monitor-exit·v0 |
148 | ····return-object·p0 | 148 | ····return-object·p0 |
149 | ····:catchall_0 | 149 | ····:catchall_0 |
150 | ····move-exception·p0 | 150 | ····move-exception·p0 |
... Open expanded diff ... |
Offset 15, 15 lines modified | Offset 15, 15 lines modified | ||
15 | #·direct·methods | 15 | #·direct·methods |
16 | .method·public·static·ensureClassLoader(Landroid/os/Bundle;)V | 16 | .method·public·static·ensureClassLoader(Landroid/os/Bundle;)V |
17 | ····.locals·1 | 17 | ····.locals·1 |
18 | ····if-eqz·p0,·:cond_0 | 18 | ····if-eqz·p0,·:cond_0 |
19 | ····.line·105 | 19 | ····.line·1056 |
20 | ····const-class·v0,·Landroid/support/v4/media/session/MediaSessionCompat; | 20 | ····const-class·v0,·Landroid/support/v4/media/session/MediaSessionCompat; |
21 | ····invoke-virtual·{v0},·Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader; | 21 | ····invoke-virtual·{v0},·Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader; |
22 | ····move-result-object·v0 | 22 | ····move-result-object·v0 |
23 | ····invoke-virtual·{p0,·v0},·Landroid/os/Bundle;->setClassLoader(Ljava/lang/ClassLoader;)V | 23 | ····invoke-virtual·{p0,·v0},·Landroid/os/Bundle;->setClassLoader(Ljava/lang/ClassLoader;)V |
Offset 37, 29 lines modified | Offset 37, 29 lines modified | ||
37 | ····const/4·v0,·0x0 | 37 | ····const/4·v0,·0x0 |
38 | ····if-nez·p0,·:cond_0 | 38 | ····if-nez·p0,·:cond_0 |
39 | ····return-object·v0 | 39 | ····return-object·v0 |
40 | ····.line·107 | 40 | ····.line·1073 |
41 | ····:cond_0 | 41 | ····:cond_0 |
42 | ····invoke-static·{p0},·Landroid/support/v4/media/session/MediaSessionCompat;->ensureClassLoader(Landroid/os/Bundle;)V | 42 | ····invoke-static·{p0},·Landroid/support/v4/media/session/MediaSessionCompat;->ensureClassLoader(Landroid/os/Bundle;)V |
43 | ····.line·107 | 43 | ····.line·1075 |
44 | ····:try_start_0 | 44 | ····:try_start_0 |
45 | ····invoke-virtual·{p0},·Landroid/os/Bundle;->isEmpty()Z | 45 | ····invoke-virtual·{p0},·Landroid/os/Bundle;->isEmpty()Z |
46 | ····:try_end_0 | 46 | ····:try_end_0 |
47 | ····.catch·Landroid/os/BadParcelableException;·{:try_start_0·..·:try_end_0}·:catch_0 | 47 | ····.catch·Landroid/os/BadParcelableException;·{:try_start_0·..·:try_end_0}·:catch_0 |
48 | ····return-object·p0 | 48 | ····return-object·p0 |
49 | ····:catch_0 | 49 | ····:catch_0 |
50 | ····const-string·p0,·"MediaSessionCompat" | 50 | ····const-string·p0,·"MediaSessionCompat" |
51 | ····const-string·v1,·"Could·not·unparcel·the·data." | 51 | ····const-string·v1,·"Could·not·unparcel·the·data." |
52 | ····.line·10 | 52 | ····.line·1079 |
53 | ····invoke-static·{p0,·v1},·Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I | 53 | ····invoke-static·{p0,·v1},·Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I |
54 | ····return-object·v0 | 54 | ····return-object·v0 |
55 | .end·method | 55 | .end·method |
Offset 26, 79 lines modified | Offset 26, 79 lines modified | ||
26 | .end·annotation | 26 | .end·annotation |
27 | #·direct·methods | 27 | #·direct·methods |
28 | .method·constructor·<init>()V | 28 | .method·constructor·<init>()V |
29 | ····.locals·0 | 29 | ····.locals·0 |
30 | ····.line·211 | 30 | ····.line·2112 |
31 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V | 31 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V |
32 | ····return-void | 32 | ····return-void |
33 | .end·method | 33 | .end·method |
34 | #·virtual·methods | 34 | #·virtual·methods |
35 | .method·public·createFromParcel(Landroid/os/Parcel;)Landroid/support/v4/media/session/MediaSessionCompat$Token; | 35 | .method·public·createFromParcel(Landroid/os/Parcel;)Landroid/support/v4/media/session/MediaSessionCompat$Token; |
36 | ····.locals·1 | 36 | ····.locals·1 |
37 | ····.line·211 | 37 | ····.line·2116 |
38 | ····sget·p0,·Landroid/os/Build$VERSION;->SDK_INT:I | 38 | ····sget·p0,·Landroid/os/Build$VERSION;->SDK_INT:I |
39 | ····const/16·v0,·0x15 | 39 | ····const/16·v0,·0x15 |
40 | ····if-lt·p0,·v0,·:cond_0 | 40 | ····if-lt·p0,·v0,·:cond_0 |
41 | ····const/4·p0,·0x0 | 41 | ····const/4·p0,·0x0 |
42 | ····.line·211 | 42 | ····.line·2117 |
43 | ····invoke-virtual·{p1,·p0},·Landroid/os/Parcel;->readParcelable(Ljava/lang/ClassLoader;)Landroid/os/Parcelable; | 43 | ····invoke-virtual·{p1,·p0},·Landroid/os/Parcel;->readParcelable(Ljava/lang/ClassLoader;)Landroid/os/Parcelable; |
44 | ····move-result-object·p0 | 44 | ····move-result-object·p0 |
45 | ····goto·:goto_0 | 45 | ····goto·:goto_0 |
46 | ····.line·21 | 46 | ····.line·2119 |
47 | ····:cond_0 | 47 | ····:cond_0 |
48 | ····invoke-virtual·{p1},·Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder; | 48 | ····invoke-virtual·{p1},·Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder; |
49 | ····move-result-object·p0 | 49 | ····move-result-object·p0 |
50 | ····.line·212 | 50 | ····.line·2121 |
51 | ····:goto_0 | 51 | ····:goto_0 |
52 | ····new-instance·p1,·Landroid/support/v4/media/session/MediaSessionCompat$Token; | 52 | ····new-instance·p1,·Landroid/support/v4/media/session/MediaSessionCompat$Token; |
53 | ····invoke-direct·{p1,·p0},·Landroid/support/v4/media/session/MediaSessionCompat$Token;-><init>(Ljava/lang/Object;)V | 53 | ····invoke-direct·{p1,·p0},·Landroid/support/v4/media/session/MediaSessionCompat$Token;-><init>(Ljava/lang/Object;)V |
54 | ····return-object·p1 | 54 | ····return-object·p1 |
55 | .end·method | 55 | .end·method |
56 | .method·public·bridge·synthetic·createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object; | 56 | .method·public·bridge·synthetic·createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object; |
57 | ····.locals·0 | 57 | ····.locals·0 |
58 | ····.line·211 | 58 | ····.line·2112 |
59 | ····invoke-virtual·{p0,·p1},·Landroid/support/v4/media/session/MediaSessionCompat$Token$1;->createFromParcel(Landroid/os/Parcel;)Landroid/support/v4/media/session/MediaSessionCompat$Token; | 59 | ····invoke-virtual·{p0,·p1},·Landroid/support/v4/media/session/MediaSessionCompat$Token$1;->createFromParcel(Landroid/os/Parcel;)Landroid/support/v4/media/session/MediaSessionCompat$Token; |
60 | ····move-result-object·p0 | 60 | ····move-result-object·p0 |
61 | ····return-object·p0 | 61 | ····return-object·p0 |
62 | .end·method | 62 | .end·method |
63 | .method·public·newArray(I)[Landroid/support/v4/media/session/MediaSessionCompat$Token; | 63 | .method·public·newArray(I)[Landroid/support/v4/media/session/MediaSessionCompat$Token; |
64 | ····.locals·0 | 64 | ····.locals·0 |
65 | ····.line·212 | 65 | ····.line·2126 |
66 | ····new-array·p0,·p1,·[Landroid/support/v4/media/session/MediaSessionCompat$Token; | 66 | ····new-array·p0,·p1,·[Landroid/support/v4/media/session/MediaSessionCompat$Token; |
67 | ····return-object·p0 | 67 | ····return-object·p0 |
68 | .end·method | 68 | .end·method |
69 | .method·public·bridge·synthetic·newArray(I)[Ljava/lang/Object; | 69 | .method·public·bridge·synthetic·newArray(I)[Ljava/lang/Object; |
70 | ····.locals·0 | 70 | ····.locals·0 |
71 | ····.line·211 | 71 | ····.line·2112 |
72 | ····invoke-virtual·{p0,·p1},·Landroid/support/v4/media/session/MediaSessionCompat$Token$1;->newArray(I)[Landroid/support/v4/media/session/MediaSessionCompat$Token; | 72 | ····invoke-virtual·{p0,·p1},·Landroid/support/v4/media/session/MediaSessionCompat$Token$1;->newArray(I)[Landroid/support/v4/media/session/MediaSessionCompat$Token; |
73 | ····move-result-object·p0 | 73 | ····move-result-object·p0 |
74 | ····return-object·p0 | 74 | ····return-object·p0 |
75 | .end·method | 75 | .end·method |
Offset 26, 56 lines modified | Offset 26, 56 lines modified | ||
26 | .end·annotation | 26 | .end·annotation |
27 | #·direct·methods | 27 | #·direct·methods |
28 | .method·constructor·<init>()V | 28 | .method·constructor·<init>()V |
29 | ····.locals·0 | 29 | ····.locals·0 |
30 | ····.line·226 | 30 | ····.line·2267 |
31 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V | 31 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V |
32 | ····return-void | 32 | ····return-void |
33 | .end·method | 33 | .end·method |
34 | #·virtual·methods | 34 | #·virtual·methods |
35 | .method·public·createFromParcel(Landroid/os/Parcel;)Landroid/support/v4/media/session/MediaSessionCompat$QueueItem; | 35 | .method·public·createFromParcel(Landroid/os/Parcel;)Landroid/support/v4/media/session/MediaSessionCompat$QueueItem; |
36 | ····.locals·0 | 36 | ····.locals·0 |
37 | ····.line·227 | 37 | ····.line·2271 |
38 | ····new-instance·p0,·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem; | 38 | ····new-instance·p0,·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem; |
39 | ····invoke-direct·{p0,·p1},·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;-><init>(Landroid/os/Parcel;)V | 39 | ····invoke-direct·{p0,·p1},·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;-><init>(Landroid/os/Parcel;)V |
40 | ····return-object·p0 | 40 | ····return-object·p0 |
41 | .end·method | 41 | .end·method |
42 | .method·public·bridge·synthetic·createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object; | 42 | .method·public·bridge·synthetic·createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object; |
43 | ····.locals·0 | 43 | ····.locals·0 |
44 | ····.line·226 | 44 | ····.line·2267 |
45 | ····invoke-virtual·{p0,·p1},·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem$1;->createFromParcel(Landroid/os/Parcel;)Landroid/support/v4/media/session/MediaSessionCompat$QueueItem; | 45 | ····invoke-virtual·{p0,·p1},·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem$1;->createFromParcel(Landroid/os/Parcel;)Landroid/support/v4/media/session/MediaSessionCompat$QueueItem; |
46 | ····move-result-object·p0 | 46 | ····move-result-object·p0 |
47 | ····return-object·p0 | 47 | ····return-object·p0 |
48 | .end·method | 48 | .end·method |
49 | .method·public·newArray(I)[Landroid/support/v4/media/session/MediaSessionCompat$QueueItem; | 49 | .method·public·newArray(I)[Landroid/support/v4/media/session/MediaSessionCompat$QueueItem; |
50 | ····.locals·0 | 50 | ····.locals·0 |
51 | ····.line·227 | 51 | ····.line·2276 |
52 | ····new-array·p0,·p1,·[Landroid/support/v4/media/session/MediaSessionCompat$QueueItem; | 52 | ····new-array·p0,·p1,·[Landroid/support/v4/media/session/MediaSessionCompat$QueueItem; |
53 | ····return-object·p0 | 53 | ····return-object·p0 |
54 | .end·method | 54 | .end·method |
55 | .method·public·bridge·synthetic·newArray(I)[Ljava/lang/Object; | 55 | .method·public·bridge·synthetic·newArray(I)[Ljava/lang/Object; |
56 | ····.locals·0 | 56 | ····.locals·0 |
57 | ····.line·226 | 57 | ····.line·2267 |
58 | ····invoke-virtual·{p0,·p1},·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem$1;->newArray(I)[Landroid/support/v4/media/session/MediaSessionCompat$QueueItem; | 58 | ····invoke-virtual·{p0,·p1},·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem$1;->newArray(I)[Landroid/support/v4/media/session/MediaSessionCompat$QueueItem; |
59 | ····move-result-object·p0 | 59 | ····move-result-object·p0 |
60 | ····return-object·p0 | 60 | ····return-object·p0 |
61 | .end·method | 61 | .end·method |
Offset 41, 128 lines modified | Offset 41, 128 lines modified | ||
41 | .field·private·final·mId:J | 41 | .field·private·final·mId:J |
42 | #·direct·methods | 42 | #·direct·methods |
43 | .method·static·constructor·<clinit>()V | 43 | .method·static·constructor·<clinit>()V |
44 | ····.locals·1 | 44 | ····.locals·1 |
45 | ····.line·226 | 45 | ····.line·2266 |
46 | ····new-instance·v0,·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem$1; | 46 | ····new-instance·v0,·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem$1; |
47 | ····invoke-direct·{v0},·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem$1;-><init>()V | 47 | ····invoke-direct·{v0},·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem$1;-><init>()V |
48 | ····sput-object·v0,·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;->CREATOR:Landroid/os/Parcelable$Creator; | 48 | ····sput-object·v0,·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;->CREATOR:Landroid/os/Parcelable$Creator; |
49 | ····return-void | 49 | ····return-void |
50 | .end·method | 50 | .end·method |
51 | .method·private·constructor·<init>(Landroid/media/session/MediaSession$QueueItem;Landroid/support/v4/media/MediaDescriptionCompat;J)V | 51 | .method·private·constructor·<init>(Landroid/media/session/MediaSession$QueueItem;Landroid/support/v4/media/MediaDescriptionCompat;J)V |
52 | ····.locals·2 | 52 | ····.locals·2 |
53 | ····.line·216 | 53 | ····.line·2161 |
54 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V | 54 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V |
55 | ····if-eqz·p2,·:cond_1 | 55 | ····if-eqz·p2,·:cond_1 |
56 | ····const-wide/16·v0,·-0x1 | 56 | ····const-wide/16·v0,·-0x1 |
57 | ····cmp-long·p1,·p3,·v0 | 57 | ····cmp-long·p1,·p3,·v0 |
58 | ····if-eqz·p1,·:cond_0 | 58 | ····if-eqz·p1,·:cond_0 |
59 | ····.line·21 | 59 | ····.line·2168 |
60 | ····iput-object·p2,·p0,·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;->mDescription:Landroid/support/v4/media/MediaDescriptionCompat; | 60 | ····iput-object·p2,·p0,·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;->mDescription:Landroid/support/v4/media/MediaDescriptionCompat; |
61 | ····.line·21 | 61 | ····.line·2169 |
62 | ····iput-wide·p3,·p0,·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;->mId:J | 62 | ····iput-wide·p3,·p0,·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;->mId:J |
63 | ····return-void | 63 | ····return-void |
64 | ····.line·216 | 64 | ····.line·2166 |
65 | ····:cond_0 | 65 | ····:cond_0 |
66 | ····new-instance·p0,·Ljava/lang/IllegalArgumentException; | 66 | ····new-instance·p0,·Ljava/lang/IllegalArgumentException; |
67 | ····const-string·p1,·"Id·cannot·be·QueueItem.UNKNOWN_ID" | 67 | ····const-string·p1,·"Id·cannot·be·QueueItem.UNKNOWN_ID" |
68 | ····invoke-direct·{p0,·p1},·Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V | 68 | ····invoke-direct·{p0,·p1},·Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V |
69 | ····throw·p0 | 69 | ····throw·p0 |
70 | ····.line·216 | 70 | ····.line·2163 |
71 | ····:cond_1 | 71 | ····:cond_1 |
72 | ····new-instance·p0,·Ljava/lang/IllegalArgumentException; | 72 | ····new-instance·p0,·Ljava/lang/IllegalArgumentException; |
73 | ····const-string·p1,·"Description·cannot·be·null" | 73 | ····const-string·p1,·"Description·cannot·be·null" |
74 | ····invoke-direct·{p0,·p1},·Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V | 74 | ····invoke-direct·{p0,·p1},·Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V |
75 | ····throw·p0 | 75 | ····throw·p0 |
76 | .end·method | 76 | .end·method |
77 | .method·constructor·<init>(Landroid/os/Parcel;)V | 77 | .method·constructor·<init>(Landroid/os/Parcel;)V |
78 | ····.locals·2 | 78 | ····.locals·2 |
79 | ····.line·217 | 79 | ····.line·2173 |
80 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V | 80 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V |
81 | ····.line·217 | 81 | ····.line·2174 |
82 | ····sget-object·v0,·Landroid/support/v4/media/MediaDescriptionCompat;->CREATOR:Landroid/os/Parcelable$Creator; | 82 | ····sget-object·v0,·Landroid/support/v4/media/MediaDescriptionCompat;->CREATOR:Landroid/os/Parcelable$Creator; |
83 | ····invoke-interface·{v0,·p1},·Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object; | 83 | ····invoke-interface·{v0,·p1},·Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object; |
84 | ····move-result-object·v0 | 84 | ····move-result-object·v0 |
85 | ····check-cast·v0,·Landroid/support/v4/media/MediaDescriptionCompat; | 85 | ····check-cast·v0,·Landroid/support/v4/media/MediaDescriptionCompat; |
86 | ····iput-object·v0,·p0,·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;->mDescription:Landroid/support/v4/media/MediaDescriptionCompat; | 86 | ····iput-object·v0,·p0,·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;->mDescription:Landroid/support/v4/media/MediaDescriptionCompat; |
87 | ····.line·217 | 87 | ····.line·2175 |
88 | ····invoke-virtual·{p1},·Landroid/os/Parcel;->readLong()J | 88 | ····invoke-virtual·{p1},·Landroid/os/Parcel;->readLong()J |
89 | ····move-result-wide·v0 | 89 | ····move-result-wide·v0 |
90 | ····iput-wide·v0,·p0,·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;->mId:J | 90 | ····iput-wide·v0,·p0,·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;->mId:J |
91 | ····return-void | 91 | ····return-void |
92 | .end·method | 92 | .end·method |
93 | .method·public·static·fromQueueItem(Ljava/lang/Object;)Landroid/support/v4/media/session/MediaSessionCompat$QueueItem; | 93 | .method·public·static·fromQueueItem(Ljava/lang/Object;)Landroid/support/v4/media/session/MediaSessionCompat$QueueItem; |
94 | ····.locals·4 | 94 | ····.locals·4 |
95 | ····if-eqz·p0,·:cond_1 | 95 | ····if-eqz·p0,·:cond_1 |
96 | ····.line·223 | 96 | ····.line·2234 |
97 | ····sget·v0,·Landroid/os/Build$VERSION;->SDK_INT:I | 97 | ····sget·v0,·Landroid/os/Build$VERSION;->SDK_INT:I |
98 | ····const/16·v1,·0x15 | 98 | ····const/16·v1,·0x15 |
99 | ····if-ge·v0,·v1,·:cond_0 | 99 | ····if-ge·v0,·v1,·:cond_0 |
100 | ····goto·:goto_0 | 100 | ····goto·:goto_0 |
101 | ····.line·223 | 101 | ····.line·2237 |
102 | ····:cond_0 | 102 | ····:cond_0 |
103 | ····check-cast·p0,·Landroid/media/session/MediaSession$QueueItem; | 103 | ····check-cast·p0,·Landroid/media/session/MediaSession$QueueItem; |
104 | ····.line·22 | 104 | ····.line·2238 |
105 | ····invoke-virtual·{p0},·Landroid/media/session/MediaSession$QueueItem;->getDescription()Landroid/media/MediaDescription; | 105 | ····invoke-virtual·{p0},·Landroid/media/session/MediaSession$QueueItem;->getDescription()Landroid/media/MediaDescription; |
106 | ····move-result-object·v0 | 106 | ····move-result-object·v0 |
107 | ····.line·22 | 107 | ····.line·2239 |
108 | ····invoke-static·{v0},·Landroid/support/v4/media/MediaDescriptionCompat;->fromMediaDescription(Ljava/lang/Object;)Landroid/support/v4/media/MediaDescriptionCompat; | 108 | ····invoke-static·{v0},·Landroid/support/v4/media/MediaDescriptionCompat;->fromMediaDescription(Ljava/lang/Object;)Landroid/support/v4/media/MediaDescriptionCompat; |
109 | ····move-result-object·v0 | 109 | ····move-result-object·v0 |
110 | ····.line·224 | 110 | ····.line·2241 |
111 | ····invoke-virtual·{p0},·Landroid/media/session/MediaSession$QueueItem;->getQueueId()J | 111 | ····invoke-virtual·{p0},·Landroid/media/session/MediaSession$QueueItem;->getQueueId()J |
112 | ····move-result-wide·v1 | 112 | ····move-result-wide·v1 |
113 | ····.line·224 | 113 | ····.line·2242 |
114 | ····new-instance·v3,·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem; | 114 | ····new-instance·v3,·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem; |
115 | ····invoke-direct·{v3,·p0,·v0,·v1,·v2},·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;-><init>(Landroid/media/session/MediaSession$QueueItem;Landroid/support/v4/media/MediaDescriptionCompat;J)V | 115 | ····invoke-direct·{v3,·p0,·v0,·v1,·v2},·Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;-><init>(Landroid/media/session/MediaSession$QueueItem;Landroid/support/v4/media/MediaDescriptionCompat;J)V |
116 | ····return-object·v3 | 116 | ····return-object·v3 |
... Open expanded diff ... |
Offset 39, 31 lines modified | Offset 39, 31 lines modified | ||
39 | .field·mResultReceiver:Landroid/os/ResultReceiver; | 39 | .field·mResultReceiver:Landroid/os/ResultReceiver; |
40 | #·direct·methods | 40 | #·direct·methods |
41 | .method·static·constructor·<clinit>()V | 41 | .method·static·constructor·<clinit>()V |
42 | ····.locals·1 | 42 | ····.locals·1 |
43 | ····.line·230 | 43 | ····.line·2306 |
44 | ····new-instance·v0,·Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper$1; | 44 | ····new-instance·v0,·Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper$1; |
45 | ····invoke-direct·{v0},·Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper$1;-><init>()V | 45 | ····invoke-direct·{v0},·Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper$1;-><init>()V |
46 | ····sput-object·v0,·Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper;->CREATOR:Landroid/os/Parcelable$Creator; | 46 | ····sput-object·v0,·Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper;->CREATOR:Landroid/os/Parcelable$Creator; |
47 | ····return-void | 47 | ····return-void |
48 | .end·method | 48 | .end·method |
49 | .method·constructor·<init>(Landroid/os/Parcel;)V | 49 | .method·constructor·<init>(Landroid/os/Parcel;)V |
50 | ····.locals·1 | 50 | ····.locals·1 |
51 | ····.line·230 | 51 | ····.line·2301 |
52 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V | 52 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V |
53 | ····.line·230 | 53 | ····.line·2302 |
54 | ····sget-object·v0,·Landroid/os/ResultReceiver;->CREATOR:Landroid/os/Parcelable$Creator; | 54 | ····sget-object·v0,·Landroid/os/ResultReceiver;->CREATOR:Landroid/os/Parcelable$Creator; |
55 | ····invoke-interface·{v0,·p1},·Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object; | 55 | ····invoke-interface·{v0,·p1},·Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object; |
56 | ····move-result-object·p1 | 56 | ····move-result-object·p1 |
57 | ····check-cast·p1,·Landroid/os/ResultReceiver; | 57 | ····check-cast·p1,·Landroid/os/ResultReceiver; |
Offset 82, 14 lines modified | Offset 82, 14 lines modified | ||
82 | ····return·p0 | 82 | ····return·p0 |
83 | .end·method | 83 | .end·method |
84 | .method·public·writeToParcel(Landroid/os/Parcel;I)V | 84 | .method·public·writeToParcel(Landroid/os/Parcel;I)V |
85 | ····.locals·0 | 85 | ····.locals·0 |
86 | ····.line·232 | 86 | ····.line·2325 |
87 | ····iget-object·p0,·p0,·Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper;->mResultReceiver:Landroid/os/ResultReceiver; | 87 | ····iget-object·p0,·p0,·Landroid/support/v4/media/session/MediaSessionCompat$ResultReceiverWrapper;->mResultReceiver:Landroid/os/ResultReceiver; |
88 | ····invoke-virtual·{p0,·p1,·p2},·Landroid/os/ResultReceiver;->writeToParcel(Landroid/os/Parcel;I)V | 88 | ····invoke-virtual·{p0,·p1,·p2},·Landroid/os/ResultReceiver;->writeToParcel(Landroid/os/Parcel;I)V |
89 | ····return-void | 89 | ····return-void |
90 | .end·method | 90 | .end·method |
Offset 18, 52 lines modified | Offset 18, 52 lines modified | ||
18 | .field·final·synthetic·this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 18 | .field·final·synthetic·this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
19 | #·direct·methods | 19 | #·direct·methods |
20 | .method·constructor·<init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V | 20 | .method·constructor·<init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V |
21 | ····.locals·0 | 21 | ····.locals·0 |
22 | ····.line·13 | 22 | ····.line·1345 |
23 | ····iput-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$6;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 23 | ····iput-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$6;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
24 | ····invoke-direct·{p0},·Landroid/view/animation/Animation;-><init>()V | 24 | ····invoke-direct·{p0},·Landroid/view/animation/Animation;-><init>()V |
25 | ····return-void | 25 | ····return-void |
26 | .end·method | 26 | .end·method |
27 | #·virtual·methods | 27 | #·virtual·methods |
28 | .method·public·applyTransformation(FLandroid/view/animation/Transformation;)V | 28 | .method·public·applyTransformation(FLandroid/view/animation/Transformation;)V |
29 | ····.locals·2 | 29 | ····.locals·2 |
30 | ····.line·134 | 30 | ····.line·1349 |
31 | ····iget-object·p2,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$6;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 31 | ····iget-object·p2,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$6;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
32 | ····iget-boolean·v0,·p2,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mUsingCustomStart:Z | 32 | ····iget-boolean·v0,·p2,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mUsingCustomStart:Z |
33 | ····if-nez·v0,·:cond_0 | 33 | ····if-nez·v0,·:cond_0 |
34 | ····.line·13 | 34 | ····.line·1350 |
35 | ····iget·v0,·p2,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mSpinnerOffsetEnd:I | 35 | ····iget·v0,·p2,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mSpinnerOffsetEnd:I |
36 | ····iget·p2,·p2,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mOriginalOffsetTop:I | 36 | ····iget·p2,·p2,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mOriginalOffsetTop:I |
37 | ····invoke-static·{p2},·Ljava/lang/Math;->abs(I)I | 37 | ····invoke-static·{p2},·Ljava/lang/Math;->abs(I)I |
38 | ····move-result·p2 | 38 | ····move-result·p2 |
39 | ····sub-int/2addr·v0,·p2 | 39 | ····sub-int/2addr·v0,·p2 |
40 | ····goto·:goto_0 | 40 | ····goto·:goto_0 |
41 | ····.line·13 | 41 | ····.line·1352 |
42 | ····:cond_0 | 42 | ····:cond_0 |
43 | ····iget·v0,·p2,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mSpinnerOffsetEnd:I | 43 | ····iget·v0,·p2,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mSpinnerOffsetEnd:I |
44 | ····.line·13 | 44 | ····.line·1354 |
45 | ····:goto_0 | 45 | ····:goto_0 |
46 | ····iget-object·p2,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$6;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 46 | ····iget-object·p2,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$6;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
47 | ····iget·v1,·p2,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mFrom:I | 47 | ····iget·v1,·p2,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mFrom:I |
48 | ····sub-int/2addr·v0,·v1 | 48 | ····sub-int/2addr·v0,·v1 |
Offset 71, 29 lines modified | Offset 71, 29 lines modified | ||
71 | ····mul-float/2addr·v0,·p1 | 71 | ····mul-float/2addr·v0,·p1 |
72 | ····float-to-int·v0,·v0 | 72 | ····float-to-int·v0,·v0 |
73 | ····add-int/2addr·v1,·v0 | 73 | ····add-int/2addr·v1,·v0 |
74 | ····.line·13 | 74 | ····.line·1355 |
75 | ····iget-object·p2,·p2,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mCircleView:Landroidx/swiperefreshlayout/widget/CircleImageView; | 75 | ····iget-object·p2,·p2,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mCircleView:Landroidx/swiperefreshlayout/widget/CircleImageView; |
76 | ····invoke-virtual·{p2},·Landroid/widget/ImageView;->getTop()I | 76 | ····invoke-virtual·{p2},·Landroid/widget/ImageView;->getTop()I |
77 | ····move-result·p2 | 77 | ····move-result·p2 |
78 | ····sub-int/2addr·v1,·p2 | 78 | ····sub-int/2addr·v1,·p2 |
79 | ····.line·13 | 79 | ····.line·1356 |
80 | ····iget-object·p2,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$6;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 80 | ····iget-object·p2,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$6;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
81 | ····invoke-virtual·{p2,·v1},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setTargetOffsetTopAndBottom(I)V | 81 | ····invoke-virtual·{p2,·v1},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setTargetOffsetTopAndBottom(I)V |
82 | ····.line·13 | 82 | ····.line·1357 |
83 | ····iget-object·p0,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$6;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 83 | ····iget-object·p0,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$6;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
84 | ····iget-object·p0,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mProgress:Landroidx/swiperefreshlayout/widget/CircularProgressDrawable; | 84 | ····iget-object·p0,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mProgress:Landroidx/swiperefreshlayout/widget/CircularProgressDrawable; |
85 | ····const/high16·p2,·0x3f800000····#·1.0f | 85 | ····const/high16·p2,·0x3f800000····#·1.0f |
86 | ····sub-float/2addr·p2,·p1 | 86 | ····sub-float/2addr·p2,·p1 |
Offset 18, 27 lines modified | Offset 18, 27 lines modified | ||
18 | .field·final·synthetic·this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 18 | .field·final·synthetic·this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
19 | #·direct·methods | 19 | #·direct·methods |
20 | .method·constructor·<init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V | 20 | .method·constructor·<init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V |
21 | ····.locals·0 | 21 | ····.locals·0 |
22 | ····.line·50 | 22 | ····.line·505 |
23 | ····iput-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$2;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 23 | ····iput-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$2;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
24 | ····invoke-direct·{p0},·Landroid/view/animation/Animation;-><init>()V | 24 | ····invoke-direct·{p0},·Landroid/view/animation/Animation;-><init>()V |
25 | ····return-void | 25 | ····return-void |
26 | .end·method | 26 | .end·method |
27 | #·virtual·methods | 27 | #·virtual·methods |
28 | .method·public·applyTransformation(FLandroid/view/animation/Transformation;)V | 28 | .method·public·applyTransformation(FLandroid/view/animation/Transformation;)V |
29 | ····.locals·0 | 29 | ····.locals·0 |
30 | ····.line·50 | 30 | ····.line·508 |
31 | ····iget-object·p0,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$2;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 31 | ····iget-object·p0,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$2;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
32 | ····invoke-virtual·{p0,·p1},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setAnimationProgress(F)V | 32 | ····invoke-virtual·{p0,·p1},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setAnimationProgress(F)V |
33 | ····return-void | 33 | ····return-void |
34 | .end·method | 34 | .end·method |
Offset 21, 37 lines modified | Offset 21, 37 lines modified | ||
21 | .field·final·synthetic·this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 21 | .field·final·synthetic·this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
22 | #·direct·methods | 22 | #·direct·methods |
23 | .method·constructor·<init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V | 23 | .method·constructor·<init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V |
24 | ····.locals·0 | 24 | ····.locals·0 |
25 | ····.line·1 | 25 | ····.line·1201 |
26 | ····iput-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$5;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 26 | ····iput-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$5;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
27 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V | 27 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V |
28 | ····return-void | 28 | ····return-void |
29 | .end·method | 29 | .end·method |
30 | #·virtual·methods | 30 | #·virtual·methods |
31 | .method·public·onAnimationEnd(Landroid/view/animation/Animation;)V | 31 | .method·public·onAnimationEnd(Landroid/view/animation/Animation;)V |
32 | ····.locals·0 | 32 | ····.locals·0 |
33 | ····.line·120 | 33 | ····.line·1209 |
34 | ····iget-object·p0,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$5;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 34 | ····iget-object·p0,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$5;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
35 | ····iget-boolean·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mScale:Z | 35 | ····iget-boolean·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mScale:Z |
36 | ····if-nez·p1,·:cond_0 | 36 | ····if-nez·p1,·:cond_0 |
37 | ····const/4·p1,·0x0 | 37 | ····const/4·p1,·0x0 |
38 | ····.line·12 | 38 | ····.line·1210 |
39 | ····invoke-virtual·{p0,·p1},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->startScaleDownAnimation(Landroid/view/animation/Animation$AnimationListener;)V | 39 | ····invoke-virtual·{p0,·p1},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->startScaleDownAnimation(Landroid/view/animation/Animation$AnimationListener;)V |
40 | ····:cond_0 | 40 | ····:cond_0 |
41 | ····return-void | 41 | ····return-void |
42 | .end·method | 42 | .end·method |
43 | .method·public·onAnimationRepeat(Landroid/view/animation/Animation;)V | 43 | .method·public·onAnimationRepeat(Landroid/view/animation/Animation;)V |
Offset 22, 15 lines modified | Offset 22, 15 lines modified | ||
22 | .field·final·synthetic·val$startingAlpha:I | 22 | .field·final·synthetic·val$startingAlpha:I |
23 | #·direct·methods | 23 | #·direct·methods |
24 | .method·constructor·<init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;II)V | 24 | .method·constructor·<init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;II)V |
25 | ····.locals·0 | 25 | ····.locals·0 |
26 | ····.line·56 | 26 | ····.line·563 |
27 | ····iput-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$4;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 27 | ····iput-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$4;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
28 | ····iput·p2,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$4;->val$startingAlpha:I | 28 | ····iput·p2,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$4;->val$startingAlpha:I |
29 | ····iput·p3,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$4;->val$endingAlpha:I | 29 | ····iput·p3,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$4;->val$endingAlpha:I |
30 | ····invoke-direct·{p0},·Landroid/view/animation/Animation;-><init>()V | 30 | ····invoke-direct·{p0},·Landroid/view/animation/Animation;-><init>()V |
Offset 39, 15 lines modified | Offset 39, 15 lines modified | ||
39 | .end·method | 39 | .end·method |
40 | #·virtual·methods | 40 | #·virtual·methods |
41 | .method·public·applyTransformation(FLandroid/view/animation/Transformation;)V | 41 | .method·public·applyTransformation(FLandroid/view/animation/Transformation;)V |
42 | ····.locals·2 | 42 | ····.locals·2 |
43 | ····.line·56 | 43 | ····.line·566 |
44 | ····iget-object·p2,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$4;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 44 | ····iget-object·p2,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$4;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
45 | ····iget-object·p2,·p2,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mProgress:Landroidx/swiperefreshlayout/widget/CircularProgressDrawable; | 45 | ····iget-object·p2,·p2,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mProgress:Landroidx/swiperefreshlayout/widget/CircularProgressDrawable; |
46 | ····iget·v0,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$4;->val$startingAlpha:I | 46 | ····iget·v0,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$4;->val$startingAlpha:I |
47 | ····int-to-float·v1,·v0 | 47 | ····int-to-float·v1,·v0 |
Offset 18, 41 lines modified | Offset 18, 41 lines modified | ||
18 | .field·final·synthetic·this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 18 | .field·final·synthetic·this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
19 | #·direct·methods | 19 | #·direct·methods |
20 | .method·constructor·<init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V | 20 | .method·constructor·<init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V |
21 | ····.locals·0 | 21 | ····.locals·0 |
22 | ····.line·13 | 22 | ····.line·1378 |
23 | ····iput-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$8;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 23 | ····iput-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$8;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
24 | ····invoke-direct·{p0},·Landroid/view/animation/Animation;-><init>()V | 24 | ····invoke-direct·{p0},·Landroid/view/animation/Animation;-><init>()V |
25 | ····return-void | 25 | ····return-void |
26 | .end·method | 26 | .end·method |
27 | #·virtual·methods | 27 | #·virtual·methods |
28 | .method·public·applyTransformation(FLandroid/view/animation/Transformation;)V | 28 | .method·public·applyTransformation(FLandroid/view/animation/Transformation;)V |
29 | ····.locals·2 | 29 | ····.locals·2 |
30 | ····.line·13 | 30 | ····.line·1381 |
31 | ····iget-object·p2,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$8;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 31 | ····iget-object·p2,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$8;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
32 | ····iget·v0,·p2,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mStartingScale:F | 32 | ····iget·v0,·p2,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mStartingScale:F |
33 | ····neg-float·v1,·v0 | 33 | ····neg-float·v1,·v0 |
34 | ····mul-float/2addr·v1,·p1 | 34 | ····mul-float/2addr·v1,·p1 |
35 | ····add-float/2addr·v0,·v1 | 35 | ····add-float/2addr·v0,·v1 |
36 | ····.line·13 | 36 | ····.line·1382 |
37 | ····invoke-virtual·{p2,·v0},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setAnimationProgress(F)V | 37 | ····invoke-virtual·{p2,·v0},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setAnimationProgress(F)V |
38 | ····.line·13 | 38 | ····.line·1383 |
39 | ····iget-object·p0,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$8;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 39 | ····iget-object·p0,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$8;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
40 | ····invoke-virtual·{p0,·p1},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->moveToStart(F)V | 40 | ····invoke-virtual·{p0,·p1},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->moveToStart(F)V |
41 | ····return-void | 41 | ····return-void |
42 | .end·method | 42 | .end·method |
Offset 18, 27 lines modified | Offset 18, 27 lines modified | ||
18 | .field·final·synthetic·this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 18 | .field·final·synthetic·this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
19 | #·direct·methods | 19 | #·direct·methods |
20 | .method·constructor·<init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V | 20 | .method·constructor·<init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V |
21 | ····.locals·0 | 21 | ····.locals·0 |
22 | ····.line·13 | 22 | ····.line·1367 |
23 | ····iput-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$7;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 23 | ····iput-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$7;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
24 | ····invoke-direct·{p0},·Landroid/view/animation/Animation;-><init>()V | 24 | ····invoke-direct·{p0},·Landroid/view/animation/Animation;-><init>()V |
25 | ····return-void | 25 | ····return-void |
26 | .end·method | 26 | .end·method |
27 | #·virtual·methods | 27 | #·virtual·methods |
28 | .method·public·applyTransformation(FLandroid/view/animation/Transformation;)V | 28 | .method·public·applyTransformation(FLandroid/view/animation/Transformation;)V |
29 | ····.locals·0 | 29 | ····.locals·0 |
30 | ····.line·13 | 30 | ····.line·1370 |
31 | ····iget-object·p0,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$7;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 31 | ····iget-object·p0,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$7;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
32 | ····invoke-virtual·{p0,·p1},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->moveToStart(F)V | 32 | ····invoke-virtual·{p0,·p1},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->moveToStart(F)V |
33 | ····return-void | 33 | ····return-void |
34 | .end·method | 34 | .end·method |
Offset 115, 15 lines modified | Offset 115, 15 lines modified | ||
115 | .field·mUsingCustomStart:Z | 115 | .field·mUsingCustomStart:Z |
116 | #·direct·methods | 116 | #·direct·methods |
117 | .method·static·constructor·<clinit>()V | 117 | .method·static·constructor·<clinit>()V |
118 | ····.locals·3 | 118 | ····.locals·3 |
119 | ····.line·9 | 119 | ····.line·92 |
120 | ····const-class·v0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 120 | ····const-class·v0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
121 | ····invoke-virtual·{v0},·Ljava/lang/Class;->getSimpleName()Ljava/lang/String; | 121 | ····invoke-virtual·{v0},·Ljava/lang/Class;->getSimpleName()Ljava/lang/String; |
122 | ····move-result-object·v0 | 122 | ····move-result-object·v0 |
123 | ····sput-object·v0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->LOG_TAG:Ljava/lang/String; | 123 | ····sput-object·v0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->LOG_TAG:Ljava/lang/String; |
Offset 134, 417 lines modified | Offset 134, 417 lines modified | ||
134 | ····const/4·v1,·0x0 | 134 | ····const/4·v1,·0x0 |
135 | ····const·v2,·0x101000e | 135 | ····const·v2,·0x101000e |
136 | ····aput·v2,·v0,·v1 | 136 | ····aput·v2,·v0,·v1 |
137 | ····.line·1 | 137 | ····.line·150 |
138 | ····sput-object·v0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->LAYOUT_ATTRS:[I | 138 | ····sput-object·v0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->LAYOUT_ATTRS:[I |
139 | ····return-void | 139 | ····return-void |
140 | .end·method | 140 | .end·method |
141 | .method·public·constructor·<init>(Landroid/content/Context;)V | 141 | .method·public·constructor·<init>(Landroid/content/Context;)V |
142 | ····.locals·1 | 142 | ····.locals·1 |
143 | ····const/4·v0,·0x0 | 143 | ····const/4·v0,·0x0 |
144 | ····.line·40 | 144 | ····.line·404 |
145 | ····invoke-direct·{p0,·p1,·v0},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V | 145 | ····invoke-direct·{p0,·p1,·v0},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V |
146 | ····return-void | 146 | ····return-void |
147 | .end·method | 147 | .end·method |
148 | .method·public·constructor·<init>(Landroid/content/Context;Landroid/util/AttributeSet;)V | 148 | .method·public·constructor·<init>(Landroid/content/Context;Landroid/util/AttributeSet;)V |
149 | ····.locals·4 | 149 | ····.locals·4 |
150 | ····.line·41 | 150 | ····.line·414 |
151 | ····invoke-direct·{p0,·p1,·p2},·Landroid/view/ViewGroup;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V | 151 | ····invoke-direct·{p0,·p1,·p2},·Landroid/view/ViewGroup;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V |
152 | ····const/4·v0,·0x0 | 152 | ····const/4·v0,·0x0 |
153 | ····.line·11 | 153 | ····.line·118 |
154 | ····iput-boolean·v0,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mRefreshing:Z | 154 | ····iput-boolean·v0,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mRefreshing:Z |
155 | ····const/high16·v1,·-0x40800000····#·-1.0f | 155 | ····const/high16·v1,·-0x40800000····#·-1.0f |
156 | ····.line·1 | 156 | ····.line·120 |
157 | ····iput·v1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mTotalDragDistance:F | 157 | ····iput·v1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mTotalDragDistance:F |
158 | ····const/4·v1,·0x2 | 158 | ····const/4·v1,·0x2 |
159 | ····new-array·v2,·v1,·[I | 159 | ····new-array·v2,·v1,·[I |
160 | ····.line·12 | 160 | ····.line·128 |
161 | ····iput-object·v2,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mParentScrollConsumed:[I | 161 | ····iput-object·v2,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mParentScrollConsumed:[I |
162 | ····new-array·v2,·v1,·[I | 162 | ····new-array·v2,·v1,·[I |
163 | ····.line·12 | 163 | ····.line·129 |
164 | ····iput-object·v2,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mParentOffsetInWindow:[I | 164 | ····iput-object·v2,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mParentOffsetInWindow:[I |
165 | ····new-array·v1,·v1,·[I | 165 | ····new-array·v1,·v1,·[I |
166 | ····.line·13 | 166 | ····.line·133 |
167 | ····iput-object·v1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mNestedScrollingV2ConsumedCompat:[I | 167 | ····iput-object·v1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mNestedScrollingV2ConsumedCompat:[I |
168 | ····const/4·v1,·-0x1 | 168 | ····const/4·v1,·-0x1 |
169 | ····.line·14 | 169 | ····.line·142 |
170 | ····iput·v1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mActivePointerId:I | 170 | ····iput·v1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mActivePointerId:I |
171 | ····.line·15 | 171 | ····.line·155 |
172 | ····iput·v1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mCircleViewIndex:I | 172 | ····iput·v1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mCircleViewIndex:I |
173 | ····.line·19 | 173 | ····.line·191 |
174 | ····new-instance·v1,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$1; | 174 | ····new-instance·v1,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$1; |
175 | ····invoke-direct·{v1,·p0},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$1;-><init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V | 175 | ····invoke-direct·{v1,·p0},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$1;-><init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V |
176 | ····iput-object·v1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mRefreshListener:Landroid/view/animation/Animation$AnimationListener; | 176 | ····iput-object·v1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mRefreshListener:Landroid/view/animation/Animation$AnimationListener; |
177 | ····.line·13 | 177 | ····.line·1345 |
178 | ····new-instance·v1,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$6; | 178 | ····new-instance·v1,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$6; |
179 | ····invoke-direct·{v1,·p0},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$6;-><init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V | 179 | ····invoke-direct·{v1,·p0},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$6;-><init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V |
180 | ····iput-object·v1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mAnimateToCorrectPosition:Landroid/view/animation/Animation; | 180 | ····iput-object·v1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mAnimateToCorrectPosition:Landroid/view/animation/Animation; |
181 | ····.line·13 | 181 | ····.line·1367 |
182 | ····new-instance·v1,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$7; | 182 | ····new-instance·v1,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$7; |
183 | ····invoke-direct·{v1,·p0},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$7;-><init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V | 183 | ····invoke-direct·{v1,·p0},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$7;-><init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V |
184 | ····iput-object·v1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mAnimateToStartPosition:Landroid/view/animation/Animation; | 184 | ····iput-object·v1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mAnimateToStartPosition:Landroid/view/animation/Animation; |
185 | ····.line·41 | 185 | ····.line·416 |
186 | ····invoke-static·{p1},·Landroid/view/ViewConfiguration;->get(Landroid/content/Context;)Landroid/view/ViewConfiguration; | 186 | ····invoke-static·{p1},·Landroid/view/ViewConfiguration;->get(Landroid/content/Context;)Landroid/view/ViewConfiguration; |
187 | ····move-result-object·v1 | 187 | ····move-result-object·v1 |
188 | ····invoke-virtual·{v1},·Landroid/view/ViewConfiguration;->getScaledTouchSlop()I | 188 | ····invoke-virtual·{v1},·Landroid/view/ViewConfiguration;->getScaledTouchSlop()I |
189 | ····move-result·v1 | 189 | ····move-result·v1 |
190 | ····iput·v1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mTouchSlop:I | 190 | ····iput·v1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mTouchSlop:I |
191 | ····.line·41 | 191 | ····.line·418 |
192 | ····invoke-virtual·{p0},·Landroid/view/ViewGroup;->getResources()Landroid/content/res/Resources; | 192 | ····invoke-virtual·{p0},·Landroid/view/ViewGroup;->getResources()Landroid/content/res/Resources; |
193 | ····move-result-object·v1 | 193 | ····move-result-object·v1 |
194 | ····const·v2,·0x10e0001 | 194 | ····const·v2,·0x10e0001 |
195 | ····invoke-virtual·{v1,·v2},·Landroid/content/res/Resources;->getInteger(I)I | 195 | ····invoke-virtual·{v1,·v2},·Landroid/content/res/Resources;->getInteger(I)I |
196 | ····move-result·v1 | 196 | ····move-result·v1 |
197 | ····iput·v1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mMediumAnimationDuration:I | 197 | ····iput·v1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mMediumAnimationDuration:I |
198 | ····.line·42 | 198 | ····.line·421 |
... Open expanded diff (truncated) ... |
Offset 21, 78 lines modified | Offset 21, 78 lines modified | ||
21 | .field·final·synthetic·this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 21 | .field·final·synthetic·this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
22 | #·direct·methods | 22 | #·direct·methods |
23 | .method·constructor·<init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V | 23 | .method·constructor·<init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V |
24 | ····.locals·0 | 24 | ····.locals·0 |
25 | ····.line·19 | 25 | ····.line·191 |
26 | ····iput-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$1;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 26 | ····iput-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$1;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
27 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V | 27 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V |
28 | ····return-void | 28 | ····return-void |
29 | .end·method | 29 | .end·method |
30 | #·virtual·methods | 30 | #·virtual·methods |
31 | .method·public·onAnimationEnd(Landroid/view/animation/Animation;)V | 31 | .method·public·onAnimationEnd(Landroid/view/animation/Animation;)V |
32 | ····.locals·1 | 32 | ····.locals·1 |
33 | ····.line·20 | 33 | ····.line·202 |
34 | ····iget-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$1;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 34 | ····iget-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$1;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
35 | ····iget-boolean·v0,·p1,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mRefreshing:Z | 35 | ····iget-boolean·v0,·p1,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mRefreshing:Z |
36 | ····if-eqz·v0,·:cond_1 | 36 | ····if-eqz·v0,·:cond_1 |
37 | ····.line·20 | 37 | ····.line·204 |
38 | ····iget-object·p1,·p1,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mProgress:Landroidx/swiperefreshlayout/widget/CircularProgressDrawable; | 38 | ····iget-object·p1,·p1,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mProgress:Landroidx/swiperefreshlayout/widget/CircularProgressDrawable; |
39 | ····const/16·v0,·0xff | 39 | ····const/16·v0,·0xff |
40 | ····invoke-virtual·{p1,·v0},·Landroidx/swiperefreshlayout/widget/CircularProgressDrawable;->setAlpha(I)V | 40 | ····invoke-virtual·{p1,·v0},·Landroidx/swiperefreshlayout/widget/CircularProgressDrawable;->setAlpha(I)V |
41 | ····.line·20 | 41 | ····.line·205 |
42 | ····iget-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$1;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 42 | ····iget-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$1;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
43 | ····iget-object·p1,·p1,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mProgress:Landroidx/swiperefreshlayout/widget/CircularProgressDrawable; | 43 | ····iget-object·p1,·p1,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mProgress:Landroidx/swiperefreshlayout/widget/CircularProgressDrawable; |
44 | ····invoke-virtual·{p1},·Landroidx/swiperefreshlayout/widget/CircularProgressDrawable;->start()V | 44 | ····invoke-virtual·{p1},·Landroidx/swiperefreshlayout/widget/CircularProgressDrawable;->start()V |
45 | ····.line·20 | 45 | ····.line·206 |
46 | ····iget-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$1;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 46 | ····iget-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$1;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
47 | ····iget-boolean·v0,·p1,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mNotify:Z | 47 | ····iget-boolean·v0,·p1,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mNotify:Z |
48 | ····if-eqz·v0,·:cond_0 | 48 | ····if-eqz·v0,·:cond_0 |
49 | ····.line·20 | 49 | ····.line·207 |
50 | ····iget-object·p1,·p1,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mListener:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnRefreshListener; | 50 | ····iget-object·p1,·p1,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mListener:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnRefreshListener; |
51 | ····if-eqz·p1,·:cond_0 | 51 | ····if-eqz·p1,·:cond_0 |
52 | ····.line·20 | 52 | ····.line·208 |
53 | ····invoke-interface·{p1},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnRefreshListener;->onRefresh()V | 53 | ····invoke-interface·{p1},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnRefreshListener;->onRefresh()V |
54 | ····.line·21 | 54 | ····.line·211 |
55 | ····:cond_0 | 55 | ····:cond_0 |
56 | ····iget-object·p0,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$1;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 56 | ····iget-object·p0,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$1;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
57 | ····iget-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mCircleView:Landroidx/swiperefreshlayout/widget/CircleImageView; | 57 | ····iget-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mCircleView:Landroidx/swiperefreshlayout/widget/CircleImageView; |
58 | ····invoke-virtual·{p1},·Landroid/widget/ImageView;->getTop()I | 58 | ····invoke-virtual·{p1},·Landroid/widget/ImageView;->getTop()I |
59 | ····move-result·p1 | 59 | ····move-result·p1 |
60 | ····iput·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mCurrentTargetOffsetTop:I | 60 | ····iput·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->mCurrentTargetOffsetTop:I |
61 | ····goto·:goto_0 | 61 | ····goto·:goto_0 |
62 | ····.line·21 | 62 | ····.line·213 |
63 | ····:cond_1 | 63 | ····:cond_1 |
64 | ····invoke-virtual·{p1},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->reset()V | 64 | ····invoke-virtual·{p1},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->reset()V |
65 | ····:goto_0 | 65 | ····:goto_0 |
66 | ····return-void | 66 | ····return-void |
67 | .end·method | 67 | .end·method |
Offset 18, 28 lines modified | Offset 18, 28 lines modified | ||
18 | .field·final·synthetic·this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 18 | .field·final·synthetic·this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
19 | #·direct·methods | 19 | #·direct·methods |
20 | .method·constructor·<init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V | 20 | .method·constructor·<init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V |
21 | ····.locals·0 | 21 | ····.locals·0 |
22 | ····.line·54 | 22 | ····.line·542 |
23 | ····iput-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$3;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 23 | ····iput-object·p1,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$3;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
24 | ····invoke-direct·{p0},·Landroid/view/animation/Animation;-><init>()V | 24 | ····invoke-direct·{p0},·Landroid/view/animation/Animation;-><init>()V |
25 | ····return-void | 25 | ····return-void |
26 | .end·method | 26 | .end·method |
27 | #·virtual·methods | 27 | #·virtual·methods |
28 | .method·public·applyTransformation(FLandroid/view/animation/Transformation;)V | 28 | .method·public·applyTransformation(FLandroid/view/animation/Transformation;)V |
29 | ····.locals·0 | 29 | ····.locals·0 |
30 | ····.line·54 | 30 | ····.line·545 |
31 | ····iget-object·p0,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$3;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; | 31 | ····iget-object·p0,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$3;->this$0:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout; |
32 | ····const/high16·p2,·0x3f800000····#·1.0f | 32 | ····const/high16·p2,·0x3f800000····#·1.0f |
33 | ····sub-float/2addr·p2,·p1 | 33 | ····sub-float/2addr·p2,·p1 |
34 | ····invoke-virtual·{p0,·p2},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setAnimationProgress(F)V | 34 | ····invoke-virtual·{p0,·p2},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setAnimationProgress(F)V |
Offset 26, 56 lines modified | Offset 26, 56 lines modified | ||
26 | .end·annotation | 26 | .end·annotation |
27 | #·direct·methods | 27 | #·direct·methods |
28 | .method·constructor·<init>()V | 28 | .method·constructor·<init>()V |
29 | ····.locals·0 | 29 | ····.locals·0 |
30 | ····.line·26 | 30 | ····.line·266 |
31 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V | 31 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V |
32 | ····return-void | 32 | ····return-void |
33 | .end·method | 33 | .end·method |
34 | #·virtual·methods | 34 | #·virtual·methods |
35 | .method·public·createFromParcel(Landroid/os/Parcel;)Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState; | 35 | .method·public·createFromParcel(Landroid/os/Parcel;)Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState; |
36 | ····.locals·0 | 36 | ····.locals·0 |
37 | ····.line·26 | 37 | ····.line·269 |
38 | ····new-instance·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState; | 38 | ····new-instance·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState; |
39 | ····invoke-direct·{p0,·p1},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState;-><init>(Landroid/os/Parcel;)V | 39 | ····invoke-direct·{p0,·p1},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState;-><init>(Landroid/os/Parcel;)V |
40 | ····return-object·p0 | 40 | ····return-object·p0 |
41 | .end·method | 41 | .end·method |
42 | .method·public·bridge·synthetic·createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object; | 42 | .method·public·bridge·synthetic·createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object; |
43 | ····.locals·0 | 43 | ····.locals·0 |
44 | ····.line·26 | 44 | ····.line·266 |
45 | ····invoke-virtual·{p0,·p1},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState$1;->createFromParcel(Landroid/os/Parcel;)Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState; | 45 | ····invoke-virtual·{p0,·p1},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState$1;->createFromParcel(Landroid/os/Parcel;)Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState; |
46 | ····move-result-object·p0 | 46 | ····move-result-object·p0 |
47 | ····return-object·p0 | 47 | ····return-object·p0 |
48 | .end·method | 48 | .end·method |
49 | .method·public·newArray(I)[Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState; | 49 | .method·public·newArray(I)[Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState; |
50 | ····.locals·0 | 50 | ····.locals·0 |
51 | ····.line·27 | 51 | ····.line·274 |
52 | ····new-array·p0,·p1,·[Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState; | 52 | ····new-array·p0,·p1,·[Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState; |
53 | ····return-object·p0 | 53 | ····return-object·p0 |
54 | .end·method | 54 | .end·method |
55 | .method·public·bridge·synthetic·newArray(I)[Ljava/lang/Object; | 55 | .method·public·bridge·synthetic·newArray(I)[Ljava/lang/Object; |
56 | ····.locals·0 | 56 | ····.locals·0 |
57 | ····.line·26 | 57 | ····.line·266 |
58 | ····invoke-virtual·{p0,·p1},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState$1;->newArray(I)[Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState; | 58 | ····invoke-virtual·{p0,·p1},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState$1;->newArray(I)[Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState; |
59 | ····move-result-object·p0 | 59 | ····move-result-object·p0 |
60 | ····return-object·p0 | 60 | ····return-object·p0 |
61 | .end·method | 61 | .end·method |
Offset 30, 31 lines modified | Offset 30, 31 lines modified | ||
30 | .field·final·mRefreshing:Z | 30 | .field·final·mRefreshing:Z |
31 | #·direct·methods | 31 | #·direct·methods |
32 | .method·static·constructor·<clinit>()V | 32 | .method·static·constructor·<clinit>()V |
33 | ····.locals·1 | 33 | ····.locals·1 |
34 | ····.line·26 | 34 | ····.line·265 |
35 | ····new-instance·v0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState$1; | 35 | ····new-instance·v0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState$1; |
36 | ····invoke-direct·{v0},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState$1;-><init>()V | 36 | ····invoke-direct·{v0},·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState$1;-><init>()V |
37 | ····sput-object·v0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState;->CREATOR:Landroid/os/Parcelable$Creator; | 37 | ····sput-object·v0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState;->CREATOR:Landroid/os/Parcelable$Creator; |
38 | ····return-void | 38 | ····return-void |
39 | .end·method | 39 | .end·method |
40 | .method·constructor·<init>(Landroid/os/Parcel;)V | 40 | .method·constructor·<init>(Landroid/os/Parcel;)V |
41 | ····.locals·0 | 41 | ····.locals·0 |
42 | ····.line·25 | 42 | ····.line·255 |
43 | ····invoke-direct·{p0,·p1},·Landroid/view/View$BaseSavedState;-><init>(Landroid/os/Parcel;)V | 43 | ····invoke-direct·{p0,·p1},·Landroid/view/View$BaseSavedState;-><init>(Landroid/os/Parcel;)V |
44 | ····.line·25 | 44 | ····.line·256 |
45 | ····invoke-virtual·{p1},·Landroid/os/Parcel;->readByte()B | 45 | ····invoke-virtual·{p1},·Landroid/os/Parcel;->readByte()B |
46 | ····move-result·p1 | 46 | ····move-result·p1 |
47 | ····if-eqz·p1,·:cond_0 | 47 | ····if-eqz·p1,·:cond_0 |
48 | ····const/4·p1,·0x1 | 48 | ····const/4·p1,·0x1 |
Offset 69, 31 lines modified | Offset 69, 31 lines modified | ||
69 | ····return-void | 69 | ····return-void |
70 | .end·method | 70 | .end·method |
71 | .method·constructor·<init>(Landroid/os/Parcelable;Z)V | 71 | .method·constructor·<init>(Landroid/os/Parcelable;Z)V |
72 | ····.locals·0 | 72 | ····.locals·0 |
73 | ····.line·24 | 73 | ····.line·247 |
74 | ····invoke-direct·{p0,·p1},·Landroid/view/View$BaseSavedState;-><init>(Landroid/os/Parcelable;)V | 74 | ····invoke-direct·{p0,·p1},·Landroid/view/View$BaseSavedState;-><init>(Landroid/os/Parcelable;)V |
75 | ····.line·24 | 75 | ····.line·248 |
76 | ····iput-boolean·p2,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState;->mRefreshing:Z | 76 | ····iput-boolean·p2,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState;->mRefreshing:Z |
77 | ····return-void | 77 | ····return-void |
78 | .end·method | 78 | .end·method |
79 | #·virtual·methods | 79 | #·virtual·methods |
80 | .method·public·writeToParcel(Landroid/os/Parcel;I)V | 80 | .method·public·writeToParcel(Landroid/os/Parcel;I)V |
81 | ····.locals·0 | 81 | ····.locals·0 |
82 | ····.line·26 | 82 | ····.line·261 |
83 | ····invoke-super·{p0,·p1,·p2},·Landroid/view/View$BaseSavedState;->writeToParcel(Landroid/os/Parcel;I)V | 83 | ····invoke-super·{p0,·p1,·p2},·Landroid/view/View$BaseSavedState;->writeToParcel(Landroid/os/Parcel;I)V |
84 | ····.line·26 | 84 | ····.line·262 |
85 | ····iget-boolean·p0,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState;->mRefreshing:Z | 85 | ····iget-boolean·p0,·p0,·Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$SavedState;->mRefreshing:Z |
86 | ····invoke-virtual·{p1,·p0},·Landroid/os/Parcel;->writeByte(B)V | 86 | ····invoke-virtual·{p1,·p0},·Landroid/os/Parcel;->writeByte(B)V |
87 | ····return-void | 87 | ····return-void |
88 | .end·method | 88 | .end·method |
Offset 26, 56 lines modified | Offset 26, 56 lines modified | ||
26 | .end·annotation | 26 | .end·annotation |
27 | #·direct·methods | 27 | #·direct·methods |
28 | .method·constructor·<init>()V | 28 | .method·constructor·<init>()V |
29 | ····.locals·0 | 29 | ····.locals·0 |
30 | ····.line·3 | 30 | ····.line·3555 |
31 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V | 31 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V |
32 | ····return-void | 32 | ····return-void |
33 | .end·method | 33 | .end·method |
34 | #·virtual·methods | 34 | #·virtual·methods |
35 | .method·public·createFromParcel(Landroid/os/Parcel;)Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo; | 35 | .method·public·createFromParcel(Landroid/os/Parcel;)Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo; |
36 | ····.locals·0 | 36 | ····.locals·0 |
37 | ····.line·3 | 37 | ····.line·3558 |
38 | ····new-instance·p0,·Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo; | 38 | ····new-instance·p0,·Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo; |
39 | ····invoke-direct·{p0,·p1},·Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo;-><init>(Landroid/os/Parcel;)V | 39 | ····invoke-direct·{p0,·p1},·Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo;-><init>(Landroid/os/Parcel;)V |
40 | ····return-object·p0 | 40 | ····return-object·p0 |
41 | .end·method | 41 | .end·method |
42 | .method·public·bridge·synthetic·createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object; | 42 | .method·public·bridge·synthetic·createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object; |
43 | ····.locals·0 | 43 | ····.locals·0 |
44 | ····.line·3 | 44 | ····.line·3555 |
45 | ····invoke-virtual·{p0,·p1},·Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo$1;->createFromParcel(Landroid/os/Parcel;)Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo; | 45 | ····invoke-virtual·{p0,·p1},·Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo$1;->createFromParcel(Landroid/os/Parcel;)Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo; |
46 | ····move-result-object·p0 | 46 | ····move-result-object·p0 |
47 | ····return-object·p0 | 47 | ····return-object·p0 |
48 | .end·method | 48 | .end·method |
49 | .method·public·newArray(I)[Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo; | 49 | .method·public·newArray(I)[Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo; |
50 | ····.locals·0 | 50 | ····.locals·0 |
51 | ····.line·3 | 51 | ····.line·3563 |
52 | ····new-array·p0,·p1,·[Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo; | 52 | ····new-array·p0,·p1,·[Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo; |
53 | ····return-object·p0 | 53 | ····return-object·p0 |
54 | .end·method | 54 | .end·method |
55 | .method·public·bridge·synthetic·newArray(I)[Ljava/lang/Object; | 55 | .method·public·bridge·synthetic·newArray(I)[Ljava/lang/Object; |
56 | ····.locals·0 | 56 | ····.locals·0 |
57 | ····.line·3 | 57 | ····.line·3555 |
58 | ····invoke-virtual·{p0,·p1},·Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo$1;->newArray(I)[Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo; | 58 | ····invoke-virtual·{p0,·p1},·Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo$1;->newArray(I)[Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo; |
59 | ····move-result-object·p0 | 59 | ····move-result-object·p0 |
60 | ····return-object·p0 | 60 | ····return-object·p0 |
61 | .end·method | 61 | .end·method |
Offset 32, 38 lines modified | Offset 32, 38 lines modified | ||
32 | .field·mWho:Ljava/lang/String; | 32 | .field·mWho:Ljava/lang/String; |
33 | #·direct·methods | 33 | #·direct·methods |
34 | .method·static·constructor·<clinit>()V | 34 | .method·static·constructor·<clinit>()V |
35 | ····.locals·1 | 35 | ····.locals·1 |
36 | ····.line·3 | 36 | ····.line·3554 |
37 | ····new-instance·v0,·Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo$1; | 37 | ····new-instance·v0,·Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo$1; |
38 | ····invoke-direct·{v0},·Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo$1;-><init>()V | 38 | ····invoke-direct·{v0},·Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo$1;-><init>()V |
39 | ····sput-object·v0,·Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo;->CREATOR:Landroid/os/Parcelable$Creator; | 39 | ····sput-object·v0,·Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo;->CREATOR:Landroid/os/Parcelable$Creator; |
40 | ····return-void | 40 | ····return-void |
41 | .end·method | 41 | .end·method |
42 | .method·constructor·<init>(Landroid/os/Parcel;)V | 42 | .method·constructor·<init>(Landroid/os/Parcel;)V |
43 | ····.locals·1 | 43 | ····.locals·1 |
44 | ····.line·3 | 44 | ····.line·3538 |
45 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V | 45 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V |
46 | ····.line·3 | 46 | ····.line·3539 |
47 | ····invoke-virtual·{p1},·Landroid/os/Parcel;->readString()Ljava/lang/String; | 47 | ····invoke-virtual·{p1},·Landroid/os/Parcel;->readString()Ljava/lang/String; |
48 | ····move-result-object·v0 | 48 | ····move-result-object·v0 |
49 | ····iput-object·v0,·p0,·Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo;->mWho:Ljava/lang/String; | 49 | ····iput-object·v0,·p0,·Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo;->mWho:Ljava/lang/String; |
50 | ····.line·3 | 50 | ····.line·3540 |
51 | ····invoke-virtual·{p1},·Landroid/os/Parcel;->readInt()I | 51 | ····invoke-virtual·{p1},·Landroid/os/Parcel;->readInt()I |
52 | ····move-result·p1 | 52 | ····move-result·p1 |
53 | ····iput·p1,·p0,·Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo;->mRequestCode:I | 53 | ····iput·p1,·p0,·Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo;->mRequestCode:I |
54 | ····return-void | 54 | ····return-void |
Offset 78, 19 lines modified | Offset 78, 19 lines modified | ||
78 | ····return·p0 | 78 | ····return·p0 |
79 | .end·method | 79 | .end·method |
80 | .method·public·writeToParcel(Landroid/os/Parcel;I)V | 80 | .method·public·writeToParcel(Landroid/os/Parcel;I)V |
81 | ····.locals·0 | 81 | ····.locals·0 |
82 | ····.line·3 | 82 | ····.line·3550 |
83 | ····iget-object·p2,·p0,·Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo;->mWho:Ljava/lang/String; | 83 | ····iget-object·p2,·p0,·Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo;->mWho:Ljava/lang/String; |
84 | ····invoke-virtual·{p1,·p2},·Landroid/os/Parcel;->writeString(Ljava/lang/String;)V | 84 | ····invoke-virtual·{p1,·p2},·Landroid/os/Parcel;->writeString(Ljava/lang/String;)V |
85 | ····.line·3 | 85 | ····.line·3551 |
86 | ····iget·p0,·p0,·Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo;->mRequestCode:I | 86 | ····iget·p0,·p0,·Landroidx/fragment/app/FragmentManager$LaunchedFragmentInfo;->mRequestCode:I |
87 | ····invoke-virtual·{p1,·p0},·Landroid/os/Parcel;->writeInt(I)V | 87 | ····invoke-virtual·{p1,·p0},·Landroid/os/Parcel;->writeInt(I)V |
88 | ····return-void | 88 | ····return-void |
89 | .end·method | 89 | .end·method |
Offset 26, 80 lines modified | Offset 26, 80 lines modified | ||
26 | .end·annotation | 26 | .end·annotation |
27 | #·direct·methods | 27 | #·direct·methods |
28 | .method·constructor·<init>()V | 28 | .method·constructor·<init>()V |
29 | ····.locals·0 | 29 | ····.locals·0 |
30 | ····.line·47 | 30 | ····.line·472 |
31 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V | 31 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V |
32 | ····return-void | 32 | ····return-void |
33 | .end·method | 33 | .end·method |
34 | #·virtual·methods | 34 | #·virtual·methods |
35 | .method·public·createFromParcel(Landroid/os/Parcel;)Landroidx/fragment/app/Fragment$SavedState; | 35 | .method·public·createFromParcel(Landroid/os/Parcel;)Landroidx/fragment/app/Fragment$SavedState; |
36 | ····.locals·1 | 36 | ····.locals·1 |
37 | ····.line·4 | 37 | ····.line·475 |
38 | ····new-instance·p0,·Landroidx/fragment/app/Fragment$SavedState; | 38 | ····new-instance·p0,·Landroidx/fragment/app/Fragment$SavedState; |
39 | ····const/4·v0,·0x0 | 39 | ····const/4·v0,·0x0 |
40 | ····invoke-direct·{p0,·p1,·v0},·Landroidx/fragment/app/Fragment$SavedState;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;)V | 40 | ····invoke-direct·{p0,·p1,·v0},·Landroidx/fragment/app/Fragment$SavedState;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;)V |
41 | ····return-object·p0 | 41 | ····return-object·p0 |
42 | .end·method | 42 | .end·method |
43 | .method·public·createFromParcel(Landroid/os/Parcel;Ljava/lang/ClassLoader;)Landroidx/fragment/app/Fragment$SavedState; | 43 | .method·public·createFromParcel(Landroid/os/Parcel;Ljava/lang/ClassLoader;)Landroidx/fragment/app/Fragment$SavedState; |
44 | ····.locals·0 | 44 | ····.locals·0 |
45 | ····.line·48 | 45 | ····.line·480 |
46 | ····new-instance·p0,·Landroidx/fragment/app/Fragment$SavedState; | 46 | ····new-instance·p0,·Landroidx/fragment/app/Fragment$SavedState; |
47 | ····invoke-direct·{p0,·p1,·p2},·Landroidx/fragment/app/Fragment$SavedState;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;)V | 47 | ····invoke-direct·{p0,·p1,·p2},·Landroidx/fragment/app/Fragment$SavedState;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;)V |
48 | ····return-object·p0 | 48 | ····return-object·p0 |
49 | .end·method | 49 | .end·method |
50 | .method·public·bridge·synthetic·createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object; | 50 | .method·public·bridge·synthetic·createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object; |
51 | ····.locals·0 | 51 | ····.locals·0 |
52 | ····.line·47 | 52 | ····.line·472 |
53 | ····invoke-virtual·{p0,·p1},·Landroidx/fragment/app/Fragment$SavedState$1;->createFromParcel(Landroid/os/Parcel;)Landroidx/fragment/app/Fragment$SavedState; | 53 | ····invoke-virtual·{p0,·p1},·Landroidx/fragment/app/Fragment$SavedState$1;->createFromParcel(Landroid/os/Parcel;)Landroidx/fragment/app/Fragment$SavedState; |
54 | ····move-result-object·p0 | 54 | ····move-result-object·p0 |
55 | ····return-object·p0 | 55 | ····return-object·p0 |
56 | .end·method | 56 | .end·method |
57 | .method·public·bridge·synthetic·createFromParcel(Landroid/os/Parcel;Ljava/lang/ClassLoader;)Ljava/lang/Object; | 57 | .method·public·bridge·synthetic·createFromParcel(Landroid/os/Parcel;Ljava/lang/ClassLoader;)Ljava/lang/Object; |
58 | ····.locals·0 | 58 | ····.locals·0 |
59 | ····.line·47 | 59 | ····.line·472 |
60 | ····invoke-virtual·{p0,·p1,·p2},·Landroidx/fragment/app/Fragment$SavedState$1;->createFromParcel(Landroid/os/Parcel;Ljava/lang/ClassLoader;)Landroidx/fragment/app/Fragment$SavedState; | 60 | ····invoke-virtual·{p0,·p1,·p2},·Landroidx/fragment/app/Fragment$SavedState$1;->createFromParcel(Landroid/os/Parcel;Ljava/lang/ClassLoader;)Landroidx/fragment/app/Fragment$SavedState; |
61 | ····move-result-object·p0 | 61 | ····move-result-object·p0 |
62 | ····return-object·p0 | 62 | ····return-object·p0 |
63 | .end·method | 63 | .end·method |
64 | .method·public·newArray(I)[Landroidx/fragment/app/Fragment$SavedState; | 64 | .method·public·newArray(I)[Landroidx/fragment/app/Fragment$SavedState; |
65 | ····.locals·0 | 65 | ····.locals·0 |
66 | ····.line·4 | 66 | ····.line·485 |
67 | ····new-array·p0,·p1,·[Landroidx/fragment/app/Fragment$SavedState; | 67 | ····new-array·p0,·p1,·[Landroidx/fragment/app/Fragment$SavedState; |
68 | ····return-object·p0 | 68 | ····return-object·p0 |
69 | .end·method | 69 | .end·method |
70 | .method·public·bridge·synthetic·newArray(I)[Ljava/lang/Object; | 70 | .method·public·bridge·synthetic·newArray(I)[Ljava/lang/Object; |
71 | ····.locals·0 | 71 | ····.locals·0 |
72 | ····.line·47 | 72 | ····.line·472 |
73 | ····invoke-virtual·{p0,·p1},·Landroidx/fragment/app/Fragment$SavedState$1;->newArray(I)[Landroidx/fragment/app/Fragment$SavedState; | 73 | ····invoke-virtual·{p0,·p1},·Landroidx/fragment/app/Fragment$SavedState$1;->newArray(I)[Landroidx/fragment/app/Fragment$SavedState; |
74 | ····move-result-object·p0 | 74 | ····move-result-object·p0 |
75 | ····return-object·p0 | 75 | ····return-object·p0 |
76 | .end·method | 76 | .end·method |
Offset 30, 42 lines modified | Offset 30, 42 lines modified | ||
30 | .field·final·mState:Landroid/os/Bundle; | 30 | .field·final·mState:Landroid/os/Bundle; |
31 | #·direct·methods | 31 | #·direct·methods |
32 | .method·static·constructor·<clinit>()V | 32 | .method·static·constructor·<clinit>()V |
33 | ····.locals·1 | 33 | ····.locals·1 |
34 | ····.line·47 | 34 | ····.line·471 |
35 | ····new-instance·v0,·Landroidx/fragment/app/Fragment$SavedState$1; | 35 | ····new-instance·v0,·Landroidx/fragment/app/Fragment$SavedState$1; |
36 | ····invoke-direct·{v0},·Landroidx/fragment/app/Fragment$SavedState$1;-><init>()V | 36 | ····invoke-direct·{v0},·Landroidx/fragment/app/Fragment$SavedState$1;-><init>()V |
37 | ····sput-object·v0,·Landroidx/fragment/app/Fragment$SavedState;->CREATOR:Landroid/os/Parcelable$Creator; | 37 | ····sput-object·v0,·Landroidx/fragment/app/Fragment$SavedState;->CREATOR:Landroid/os/Parcelable$Creator; |
38 | ····return-void | 38 | ····return-void |
39 | .end·method | 39 | .end·method |
40 | .method·constructor·<init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;)V | 40 | .method·constructor·<init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;)V |
41 | ····.locals·0 | 41 | ····.locals·0 |
42 | ····.line·45 | 42 | ····.line·453 |
43 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V | 43 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V |
44 | ····.line·4 | 44 | ····.line·454 |
45 | ····invoke-virtual·{p1},·Landroid/os/Parcel;->readBundle()Landroid/os/Bundle; | 45 | ····invoke-virtual·{p1},·Landroid/os/Parcel;->readBundle()Landroid/os/Bundle; |
46 | ····move-result-object·p1 | 46 | ····move-result-object·p1 |
47 | ····iput-object·p1,·p0,·Landroidx/fragment/app/Fragment$SavedState;->mState:Landroid/os/Bundle; | 47 | ····iput-object·p1,·p0,·Landroidx/fragment/app/Fragment$SavedState;->mState:Landroid/os/Bundle; |
48 | ····if-eqz·p2,·:cond_0 | 48 | ····if-eqz·p2,·:cond_0 |
49 | ····if-eqz·p1,·:cond_0 | 49 | ····if-eqz·p1,·:cond_0 |
50 | ····.line·4 | 50 | ····.line·456 |
51 | ····invoke-virtual·{p1,·p2},·Landroid/os/Bundle;->setClassLoader(Ljava/lang/ClassLoader;)V | 51 | ····invoke-virtual·{p1,·p2},·Landroid/os/Bundle;->setClassLoader(Ljava/lang/ClassLoader;)V |
52 | ····:cond_0 | 52 | ····:cond_0 |
53 | ····return-void | 53 | ····return-void |
54 | .end·method | 54 | .end·method |
Offset 77, 14 lines modified | Offset 77, 14 lines modified | ||
77 | ····return·p0 | 77 | ····return·p0 |
78 | .end·method | 78 | .end·method |
79 | .method·public·writeToParcel(Landroid/os/Parcel;I)V | 79 | .method·public·writeToParcel(Landroid/os/Parcel;I)V |
80 | ····.locals·0 | 80 | ····.locals·0 |
81 | ····.line·4 | 81 | ····.line·467 |
82 | ····iget-object·p0,·p0,·Landroidx/fragment/app/Fragment$SavedState;->mState:Landroid/os/Bundle; | 82 | ····iget-object·p0,·p0,·Landroidx/fragment/app/Fragment$SavedState;->mState:Landroid/os/Bundle; |
83 | ····invoke-virtual·{p1,·p0},·Landroid/os/Parcel;->writeBundle(Landroid/os/Bundle;)V | 83 | ····invoke-virtual·{p1,·p0},·Landroid/os/Parcel;->writeBundle(Landroid/os/Bundle;)V |
84 | ····return-void | 84 | ····return-void |
85 | .end·method | 85 | .end·method |
Offset 27, 101 lines modified | Offset 27, 101 lines modified | ||
27 | .field·openDrawerGravity:I | 27 | .field·openDrawerGravity:I |
28 | #·direct·methods | 28 | #·direct·methods |
29 | .method·static·constructor·<clinit>()V | 29 | .method·static·constructor·<clinit>()V |
30 | ····.locals·1 | 30 | ····.locals·1 |
31 | ····.line·22 | 31 | ····.line·2211 |
32 | ····new-instance·v0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState$1; | 32 | ····new-instance·v0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState$1; |
33 | ····invoke-direct·{v0},·Landroidx/drawerlayout/widget/DrawerLayout$SavedState$1;-><init>()V | 33 | ····invoke-direct·{v0},·Landroidx/drawerlayout/widget/DrawerLayout$SavedState$1;-><init>()V |
34 | ····sput-object·v0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->CREATOR:Landroid/os/Parcelable$Creator; | 34 | ····sput-object·v0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->CREATOR:Landroid/os/Parcelable$Creator; |
35 | ····return-void | 35 | ····return-void |
36 | .end·method | 36 | .end·method |
37 | .method·public·constructor·<init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;)V | 37 | .method·public·constructor·<init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;)V |
38 | ····.locals·0 | 38 | ····.locals·0 |
39 | ····.line·21 | 39 | ····.line·2189 |
40 | ····invoke-direct·{p0,·p1,·p2},·Landroidx/customview/view/AbsSavedState;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;)V | 40 | ····invoke-direct·{p0,·p1,·p2},·Landroidx/customview/view/AbsSavedState;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;)V |
41 | ····const/4·p2,·0x0 | 41 | ····const/4·p2,·0x0 |
42 | ····.line·21 | 42 | ····.line·2182 |
43 | ····iput·p2,·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->openDrawerGravity:I | 43 | ····iput·p2,·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->openDrawerGravity:I |
44 | ····.line·21 | 44 | ····.line·2190 |
45 | ····invoke-virtual·{p1},·Landroid/os/Parcel;->readInt()I | 45 | ····invoke-virtual·{p1},·Landroid/os/Parcel;->readInt()I |
46 | ····move-result·p2 | 46 | ····move-result·p2 |
47 | ····iput·p2,·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->openDrawerGravity:I | 47 | ····iput·p2,·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->openDrawerGravity:I |
48 | ····.line·21 | 48 | ····.line·2191 |
49 | ····invoke-virtual·{p1},·Landroid/os/Parcel;->readInt()I | 49 | ····invoke-virtual·{p1},·Landroid/os/Parcel;->readInt()I |
50 | ····move-result·p2 | 50 | ····move-result·p2 |
51 | ····iput·p2,·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->lockModeLeft:I | 51 | ····iput·p2,·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->lockModeLeft:I |
52 | ····.line·21 | 52 | ····.line·2192 |
53 | ····invoke-virtual·{p1},·Landroid/os/Parcel;->readInt()I | 53 | ····invoke-virtual·{p1},·Landroid/os/Parcel;->readInt()I |
54 | ····move-result·p2 | 54 | ····move-result·p2 |
55 | ····iput·p2,·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->lockModeRight:I | 55 | ····iput·p2,·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->lockModeRight:I |
56 | ····.line·21 | 56 | ····.line·2193 |
57 | ····invoke-virtual·{p1},·Landroid/os/Parcel;->readInt()I | 57 | ····invoke-virtual·{p1},·Landroid/os/Parcel;->readInt()I |
58 | ····move-result·p2 | 58 | ····move-result·p2 |
59 | ····iput·p2,·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->lockModeStart:I | 59 | ····iput·p2,·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->lockModeStart:I |
60 | ····.line·21 | 60 | ····.line·2194 |
61 | ····invoke-virtual·{p1},·Landroid/os/Parcel;->readInt()I | 61 | ····invoke-virtual·{p1},·Landroid/os/Parcel;->readInt()I |
62 | ····move-result·p1 | 62 | ····move-result·p1 |
63 | ····iput·p1,·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->lockModeEnd:I | 63 | ····iput·p1,·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->lockModeEnd:I |
64 | ····return-void | 64 | ····return-void |
65 | .end·method | 65 | .end·method |
66 | #·virtual·methods | 66 | #·virtual·methods |
67 | .method·public·writeToParcel(Landroid/os/Parcel;I)V | 67 | .method·public·writeToParcel(Landroid/os/Parcel;I)V |
68 | ····.locals·0 | 68 | ····.locals·0 |
69 | ····.line·2 | 69 | ····.line·2203 |
70 | ····invoke-super·{p0,·p1,·p2},·Landroidx/customview/view/AbsSavedState;->writeToParcel(Landroid/os/Parcel;I)V | 70 | ····invoke-super·{p0,·p1,·p2},·Landroidx/customview/view/AbsSavedState;->writeToParcel(Landroid/os/Parcel;I)V |
71 | ····.line·2 | 71 | ····.line·2204 |
72 | ····iget·p2,·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->openDrawerGravity:I | 72 | ····iget·p2,·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->openDrawerGravity:I |
73 | ····invoke-virtual·{p1,·p2},·Landroid/os/Parcel;->writeInt(I)V | 73 | ····invoke-virtual·{p1,·p2},·Landroid/os/Parcel;->writeInt(I)V |
74 | ····.line·2 | 74 | ····.line·2205 |
75 | ····iget·p2,·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->lockModeLeft:I | 75 | ····iget·p2,·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->lockModeLeft:I |
76 | ····invoke-virtual·{p1,·p2},·Landroid/os/Parcel;->writeInt(I)V | 76 | ····invoke-virtual·{p1,·p2},·Landroid/os/Parcel;->writeInt(I)V |
77 | ····.line·2 | 77 | ····.line·2206 |
78 | ····iget·p2,·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->lockModeRight:I | 78 | ····iget·p2,·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->lockModeRight:I |
79 | ····invoke-virtual·{p1,·p2},·Landroid/os/Parcel;->writeInt(I)V | 79 | ····invoke-virtual·{p1,·p2},·Landroid/os/Parcel;->writeInt(I)V |
80 | ····.line·2 | 80 | ····.line·2207 |
81 | ····iget·p2,·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->lockModeStart:I | 81 | ····iget·p2,·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->lockModeStart:I |
82 | ····invoke-virtual·{p1,·p2},·Landroid/os/Parcel;->writeInt(I)V | 82 | ····invoke-virtual·{p1,·p2},·Landroid/os/Parcel;->writeInt(I)V |
83 | ····.line·2 | 83 | ····.line·2208 |
84 | ····iget·p0,·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->lockModeEnd:I | 84 | ····iget·p0,·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;->lockModeEnd:I |
85 | ····invoke-virtual·{p1,·p0},·Landroid/os/Parcel;->writeInt(I)V | 85 | ····invoke-virtual·{p1,·p0},·Landroid/os/Parcel;->writeInt(I)V |
86 | ····return-void | 86 | ····return-void |
87 | .end·method | 87 | .end·method |
Offset 26, 80 lines modified | Offset 26, 80 lines modified | ||
26 | .end·annotation | 26 | .end·annotation |
27 | #·direct·methods | 27 | #·direct·methods |
28 | .method·constructor·<init>()V | 28 | .method·constructor·<init>()V |
29 | ····.locals·0 | 29 | ····.locals·0 |
30 | ····.line·22 | 30 | ····.line·2211 |
31 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V | 31 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V |
32 | ····return-void | 32 | ····return-void |
33 | .end·method | 33 | .end·method |
34 | #·virtual·methods | 34 | #·virtual·methods |
35 | .method·public·createFromParcel(Landroid/os/Parcel;)Landroidx/drawerlayout/widget/DrawerLayout$SavedState; | 35 | .method·public·createFromParcel(Landroid/os/Parcel;)Landroidx/drawerlayout/widget/DrawerLayout$SavedState; |
36 | ····.locals·1 | 36 | ····.locals·1 |
37 | ····.line·22 | 37 | ····.line·2219 |
38 | ····new-instance·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState; | 38 | ····new-instance·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState; |
39 | ····const/4·v0,·0x0 | 39 | ····const/4·v0,·0x0 |
40 | ····invoke-direct·{p0,·p1,·v0},·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;)V | 40 | ····invoke-direct·{p0,·p1,·v0},·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;)V |
41 | ····return-object·p0 | 41 | ····return-object·p0 |
42 | .end·method | 42 | .end·method |
43 | .method·public·createFromParcel(Landroid/os/Parcel;Ljava/lang/ClassLoader;)Landroidx/drawerlayout/widget/DrawerLayout$SavedState; | 43 | .method·public·createFromParcel(Landroid/os/Parcel;Ljava/lang/ClassLoader;)Landroidx/drawerlayout/widget/DrawerLayout$SavedState; |
44 | ····.locals·0 | 44 | ····.locals·0 |
45 | ····.line·22 | 45 | ····.line·2214 |
46 | ····new-instance·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState; | 46 | ····new-instance·p0,·Landroidx/drawerlayout/widget/DrawerLayout$SavedState; |
47 | ····invoke-direct·{p0,·p1,·p2},·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;)V | 47 | ····invoke-direct·{p0,·p1,·p2},·Landroidx/drawerlayout/widget/DrawerLayout$SavedState;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;)V |
48 | ····return-object·p0 | 48 | ····return-object·p0 |
49 | .end·method | 49 | .end·method |
50 | .method·public·bridge·synthetic·createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object; | 50 | .method·public·bridge·synthetic·createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object; |
51 | ····.locals·0 | 51 | ····.locals·0 |
52 | ····.line·22 | 52 | ····.line·2211 |
53 | ····invoke-virtual·{p0,·p1},·Landroidx/drawerlayout/widget/DrawerLayout$SavedState$1;->createFromParcel(Landroid/os/Parcel;)Landroidx/drawerlayout/widget/DrawerLayout$SavedState; | 53 | ····invoke-virtual·{p0,·p1},·Landroidx/drawerlayout/widget/DrawerLayout$SavedState$1;->createFromParcel(Landroid/os/Parcel;)Landroidx/drawerlayout/widget/DrawerLayout$SavedState; |
54 | ····move-result-object·p0 | 54 | ····move-result-object·p0 |
55 | ····return-object·p0 | 55 | ····return-object·p0 |
56 | .end·method | 56 | .end·method |
57 | .method·public·bridge·synthetic·createFromParcel(Landroid/os/Parcel;Ljava/lang/ClassLoader;)Ljava/lang/Object; | 57 | .method·public·bridge·synthetic·createFromParcel(Landroid/os/Parcel;Ljava/lang/ClassLoader;)Ljava/lang/Object; |
58 | ····.locals·0 | 58 | ····.locals·0 |
59 | ····.line·22 | 59 | ····.line·2211 |
60 | ····invoke-virtual·{p0,·p1,·p2},·Landroidx/drawerlayout/widget/DrawerLayout$SavedState$1;->createFromParcel(Landroid/os/Parcel;Ljava/lang/ClassLoader;)Landroidx/drawerlayout/widget/DrawerLayout$SavedState; | 60 | ····invoke-virtual·{p0,·p1,·p2},·Landroidx/drawerlayout/widget/DrawerLayout$SavedState$1;->createFromParcel(Landroid/os/Parcel;Ljava/lang/ClassLoader;)Landroidx/drawerlayout/widget/DrawerLayout$SavedState; |
61 | ····move-result-object·p0 | 61 | ····move-result-object·p0 |
62 | ····return-object·p0 | 62 | ····return-object·p0 |
63 | .end·method | 63 | .end·method |
64 | .method·public·newArray(I)[Landroidx/drawerlayout/widget/DrawerLayout$SavedState; | 64 | .method·public·newArray(I)[Landroidx/drawerlayout/widget/DrawerLayout$SavedState; |
65 | ····.locals·0 | 65 | ····.locals·0 |
66 | ····.line·22 | 66 | ····.line·2224 |
67 | ····new-array·p0,·p1,·[Landroidx/drawerlayout/widget/DrawerLayout$SavedState; | 67 | ····new-array·p0,·p1,·[Landroidx/drawerlayout/widget/DrawerLayout$SavedState; |
68 | ····return-object·p0 | 68 | ····return-object·p0 |
69 | .end·method | 69 | .end·method |
70 | .method·public·bridge·synthetic·newArray(I)[Ljava/lang/Object; | 70 | .method·public·bridge·synthetic·newArray(I)[Ljava/lang/Object; |
71 | ····.locals·0 | 71 | ····.locals·0 |
72 | ····.line·22 | 72 | ····.line·2211 |
73 | ····invoke-virtual·{p0,·p1},·Landroidx/drawerlayout/widget/DrawerLayout$SavedState$1;->newArray(I)[Landroidx/drawerlayout/widget/DrawerLayout$SavedState; | 73 | ····invoke-virtual·{p0,·p1},·Landroidx/drawerlayout/widget/DrawerLayout$SavedState$1;->newArray(I)[Landroidx/drawerlayout/widget/DrawerLayout$SavedState; |
74 | ····move-result-object·p0 | 74 | ····move-result-object·p0 |
75 | ····return-object·p0 | 75 | ····return-object·p0 |
76 | .end·method | 76 | .end·method |
Offset 100, 14 lines modified | Offset 100, 14 lines modified | ||
100 | ····return-object·v0 | 100 | ····return-object·v0 |
101 | .end·method | 101 | .end·method |
102 | .method·public·setLegacyStreamType(I)Landroidx/media/AudioAttributesCompat$Builder; | 102 | .method·public·setLegacyStreamType(I)Landroidx/media/AudioAttributesCompat$Builder; |
103 | ····.locals·1 | 103 | ····.locals·1 |
104 | ····.line·4 | 104 | ····.line·478 |
105 | ····iget-object·v0,·p0,·Landroidx/media/AudioAttributesCompat$Builder;->mBuilderImpl:Landroidx/media/AudioAttributesImpl$Builder; | 105 | ····iget-object·v0,·p0,·Landroidx/media/AudioAttributesCompat$Builder;->mBuilderImpl:Landroidx/media/AudioAttributesImpl$Builder; |
106 | ····invoke-interface·{v0,·p1},·Landroidx/media/AudioAttributesImpl$Builder;->setLegacyStreamType(I)Landroidx/media/AudioAttributesImpl$Builder; | 106 | ····invoke-interface·{v0,·p1},·Landroidx/media/AudioAttributesImpl$Builder;->setLegacyStreamType(I)Landroidx/media/AudioAttributesImpl$Builder; |
107 | ····return-object·p0 | 107 | ····return-object·p0 |
108 | .end·method | 108 | .end·method |
Offset 24, 181 lines modified | Offset 24, 112 lines modified | ||
24 | .field·public·mUsage:I | 24 | .field·public·mUsage:I |
25 | #·direct·methods | 25 | #·direct·methods |
26 | .method·public·constructor·<init>()V | 26 | .method·public·constructor·<init>()V |
27 | ····.locals·1 | 27 | ····.locals·1 |
28 | ····.line· | 28 | ····.line·87 |
29 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V | 29 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V |
30 | ····const/4·v0,·0x0 | 30 | ····const/4·v0,·0x0 |
31 | ····.line· | 31 | ····.line·59 |
32 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase;->mUsage:I | 32 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase;->mUsage:I |
33 | ····.line·6 | 33 | ····.line·65 |
34 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase;->mContentType:I | 34 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase;->mContentType:I |
35 | ····.line·7 | 35 | ····.line·71 |
36 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase;->mFlags:I | 36 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase;->mFlags:I |
37 | ····const/4·v0,·-0x1 | 37 | ····const/4·v0,·-0x1 |
38 | ····.line· | 38 | ····.line·77 |
39 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase;->mLegacyStream:I | 39 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase;->mLegacyStream:I |
40 | ····return-void | 40 | ····return-void |
41 | .end·method | 41 | .end·method |
42 | .method·constructor·<init>(IIII)V | 42 | .method·constructor·<init>(IIII)V |
43 | ····.locals·1 | 43 | ····.locals·1 |
44 | ····.line· | 44 | ····.line·89 |
45 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V | 45 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V |
46 | ····const/4·v0,·0x0 | 46 | ····const/4·v0,·0x0 |
47 | ····.line· | 47 | ····.line·59 |
48 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase;->mUsage:I | 48 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase;->mUsage:I |
49 | ····.line·6 | 49 | ····.line·65 |
50 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase;->mContentType:I | 50 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase;->mContentType:I |
51 | ····.line·7 | 51 | ····.line·71 |
52 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase;->mFlags:I | 52 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase;->mFlags:I |
53 | ····const/4·v0,·-0x1 | 53 | ····const/4·v0,·-0x1 |
54 | ····.line· | 54 | ····.line·77 |
55 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase;->mLegacyStream:I | 55 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase;->mLegacyStream:I |
56 | ····.line·9 | 56 | ····.line·90 |
57 | ····iput·p1,·p0,·Landroidx/media/AudioAttributesImplBase;->mContentType:I | 57 | ····iput·p1,·p0,·Landroidx/media/AudioAttributesImplBase;->mContentType:I |
58 | ····.line·9 | 58 | ····.line·91 |
59 | ····iput·p2,·p0,·Landroidx/media/AudioAttributesImplBase;->mFlags:I | 59 | ····iput·p2,·p0,·Landroidx/media/AudioAttributesImplBase;->mFlags:I |
60 | ····.line·9 | 60 | ····.line·92 |
61 | ····iput·p3,·p0,·Landroidx/media/AudioAttributesImplBase;->mUsage:I | 61 | ····iput·p3,·p0,·Landroidx/media/AudioAttributesImplBase;->mUsage:I |
62 | ····.line·9 | 62 | ····.line·93 |
63 | ····iput·p4,·p0,·Landroidx/media/AudioAttributesImplBase;->mLegacyStream:I | 63 | ····iput·p4,·p0,·Landroidx/media/AudioAttributesImplBase;->mLegacyStream:I |
64 | ····return-void | 64 | ····return-void |
65 | .end·method | 65 | .end·method |
66 | .method·static·usageForStreamType(I)I | ||
67 | ····.locals·1 | ||
68 | ····const/4·v0,·0x2 | ||
69 | ····packed-switch·p0,·:pswitch_data_0 | ||
70 | ····:pswitch_0 | ||
71 | ····const/4·p0,·0x0 | ||
72 | ····return·p0 | ||
73 | ····:pswitch_1 | ||
74 | ····const/16·p0,·0xb | ||
75 | ····return·p0 | ||
76 | ····:pswitch_2 | ||
77 | ····const/4·p0,·0x3 | ||
78 | ····return·p0 | ||
79 | ····:pswitch_3 | ||
80 | ····return·v0 | ||
81 | ····:pswitch_4 | ||
82 | ····const/4·p0,·0x5 | ||
83 | ····return·p0 | ||
84 | ····:pswitch_5 | ||
85 | ····const/4·p0,·0x4 | ||
86 | ····return·p0 | ||
87 | ····:pswitch_6 | ||
88 | ····const/4·p0,·0x1 | ||
89 | ····return·p0 | ||
90 | ····:pswitch_7 | ||
91 | ····const/4·p0,·0x6 | ||
92 | ····return·p0 | ||
93 | ····:pswitch_8 | ||
94 | ····const/16·p0,·0xd | ||
95 | ····return·p0 | ||
96 | ····:pswitch_9 | ||
97 | ····return·v0 | ||
98 | ····:pswitch_data_0 | ||
99 | ····.packed-switch·0x0 | ||
100 | ········:pswitch_9 | ||
101 | ········:pswitch_8 | ||
102 | ········:pswitch_7 | ||
103 | ········:pswitch_6 | ||
104 | ········:pswitch_5 | ||
105 | ········:pswitch_4 | ||
... Open expanded diff ... |
Offset 27, 182 lines modified | Offset 27, 42 lines modified | ||
27 | .field·private·mUsage:I | 27 | .field·private·mUsage:I |
28 | #·direct·methods | 28 | #·direct·methods |
29 | .method·constructor·<init>()V | 29 | .method·constructor·<init>()V |
30 | ····.locals·1 | 30 | ····.locals·1 |
31 | ····.line·18 | 31 | ····.line·185 |
32 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V | 32 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V |
33 | ····const/4·v0,·0x0 | 33 | ····const/4·v0,·0x0 |
34 | ····.line·18 | 34 | ····.line·180 |
35 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase$Builder;->mUsage:I | 35 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase$Builder;->mUsage:I |
36 | ····.line·18 | 36 | ····.line·181 |
37 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase$Builder;->mContentType:I | 37 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase$Builder;->mContentType:I |
38 | ····.line·18 | 38 | ····.line·182 |
39 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase$Builder;->mFlags:I | 39 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase$Builder;->mFlags:I |
40 | ····const/4·v0,·-0x1 | 40 | ····const/4·v0,·-0x1 |
41 | ····.line·18 | 41 | ····.line·183 |
42 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase$Builder;->mLegacyStream:I | 42 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase$Builder;->mLegacyStream:I |
43 | ····return-void | 43 | ····return-void |
44 | .end·method | 44 | .end·method |
45 | .method·private·setInternalLegacyStreamType(I)Landroidx/media/AudioAttributesImplBase$Builder; | ||
46 | ····.locals·3 | ||
47 | ····const/4·v0,·0x1 | ||
48 | ····const/4·v1,·0x4 | ||
49 | ····packed-switch·p1,·:pswitch_data_0 | ||
50 | ····.line·311 | ||
51 | ····new-instance·v0,·Ljava/lang/StringBuilder; | ||
52 | ····invoke-direct·{v0},·Ljava/lang/StringBuilder;-><init>()V | ||
53 | ····const-string·v1,·"Invalid·stream·type·" | ||
54 | ····invoke-virtual·{v0,·v1},·Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; | ||
55 | ····invoke-virtual·{v0,·p1},·Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; | ||
56 | ····const-string·v1,·"·for·AudioAttributesCompat" | ||
57 | ····invoke-virtual·{v0,·v1},·Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; | ||
58 | ····invoke-virtual·{v0},·Ljava/lang/StringBuilder;->toString()Ljava/lang/String; | ||
59 | ····move-result-object·v0 | ||
60 | ····const-string·v1,·"AudioAttributesCompat" | ||
61 | ····invoke-static·{v1,·v0},·Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I | ||
62 | ····goto·:goto_1 | ||
63 | ····.line·308 | ||
64 | ····:pswitch_0 | ||
65 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase$Builder;->mContentType:I | ||
66 | ····goto·:goto_1 | ||
67 | ····.line·305 | ||
68 | ····:pswitch_1 | ||
69 | ····iput·v1,·p0,·Landroidx/media/AudioAttributesImplBase$Builder;->mContentType:I | ||
70 | ····goto·:goto_1 | ||
71 | ····.line·302 | ||
72 | ····:pswitch_2 | ||
73 | ····iput·v1,·p0,·Landroidx/media/AudioAttributesImplBase$Builder;->mContentType:I | ||
74 | ····goto·:goto_1 | ||
75 | ····.line·280 | ||
76 | ····:pswitch_3 | ||
77 | ····iget·v2,·p0,·Landroidx/media/AudioAttributesImplBase$Builder;->mFlags:I | ||
78 | ····or-int/2addr·v0,·v2 | ||
79 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase$Builder;->mFlags:I | ||
80 | ····goto·:goto_0 | ||
81 | ····.line·298 | ||
82 | ····:pswitch_4 | ||
83 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase$Builder;->mContentType:I | ||
84 | ····.line·299 | ||
85 | ····iget·v0,·p0,·Landroidx/media/AudioAttributesImplBase$Builder;->mFlags:I | ||
86 | ····or-int/2addr·v0,·v1 | ||
87 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase$Builder;->mFlags:I | ||
88 | ····goto·:goto_1 | ||
89 | ····.line·295 | ||
90 | ····:pswitch_5 | ||
91 | ····iput·v1,·p0,·Landroidx/media/AudioAttributesImplBase$Builder;->mContentType:I | ||
92 | ····goto·:goto_1 | ||
93 | ····.line·292 | ||
94 | ····:pswitch_6 | ||
95 | ····iput·v1,·p0,·Landroidx/media/AudioAttributesImplBase$Builder;->mContentType:I | ||
96 | ····goto·:goto_1 | ||
97 | ····:pswitch_7 | ||
98 | ····const/4·v0,·0x2 | ||
99 | ····.line·289 | ||
100 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplBase$Builder;->mContentType:I | ||
101 | ····goto·:goto_1 | ||
102 | ····.line·286 | ||
103 | ····:pswitch_8 | ||
104 | ····iput·v1,·p0,·Landroidx/media/AudioAttributesImplBase$Builder;->mContentType:I | ||
... Open expanded diff ... |
Offset 14, 26 lines modified | Offset 14, 26 lines modified | ||
14 | .end·annotation | 14 | .end·annotation |
15 | #·direct·methods | 15 | #·direct·methods |
16 | .method·constructor·<init>()V | 16 | .method·constructor·<init>()V |
17 | ····.locals·0 | 17 | ····.locals·0 |
18 | ····.line·5 | 18 | ····.line·56 |
19 | ····invoke-direct·{p0},·Landroidx/media/AudioAttributesImplApi21$Builder;-><init>()V | 19 | ····invoke-direct·{p0},·Landroidx/media/AudioAttributesImplApi21$Builder;-><init>()V |
20 | ····return-void | 20 | ····return-void |
21 | .end·method | 21 | .end·method |
22 | #·virtual·methods | 22 | #·virtual·methods |
23 | .method·public·build()Landroidx/media/AudioAttributesImpl; | 23 | .method·public·build()Landroidx/media/AudioAttributesImpl; |
24 | ····.locals·1 | 24 | ····.locals·1 |
25 | ····.line·6 | 25 | ····.line·66 |
26 | ····new-instance·v0,·Landroidx/media/AudioAttributesImplApi26; | 26 | ····new-instance·v0,·Landroidx/media/AudioAttributesImplApi26; |
27 | ····iget-object·p0,·p0,·Landroidx/media/AudioAttributesImplApi21$Builder;->mFwkBuilder:Landroid/media/AudioAttributes$Builder; | 27 | ····iget-object·p0,·p0,·Landroidx/media/AudioAttributesImplApi21$Builder;->mFwkBuilder:Landroid/media/AudioAttributes$Builder; |
28 | ····invoke-virtual·{p0},·Landroid/media/AudioAttributes$Builder;->build()Landroid/media/AudioAttributes; | 28 | ····invoke-virtual·{p0},·Landroid/media/AudioAttributes$Builder;->build()Landroid/media/AudioAttributes; |
29 | ····move-result-object·p0 | 29 | ····move-result-object·p0 |
Offset 11, 23 lines modified | Offset 11, 23 lines modified | ||
11 | .end·annotation | 11 | .end·annotation |
12 | #·direct·methods | 12 | #·direct·methods |
13 | .method·public·constructor·<init>()V | 13 | .method·public·constructor·<init>()V |
14 | ····.locals·0 | 14 | ····.locals·0 |
15 | ····.line·4 | 15 | ····.line·42 |
16 | ····invoke-direct·{p0},·Landroidx/media/AudioAttributesImplApi21;-><init>()V | 16 | ····invoke-direct·{p0},·Landroidx/media/AudioAttributesImplApi21;-><init>()V |
17 | ····return-void | 17 | ····return-void |
18 | .end·method | 18 | .end·method |
19 | .method·constructor·<init>(Landroid/media/AudioAttributes;)V | 19 | .method·constructor·<init>(Landroid/media/AudioAttributes;)V |
20 | ····.locals·1 | 20 | ····.locals·1 |
21 | ····const/4·v0,·-0x1 | 21 | ····const/4·v0,·-0x1 |
22 | ····.line·4 | 22 | ····.line·46 |
23 | ····invoke-direct·{p0,·p1,·v0},·Landroidx/media/AudioAttributesImplApi21;-><init>(Landroid/media/AudioAttributes;I)V | 23 | ····invoke-direct·{p0,·p1,·v0},·Landroidx/media/AudioAttributesImplApi21;-><init>(Landroid/media/AudioAttributes;I)V |
24 | ····return-void | 24 | ····return-void |
25 | .end·method | 25 | .end·method |
Offset 21, 33 lines modified | Offset 21, 33 lines modified | ||
21 | .field·final·mFwkBuilder:Landroid/media/AudioAttributes$Builder; | 21 | .field·final·mFwkBuilder:Landroid/media/AudioAttributes$Builder; |
22 | #·direct·methods | 22 | #·direct·methods |
23 | .method·constructor·<init>()V | 23 | .method·constructor·<init>()V |
24 | ····.locals·1 | 24 | ····.locals·1 |
25 | ····.line·13 | 25 | ····.line·133 |
26 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V | 26 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V |
27 | ····.line·13 | 27 | ····.line·134 |
28 | ····new-instance·v0,·Landroid/media/AudioAttributes$Builder; | 28 | ····new-instance·v0,·Landroid/media/AudioAttributes$Builder; |
29 | ····invoke-direct·{v0},·Landroid/media/AudioAttributes$Builder;-><init>()V | 29 | ····invoke-direct·{v0},·Landroid/media/AudioAttributes$Builder;-><init>()V |
30 | ····iput-object·v0,·p0,·Landroidx/media/AudioAttributesImplApi21$Builder;->mFwkBuilder:Landroid/media/AudioAttributes$Builder; | 30 | ····iput-object·v0,·p0,·Landroidx/media/AudioAttributesImplApi21$Builder;->mFwkBuilder:Landroid/media/AudioAttributes$Builder; |
31 | ····return-void | 31 | ····return-void |
32 | .end·method | 32 | .end·method |
33 | #·virtual·methods | 33 | #·virtual·methods |
34 | .method·public·build()Landroidx/media/AudioAttributesImpl; | 34 | .method·public·build()Landroidx/media/AudioAttributesImpl; |
35 | ····.locals·1 | 35 | ····.locals·1 |
36 | ····.line·14 | 36 | ····.line·144 |
37 | ····new-instance·v0,·Landroidx/media/AudioAttributesImplApi21; | 37 | ····new-instance·v0,·Landroidx/media/AudioAttributesImplApi21; |
38 | ····iget-object·p0,·p0,·Landroidx/media/AudioAttributesImplApi21$Builder;->mFwkBuilder:Landroid/media/AudioAttributes$Builder; | 38 | ····iget-object·p0,·p0,·Landroidx/media/AudioAttributesImplApi21$Builder;->mFwkBuilder:Landroid/media/AudioAttributes$Builder; |
39 | ····invoke-virtual·{p0},·Landroid/media/AudioAttributes$Builder;->build()Landroid/media/AudioAttributes; | 39 | ····invoke-virtual·{p0},·Landroid/media/AudioAttributes$Builder;->build()Landroid/media/AudioAttributes; |
40 | ····move-result-object·p0 | 40 | ····move-result-object·p0 |
Offset 56, 23 lines modified | Offset 56, 23 lines modified | ||
56 | ····return-object·v0 | 56 | ····return-object·v0 |
57 | .end·method | 57 | .end·method |
58 | .method·public·bridge·synthetic·setLegacyStreamType(I)Landroidx/media/AudioAttributesImpl$Builder; | 58 | .method·public·bridge·synthetic·setLegacyStreamType(I)Landroidx/media/AudioAttributesImpl$Builder; |
59 | ····.locals·0 | 59 | ····.locals·0 |
60 | ····.line·1 | 60 | ····.line·130 |
61 | ····invoke-virtual·{p0,·p1},·Landroidx/media/AudioAttributesImplApi21$Builder;->setLegacyStreamType(I)Landroidx/media/AudioAttributesImplApi21$Builder; | 61 | ····invoke-virtual·{p0,·p1},·Landroidx/media/AudioAttributesImplApi21$Builder;->setLegacyStreamType(I)Landroidx/media/AudioAttributesImplApi21$Builder; |
62 | ····return-object·p0 | 62 | ····return-object·p0 |
63 | .end·method | 63 | .end·method |
64 | .method·public·setLegacyStreamType(I)Landroidx/media/AudioAttributesImplApi21$Builder; | 64 | .method·public·setLegacyStreamType(I)Landroidx/media/AudioAttributesImplApi21$Builder; |
65 | ····.locals·1 | 65 | ····.locals·1 |
66 | ····.line·17 | 66 | ····.line·175 |
67 | ····iget-object·v0,·p0,·Landroidx/media/AudioAttributesImplApi21$Builder;->mFwkBuilder:Landroid/media/AudioAttributes$Builder; | 67 | ····iget-object·v0,·p0,·Landroidx/media/AudioAttributesImplApi21$Builder;->mFwkBuilder:Landroid/media/AudioAttributes$Builder; |
68 | ····invoke-virtual·{v0,·p1},·Landroid/media/AudioAttributes$Builder;->setLegacyStreamType(I)Landroid/media/AudioAttributes$Builder; | 68 | ····invoke-virtual·{v0,·p1},·Landroid/media/AudioAttributes$Builder;->setLegacyStreamType(I)Landroid/media/AudioAttributes$Builder; |
69 | ····return-object·p0 | 69 | ····return-object·p0 |
70 | .end·method | 70 | .end·method |
Offset 20, 103 lines modified | Offset 20, 103 lines modified | ||
20 | .field·public·mLegacyStreamType:I | 20 | .field·public·mLegacyStreamType:I |
21 | #·direct·methods | 21 | #·direct·methods |
22 | .method·public·constructor·<init>()V | 22 | .method·public·constructor·<init>()V |
23 | ····.locals·1 | 23 | ····.locals·1 |
24 | ····.line·5 | 24 | ····.line·57 |
25 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V | 25 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V |
26 | ····const/4·v0,·-0x1 | 26 | ····const/4·v0,·-0x1 |
27 | ····.line·4 | 27 | ····.line·47 |
28 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplApi21;->mLegacyStreamType:I | 28 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplApi21;->mLegacyStreamType:I |
29 | ····return-void | 29 | ····return-void |
30 | .end·method | 30 | .end·method |
31 | .method·constructor·<init>(Landroid/media/AudioAttributes;)V | 31 | .method·constructor·<init>(Landroid/media/AudioAttributes;)V |
32 | ····.locals·1 | 32 | ····.locals·1 |
33 | ····const/4·v0,·-0x1 | 33 | ····const/4·v0,·-0x1 |
34 | ····.line·6 | 34 | ····.line·61 |
35 | ····invoke-direct·{p0,·p1,·v0},·Landroidx/media/AudioAttributesImplApi21;-><init>(Landroid/media/AudioAttributes;I)V | 35 | ····invoke-direct·{p0,·p1,·v0},·Landroidx/media/AudioAttributesImplApi21;-><init>(Landroid/media/AudioAttributes;I)V |
36 | ····return-void | 36 | ····return-void |
37 | .end·method | 37 | .end·method |
38 | .method·constructor·<init>(Landroid/media/AudioAttributes;I)V | 38 | .method·constructor·<init>(Landroid/media/AudioAttributes;I)V |
39 | ····.locals·1 | 39 | ····.locals·1 |
40 | ····.line·6 | 40 | ····.line·64 |
41 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V | 41 | ····invoke-direct·{p0},·Ljava/lang/Object;-><init>()V |
42 | ····const/4·v0,·-0x1 | 42 | ····const/4·v0,·-0x1 |
43 | ····.line·4 | 43 | ····.line·47 |
44 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplApi21;->mLegacyStreamType:I | 44 | ····iput·v0,·p0,·Landroidx/media/AudioAttributesImplApi21;->mLegacyStreamType:I |
45 | ····.line·6 | 45 | ····.line·65 |
46 | ····iput-object·p1,·p0,·Landroidx/media/AudioAttributesImplApi21;->mAudioAttributes:Landroid/media/AudioAttributes; | 46 | ····iput-object·p1,·p0,·Landroidx/media/AudioAttributesImplApi21;->mAudioAttributes:Landroid/media/AudioAttributes; |
47 | ····.line·6 | 47 | ····.line·66 |
48 | ····iput·p2,·p0,·Landroidx/media/AudioAttributesImplApi21;->mLegacyStreamType:I | 48 | ····iput·p2,·p0,·Landroidx/media/AudioAttributesImplApi21;->mLegacyStreamType:I |
49 | ····return-void | 49 | ····return-void |
50 | .end·method | 50 | .end·method |
51 | #·virtual·methods | 51 | #·virtual·methods |
52 | .method·public·equals(Ljava/lang/Object;)Z | 52 | .method·public·equals(Ljava/lang/Object;)Z |
53 | ····.locals·1 | 53 | ····.locals·1 |
54 | ····.line·11 | 54 | ····.line·117 |
55 | ····instance-of·v0,·p1,·Landroidx/media/AudioAttributesImplApi21; | 55 | ····instance-of·v0,·p1,·Landroidx/media/AudioAttributesImplApi21; |
56 | ····if-nez·v0,·:cond_0 | 56 | ····if-nez·v0,·:cond_0 |
57 | ····const/4·p0,·0x0 | 57 | ····const/4·p0,·0x0 |
58 | ····return·p0 | 58 | ····return·p0 |
59 | ····.line·1 | 59 | ····.line·120 |
60 | ····:cond_0 | 60 | ····:cond_0 |
61 | ····check-cast·p1,·Landroidx/media/AudioAttributesImplApi21; | 61 | ····check-cast·p1,·Landroidx/media/AudioAttributesImplApi21; |
62 | ····.line·12 | 62 | ····.line·121 |
63 | ····iget-object·p0,·p0,·Landroidx/media/AudioAttributesImplApi21;->mAudioAttributes:Landroid/media/AudioAttributes; | 63 | ····iget-object·p0,·p0,·Landroidx/media/AudioAttributesImplApi21;->mAudioAttributes:Landroid/media/AudioAttributes; |
64 | ····iget-object·p1,·p1,·Landroidx/media/AudioAttributesImplApi21;->mAudioAttributes:Landroid/media/AudioAttributes; | 64 | ····iget-object·p1,·p1,·Landroidx/media/AudioAttributesImplApi21;->mAudioAttributes:Landroid/media/AudioAttributes; |
65 | ····invoke-virtual·{p0,·p1},·Landroid/media/AudioAttributes;->equals(Ljava/lang/Object;)Z | 65 | ····invoke-virtual·{p0,·p1},·Landroid/media/AudioAttributes;->equals(Ljava/lang/Object;)Z |
66 | ····move-result·p0 | 66 | ····move-result·p0 |
67 | ····return·p0 | 67 | ····return·p0 |
68 | .end·method | 68 | .end·method |
69 | .method·public·hashCode()I | 69 | .method·public·hashCode()I |
70 | ····.locals·0 | 70 | ····.locals·0 |
71 | ····.line·11 | 71 | ····.line·112 |
72 | ····iget-object·p0,·p0,·Landroidx/media/AudioAttributesImplApi21;->mAudioAttributes:Landroid/media/AudioAttributes; | 72 | ····iget-object·p0,·p0,·Landroidx/media/AudioAttributesImplApi21;->mAudioAttributes:Landroid/media/AudioAttributes; |
73 | ····invoke-virtual·{p0},·Landroid/media/AudioAttributes;->hashCode()I | 73 | ····invoke-virtual·{p0},·Landroid/media/AudioAttributes;->hashCode()I |
74 | ····move-result·p0 | 74 | ····move-result·p0 |
75 | ····return·p0 | 75 | ····return·p0 |
76 | .end·method | 76 | .end·method |
77 | .method·public·toString()Ljava/lang/String; | 77 | .method·public·toString()Ljava/lang/String; |
78 | ····.locals·2 | 78 | ····.locals·2 |
79 | ····.line·12 | 79 | ····.line·127 |
80 | ····new-instance·v0,·Ljava/lang/StringBuilder; | 80 | ····new-instance·v0,·Ljava/lang/StringBuilder; |
81 | ····invoke-direct·{v0},·Ljava/lang/StringBuilder;-><init>()V | 81 | ····invoke-direct·{v0},·Ljava/lang/StringBuilder;-><init>()V |
82 | ····const-string·v1,·"AudioAttributesCompat:·audioattributes=" | 82 | ····const-string·v1,·"AudioAttributesCompat:·audioattributes=" |
83 | ····invoke-virtual·{v0,·v1},·Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; | 83 | ····invoke-virtual·{v0,·v1},·Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; |
Offset 183, 15 lines modified | Offset 183, 15 lines modified | ||
183 | ····:goto_2 | 183 | ····:goto_2 |
184 | ····:pswitch_7 | 184 | ····:pswitch_7 |
185 | ····return·v2 | 185 | ····return·v2 |
186 | ····:pswitch_8 | 186 | ····:pswitch_8 |
187 | ····return·p1 | 187 | ····return·p1 |
188 | ····.line·60 | 188 | ····.line·601 |
189 | ····:cond_5 | 189 | ····:cond_5 |
190 | ····new-instance·p0,·Ljava/lang/IllegalArgumentException; | 190 | ····new-instance·p0,·Ljava/lang/IllegalArgumentException; |
191 | ····new-instance·p1,·Ljava/lang/StringBuilder; | 191 | ····new-instance·p1,·Ljava/lang/StringBuilder; |
192 | ····invoke-direct·{p1},·Ljava/lang/StringBuilder;-><init>()V | 192 | ····invoke-direct·{p1},·Ljava/lang/StringBuilder;-><init>()V |
Offset 238, 15 lines modified | Offset 238, 15 lines modified | ||
238 | .end·method | 238 | .end·method |
239 | .method·static·usageToString(I)Ljava/lang/String; | 239 | .method·static·usageToString(I)Ljava/lang/String; |
240 | ····.locals·2 | 240 | ····.locals·2 |
241 | ····packed-switch·p0,·:pswitch_data_0 | 241 | ····packed-switch·p0,·:pswitch_data_0 |
242 | ····.line·5 | 242 | ····.line·528 |
243 | ····:pswitch_0 | 243 | ····:pswitch_0 |
244 | ····new-instance·v0,·Ljava/lang/StringBuilder; | 244 | ····new-instance·v0,·Ljava/lang/StringBuilder; |
245 | ····invoke-direct·{v0},·Ljava/lang/StringBuilder;-><init>()V | 245 | ····invoke-direct·{v0},·Ljava/lang/StringBuilder;-><init>()V |
246 | ····const-string·v1,·"unknown·usage·" | 246 | ····const-string·v1,·"unknown·usage·" |
Offset 420, 70 lines modified | Offset 420, 70 lines modified | ||
420 | .end·method | 420 | .end·method |
421 | #·virtual·methods | 421 | #·virtual·methods |
422 | .method·public·equals(Ljava/lang/Object;)Z | 422 | .method·public·equals(Ljava/lang/Object;)Z |
423 | ····.locals·2 | 423 | ····.locals·2 |
424 | ····.line·61 | 424 | ····.line·611 |
425 | ····instance-of·v0,·p1,·Landroidx/media/AudioAttributesCompat; | 425 | ····instance-of·v0,·p1,·Landroidx/media/AudioAttributesCompat; |
426 | ····const/4·v1,·0x0 | 426 | ····const/4·v1,·0x0 |
427 | ····if-nez·v0,·:cond_0 | 427 | ····if-nez·v0,·:cond_0 |
428 | ····return·v1 | 428 | ····return·v1 |
429 | ····.line·6 | 429 | ····.line·614 |
430 | ····:cond_0 | 430 | ····:cond_0 |
431 | ····check-cast·p1,·Landroidx/media/AudioAttributesCompat; | 431 | ····check-cast·p1,·Landroidx/media/AudioAttributesCompat; |
432 | ····.line·6 | 432 | ····.line·615 |
433 | ····iget-object·p0,·p0,·Landroidx/media/AudioAttributesCompat;->mImpl:Landroidx/media/AudioAttributesImpl; | 433 | ····iget-object·p0,·p0,·Landroidx/media/AudioAttributesCompat;->mImpl:Landroidx/media/AudioAttributesImpl; |
434 | ····if-nez·p0,·:cond_2 | 434 | ····if-nez·p0,·:cond_2 |
435 | ····.line·6 | 435 | ····.line·616 |
436 | ····iget-object·p0,·p1,·Landroidx/media/AudioAttributesCompat;->mImpl:Landroidx/media/AudioAttributesImpl; | 436 | ····iget-object·p0,·p1,·Landroidx/media/AudioAttributesCompat;->mImpl:Landroidx/media/AudioAttributesImpl; |
437 | ····if-nez·p0,·:cond_1 | 437 | ····if-nez·p0,·:cond_1 |
438 | ····const/4·v1,·0x1 | 438 | ····const/4·v1,·0x1 |
439 | ····:cond_1 | 439 | ····:cond_1 |
440 | ····return·v1 | 440 | ····return·v1 |
441 | ····.line·6 | 441 | ····.line·618 |
442 | ····:cond_2 | 442 | ····:cond_2 |
443 | ····iget-object·p1,·p1,·Landroidx/media/AudioAttributesCompat;->mImpl:Landroidx/media/AudioAttributesImpl; | 443 | ····iget-object·p1,·p1,·Landroidx/media/AudioAttributesCompat;->mImpl:Landroidx/media/AudioAttributesImpl; |
444 | ····invoke-virtual·{p0,·p1},·Ljava/lang/Object;->equals(Ljava/lang/Object;)Z | 444 | ····invoke-virtual·{p0,·p1},·Ljava/lang/Object;->equals(Ljava/lang/Object;)Z |
445 | ····move-result·p0 | 445 | ····move-result·p0 |
446 | ····return·p0 | 446 | ····return·p0 |
447 | .end·method | 447 | .end·method |
448 | .method·public·hashCode()I | 448 | .method·public·hashCode()I |
449 | ····.locals·0 | 449 | ····.locals·0 |
450 | ····.line·4 | 450 | ····.line·485 |
451 | ····iget-object·p0,·p0,·Landroidx/media/AudioAttributesCompat;->mImpl:Landroidx/media/AudioAttributesImpl; | 451 | ····iget-object·p0,·p0,·Landroidx/media/AudioAttributesCompat;->mImpl:Landroidx/media/AudioAttributesImpl; |
452 | ····invoke-virtual·{p0},·Ljava/lang/Object;->hashCode()I | 452 | ····invoke-virtual·{p0},·Ljava/lang/Object;->hashCode()I |
453 | ····move-result·p0 | 453 | ····move-result·p0 |
454 | ····return·p0 | 454 | ····return·p0 |
455 | .end·method | 455 | .end·method |
456 | .method·public·toString()Ljava/lang/String; | 456 | .method·public·toString()Ljava/lang/String; |
457 | ····.locals·0 | 457 | ····.locals·0 |
458 | ····.line·49 | 458 | ····.line·490 |
459 | ····iget-object·p0,·p0,·Landroidx/media/AudioAttributesCompat;->mImpl:Landroidx/media/AudioAttributesImpl; | 459 | ····iget-object·p0,·p0,·Landroidx/media/AudioAttributesCompat;->mImpl:Landroidx/media/AudioAttributesImpl; |
460 | ····invoke-virtual·{p0},·Ljava/lang/Object;->toString()Ljava/lang/String; | 460 | ····invoke-virtual·{p0},·Ljava/lang/Object;->toString()Ljava/lang/String; |
461 | ····move-result-object·p0 | 461 | ····move-result-object·p0 |
462 | ····return-object·p0 | 462 | ····return-object·p0 |
Offset 1, 1 lines modified | Offset 1, 1 lines modified | ||
1 | 2.3.0-alpha0 | 1 | 2.3.0-alpha05 |
Offset 1, 109 lines modified | Offset 1, 100 lines modified | ||
1 | Manifest-Version:·1.0\xd | 1 | Manifest-Version:·1.0\xd |
2 | Created-By:·soong_zip\xd | 2 | Created-By:·soong_zip\xd |
3 | \xd | 3 | \xd |
4 | Name:·AndroidManifest.xml\xd | 4 | Name:·AndroidManifest.xml\xd |
5 | SHA-256-Digest:· | 5 | SHA-256-Digest:·9fqSZDQ4fTcqt2bKHslKwRkklcadH+9koyDxwvyR8vI=\xd |
6 | \xd | 6 | \xd |
7 | Name:·META-INF/androidx.activity_activity.version\xd | 7 | Name:·META-INF/androidx.activity_activity.version\xd |
8 | SHA-256-Digest:· | 8 | SHA-256-Digest:·xz+m3R8eN7+R2i0GPdiN0mdjZIprRweAsI2x/eS0FUc=\xd |
9 | \xd | ||
10 | Name:·META-INF/androidx.annotation_annotation-experimental.version\xd | ||
11 | SHA-256-Digest:·wVwueMje4MuWGduylY6MPUJVWRbNN5syBnZiEg6rKdA=\xd | ||
12 | \xd | 9 | \xd |
13 | Name:·META-INF/androidx.arch.core_core-runtime.version\xd | 10 | Name:·META-INF/androidx.arch.core_core-runtime.version\xd |
14 | SHA-256-Digest:·WGhAFSfUNZxPdHzBoS8USnnSOWmxlIzVAhsq/Qc8d3Y=\xd | 11 | SHA-256-Digest:·WGhAFSfUNZxPdHzBoS8USnnSOWmxlIzVAhsq/Qc8d3Y=\xd |
15 | \xd | 12 | \xd |
16 | Name:·META-INF/androidx.asynclayoutinflater_asynclayoutinflater.versio\xd | 13 | Name:·META-INF/androidx.asynclayoutinflater_asynclayoutinflater.versio\xd |
17 | ·n\xd | 14 | ·n\xd |
18 | SHA-256-Digest:·wVwueMje4MuWGduylY6MPUJVWRbNN5syBnZiEg6rKdA=\xd | 15 | SHA-256-Digest:·wVwueMje4MuWGduylY6MPUJVWRbNN5syBnZiEg6rKdA=\xd |
19 | \xd | 16 | \xd |
20 | Name:·META-INF/androidx.coordinatorlayout_coordinatorlayout.version\xd | 17 | Name:·META-INF/androidx.coordinatorlayout_coordinatorlayout.version\xd |
21 | SHA-256-Digest:·aJlh2UWnR9mF5VrFLvT9RD0XE8NHATPXftk/CscN5/o=\xd | 18 | SHA-256-Digest:·aJlh2UWnR9mF5VrFLvT9RD0XE8NHATPXftk/CscN5/o=\xd |
22 | \xd | 19 | \xd |
23 | Name:·META-INF/androidx.core_core.version\xd | 20 | Name:·META-INF/androidx.core_core.version\xd |
24 | SHA-256-Digest:· | 21 | SHA-256-Digest:·oS8gEFIRzubDgKeSkOHGU86NdE7hg6W7vKGJGQvTtA4=\xd |
25 | \xd | 22 | \xd |
26 | Name:·META-INF/androidx.cursoradapter_cursoradapter.version\xd | 23 | Name:·META-INF/androidx.cursoradapter_cursoradapter.version\xd |
27 | SHA-256-Digest:·wVwueMje4MuWGduylY6MPUJVWRbNN5syBnZiEg6rKdA=\xd | 24 | SHA-256-Digest:·wVwueMje4MuWGduylY6MPUJVWRbNN5syBnZiEg6rKdA=\xd |
28 | \xd | 25 | \xd |
29 | Name:·META-INF/androidx.customview_customview.version\xd | 26 | Name:·META-INF/androidx.customview_customview.version\xd |
30 | SHA-256-Digest:·aJlh2UWnR9mF5VrFLvT9RD0XE8NHATPXftk/CscN5/o=\xd | 27 | SHA-256-Digest:·aJlh2UWnR9mF5VrFLvT9RD0XE8NHATPXftk/CscN5/o=\xd |
31 | \xd | 28 | \xd |
32 | Name:·META-INF/androidx.documentfile_documentfile.version\xd | 29 | Name:·META-INF/androidx.documentfile_documentfile.version\xd |
33 | SHA-256-Digest:·wVwueMje4MuWGduylY6MPUJVWRbNN5syBnZiEg6rKdA=\xd | 30 | SHA-256-Digest:·wVwueMje4MuWGduylY6MPUJVWRbNN5syBnZiEg6rKdA=\xd |
34 | \xd | 31 | \xd |
35 | Name:·META-INF/androidx.drawerlayout_drawerlayout.version\xd | 32 | Name:·META-INF/androidx.drawerlayout_drawerlayout.version\xd |
36 | SHA-256-Digest:·aJlh2UWnR9mF5VrFLvT9RD0XE8NHATPXftk/CscN5/o=\xd | 33 | SHA-256-Digest:·aJlh2UWnR9mF5VrFLvT9RD0XE8NHATPXftk/CscN5/o=\xd |
37 | \xd | 34 | \xd |
38 | Name:·META-INF/androidx.fragment_fragment.version\xd | 35 | Name:·META-INF/androidx.fragment_fragment.version\xd |
39 | SHA-256-Digest:· | 36 | SHA-256-Digest:·5Gal5NDywUFwzHFcZN9CcexepGkujt7rfQqVJraqOVg=\xd |
40 | \xd | 37 | \xd |
41 | Name:·META-INF/androidx.interpolator_interpolator.version\xd | 38 | Name:·META-INF/androidx.interpolator_interpolator.version\xd |
42 | SHA-256-Digest:·wVwueMje4MuWGduylY6MPUJVWRbNN5syBnZiEg6rKdA=\xd | 39 | SHA-256-Digest:·wVwueMje4MuWGduylY6MPUJVWRbNN5syBnZiEg6rKdA=\xd |
43 | \xd | 40 | \xd |
44 | Name:·META-INF/androidx.legacy_legacy-support-core-ui.version\xd | 41 | Name:·META-INF/androidx.legacy_legacy-support-core-ui.version\xd |
45 | SHA-256-Digest:·wVwueMje4MuWGduylY6MPUJVWRbNN5syBnZiEg6rKdA=\xd | 42 | SHA-256-Digest:·wVwueMje4MuWGduylY6MPUJVWRbNN5syBnZiEg6rKdA=\xd |
46 | \xd | 43 | \xd |
47 | Name:·META-INF/androidx.legacy_legacy-support-core-utils.version\xd | 44 | Name:·META-INF/androidx.legacy_legacy-support-core-utils.version\xd |
48 | SHA-256-Digest:·wVwueMje4MuWGduylY6MPUJVWRbNN5syBnZiEg6rKdA=\xd | 45 | SHA-256-Digest:·wVwueMje4MuWGduylY6MPUJVWRbNN5syBnZiEg6rKdA=\xd |
49 | \xd | 46 | \xd |
50 | Name:·META-INF/androidx.lifecycle_lifecycle-livedata-core.version\xd | 47 | Name:·META-INF/androidx.lifecycle_lifecycle-livedata-core.version\xd |
51 | SHA-256-Digest:· | 48 | SHA-256-Digest:·kEdwhIvdTBaMQfRzaE4dCUFFlZHfilME/u/9/Ol0/oo=\xd |
52 | \xd | 49 | \xd |
53 | Name:·META-INF/androidx.lifecycle_lifecycle-runtime.version\xd | 50 | Name:·META-INF/androidx.lifecycle_lifecycle-runtime.version\xd |
54 | SHA-256-Digest:· | 51 | SHA-256-Digest:·kEdwhIvdTBaMQfRzaE4dCUFFlZHfilME/u/9/Ol0/oo=\xd |
55 | \xd | 52 | \xd |
56 | Name:·META-INF/androidx.lifecycle_lifecycle-viewmodel-savedstate.versi\xd | 53 | Name:·META-INF/androidx.lifecycle_lifecycle-viewmodel-savedstate.versi\xd |
57 | ·on\xd | 54 | ·on\xd |
58 | SHA-256-Digest:· | 55 | SHA-256-Digest:·kEdwhIvdTBaMQfRzaE4dCUFFlZHfilME/u/9/Ol0/oo=\xd |
59 | \xd | 56 | \xd |
60 | Name:·META-INF/androidx.lifecycle_lifecycle-viewmodel.version\xd | 57 | Name:·META-INF/androidx.lifecycle_lifecycle-viewmodel.version\xd |
61 | SHA-256-Digest:· | 58 | SHA-256-Digest:·kEdwhIvdTBaMQfRzaE4dCUFFlZHfilME/u/9/Ol0/oo=\xd |
62 | \xd | 59 | \xd |
63 | Name:·META-INF/androidx.loader_loader.version\xd | 60 | Name:·META-INF/androidx.loader_loader.version\xd |
64 | SHA-256-Digest:·aJlh2UWnR9mF5VrFLvT9RD0XE8NHATPXftk/CscN5/o=\xd | 61 | SHA-256-Digest:·aJlh2UWnR9mF5VrFLvT9RD0XE8NHATPXftk/CscN5/o=\xd |
65 | \xd | 62 | \xd |
66 | Name:·META-INF/androidx.localbroadcastmanager_localbroadcastmanager.ve\xd | 63 | Name:·META-INF/androidx.localbroadcastmanager_localbroadcastmanager.ve\xd |
67 | ·rsion\xd | 64 | ·rsion\xd |
68 | SHA-256-Digest:·Ua5RxiDB4TdUci9QAk3UBejMqS9NqnpqdjW2scAbY8A=\xd | 65 | SHA-256-Digest:·Ua5RxiDB4TdUci9QAk3UBejMqS9NqnpqdjW2scAbY8A=\xd |
69 | \xd | 66 | \xd |
70 | Name:·META-INF/androidx.media_media.version\xd | 67 | Name:·META-INF/androidx.media_media.version\xd |
71 | SHA-256-Digest:· | 68 | SHA-256-Digest:·puyV2P3sklzCsHEkawgY2Culd01AANdJCN2QquNeAOo=\xd |
72 | \xd | 69 | \xd |
73 | Name:·META-INF/androidx.print_print.version\xd | 70 | Name:·META-INF/androidx.print_print.version\xd |
74 | SHA-256-Digest:·wVwueMje4MuWGduylY6MPUJVWRbNN5syBnZiEg6rKdA=\xd | 71 | SHA-256-Digest:·wVwueMje4MuWGduylY6MPUJVWRbNN5syBnZiEg6rKdA=\xd |
75 | \xd | 72 | \xd |
76 | Name:·META-INF/androidx.savedstate_savedstate.version\xd | 73 | Name:·META-INF/androidx.savedstate_savedstate.version\xd |
77 | SHA-256-Digest:·wVwueMje4MuWGduylY6MPUJVWRbNN5syBnZiEg6rKdA=\xd | 74 | SHA-256-Digest:·wVwueMje4MuWGduylY6MPUJVWRbNN5syBnZiEg6rKdA=\xd |
78 | \xd | 75 | \xd |
79 | Name:·META-INF/androidx.slidingpanelayout_slidingpanelayout.version\xd | 76 | Name:·META-INF/androidx.slidingpanelayout_slidingpanelayout.version\xd |
80 | SHA-256-Digest:·aJlh2UWnR9mF5VrFLvT9RD0XE8NHATPXftk/CscN5/o=\xd | 77 | SHA-256-Digest:·aJlh2UWnR9mF5VrFLvT9RD0XE8NHATPXftk/CscN5/o=\xd |
81 | \xd | 78 | \xd |
82 | Name:·META-INF/androidx.swiperefreshlayout_swiperefreshlayout.version\xd | 79 | Name:·META-INF/androidx.swiperefreshlayout_swiperefreshlayout.version\xd |
83 | SHA-256-Digest:· | 80 | SHA-256-Digest:·F6hVbqRJHIxw/VqsUfUA+FNau1B74tT8Ks6fJyJrzSo=\xd |
84 | \xd | 81 | \xd |
85 | Name:·META-INF/androidx.versionedparcelable_versionedparcelable.versio\xd | 82 | Name:·META-INF/androidx.versionedparcelable_versionedparcelable.versio\xd |
86 | ·n\xd | 83 | ·n\xd |
87 | SHA-256-Digest:·aJlh2UWnR9mF5VrFLvT9RD0XE8NHATPXftk/CscN5/o=\xd | 84 | SHA-256-Digest:·aJlh2UWnR9mF5VrFLvT9RD0XE8NHATPXftk/CscN5/o=\xd |
88 | \xd | 85 | \xd |
89 | Name:·META-INF/androidx.viewpager_viewpager.version\xd | 86 | Name:·META-INF/androidx.viewpager_viewpager.version\xd |
90 | SHA-256-Digest:·wVwueMje4MuWGduylY6MPUJVWRbNN5syBnZiEg6rKdA=\xd | 87 | SHA-256-Digest:·wVwueMje4MuWGduylY6MPUJVWRbNN5syBnZiEg6rKdA=\xd |
91 | \xd | 88 | \xd |
92 | Name:·META-INF/annotation-experimental_release.kotlin_module\xd | ||
93 | SHA-256-Digest:·1VYR/uIXmulM4hZHzcR58oTO9aNUv2LQzJIQuSaFTZc=\xd | ||
94 | \xd | ||
95 | Name:·META-INF/proguard/androidx-annotations.pro\xd | 89 | Name:·META-INF/proguard/androidx-annotations.pro\xd |
96 | SHA-256-Digest:·M/eLd9AzF+l12cP2AYORDIyrIrDy2h+TQrjFnXW8IP8=\xd | 90 | SHA-256-Digest:·M/eLd9AzF+l12cP2AYORDIyrIrDy2h+TQrjFnXW8IP8=\xd |
97 | \xd | 91 | \xd |
98 | Name:·assets/NOTICE.html.gz\xd | ||
99 | SHA-256-Digest:·NFqAeDV1eV4zB1iKkbY2K51oLtLAsx+B3z3xbniRDHo=\xd | ||
100 | \xd | ||
101 | Name:·classes.dex\xd | 92 | Name:·classes.dex\xd |
102 | SHA-256-Digest:· | 93 | SHA-256-Digest:·b/b/HkoJ9W8/WPQVBASYT+rOoGBYQP/wgt0F6kyCXoE=\xd |
103 | \xd | 94 | \xd |
104 | Name:·res/anim-v21/fragment_fast_out_extra_slow_in.xml\xd | 95 | Name:·res/anim-v21/fragment_fast_out_extra_slow_in.xml\xd |
105 | SHA-256-Digest:·I2mH6G9DBPQCAwkhrZOzHoryzGmfPlTv1iKPr1LEqnY=\xd | 96 | SHA-256-Digest:·I2mH6G9DBPQCAwkhrZOzHoryzGmfPlTv1iKPr1LEqnY=\xd |
106 | \xd | 97 | \xd |
107 | Name:·res/anim/fragment_close_enter.xml\xd | 98 | Name:·res/anim/fragment_close_enter.xml\xd |
108 | SHA-256-Digest:·cnnjmIh0RI20b2sdQmQUSeiaZDvc96rBqNlbu+4U9yg=\xd | 99 | SHA-256-Digest:·cnnjmIh0RI20b2sdQmQUSeiaZDvc96rBqNlbu+4U9yg=\xd |
109 | \xd | 100 | \xd |
Offset 233, 12 lines modified | Offset 224, 9 lines modified | ||
233 | Name:·res/layout/osu_web_view.xml\xd | 224 | Name:·res/layout/osu_web_view.xml\xd |
234 | SHA-256-Digest:·c+edRhG+Dbkpfuhbfn4lY36FGr5g6u7a16tl8KCOU40=\xd | 225 | SHA-256-Digest:·c+edRhG+Dbkpfuhbfn4lY36FGr5g6u7a16tl8KCOU40=\xd |
235 | \xd | 226 | \xd |
236 | Name:·res/xml/network_security_config.xml\xd | 227 | Name:·res/xml/network_security_config.xml\xd |
237 | SHA-256-Digest:·PgVIwFDXfVtWeb9sAmvDG8mOlTg6AUyoZYpu/3VfWfY=\xd | 228 | SHA-256-Digest:·PgVIwFDXfVtWeb9sAmvDG8mOlTg6AUyoZYpu/3VfWfY=\xd |
238 | \xd | 229 | \xd |
239 | Name:·resources.arsc\xd | 230 | Name:·resources.arsc\xd |
240 | SHA-256-Digest:· | 231 | SHA-256-Digest:·X3g020yoUxpJxj8wIxfcf+KxWBD4qGyfE8H0DXInyYI=\xd |
241 | \xd | ||
242 | Name:·stamp-cert-sha256\xd | ||
243 | SHA-256-Digest:·HZwqAqk4Fv9ceuZPmq0Cwj3kncUUYg2xp61iTSqDZ5w=\xd | ||
244 | \xd | 232 | \xd |
Offset 1, 1 lines modified | Offset 1, 1 lines modified | ||
1 | 2.3.0-alpha0 | 1 | 2.3.0-alpha05 |
Offset 1, 1 lines modified | Offset 1, 1 lines modified | ||
1 | 1.3.0-alpha0 | 1 | 1.3.0-alpha07 |
Offset 1, 1 lines modified | Offset 1, 1 lines modified | ||
1 | 1.2.0-alpha0 | 1 | 1.2.0-alpha07 |
Offset 1, 1 lines modified | Offset 1, 1 lines modified | ||
1 | 1.2.0- | 1 | 1.2.0-alpha04 |
Offset 1, 111 lines modified | Offset 1, 102 lines modified | ||
1 | Signature-Version:·1.0\xd | 1 | Signature-Version:·1.0\xd |
2 | Created-By:·1.0·(Android·SignApk)\xd | 2 | Created-By:·1.0·(Android·SignApk)\xd |
3 | SHA-256-Digest-Manifest:· | 3 | SHA-256-Digest-Manifest:·0ZjbR75OLiHIx6Gci9VvE4NGeHsCUxGGxTfUroN7/So=\xd |
4 | X-Android-APK-Signed:·2,·3\xd | 4 | X-Android-APK-Signed:·2,·3\xd |
5 | \xd | 5 | \xd |
6 | Name:·AndroidManifest.xml\xd | 6 | Name:·AndroidManifest.xml\xd |
7 | SHA-256-Digest:· | 7 | SHA-256-Digest:·/Kh2lEsrgPvuVu4NTKlN0Vonoz70UEO6hOP+QpJ7h3Y=\xd |
8 | \xd | 8 | \xd |
9 | Name:·META-INF/androidx.activity_activity.version\xd | 9 | Name:·META-INF/androidx.activity_activity.version\xd |
10 | SHA-256-Digest:· | 10 | SHA-256-Digest:·AQ3Pd00eOa/ToZfN1dppTDwv3ByVeOmdQMPQvJ0OEVc=\xd |
11 | \xd | ||
12 | Name:·META-INF/androidx.annotation_annotation-experimental.version\xd | ||
13 | SHA-256-Digest:·9parLIAwJ1u8VYbo0ysLxgIw2UxvdBTRbqKeWBjNZgI=\xd | ||
14 | \xd | 11 | \xd |
15 | Name:·META-INF/androidx.arch.core_core-runtime.version\xd | 12 | Name:·META-INF/androidx.arch.core_core-runtime.version\xd |
16 | SHA-256-Digest:·tYyn5dB58gBNXy2LVbjREtp2J39iyiJ1CCjJ/3hfnvc=\xd | 13 | SHA-256-Digest:·tYyn5dB58gBNXy2LVbjREtp2J39iyiJ1CCjJ/3hfnvc=\xd |
17 | \xd | 14 | \xd |
18 | Name:·META-INF/androidx.asynclayoutinflater_asynclayoutinflater.versio\xd | 15 | Name:·META-INF/androidx.asynclayoutinflater_asynclayoutinflater.versio\xd |
19 | ·n\xd | 16 | ·n\xd |
20 | SHA-256-Digest:·X4QJPySkU8LCWf0z0COiYr/KyiSNwyhQ/7tWo2z7lwM=\xd | 17 | SHA-256-Digest:·X4QJPySkU8LCWf0z0COiYr/KyiSNwyhQ/7tWo2z7lwM=\xd |
21 | \xd | 18 | \xd |
22 | Name:·META-INF/androidx.coordinatorlayout_coordinatorlayout.version\xd | 19 | Name:·META-INF/androidx.coordinatorlayout_coordinatorlayout.version\xd |
23 | SHA-256-Digest:·RHMXjfHxNdRFUkuaOKf8l7Aaowp5eY9ZWR7fOCRBUAQ=\xd | 20 | SHA-256-Digest:·RHMXjfHxNdRFUkuaOKf8l7Aaowp5eY9ZWR7fOCRBUAQ=\xd |
24 | \xd | 21 | \xd |
25 | Name:·META-INF/androidx.core_core.version\xd | 22 | Name:·META-INF/androidx.core_core.version\xd |
26 | SHA-256-Digest:·e | 23 | SHA-256-Digest:·eZYy2V9c1pJlOBf633V/82V7u9iZ7JWx/rDpL/L/4Zg=\xd |
27 | \xd | 24 | \xd |
28 | Name:·META-INF/androidx.cursoradapter_cursoradapter.version\xd | 25 | Name:·META-INF/androidx.cursoradapter_cursoradapter.version\xd |
29 | SHA-256-Digest:·3z6UXvm/okqitWWlGp6ptaqS7h0Vwd9KXOl1bSvKiLI=\xd | 26 | SHA-256-Digest:·3z6UXvm/okqitWWlGp6ptaqS7h0Vwd9KXOl1bSvKiLI=\xd |
30 | \xd | 27 | \xd |
31 | Name:·META-INF/androidx.customview_customview.version\xd | 28 | Name:·META-INF/androidx.customview_customview.version\xd |
32 | SHA-256-Digest:·8tIQ2umyX2bWXEb5/j9hEci0+hyozguhj4vZXdw/bG8=\xd | 29 | SHA-256-Digest:·8tIQ2umyX2bWXEb5/j9hEci0+hyozguhj4vZXdw/bG8=\xd |
33 | \xd | 30 | \xd |
34 | Name:·META-INF/androidx.documentfile_documentfile.version\xd | 31 | Name:·META-INF/androidx.documentfile_documentfile.version\xd |
35 | SHA-256-Digest:·rOIZzs78YTTEeuy98WintGwE58BqF5KSzALrFoJiH2c=\xd | 32 | SHA-256-Digest:·rOIZzs78YTTEeuy98WintGwE58BqF5KSzALrFoJiH2c=\xd |
36 | \xd | 33 | \xd |
37 | Name:·META-INF/androidx.drawerlayout_drawerlayout.version\xd | 34 | Name:·META-INF/androidx.drawerlayout_drawerlayout.version\xd |
38 | SHA-256-Digest:·6j1KRHXYyQprOSjrf7DfuHz/e8bdEA0Ta1vwa6wkY54=\xd | 35 | SHA-256-Digest:·6j1KRHXYyQprOSjrf7DfuHz/e8bdEA0Ta1vwa6wkY54=\xd |
39 | \xd | 36 | \xd |
40 | Name:·META-INF/androidx.fragment_fragment.version\xd | 37 | Name:·META-INF/androidx.fragment_fragment.version\xd |
41 | SHA-256-Digest:· | 38 | SHA-256-Digest:·R7RygS2x9jiLprY1gnuRtMN8b2GdMydOONptW12WOVA=\xd |
42 | \xd | 39 | \xd |
43 | Name:·META-INF/androidx.interpolator_interpolator.version\xd | 40 | Name:·META-INF/androidx.interpolator_interpolator.version\xd |
44 | SHA-256-Digest:·ZqUR4cfK5ndpAQfb2aipyNfGV5kqOkN2XJme9Eh+NZg=\xd | 41 | SHA-256-Digest:·ZqUR4cfK5ndpAQfb2aipyNfGV5kqOkN2XJme9Eh+NZg=\xd |
45 | \xd | 42 | \xd |
46 | Name:·META-INF/androidx.legacy_legacy-support-core-ui.version\xd | 43 | Name:·META-INF/androidx.legacy_legacy-support-core-ui.version\xd |
47 | SHA-256-Digest:·f865kgqkv6JYv1OS8YbtBtbzyLZYIF39vXKKdPBC5aw=\xd | 44 | SHA-256-Digest:·f865kgqkv6JYv1OS8YbtBtbzyLZYIF39vXKKdPBC5aw=\xd |
48 | \xd | 45 | \xd |
49 | Name:·META-INF/androidx.legacy_legacy-support-core-utils.version\xd | 46 | Name:·META-INF/androidx.legacy_legacy-support-core-utils.version\xd |
50 | SHA-256-Digest:·e9qeY5GI1di3uJfxBte4mtQFfRh8ZmD7qQJsXiLIKg4=\xd | 47 | SHA-256-Digest:·e9qeY5GI1di3uJfxBte4mtQFfRh8ZmD7qQJsXiLIKg4=\xd |
51 | \xd | 48 | \xd |
52 | Name:·META-INF/androidx.lifecycle_lifecycle-livedata-core.version\xd | 49 | Name:·META-INF/androidx.lifecycle_lifecycle-livedata-core.version\xd |
53 | SHA-256-Digest:· | 50 | SHA-256-Digest:·BNChvb560Na1CYrXFv2d2WhzEX86UyhtSJ+EH01sMQc=\xd |
54 | \xd | 51 | \xd |
55 | Name:·META-INF/androidx.lifecycle_lifecycle-runtime.version\xd | 52 | Name:·META-INF/androidx.lifecycle_lifecycle-runtime.version\xd |
56 | SHA-256-Digest:·H | 53 | SHA-256-Digest:·iHtCN8bKZxv73Bc6ZCnXKSjaSXHufVLEQW42EPxkzZ8=\xd |
57 | \xd | 54 | \xd |
58 | Name:·META-INF/androidx.lifecycle_lifecycle-viewmodel-savedstate.versi\xd | 55 | Name:·META-INF/androidx.lifecycle_lifecycle-viewmodel-savedstate.versi\xd |
59 | ·on\xd | 56 | ·on\xd |
60 | SHA-256-Digest:· | 57 | SHA-256-Digest:·ZMTmVQbpsnuZo4EI3PW9cxrr1Ys+EK7ioDjmt0gLq0A=\xd |
61 | \xd | 58 | \xd |
62 | Name:·META-INF/androidx.lifecycle_lifecycle-viewmodel.version\xd | 59 | Name:·META-INF/androidx.lifecycle_lifecycle-viewmodel.version\xd |
63 | SHA-256-Digest:· | 60 | SHA-256-Digest:·GKIHW7CJgSodz4UMNwKza3QmP/8Fpbq3YDUvX0kGHV4=\xd |
64 | \xd | 61 | \xd |
65 | Name:·META-INF/androidx.loader_loader.version\xd | 62 | Name:·META-INF/androidx.loader_loader.version\xd |
66 | SHA-256-Digest:·xTKeVhxxbQLz/qYvZNCYtHC2wZ/jN10xk3RUG6iydZY=\xd | 63 | SHA-256-Digest:·xTKeVhxxbQLz/qYvZNCYtHC2wZ/jN10xk3RUG6iydZY=\xd |
67 | \xd | 64 | \xd |
68 | Name:·META-INF/androidx.localbroadcastmanager_localbroadcastmanager.ve\xd | 65 | Name:·META-INF/androidx.localbroadcastmanager_localbroadcastmanager.ve\xd |
69 | ·rsion\xd | 66 | ·rsion\xd |
70 | SHA-256-Digest:·5EkwoOuXWbMuuLdcvlvCyqFhKv5nP8k1z64vr5C6VRo=\xd | 67 | SHA-256-Digest:·5EkwoOuXWbMuuLdcvlvCyqFhKv5nP8k1z64vr5C6VRo=\xd |
71 | \xd | 68 | \xd |
72 | Name:·META-INF/androidx.media_media.version\xd | 69 | Name:·META-INF/androidx.media_media.version\xd |
73 | SHA-256-Digest:· | 70 | SHA-256-Digest:·hO+mmj27I4nd9v5Tg7EEjFfrm3/2z1iMAHCoctpW3kY=\xd |
74 | \xd | 71 | \xd |
75 | Name:·META-INF/androidx.print_print.version\xd | 72 | Name:·META-INF/androidx.print_print.version\xd |
76 | SHA-256-Digest:·yTI5+YtvD18r6fIv+/ZwKnzMLdL8jgdbmkMGGZNaoy0=\xd | 73 | SHA-256-Digest:·yTI5+YtvD18r6fIv+/ZwKnzMLdL8jgdbmkMGGZNaoy0=\xd |
77 | \xd | 74 | \xd |
78 | Name:·META-INF/androidx.savedstate_savedstate.version\xd | 75 | Name:·META-INF/androidx.savedstate_savedstate.version\xd |
79 | SHA-256-Digest:·uGrcbOZM4m9Pwo3csWUcqfjo1ArKog/+lLExflCX3S4=\xd | 76 | SHA-256-Digest:·uGrcbOZM4m9Pwo3csWUcqfjo1ArKog/+lLExflCX3S4=\xd |
80 | \xd | 77 | \xd |
81 | Name:·META-INF/androidx.slidingpanelayout_slidingpanelayout.version\xd | 78 | Name:·META-INF/androidx.slidingpanelayout_slidingpanelayout.version\xd |
82 | SHA-256-Digest:·BUEngmvfeQE0Qn7ihBWlij41meziTd7uxmqhbPS5+E4=\xd | 79 | SHA-256-Digest:·BUEngmvfeQE0Qn7ihBWlij41meziTd7uxmqhbPS5+E4=\xd |
83 | \xd | 80 | \xd |
84 | Name:·META-INF/androidx.swiperefreshlayout_swiperefreshlayout.version\xd | 81 | Name:·META-INF/androidx.swiperefreshlayout_swiperefreshlayout.version\xd |
85 | SHA-256-Digest:· | 82 | SHA-256-Digest:·3rpYBpvWrUIAKGdtTr7sOwYTS+j7VHg89DvMovhjCcY=\xd |
86 | \xd | 83 | \xd |
87 | Name:·META-INF/androidx.versionedparcelable_versionedparcelable.versio\xd | 84 | Name:·META-INF/androidx.versionedparcelable_versionedparcelable.versio\xd |
88 | ·n\xd | 85 | ·n\xd |
89 | SHA-256-Digest:·T5Z0gTL2PbLukt/Dq7cCVO3DkUfGObE2MTNlPc3T8UQ=\xd | 86 | SHA-256-Digest:·T5Z0gTL2PbLukt/Dq7cCVO3DkUfGObE2MTNlPc3T8UQ=\xd |
90 | \xd | 87 | \xd |
91 | Name:·META-INF/androidx.viewpager_viewpager.version\xd | 88 | Name:·META-INF/androidx.viewpager_viewpager.version\xd |
92 | SHA-256-Digest:·mXZnQ9FaOiO1QhYONAVDHj4k5AgBLDByoIrjA8x1qtg=\xd | 89 | SHA-256-Digest:·mXZnQ9FaOiO1QhYONAVDHj4k5AgBLDByoIrjA8x1qtg=\xd |
93 | \xd | 90 | \xd |
94 | Name:·META-INF/annotation-experimental_release.kotlin_module\xd | ||
95 | SHA-256-Digest:·Z/hKlVw1feaYoG2MbDyKnZvTM9IQYafToAk7Dthn/aQ=\xd | ||
96 | \xd | ||
97 | Name:·META-INF/proguard/androidx-annotations.pro\xd | 91 | Name:·META-INF/proguard/androidx-annotations.pro\xd |
98 | SHA-256-Digest:·z4VPeB3xyX+1oqubmSAZIacjNrmoTsLyFuu+ubl7+m4=\xd | 92 | SHA-256-Digest:·z4VPeB3xyX+1oqubmSAZIacjNrmoTsLyFuu+ubl7+m4=\xd |
99 | \xd | 93 | \xd |
100 | Name:·assets/NOTICE.html.gz\xd | ||
101 | SHA-256-Digest:·VDlkbPHO804re1e62W3TQ1lcA1xJ4gWhD8AVZob0j/Y=\xd | ||
102 | \xd | ||
103 | Name:·classes.dex\xd | 94 | Name:·classes.dex\xd |
104 | SHA-256-Digest:· | 95 | SHA-256-Digest:·XyQsGpAxMYHYSxso4rUNgQWjyPYpUlIP3O9XtR7p8S4=\xd |
105 | \xd | 96 | \xd |
106 | Name:·res/anim-v21/fragment_fast_out_extra_slow_in.xml\xd | 97 | Name:·res/anim-v21/fragment_fast_out_extra_slow_in.xml\xd |
107 | SHA-256-Digest:·Rw5L5YmiyI39wrLraJFEMIg+GM/gEUozJv3cZ98ln2U=\xd | 98 | SHA-256-Digest:·Rw5L5YmiyI39wrLraJFEMIg+GM/gEUozJv3cZ98ln2U=\xd |
108 | \xd | 99 | \xd |
109 | Name:·res/anim/fragment_close_enter.xml\xd | 100 | Name:·res/anim/fragment_close_enter.xml\xd |
110 | SHA-256-Digest:·rm0C3Yl3nUSWYxFZOsNmCIhd8FAS7M0kEOy2aoaiEes=\xd | 101 | SHA-256-Digest:·rm0C3Yl3nUSWYxFZOsNmCIhd8FAS7M0kEOy2aoaiEes=\xd |
111 | \xd | 102 | \xd |
Offset 235, 12 lines modified | Offset 226, 9 lines modified | ||
235 | Name:·res/layout/osu_web_view.xml\xd | 226 | Name:·res/layout/osu_web_view.xml\xd |
236 | SHA-256-Digest:·jj8h/V9OMFX+v95YYdU86qTdsTVx6ViDKPSg/sk4VDU=\xd | 227 | SHA-256-Digest:·jj8h/V9OMFX+v95YYdU86qTdsTVx6ViDKPSg/sk4VDU=\xd |
237 | \xd | 228 | \xd |
238 | Name:·res/xml/network_security_config.xml\xd | 229 | Name:·res/xml/network_security_config.xml\xd |
239 | SHA-256-Digest:·vT7Xxi2qJezzwgH1Dam2RnLfkmNnmP/B+tZowXZBJqw=\xd | 230 | SHA-256-Digest:·vT7Xxi2qJezzwgH1Dam2RnLfkmNnmP/B+tZowXZBJqw=\xd |
240 | \xd | 231 | \xd |
241 | Name:·resources.arsc\xd | 232 | Name:·resources.arsc\xd |
242 | SHA-256-Digest:· | 233 | SHA-256-Digest:·YHehjk4wNw8iHDiwe7wqnytcbLaYarsI9lL1GdIgwP0=\xd |
243 | \xd | ||
244 | Name:·stamp-cert-sha256\xd | ||
245 | SHA-256-Digest:·L0p4Bm/NGffFWX26fUKi8jlq3aKsfwyEBtSavY6F0c0=\xd | ||
246 | \xd | 234 | \xd |
Offset 1, 1 lines modified | Offset 1, 1 lines modified | ||
1 | 2.3.0-alpha0 | 1 | 2.3.0-alpha05 |
Offset 1, 1 lines modified | Offset 1, 1 lines modified | ||
1 | 2.3.0-alpha0 | 1 | 2.3.0-alpha05 |
Offset 1, 1 lines modified | Offset 1, 1 lines modified | ||
1 | 1.5.0-alpha0 | 1 | 1.5.0-alpha01 |
Offset 1, 1 lines modified | Offset 1, 1 lines modified | ||
1 | 1. | 1 | 1.1.0-rc01 |
Offset 1, 8 lines modified | Offset 1, 8 lines modified | ||
1 | ··Size:· | 1 | ··Size:·236890····» Blocks:·464········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:·6 | 1 | Zip·file·size:·679222·bytes,·number·of·entries:·2 |
2 | -rw----·····2.0·fat···6 | 2 | -rw----·····2.0·fat···678936·b-·stor·08-Jan-01·00:00·classes.dex |
3 | -rw----·····2.0·fat·······45·b-·defN·08-Jan-01·00:00·META-INF/MANIFEST.MF | 3 | -rw----·····2.0·fat·······45·b-·defN·08-Jan-01·00:00·META-INF/MANIFEST.MF |
4 | 2·files,·6 | 4 | 2·files,·678981·bytes·uncompressed,·678983·bytes·compressed:··0.0% |
Offset 1, 8 lines modified | Offset 1, 8 lines modified | ||
1 | Zip·file·size:·91 | 1 | Zip·file·size:·910349·bytes,·number·of·entries:·527 |
2 | ?rwxrwxr-x··2.0·unx······462·b-·stor·80-Jan-01·00:00·android/net/wifi/-$$Lambda$Gsf5KUGneXzqwdBsuVbe0aqUmdQ.class | 2 | ?rwxrwxr-x··2.0·unx······462·b-·stor·80-Jan-01·00:00·android/net/wifi/-$$Lambda$Gsf5KUGneXzqwdBsuVbe0aqUmdQ.class |
3 | ?rwxrwxr-x··2.0·unx······436·b-·stor·80-Jan-01·00:00·android/net/wifi/-$$Lambda$O5kkps4d9X9Xr5DI8L3NlcZliu8.class | 3 | ?rwxrwxr-x··2.0·unx······436·b-·stor·80-Jan-01·00:00·android/net/wifi/-$$Lambda$O5kkps4d9X9Xr5DI8L3NlcZliu8.class |
4 | ?rwxrwxr-x··2.0·unx······729·b-·stor·80-Jan-01·00:00·android/net/wifi/-$$Lambda$WifiFrameworkInitializer$K4DpGPGObWI293pmRTuiEj5r-DE.class | 4 | ?rwxrwxr-x··2.0·unx······729·b-·stor·80-Jan-01·00:00·android/net/wifi/-$$Lambda$WifiFrameworkInitializer$K4DpGPGObWI293pmRTuiEj5r-DE.class |
5 | ?rwxrwxr-x··2.0·unx······690·b-·stor·80-Jan-01·00:00·android/net/wifi/-$$Lambda$WifiFrameworkInitializer$NhRsE1V-xfIYpVcOvGhb_9LK1o4.class | 5 | ?rwxrwxr-x··2.0·unx······690·b-·stor·80-Jan-01·00:00·android/net/wifi/-$$Lambda$WifiFrameworkInitializer$NhRsE1V-xfIYpVcOvGhb_9LK1o4.class |
6 | ?rwxrwxr-x··2.0·unx······679·b-·stor·80-Jan-01·00:00·android/net/wifi/-$$Lambda$WifiFrameworkInitializer$evN9sVM7TGOwMVxoJTGBCfu_880.class | 6 | ?rwxrwxr-x··2.0·unx······679·b-·stor·80-Jan-01·00:00·android/net/wifi/-$$Lambda$WifiFrameworkInitializer$evN9sVM7TGOwMVxoJTGBCfu_880.class |
7 | ?rwxrwxr-x··2.0·unx······729·b-·stor·80-Jan-01·00:00·android/net/wifi/-$$Lambda$WifiFrameworkInitializer$qxuZsnr_-ppKI2ad2pa3htyx2u0.class | 7 | ?rwxrwxr-x··2.0·unx······729·b-·stor·80-Jan-01·00:00·android/net/wifi/-$$Lambda$WifiFrameworkInitializer$qxuZsnr_-ppKI2ad2pa3htyx2u0.class |
8 | ?rwxrwxr-x··2.0·unx······736·b-·stor·80-Jan-01·00:00·android/net/wifi/-$$Lambda$WifiFrameworkInitializer$x3Vn05kArEY-A6R4yC4wjkP7XRY.class | 8 | ?rwxrwxr-x··2.0·unx······736·b-·stor·80-Jan-01·00:00·android/net/wifi/-$$Lambda$WifiFrameworkInitializer$x3Vn05kArEY-A6R4yC4wjkP7XRY.class |
Offset 89, 15 lines modified | Offset 89, 15 lines modified | ||
89 | ?rwxrwxr-x··2.0·unx······865·b-·stor·80-Jan-01·00:00·android/net/wifi/ScanResult$RadioChainInfo.class | 89 | ?rwxrwxr-x··2.0·unx······865·b-·stor·80-Jan-01·00:00·android/net/wifi/ScanResult$RadioChainInfo.class |
90 | ?rwxrwxr-x··2.0·unx·····9323·b-·stor·80-Jan-01·00:00·android/net/wifi/ScanResult.class | 90 | ?rwxrwxr-x··2.0·unx·····9323·b-·stor·80-Jan-01·00:00·android/net/wifi/ScanResult.class |
91 | ?rwxrwxr-x··2.0·unx······756·b-·stor·80-Jan-01·00:00·android/net/wifi/SoftApCapability$1.class | 91 | ?rwxrwxr-x··2.0·unx······756·b-·stor·80-Jan-01·00:00·android/net/wifi/SoftApCapability$1.class |
92 | ?rwxrwxr-x··2.0·unx······140·b-·stor·80-Jan-01·00:00·android/net/wifi/SoftApCapability$HotspotFeatures.class | 92 | ?rwxrwxr-x··2.0·unx······140·b-·stor·80-Jan-01·00:00·android/net/wifi/SoftApCapability$HotspotFeatures.class |
93 | ?rwxrwxr-x··2.0·unx·····2013·b-·stor·80-Jan-01·00:00·android/net/wifi/SoftApCapability.class | 93 | ?rwxrwxr-x··2.0·unx·····2013·b-·stor·80-Jan-01·00:00·android/net/wifi/SoftApCapability.class |
94 | ?rwxrwxr-x··2.0·unx·····1361·b-·stor·80-Jan-01·00:00·android/net/wifi/SoftApConfiguration$1.class | 94 | ?rwxrwxr-x··2.0·unx·····1361·b-·stor·80-Jan-01·00:00·android/net/wifi/SoftApConfiguration$1.class |
95 | ?rwxrwxr-x··2.0·unx······136·b-·stor·80-Jan-01·00:00·android/net/wifi/SoftApConfiguration$BandType.class | 95 | ?rwxrwxr-x··2.0·unx······136·b-·stor·80-Jan-01·00:00·android/net/wifi/SoftApConfiguration$BandType.class |
96 | ?rwxrwxr-x··2.0·unx····· | 96 | ?rwxrwxr-x··2.0·unx·····5025·b-·stor·80-Jan-01·00:00·android/net/wifi/SoftApConfiguration$Builder.class |
97 | ?rwxrwxr-x··2.0·unx······140·b-·stor·80-Jan-01·00:00·android/net/wifi/SoftApConfiguration$SecurityType.class | 97 | ?rwxrwxr-x··2.0·unx······140·b-·stor·80-Jan-01·00:00·android/net/wifi/SoftApConfiguration$SecurityType.class |
98 | ?rwxrwxr-x··2.0·unx·····7275·b-·stor·80-Jan-01·00:00·android/net/wifi/SoftApConfiguration.class | 98 | ?rwxrwxr-x··2.0·unx·····7275·b-·stor·80-Jan-01·00:00·android/net/wifi/SoftApConfiguration.class |
99 | ?rwxrwxr-x··2.0·unx······709·b-·stor·80-Jan-01·00:00·android/net/wifi/SoftApInfo$1.class | 99 | ?rwxrwxr-x··2.0·unx······709·b-·stor·80-Jan-01·00:00·android/net/wifi/SoftApInfo$1.class |
100 | ?rwxrwxr-x··2.0·unx·····2038·b-·stor·80-Jan-01·00:00·android/net/wifi/SoftApInfo.class | 100 | ?rwxrwxr-x··2.0·unx·····2038·b-·stor·80-Jan-01·00:00·android/net/wifi/SoftApInfo.class |
101 | ?rwxrwxr-x··2.0·unx······715·b-·stor·80-Jan-01·00:00·android/net/wifi/SupplicantState$1.class | 101 | ?rwxrwxr-x··2.0·unx······715·b-·stor·80-Jan-01·00:00·android/net/wifi/SupplicantState$1.class |
102 | ?rwxrwxr-x··2.0·unx·····1532·b-·stor·80-Jan-01·00:00·android/net/wifi/SupplicantState$2.class | 102 | ?rwxrwxr-x··2.0·unx·····1532·b-·stor·80-Jan-01·00:00·android/net/wifi/SupplicantState$2.class |
103 | ?rwxrwxr-x··2.0·unx·····2669·b-·stor·80-Jan-01·00:00·android/net/wifi/SupplicantState.class | 103 | ?rwxrwxr-x··2.0·unx·····2669·b-·stor·80-Jan-01·00:00·android/net/wifi/SupplicantState.class |
Offset 130, 15 lines modified | Offset 130, 15 lines modified | ||
130 | ?rwxrwxr-x··2.0·unx······544·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiConfiguration$PairwiseCipher.class | 130 | ?rwxrwxr-x··2.0·unx······544·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiConfiguration$PairwiseCipher.class |
131 | ?rwxrwxr-x··2.0·unx······494·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiConfiguration$Protocol.class | 131 | ?rwxrwxr-x··2.0·unx······494·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiConfiguration$Protocol.class |
132 | ?rwxrwxr-x··2.0·unx······453·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiConfiguration$RecentFailure.class | 132 | ?rwxrwxr-x··2.0·unx······453·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiConfiguration$RecentFailure.class |
133 | ?rwxrwxr-x··2.0·unx······145·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiConfiguration$RecentFailureReason.class | 133 | ?rwxrwxr-x··2.0·unx······145·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiConfiguration$RecentFailureReason.class |
134 | ?rwxrwxr-x··2.0·unx······138·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiConfiguration$SecurityType.class | 134 | ?rwxrwxr-x··2.0·unx······138·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiConfiguration$SecurityType.class |
135 | ?rwxrwxr-x··2.0·unx······441·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiConfiguration$Status.class | 135 | ?rwxrwxr-x··2.0·unx······441·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiConfiguration$Status.class |
136 | ?rwxrwxr-x··2.0·unx······509·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiConfiguration$SuiteBCipher.class | 136 | ?rwxrwxr-x··2.0·unx······509·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiConfiguration$SuiteBCipher.class |
137 | ?rwxrwxr-x··2.0·unx····23 | 137 | ?rwxrwxr-x··2.0·unx····23467·b-·defN·80-Jan-01·00:00·android/net/wifi/WifiConfiguration.class |
138 | ?rwxrwxr-x··2.0·unx·····1753·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiEnterpriseConfig$1.class | 138 | ?rwxrwxr-x··2.0·unx·····1753·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiEnterpriseConfig$1.class |
139 | ?rwxrwxr-x··2.0·unx······681·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiEnterpriseConfig$Eap.class | 139 | ?rwxrwxr-x··2.0·unx······681·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiEnterpriseConfig$Eap.class |
140 | ?rwxrwxr-x··2.0·unx······133·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiEnterpriseConfig$Ocsp.class | 140 | ?rwxrwxr-x··2.0·unx······133·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiEnterpriseConfig$Ocsp.class |
141 | ?rwxrwxr-x··2.0·unx······714·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiEnterpriseConfig$Phase2.class | 141 | ?rwxrwxr-x··2.0·unx······714·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiEnterpriseConfig$Phase2.class |
142 | ?rwxrwxr-x··2.0·unx······167·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiEnterpriseConfig$SupplicantLoader.class | 142 | ?rwxrwxr-x··2.0·unx······167·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiEnterpriseConfig$SupplicantLoader.class |
143 | ?rwxrwxr-x··2.0·unx······167·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiEnterpriseConfig$SupplicantSaver.class | 143 | ?rwxrwxr-x··2.0·unx······167·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiEnterpriseConfig$SupplicantSaver.class |
144 | ?rwxrwxr-x··2.0·unx····16540·b-·defN·80-Jan-01·00:00·android/net/wifi/WifiEnterpriseConfig.class | 144 | ?rwxrwxr-x··2.0·unx····16540·b-·defN·80-Jan-01·00:00·android/net/wifi/WifiEnterpriseConfig.class |
Offset 412, 15 lines modified | Offset 412, 14 lines modified | ||
412 | ?rwxrwxr-x··2.0·unx·····1407·b-·stor·80-Jan-01·00:00·com/android/wifi/x/com/android/internal/util/Protocol.class | 412 | ?rwxrwxr-x··2.0·unx·····1407·b-·stor·80-Jan-01·00:00·com/android/wifi/x/com/android/internal/util/Protocol.class |
413 | ?rwxrwxr-x··2.0·unx······810·b-·stor·80-Jan-01·00:00·com/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader.class | 413 | ?rwxrwxr-x··2.0·unx······810·b-·stor·80-Jan-01·00:00·com/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader.class |
414 | ?rwxrwxr-x··2.0·unx·····3239·b-·stor·80-Jan-01·00:00·com/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord.class | 414 | ?rwxrwxr-x··2.0·unx·····3239·b-·stor·80-Jan-01·00:00·com/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord.class |
415 | ?rwxrwxr-x··2.0·unx······361·b-·stor·80-Jan-01·00:00·com/android/wifi/x/com/android/net/module/util/DnsPacket$ParseException.class | 415 | ?rwxrwxr-x··2.0·unx······361·b-·stor·80-Jan-01·00:00·com/android/wifi/x/com/android/net/module/util/DnsPacket$ParseException.class |
416 | ?rwxrwxr-x··2.0·unx·····1799·b-·stor·80-Jan-01·00:00·com/android/wifi/x/com/android/net/module/util/DnsPacket.class | 416 | ?rwxrwxr-x··2.0·unx·····1799·b-·stor·80-Jan-01·00:00·com/android/wifi/x/com/android/net/module/util/DnsPacket.class |
417 | ?rwxrwxr-x··2.0·unx·····1947·b-·stor·80-Jan-01·00:00·com/android/wifi/x/com/android/net/module/util/Inet4AddressUtils.class | 417 | ?rwxrwxr-x··2.0·unx·····1947·b-·stor·80-Jan-01·00:00·com/android/wifi/x/com/android/net/module/util/Inet4AddressUtils.class |
418 | ?rwxrwxr-x··2.0·unx······644·b-·stor·80-Jan-01·00:00·com/android/wifi/x/com/android/net/module/util/InetAddressUtils.class | 418 | ?rwxrwxr-x··2.0·unx······644·b-·stor·80-Jan-01·00:00·com/android/wifi/x/com/android/net/module/util/InetAddressUtils.class |
419 | ?rwxrwxr-x··2.0·unx·····2678·b-·stor·80-Jan-01·00:00·com/android/wifi/x/com/android/net/module/util/IpUtils.class | ||
420 | ?rwxrwxr-x··2.0·unx······344·b-·stor·80-Jan-01·00:00·android/net/wifi/IActionListener$Default.class | 419 | ?rwxrwxr-x··2.0·unx······344·b-·stor·80-Jan-01·00:00·android/net/wifi/IActionListener$Default.class |
421 | ?rwxrwxr-x··2.0·unx·····1265·b-·stor·80-Jan-01·00:00·android/net/wifi/IActionListener$Stub$Proxy.class | 420 | ?rwxrwxr-x··2.0·unx·····1265·b-·stor·80-Jan-01·00:00·android/net/wifi/IActionListener$Stub$Proxy.class |
422 | ?rwxrwxr-x··2.0·unx·····1591·b-·stor·80-Jan-01·00:00·android/net/wifi/IActionListener$Stub.class | 421 | ?rwxrwxr-x··2.0·unx·····1591·b-·stor·80-Jan-01·00:00·android/net/wifi/IActionListener$Stub.class |
423 | ?rwxrwxr-x··2.0·unx······476·b-·stor·80-Jan-01·00:00·android/net/wifi/IDppCallback$Default.class | 422 | ?rwxrwxr-x··2.0·unx······476·b-·stor·80-Jan-01·00:00·android/net/wifi/IDppCallback$Default.class |
424 | ?rwxrwxr-x··2.0·unx·····1836·b-·stor·80-Jan-01·00:00·android/net/wifi/IDppCallback$Stub$Proxy.class | 423 | ?rwxrwxr-x··2.0·unx·····1836·b-·stor·80-Jan-01·00:00·android/net/wifi/IDppCallback$Stub$Proxy.class |
425 | ?rwxrwxr-x··2.0·unx·····1958·b-·stor·80-Jan-01·00:00·android/net/wifi/IDppCallback$Stub.class | 424 | ?rwxrwxr-x··2.0·unx·····1958·b-·stor·80-Jan-01·00:00·android/net/wifi/IDppCallback$Stub.class |
426 | ?rwxrwxr-x··2.0·unx······467·b-·stor·80-Jan-01·00:00·android/net/wifi/ILocalOnlyHotspotCallback$Default.class | 425 | ?rwxrwxr-x··2.0·unx······467·b-·stor·80-Jan-01·00:00·android/net/wifi/ILocalOnlyHotspotCallback$Default.class |
Offset 523, 8 lines modified | Offset 522, 8 lines modified | ||
523 | ?rwxrwxr-x··2.0·unx·····1233·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiManager$SuggestionConnectionStatusListenerProxy.class | 522 | ?rwxrwxr-x··2.0·unx·····1233·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiManager$SuggestionConnectionStatusListenerProxy.class |
524 | ?rwxrwxr-x··2.0·unx·····1576·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiManager$TrafficStateCallbackProxy.class | 523 | ?rwxrwxr-x··2.0·unx·····1576·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiManager$TrafficStateCallbackProxy.class |
525 | ?rwxrwxr-x··2.0·unx·····2903·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy.class | 524 | ?rwxrwxr-x··2.0·unx·····2903·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy.class |
526 | ?rwxrwxr-x··2.0·unx······209·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiScanner$PnoScanListener.class | 525 | ?rwxrwxr-x··2.0·unx······209·b-·stor·80-Jan-01·00:00·android/net/wifi/WifiScanner$PnoScanListener.class |
527 | ?rwxrwxr-x··2.0·unx·····4791·b-·stor·80-Jan-01·00:00·android/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy.class | 526 | ?rwxrwxr-x··2.0·unx·····4791·b-·stor·80-Jan-01·00:00·android/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy.class |
528 | ?rwxrwxr-x··2.0·unx·····1869·b-·stor·80-Jan-01·00:00·android/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy.class | 527 | ?rwxrwxr-x··2.0·unx·····1869·b-·stor·80-Jan-01·00:00·android/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy.class |
529 | ?rwxrwxr-x··2.0·unx·····1317·b-·stor·80-Jan-01·00:00·android/net/wifi/rtt/WifiRttManager$1.class | 528 | ?rwxrwxr-x··2.0·unx·····1317·b-·stor·80-Jan-01·00:00·android/net/wifi/rtt/WifiRttManager$1.class |
530 | 52 | 529 | 527·files,·965654·bytes·uncompressed,·810057·bytes·compressed:··16.1% |
Offset 1245, 17 lines modified | Offset 1245, 14 lines modified | ||
1245 | Filename:·com/android/wifi/x/com/android/net/module/util/Inet4AddressUtils.class | 1245 | Filename:·com/android/wifi/x/com/android/net/module/util/Inet4AddressUtils.class |
1246 | Comment:· | 1246 | Comment:· |
1247 | Filename:·com/android/wifi/x/com/android/net/module/util/InetAddressUtils.class | 1247 | Filename:·com/android/wifi/x/com/android/net/module/util/InetAddressUtils.class |
1248 | Comment:· | 1248 | Comment:· |
1249 | Filename:·com/android/wifi/x/com/android/net/module/util/IpUtils.class | ||
1250 | Comment:· | ||
1251 | Filename:·android/net/wifi/IActionListener$Default.class | 1249 | Filename:·android/net/wifi/IActionListener$Default.class |
1252 | Comment:· | 1250 | Comment:· |
1253 | Filename:·android/net/wifi/IActionListener$Stub$Proxy.class | 1251 | Filename:·android/net/wifi/IActionListener$Stub$Proxy.class |
1254 | Comment:· | 1252 | Comment:· |
1255 | Filename:·android/net/wifi/IActionListener$Stub.class | 1253 | Filename:·android/net/wifi/IActionListener$Stub.class |
Offset 135, 14 lines modified | Offset 135, 17 lines modified | ||
135 | ········if·(mSecurityType·==·0)·{ | 135 | ········if·(mSecurityType·==·0)·{ |
136 | ············if·(mPassphrase·!=·null)·{ | 136 | ············if·(mPassphrase·!=·null)·{ |
137 | ················throw·new·IllegalArgumentException("passphrase·should·be·null·when·security·type·is·open"); | 137 | ················throw·new·IllegalArgumentException("passphrase·should·be·null·when·security·type·is·open"); |
138 | ············} | 138 | ············} |
139 | ········} | 139 | ········} |
140 | ········else·{ | 140 | ········else·{ |
141 | ············Preconditions.checkStringNotEmpty((CharSequence)mPassphrase); | 141 | ············Preconditions.checkStringNotEmpty((CharSequence)mPassphrase); |
142 | ············if·(!StandardCharsets.US_ASCII.newEncoder().canEncode(mPassphrase))·{ | ||
143 | ················throw·new·IllegalArgumentException("passphrase·not·ASCII·encodable"); | ||
144 | ············} | ||
142 | ············if·((mSecurityType·==·1·||·mSecurityType·==·2)·&&·(mPassphrase.length()·<·8·||·mPassphrase.length()·>·63))·{ | 145 | ············if·((mSecurityType·==·1·||·mSecurityType·==·2)·&&·(mPassphrase.length()·<·8·||·mPassphrase.length()·>·63))·{ |
143 | ················throw·new·IllegalArgumentException("Password·size·must·be·at·least·8·and·no·more·than·63·for·WPA2_PSK·and·WPA3_SAE_TRANSITION·Mode"); | 146 | ················throw·new·IllegalArgumentException("Password·size·must·be·at·least·8·and·no·more·than·63·for·WPA2_PSK·and·WPA3_SAE_TRANSITION·Mode"); |
144 | ············} | 147 | ············} |
145 | ········} | 148 | ········} |
146 | ········this.mSecurityType·=·mSecurityType; | 149 | ········this.mSecurityType·=·mSecurityType; |
147 | ········this.mPassphrase·=·mPassphrase; | 150 | ········this.mPassphrase·=·mPassphrase; |
148 | ········return·this; | 151 | ········return·this; |
Offset 346, 66 lines modified | Offset 346, 58 lines modified | ||
346 | ····public·int·describeContents()·{ | 346 | ····public·int·describeContents()·{ |
347 | ········return·0; | 347 | ········return·0; |
348 | ····} | 348 | ····} |
349 | ···· | 349 | ···· |
350 | ····public·int·getAuthType()·{ | 350 | ····public·int·getAuthType()·{ |
351 | ········final·int·cardinality·=·this.allowedKeyManagement.cardinality(); | 351 | ········final·int·cardinality·=·this.allowedKeyManagement.cardinality(); |
352 | ········final·int·n·=·1; | 352 | ········final·int·n·=·1; |
353 | ········final·int·n2·=·10; | ||
354 | ········final·int·n3·=·3; | ||
355 | ········final·int·n4·=·2; | ||
356 | ········if·(cardinality·>·n)·{ | 353 | ········if·(cardinality·>·n)·{ |
357 | ············ | 354 | ············throw·new·IllegalStateException("More·than·one·auth·type·set"); |
358 | ················if·(this.allowedKeyManagement.cardinality()·==·n4·&&·this.allowedKeyManagement.get(n3))·{ | ||
359 | ····················return·n4; | ||
360 | ················} | ||
361 | ················if·(this.allowedKeyManagement.cardinality()·==·n3·&&·this.allowedKeyManagement.get(n3)·&&·this.allowedKeyManagement.get(n2))·{ | ||
362 | ····················return·n2; | ||
363 | ················} | ||
364 | ············} | ||
365 | ············final·StringBuilder·sb·=·new·StringBuilder(); | ||
366 | ············sb.append("Invalid·auth·type·set:·"); | ||
367 | ············sb.append(this.allowedKeyManagement); | ||
368 | ············throw·new·IllegalStateException(sb.toString()); | ||
369 | ········} | 355 | ········} |
370 | ········if·(this.allowedKeyManagement.get(n))·{ | 356 | ········if·(this.allowedKeyManagement.get(n))·{ |
371 | ············return·n; | 357 | ············return·n; |
372 | ········} | 358 | ········} |
373 | ········final·BitSet·allowedKeyManagement·=·this.allowedKeyManagement; | 359 | ········final·BitSet·allowedKeyManagement·=·this.allowedKeyManagement; |
374 | ········final·int·n | 360 | ········final·int·n2·=·4; |
375 | ········if·(allowedKeyManagement.get(n | 361 | ········if·(allowedKeyManagement.get(n2))·{ |
376 | ············return·n | 362 | ············return·n2; |
363 | ········} | ||
364 | ········final·BitSet·allowedKeyManagement2·=·this.allowedKeyManagement; | ||
365 | ········final·int·n3·=·2; | ||
366 | ········if·(allowedKeyManagement2.get(n3))·{ | ||
367 | ············return·n3; | ||
377 | ········} | 368 | ········} |
378 | ········i | 369 | ········final·BitSet·allowedKeyManagement3·=·this.allowedKeyManagement; |
370 | ········final·int·n4·=·3; | ||
371 | ········if·(allowedKeyManagement3.get(n4))·{ | ||
379 | ············return·n4; | 372 | ············return·n4; |
380 | ········} | 373 | ········} |
381 | ········i | 374 | ········final·BitSet·allowedKeyManagement4·=·this.allowedKeyManagement; |
382 | ········ | 375 | ········final·int·n5·=·8; |
376 | ········if·(allowedKeyManagement4.get(n5))·{ | ||
377 | ············return·n5; | ||
383 | ········} | 378 | ········} |
384 | ········final·BitSet·allowedKeyManagement | 379 | ········final·BitSet·allowedKeyManagement5·=·this.allowedKeyManagement; |
385 | ········final·int·n6·=· | 380 | ········final·int·n6·=·9; |
386 | ········if·(allowedKeyManagement | 381 | ········if·(allowedKeyManagement5.get(n6))·{ |
387 | ············return·n6; | 382 | ············return·n6; |
388 | ········} | 383 | ········} |
389 | ········final·BitSet·allowedKeyManagement | 384 | ········final·BitSet·allowedKeyManagement6·=·this.allowedKeyManagement; |
390 | ········final·int·n7·=· | 385 | ········final·int·n7·=·10; |
391 | ········if·(allowedKeyManagement | 386 | ········if·(allowedKeyManagement6.get(n7))·{ |
392 | ············return·n7; | 387 | ············return·n7; |
393 | ········} | 388 | ········} |
394 | ········i | 389 | ········final·BitSet·allowedKeyManagement7·=·this.allowedKeyManagement; |
395 | ············return·n2; | ||
396 | ········} | ||
397 | ········final·BitSet·allowedKeyManagement4·=·this.allowedKeyManagement; | ||
398 | ········final·int·n8·=·13; | 390 | ········final·int·n8·=·13; |
399 | ········if·(allowedKeyManagement | 391 | ········if·(allowedKeyManagement7.get(n8))·{ |
400 | ············return·n8; | 392 | ············return·n8; |
401 | ········} | 393 | ········} |
402 | ········final·BitSet·allowedKeyManagement | 394 | ········final·BitSet·allowedKeyManagement8·=·this.allowedKeyManagement; |
403 | ········final·int·n9·=·14; | 395 | ········final·int·n9·=·14; |
404 | ········if·(allowedKeyManagement | 396 | ········if·(allowedKeyManagement8.get(n9))·{ |
405 | ············return·n9; | 397 | ············return·n9; |
406 | ········} | 398 | ········} |
407 | ········return·0; | 399 | ········return·0; |
408 | ····} | 400 | ····} |
409 | ···· | 401 | ···· |
410 | ····public·ProxyInfo·getHttpProxy()·{ | 402 | ····public·ProxyInfo·getHttpProxy()·{ |
411 | ········if·(this.mIpConfiguration.getProxySettings()·==·IpConfiguration$ProxySettings.NONE)·{ | 403 | ········if·(this.mIpConfiguration.getProxySettings()·==·IpConfiguration$ProxySettings.NONE)·{ |
Offset 7, 16 lines modified | Offset 7, 16 lines modified | ||
7 | import·java.text.DecimalFormat; | 7 | import·java.text.DecimalFormat; |
8 | public·class·DnsPacket$DnsRecord | 8 | public·class·DnsPacket$DnsRecord |
9 | { | 9 | { |
10 | ····private·static·final·int·MAXLABELCOUNT·=·128; | 10 | ····private·static·final·int·MAXLABELCOUNT·=·128; |
11 | ····private·static·final·int·MAXLABELSIZE·=·63; | 11 | ····private·static·final·int·MAXLABELSIZE·=·63; |
12 | ····private·static·final·int·MAXNAMESIZE·=·255; | 12 | ····private·static·final·int·MAXNAMESIZE·=·255; |
13 | ····p | 13 | ····private·static·final·int·NAME_COMPRESSION·=·192; |
14 | ····p | 14 | ····private·static·final·int·NAME_NORMAL·=·0; |
15 | ····private·static·final·String·TAG·=·"DnsRecord"; | 15 | ····private·static·final·String·TAG·=·"DnsRecord"; |
16 | ····public·final·String·dName; | 16 | ····public·final·String·dName; |
17 | ····private·final·DecimalFormat·mByteFormat; | 17 | ····private·final·DecimalFormat·mByteFormat; |
18 | ····private·final·FieldPosition·mPos; | 18 | ····private·final·FieldPosition·mPos; |
19 | ····private·final·byte[]·mRdata; | 19 | ····private·final·byte[]·mRdata; |
20 | ····public·final·int·nsClass; | 20 | ····public·final·int·nsClass; |
21 | ····public·final·int·nsType; | 21 | ····public·final·int·nsType; |
Offset 1, 8 lines modified | Offset 1, 8 lines modified | ||
1 | ··Size:·6 | 1 | ··Size:·679222····» Blocks:·1328·······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, 16 lines modified | Offset 1, 16 lines modified | ||
1 | Zip·file·size:·337 | 1 | Zip·file·size:·3372326·bytes,·number·of·entries:·14 |
2 | -rw----·····2.0·fat··33 | 2 | -rw----·····2.0·fat··3367644·b-·stor·08-Jan-01·00:00·classes.dex |
3 | -rw----·····2.0·fat·····1434·b-·defN·08-Jan-01·00:00·com/android/server/wifi/util/XmlUtilHelper.uau | 3 | -rw----·····2.0·fat·····1434·b-·defN·08-Jan-01·00:00·com/android/server/wifi/util/XmlUtilHelper.uau |
4 | -rw----·····2.0·fat·····2565·b-·defN·08-Jan-01·00:00·com/android/internal/util/StateMachine.uau | 4 | -rw----·····2.0·fat·····2565·b-·defN·08-Jan-01·00:00·com/android/internal/util/StateMachine.uau |
5 | -rw----·····2.0·fat······703·b-·defN·08-Jan-01·00:00·com/android/internal/util/State.uau | 5 | -rw----·····2.0·fat······703·b-·defN·08-Jan-01·00:00·com/android/internal/util/State.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/internal/util/IState.uau |
7 | -rw----·····2.0·fat······821·b-·defN·08-Jan-01·00:00·com/android/internal/util/HexDump.uau | 7 | -rw----·····2.0·fat······821·b-·defN·08-Jan-01·00:00·com/android/internal/util/HexDump.uau |
8 | -rw----·····2.0·fat······204·b-·defN·08-Jan-01·00:00·com/android/internal/util/FastXmlSerializer.uau | 8 | -rw----·····2.0·fat······204·b-·defN·08-Jan-01·00:00·com/android/internal/util/FastXmlSerializer.uau |
9 | -rw----·····2.0·fat······268·b-·defN·08-Jan-01·00:00·android/util/Rational.uau | 9 | -rw----·····2.0·fat······268·b-·defN·08-Jan-01·00:00·android/util/Rational.uau |
10 | -rw----·····2.0·fat······589·b-·defN·08-Jan-01·00:00·android/util/LocalLog.uau | 10 | -rw----·····2.0·fat······589·b-·defN·08-Jan-01·00:00·android/util/LocalLog.uau |
11 | -rw----·····2.0·fat······241·b-·defN·08-Jan-01·00:00·android/util/LocalLog.ReadOnlyLocalLog.uau | 11 | -rw----·····2.0·fat······241·b-·defN·08-Jan-01·00:00·android/util/LocalLog.ReadOnlyLocalLog.uau |
12 | -rw----·····2.0·fat·····1056·b-·defN·08-Jan-01·00:00·android/net/InterfaceConfiguration.uau | 12 | -rw----·····2.0·fat·····1056·b-·defN·08-Jan-01·00:00·android/net/InterfaceConfiguration.uau |
13 | -rw----·····2.0·fat·····1029·b-·defN·08-Jan-01·00:00·android/net/DhcpResults.uau | 13 | -rw----·····2.0·fat·····1029·b-·defN·08-Jan-01·00:00·android/net/DhcpResults.uau |
14 | -rw----·····2.0·fat······339·b-·defN·80-Feb-01·00:00·META-INF/proguard/androidx-annotations.pro | 14 | -rw----·····2.0·fat······339·b-·defN·80-Feb-01·00:00·META-INF/proguard/androidx-annotations.pro |
15 | -rw----·····2.0·fat·······45·b-·defN·08-Jan-01·00:00·META-INF/MANIFEST.MF | 15 | -rw----·····2.0·fat·······45·b-·defN·08-Jan-01·00:00·META-INF/MANIFEST.MF |
16 | 14·files,·33 | 16 | 14·files,·3377138·bytes·uncompressed,·3370291·bytes·compressed:··0.2% |
Offset 1, 11 lines modified | Offset 1, 8 lines modified | ||
1 | Zip·file·size:·50 | 1 | Zip·file·size:·5037694·bytes,·number·of·entries:·2197 |
2 | ?rwxrwxr-x··2.0·unx·····1585·b-·stor·80-Jan-01·00:00·android/net/networkstack/aidl/quirks/IPv6ProvisioningLossQuirk.class | ||
3 | ?rwxrwxr-x··2.0·unx······793·b-·stor·80-Jan-01·00:00·android/net/networkstack/aidl/quirks/IPv6ProvisioningLossQuirkParcelable$1.class | ||
4 | ?rwxrwxr-x··2.0·unx·····1067·b-·stor·80-Jan-01·00:00·android/net/networkstack/aidl/quirks/IPv6ProvisioningLossQuirkParcelable.class | ||
5 | ?rwxrwxr-x··2.0·unx······650·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$ActiveModeWarden$-Plt3MFTYdXeWBuvNCn1gi-5J5k.class | 2 | ?rwxrwxr-x··2.0·unx······650·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$ActiveModeWarden$-Plt3MFTYdXeWBuvNCn1gi-5J5k.class |
6 | ?rwxrwxr-x··2.0·unx······518·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$ActiveModeWarden$S7UNguyF36djptgCPj9SyKz9CEc.class | 3 | ?rwxrwxr-x··2.0·unx······518·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$ActiveModeWarden$S7UNguyF36djptgCPj9SyKz9CEc.class |
7 | ?rwxrwxr-x··2.0·unx······799·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$ActiveModeWarden$WifiController$EnabledState$eY1NyossFk5pfRDLOy4YXG2Puwg.class | 4 | ?rwxrwxr-x··2.0·unx······799·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$ActiveModeWarden$WifiController$EnabledState$eY1NyossFk5pfRDLOy4YXG2Puwg.class |
8 | ?rwxrwxr-x··2.0·unx······518·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$ActiveModeWarden$xPvl3LCNSD6grhqXRhYeMKywknM.class | 5 | ?rwxrwxr-x··2.0·unx······518·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$ActiveModeWarden$xPvl3LCNSD6grhqXRhYeMKywknM.class |
9 | ?rwxrwxr-x··2.0·unx······525·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$AvailableNetworkNotifier$8AuO976D3dRYxVBuKj3-nbzUsBo.class | 6 | ?rwxrwxr-x··2.0·unx······525·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$AvailableNetworkNotifier$8AuO976D3dRYxVBuKj3-nbzUsBo.class |
10 | ?rwxrwxr-x··2.0·unx······534·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$AvailableNetworkNotifier$CHSKQjmLyURyOXr7RtOrIJsg714.class | 7 | ?rwxrwxr-x··2.0·unx······534·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$AvailableNetworkNotifier$CHSKQjmLyURyOXr7RtOrIJsg714.class |
11 | ?rwxrwxr-x··2.0·unx······529·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$AvailableNetworkNotifier$S0FaoECCwNFCuGVJV69DPVdzyE8.class | 8 | ?rwxrwxr-x··2.0·unx······529·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$AvailableNetworkNotifier$S0FaoECCwNFCuGVJV69DPVdzyE8.class |
Offset 57, 15 lines modified | Offset 54, 14 lines modified | ||
57 | ?rwxrwxr-x··2.0·unx······859·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$NetworkSuggestionNominator$PerAppMatchMetaInfo$NGJqgonlkCJ6fAkPw_Gl-WCeAf4.class | 54 | ?rwxrwxr-x··2.0·unx······859·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$NetworkSuggestionNominator$PerAppMatchMetaInfo$NGJqgonlkCJ6fAkPw_Gl-WCeAf4.class |
58 | ?rwxrwxr-x··2.0·unx······777·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$NetworkSuggestionNominator$d2pYB4S8q2XzlM7C7bRzj4hx05o.class | 55 | ?rwxrwxr-x··2.0·unx······777·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$NetworkSuggestionNominator$d2pYB4S8q2XzlM7C7bRzj4hx05o.class |
59 | ?rwxrwxr-x··2.0·unx······640·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$NetworkSuggestionNominator$ivQ50lfqhx_8jrs-8bLgRCAA7aY.class | 56 | ?rwxrwxr-x··2.0·unx······640·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$NetworkSuggestionNominator$ivQ50lfqhx_8jrs-8bLgRCAA7aY.class |
60 | ?rwxrwxr-x··2.0·unx······456·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$OGSS2qx6njxlnp0dnKb4lA3jnw8.class | 57 | ?rwxrwxr-x··2.0·unx······456·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$OGSS2qx6njxlnp0dnKb4lA3jnw8.class |
61 | ?rwxrwxr-x··2.0·unx······452·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$SarManager$VrXGaN2lCt0CybxxEfgneaY4FvY.class | 58 | ?rwxrwxr-x··2.0·unx······452·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$SarManager$VrXGaN2lCt0CybxxEfgneaY4FvY.class |
62 | ?rwxrwxr-x··2.0·unx······460·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$SarManager$cF1vmoM2QYZACA-YzJsns9WSQI4.class | 59 | ?rwxrwxr-x··2.0·unx······460·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$SarManager$cF1vmoM2QYZACA-YzJsns9WSQI4.class |
63 | ?rwxrwxr-x··2.0·unx······632·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$Sgsg9Ml_dxoj_SCBslbH-6YHea8.class | 60 | ?rwxrwxr-x··2.0·unx······632·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$Sgsg9Ml_dxoj_SCBslbH-6YHea8.class |
64 | ?rwxrwxr-x··2.0·unx······805·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$SoftApManager$SoftApStateMachine$StartedState$tYFzLMZOtb2t4OliJUo3FJp_1j8.class | ||
65 | ?rwxrwxr-x··2.0·unx······515·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$SupplicantStaIfaceHal$52QH7A2r7a2LbE_6yFO8yWOvIiQ.class | 61 | ?rwxrwxr-x··2.0·unx······515·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$SupplicantStaIfaceHal$52QH7A2r7a2LbE_6yFO8yWOvIiQ.class |
66 | ?rwxrwxr-x··2.0·unx······696·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$SupplicantStaIfaceHal$ServiceManagerDeathRecipient$d-46woRLrt-A_5VzKq0teHo-f90.class | 62 | ?rwxrwxr-x··2.0·unx······696·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$SupplicantStaIfaceHal$ServiceManagerDeathRecipient$d-46woRLrt-A_5VzKq0teHo-f90.class |
67 | ?rwxrwxr-x··2.0·unx······676·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$SupplicantStaIfaceHal$SupplicantDeathRecipient$2qEgiCB3aUF88PzSSLK9dis2Y3s.class | 63 | ?rwxrwxr-x··2.0·unx······676·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$SupplicantStaIfaceHal$SupplicantDeathRecipient$2qEgiCB3aUF88PzSSLK9dis2Y3s.class |
68 | ?rwxrwxr-x··2.0·unx······578·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$SupplicantStaIfaceHal$dyUir-a5SO6f_hpHJNq5ErnqpMk.class | 64 | ?rwxrwxr-x··2.0·unx······578·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$SupplicantStaIfaceHal$dyUir-a5SO6f_hpHJNq5ErnqpMk.class |
69 | ?rwxrwxr-x··2.0·unx······487·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$UV1wDVoVlbcxpr8zevj_aMFtUGw.class | 65 | ?rwxrwxr-x··2.0·unx······487·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$UV1wDVoVlbcxpr8zevj_aMFtUGw.class |
70 | ?rwxrwxr-x··2.0·unx······519·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$VT9e2V3o0MYZG8ZEONk9kV8oR9o.class | 66 | ?rwxrwxr-x··2.0·unx······519·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$VT9e2V3o0MYZG8ZEONk9kV8oR9o.class |
71 | ?rwxrwxr-x··2.0·unx······541·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WakeupController$sB8N4NPbyfefFu6fc4L75U1Md4E.class | 67 | ?rwxrwxr-x··2.0·unx······541·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WakeupController$sB8N4NPbyfefFu6fc4L75U1Md4E.class |
Offset 144, 15 lines modified | Offset 140, 14 lines modified | ||
144 | ?rwxrwxr-x··2.0·unx······774·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$6TeOji4ofAJa3ZMZWbuEviP8go8.class | 140 | ?rwxrwxr-x··2.0·unx······774·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$6TeOji4ofAJa3ZMZWbuEviP8go8.class |
145 | ?rwxrwxr-x··2.0·unx······585·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$6lbD2TTt2dxmHN0v1SESqWXSZN4.class | 141 | ?rwxrwxr-x··2.0·unx······585·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$6lbD2TTt2dxmHN0v1SESqWXSZN4.class |
146 | ?rwxrwxr-x··2.0·unx······621·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$7$eMYau17vdgiWx_KHNvkXGvjAy0M.class | 142 | ?rwxrwxr-x··2.0·unx······621·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$7$eMYau17vdgiWx_KHNvkXGvjAy0M.class |
147 | ?rwxrwxr-x··2.0·unx······531·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$7Kd5kIr0ftSSCTRUW1P6Yt89wxc.class | 143 | ?rwxrwxr-x··2.0·unx······531·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$7Kd5kIr0ftSSCTRUW1P6Yt89wxc.class |
148 | ?rwxrwxr-x··2.0·unx······658·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$7VoIWmwOxXaUqpF67W5w8joig4M.class | 144 | ?rwxrwxr-x··2.0·unx······658·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$7VoIWmwOxXaUqpF67W5w8joig4M.class |
149 | ?rwxrwxr-x··2.0·unx······661·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$7XaXTxjE8ekIJ-lhcaxWokO3Yxk.class | 145 | ?rwxrwxr-x··2.0·unx······661·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$7XaXTxjE8ekIJ-lhcaxWokO3Yxk.class |
150 | ?rwxrwxr-x··2.0·unx······530·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$Bm0dB_Grybclx8PAiBvhzyRrmxE.class | 146 | ?rwxrwxr-x··2.0·unx······530·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$Bm0dB_Grybclx8PAiBvhzyRrmxE.class |
151 | ?rwxrwxr-x··2.0·unx······947·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$CjlUpg3xA5Ga7fshHhCZOkkIBvY.class | ||
152 | ?rwxrwxr-x··2.0·unx······541·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$DZKIXvqu60pFDrCIBkSA6b2OQQg.class | 147 | ?rwxrwxr-x··2.0·unx······541·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$DZKIXvqu60pFDrCIBkSA6b2OQQg.class |
153 | ?rwxrwxr-x··2.0·unx······691·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$ENZNS6Z4RWX6UdpPsBfibUJWGFs.class | 148 | ?rwxrwxr-x··2.0·unx······691·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$ENZNS6Z4RWX6UdpPsBfibUJWGFs.class |
154 | ?rwxrwxr-x··2.0·unx······644·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$EYLbkr5WTqD_nZP61v5uqvy9T4E.class | 149 | ?rwxrwxr-x··2.0·unx······644·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$EYLbkr5WTqD_nZP61v5uqvy9T4E.class |
155 | ?rwxrwxr-x··2.0·unx······652·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$EuyMnueqdutMI0ckx-VZwgGASuI.class | 150 | ?rwxrwxr-x··2.0·unx······652·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$EuyMnueqdutMI0ckx-VZwgGASuI.class |
156 | ?rwxrwxr-x··2.0·unx······818·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$F-4A2dQcBjdx8sONhfwkvwuhzkU.class | 151 | ?rwxrwxr-x··2.0·unx······818·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$F-4A2dQcBjdx8sONhfwkvwuhzkU.class |
157 | ?rwxrwxr-x··2.0·unx······875·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$FQfZ8WJOlAfivVFmRi4Dy69M9C0.class | 152 | ?rwxrwxr-x··2.0·unx······875·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$FQfZ8WJOlAfivVFmRi4Dy69M9C0.class |
158 | ?rwxrwxr-x··2.0·unx······526·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$FRQJkJJTKO9hzpVObpLtUjs-fIw.class | 153 | ?rwxrwxr-x··2.0·unx······526·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$FRQJkJJTKO9hzpVObpLtUjs-fIw.class |
Offset 162, 23 lines modified | Offset 157, 24 lines modified | ||
162 | ?rwxrwxr-x··2.0·unx······539·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$JITVPBOoxNHvuAEaQA7pSnRcdSo.class | 157 | ?rwxrwxr-x··2.0·unx······539·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$JITVPBOoxNHvuAEaQA7pSnRcdSo.class |
163 | ?rwxrwxr-x··2.0·unx······524·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$K3aFY8RXsUpK-qhVeCXLeMTzdVE.class | 158 | ?rwxrwxr-x··2.0·unx······524·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$K3aFY8RXsUpK-qhVeCXLeMTzdVE.class |
164 | ?rwxrwxr-x··2.0·unx······805·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$LAdONQUEefoqbtUo2eSLXyC8gak.class | 159 | ?rwxrwxr-x··2.0·unx······805·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$LAdONQUEefoqbtUo2eSLXyC8gak.class |
165 | ?rwxrwxr-x··2.0·unx······479·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$LpgW05-JIogqWOSyHsG4gQLHGF8.class | 160 | ?rwxrwxr-x··2.0·unx······479·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$LpgW05-JIogqWOSyHsG4gQLHGF8.class |
166 | ?rwxrwxr-x··2.0·unx······548·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$OZed-trm_njxneJLTfJTzXQDN9Y.class | 161 | ?rwxrwxr-x··2.0·unx······548·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$OZed-trm_njxneJLTfJTzXQDN9Y.class |
167 | ?rwxrwxr-x··2.0·unx······863·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$PjSNdf4TY8BbQ7xj9sso0ZCxTWw.class | 162 | ?rwxrwxr-x··2.0·unx······863·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$PjSNdf4TY8BbQ7xj9sso0ZCxTWw.class |
168 | ?rwxrwxr-x··2.0·unx······477·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$Pt1Ihcc2sM6HL3NuTqmuOdyOw4g.class | 163 | ?rwxrwxr-x··2.0·unx······477·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$Pt1Ihcc2sM6HL3NuTqmuOdyOw4g.class |
164 | ?rwxrwxr-x··2.0·unx······989·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$QEbQWjtkwU2ZCBwW2g7n2lupBkw.class | ||
169 | ?rwxrwxr-x··2.0·unx······645·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$QTrkj43kMMYhnmJ1D456-k88MNI.class | 165 | ?rwxrwxr-x··2.0·unx······645·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$QTrkj43kMMYhnmJ1D456-k88MNI.class |
170 | ?rwxrwxr-x··2.0·unx······630·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$QmH9DVwAXfFzetvJWE4l7kLwI0g.class | ||
171 | ?rwxrwxr-x··2.0·unx······644·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$R14oMkwaoCf0rYeV0TmP0uv4p6g.class | 166 | ?rwxrwxr-x··2.0·unx······644·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$R14oMkwaoCf0rYeV0TmP0uv4p6g.class |
172 | ?rwxrwxr-x··2.0·unx······546·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$RIoR2rNrE6KhWiTZT3kCXAI6cKY.class | 167 | ?rwxrwxr-x··2.0·unx······546·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$RIoR2rNrE6KhWiTZT3kCXAI6cKY.class |
173 | ?rwxrwxr-x··2.0·unx······624·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$SAftnfkEI_FloJ0TtVmBzLZ4ZUA.class | 168 | ?rwxrwxr-x··2.0·unx······624·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$SAftnfkEI_FloJ0TtVmBzLZ4ZUA.class |
174 | ?rwxrwxr-x··2.0·unx······848·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$SoxiGZ1eoLM6G7RGWcz6_vhq4Uc.class | 169 | ?rwxrwxr-x··2.0·unx······848·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$SoxiGZ1eoLM6G7RGWcz6_vhq4Uc.class |
175 | ?rwxrwxr-x··2.0·unx······475·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$Srbv6FH-BkbrrjmlD43KUvoQHn8.class | 170 | ?rwxrwxr-x··2.0·unx······475·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$Srbv6FH-BkbrrjmlD43KUvoQHn8.class |
176 | ?rwxrwxr-x··2.0·unx······537·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$StFP6PHilSa9eLBz4cr3PF0zA98.class | 171 | ?rwxrwxr-x··2.0·unx······537·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$StFP6PHilSa9eLBz4cr3PF0zA98.class |
177 | ?rwxrwxr-x··2.0·unx······540·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$TfiCerdBC00WhQU_u5NTm_02ptA.class | 172 | ?rwxrwxr-x··2.0·unx······540·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$TfiCerdBC00WhQU_u5NTm_02ptA.class |
173 | ?rwxrwxr-x··2.0·unx······687·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$Tq6QN2Gof7SbZ6LPwxylkl6psmc.class | ||
178 | ?rwxrwxr-x··2.0·unx······637·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$UIxxCuF3gf-Q5VFVGv1egbbeWJ4.class | 174 | ?rwxrwxr-x··2.0·unx······637·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$UIxxCuF3gf-Q5VFVGv1egbbeWJ4.class |
179 | ?rwxrwxr-x··2.0·unx······579·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$U_QpZiXKpmvP1uJjmQ8VfBaaP4g.class | 175 | ?rwxrwxr-x··2.0·unx······579·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$U_QpZiXKpmvP1uJjmQ8VfBaaP4g.class |
180 | ?rwxrwxr-x··2.0·unx······825·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$VNzO3lUkAol8XsZ1LPOGiGlmXt0.class | 176 | ?rwxrwxr-x··2.0·unx······825·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$VNzO3lUkAol8XsZ1LPOGiGlmXt0.class |
181 | ?rwxrwxr-x··2.0·unx······647·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$VUJixq5fuPV4Z_ESmgXl6L7q_Qs.class | 177 | ?rwxrwxr-x··2.0·unx······647·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$VUJixq5fuPV4Z_ESmgXl6L7q_Qs.class |
182 | ?rwxrwxr-x··2.0·unx······533·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$WL-c42nVWOFo3R59E-pROi1xghc.class | 178 | ?rwxrwxr-x··2.0·unx······533·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$WL-c42nVWOFo3R59E-pROi1xghc.class |
183 | ?rwxrwxr-x··2.0·unx······540·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$WQxRz20C5HcRIp-aPw78W5SSdg4.class | 179 | ?rwxrwxr-x··2.0·unx······540·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$WQxRz20C5HcRIp-aPw78W5SSdg4.class |
184 | ?rwxrwxr-x··2.0·unx······798·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$Wvq-7H2ApCFgYwZQCHWkEPSB_00.class | 180 | ?rwxrwxr-x··2.0·unx······798·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$Wvq-7H2ApCFgYwZQCHWkEPSB_00.class |
Offset 195, 17 lines modified | Offset 191, 17 lines modified | ||
195 | ?rwxrwxr-x··2.0·unx······533·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$i4NOfjl76VVOxHVUCszRDhiEHr4.class | 191 | ?rwxrwxr-x··2.0·unx······533·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$i4NOfjl76VVOxHVUCszRDhiEHr4.class |
196 | ?rwxrwxr-x··2.0·unx······474·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$jObauhfE5wZKWtIo-whDK0_5ttk.class | 192 | ?rwxrwxr-x··2.0·unx······474·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$jObauhfE5wZKWtIo-whDK0_5ttk.class |
197 | ?rwxrwxr-x··2.0·unx······949·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$kKKGFK0MOeBJnuYc4Qxzvr_U4Ek.class | 193 | ?rwxrwxr-x··2.0·unx······949·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$kKKGFK0MOeBJnuYc4Qxzvr_U4Ek.class |
198 | ?rwxrwxr-x··2.0·unx······533·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$kyNmlLzCsRj-Pv0gTPbIGNBVNbY.class | 194 | ?rwxrwxr-x··2.0·unx······533·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$kyNmlLzCsRj-Pv0gTPbIGNBVNbY.class |
199 | ?rwxrwxr-x··2.0·unx······535·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$mXCaaDa5srnjOPafzsfN6xKAgac.class | 195 | ?rwxrwxr-x··2.0·unx······535·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$mXCaaDa5srnjOPafzsfN6xKAgac.class |
200 | ?rwxrwxr-x··2.0·unx······630·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$m_BZmhYmBBjTPFqrhwD4Z5fbFWk.class | 196 | ?rwxrwxr-x··2.0·unx······630·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$m_BZmhYmBBjTPFqrhwD4Z5fbFWk.class |
201 | ?rwxrwxr-x··2.0·unx······480·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$n8MaUZNbtfcoTADR65u5-MK3DoQ.class | 197 | ?rwxrwxr-x··2.0·unx······480·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$n8MaUZNbtfcoTADR65u5-MK3DoQ.class |
198 | ?rwxrwxr-x··2.0·unx······671·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$nd20ljo_XFKM5CZPUsUAGNROuUs.class | ||
202 | ?rwxrwxr-x··2.0·unx······826·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$nicZ_yj9jb7dBgb41kyp_jYSKaQ.class | 199 | ?rwxrwxr-x··2.0·unx······826·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$nicZ_yj9jb7dBgb41kyp_jYSKaQ.class |
203 | ?rwxrwxr-x··2.0·unx······705·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$o4WU9fA1GM_TxO7yZt0KuPOV2HU.class | 200 | ?rwxrwxr-x··2.0·unx······705·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$o4WU9fA1GM_TxO7yZt0KuPOV2HU.class |
204 | ?rwxrwxr-x··2.0·unx······647·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$qR3mSCJh9iek0MTG1c8Q2yiIzMY.class | ||
205 | ?rwxrwxr-x··2.0·unx······625·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$qSfaB0_LqgVmQVcZPFs_2AC5MM4.class | 201 | ?rwxrwxr-x··2.0·unx······625·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$qSfaB0_LqgVmQVcZPFs_2AC5MM4.class |
206 | ?rwxrwxr-x··2.0·unx······781·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$r1Ih-rTH5HNCcdI6fAq1Cv69h9M.class | 202 | ?rwxrwxr-x··2.0·unx······781·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$r1Ih-rTH5HNCcdI6fAq1Cv69h9M.class |
207 | ?rwxrwxr-x··2.0·unx······525·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$tIxnrzfiOtcdZDhqmliVISv3E5M.class | 203 | ?rwxrwxr-x··2.0·unx······525·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$tIxnrzfiOtcdZDhqmliVISv3E5M.class |
208 | ?rwxrwxr-x··2.0·unx······527·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$tgLn3hEXzEFuHffJnQ32H3nSCfQ.class | 204 | ?rwxrwxr-x··2.0·unx······527·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$tgLn3hEXzEFuHffJnQ32H3nSCfQ.class |
209 | ?rwxrwxr-x··2.0·unx······528·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$tl4iC0aSQGMAr1lvzQjbSKjYkyI.class | 205 | ?rwxrwxr-x··2.0·unx······528·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$tl4iC0aSQGMAr1lvzQjbSKjYkyI.class |
210 | ?rwxrwxr-x··2.0·unx······545·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$upXb8fyixCDkIC9571OJ3JUJ7Fo.class | 206 | ?rwxrwxr-x··2.0·unx······545·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$upXb8fyixCDkIC9571OJ3JUJ7Fo.class |
211 | ?rwxrwxr-x··2.0·unx······625·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$wcxB8t2pQ4ncYJNSzPqEXu_2W2A.class | 207 | ?rwxrwxr-x··2.0·unx······625·b-·stor·80-Jan-01·00:00·com/android/server/wifi/-$$Lambda$WifiServiceImpl$wcxB8t2pQ4ncYJNSzPqEXu_2W2A.class |
Offset 263, 27 lines modified | Offset 259, 27 lines modified | ||
263 | ?rwxrwxr-x··2.0·unx······144·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ClientModeImpl$ResetSimReason.class | 259 | ?rwxrwxr-x··2.0·unx······144·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ClientModeImpl$ResetSimReason.class |
264 | ?rwxrwxr-x··2.0·unx·····3974·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ClientModeImpl$WifiNetworkAgent.class | 260 | ?rwxrwxr-x··2.0·unx·····3974·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ClientModeImpl$WifiNetworkAgent.class |
265 | ?rwxrwxr-x··2.0·unx·······95·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ClientModeManager$1.class | 261 | ?rwxrwxr-x··2.0·unx·······95·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ClientModeManager$1.class |
266 | ?rwxrwxr-x··2.0·unx·····1125·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ClientModeManager$DeferStopHandler$1.class | 262 | ?rwxrwxr-x··2.0·unx·····1125·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ClientModeManager$DeferStopHandler$1.class |
267 | ?rwxrwxr-x··2.0·unx·····2387·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ClientModeManager$DeferStopHandler$2.class | 263 | ?rwxrwxr-x··2.0·unx·····2387·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ClientModeManager$DeferStopHandler$2.class |
268 | ?rwxrwxr-x··2.0·unx······595·b-·stor·80-Jan-01·00:00·com/android/server/wifi/Clock.class | 264 | ?rwxrwxr-x··2.0·unx······595·b-·stor·80-Jan-01·00:00·com/android/server/wifi/Clock.class |
269 | ?rwxrwxr-x··2.0·unx·····3814·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ConfigurationMap.class | 265 | ?rwxrwxr-x··2.0·unx·····3814·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ConfigurationMap.class |
270 | ?rwxrwxr-x··2.0·unx·····52 | 266 | ?rwxrwxr-x··2.0·unx·····5275·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ConnectToNetworkNotificationBuilder.class |
271 | ?rwxrwxr-x··2.0·unx······891·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ConnectedScore.class | 267 | ?rwxrwxr-x··2.0·unx······891·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ConnectedScore.class |
272 | ?rwxrwxr-x··2.0·unx·····4436·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ConnectionFailureNotificationBuilder.class | 268 | ?rwxrwxr-x··2.0·unx·····4436·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ConnectionFailureNotificationBuilder.class |
273 | ?rwxrwxr-x··2.0·unx·····1074·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ConnectionFailureNotifier$1.class | 269 | ?rwxrwxr-x··2.0·unx·····1074·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ConnectionFailureNotifier$1.class |
274 | ?rwxrwxr-x··2.0·unx·····2987·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ConnectionFailureNotifier$DisableMacRandomizationListener.class | 270 | ?rwxrwxr-x··2.0·unx·····2987·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ConnectionFailureNotifier$DisableMacRandomizationListener.class |
275 | ?rwxrwxr-x··2.0·unx·····4254·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ConnectionFailureNotifier.class | 271 | ?rwxrwxr-x··2.0·unx·····4254·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ConnectionFailureNotifier.class |
276 | ?rwxrwxr-x··2.0·unx····143 | 272 | ?rwxrwxr-x··2.0·unx····14393·b-·defN·80-Jan-01·00:00·com/android/server/wifi/DeviceConfigFacade.class |
277 | ?rwxrwxr-x··2.0·unx·····1459·b-·stor·80-Jan-01·00:00·com/android/server/wifi/DppManager$2.class | 273 | ?rwxrwxr-x··2.0·unx·····1459·b-·stor·80-Jan-01·00:00·com/android/server/wifi/DppManager$2.class |
278 | ?rwxrwxr-x··2.0·unx······980·b-·stor·80-Jan-01·00:00·com/android/server/wifi/DppManager$DppRequestInfo.class | 274 | ?rwxrwxr-x··2.0·unx······980·b-·stor·80-Jan-01·00:00·com/android/server/wifi/DppManager$DppRequestInfo.class |
279 | ?rwxrwxr-x··2.0·unx····13958·b-·defN·80-Jan-01·00:00·com/android/server/wifi/DppManager.class | 275 | ?rwxrwxr-x··2.0·unx····13958·b-·defN·80-Jan-01·00:00·com/android/server/wifi/DppManager.class |
280 | ?rwxrwxr-x··2.0·unx·····7570·b-·stor·80-Jan-01·00:00·com/android/server/wifi/DppMetrics.class | 276 | ?rwxrwxr-x··2.0·unx·····7570·b-·stor·80-Jan-01·00:00·com/android/server/wifi/DppMetrics.class |
281 | ?rwxrwxr-x··2.0·unx·····5 | 277 | ?rwxrwxr-x··2.0·unx·····5704·b-·stor·80-Jan-01·00:00·com/android/server/wifi/EapFailureNotifier.class |
282 | ?rwxrwxr-x··2.0·unx·····27 | 278 | ?rwxrwxr-x··2.0·unx·····2740·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ExtendedWifiInfo.class |
283 | ?rwxrwxr-x··2.0·unx·····5761·b-·stor·80-Jan-01·00:00·com/android/server/wifi/FrameworkFacade.class | 279 | ?rwxrwxr-x··2.0·unx·····5761·b-·stor·80-Jan-01·00:00·com/android/server/wifi/FrameworkFacade.class |
284 | ?rwxrwxr-x··2.0·unx·····1041·b-·stor·80-Jan-01·00:00·com/android/server/wifi/HalDeviceManager$IfaceCreationData.class | 280 | ?rwxrwxr-x··2.0·unx·····1041·b-·stor·80-Jan-01·00:00·com/android/server/wifi/HalDeviceManager$IfaceCreationData.class |
285 | ?rwxrwxr-x··2.0·unx······168·b-·stor·80-Jan-01·00:00·com/android/server/wifi/HalDeviceManager$InterfaceAvailableForRequestListener.class | 281 | ?rwxrwxr-x··2.0·unx······168·b-·stor·80-Jan-01·00:00·com/android/server/wifi/HalDeviceManager$InterfaceAvailableForRequestListener.class |
286 | ?rwxrwxr-x··2.0·unx·····1217·b-·stor·80-Jan-01·00:00·com/android/server/wifi/HalDeviceManager$InterfaceCacheEntry.class | 282 | ?rwxrwxr-x··2.0·unx·····1217·b-·stor·80-Jan-01·00:00·com/android/server/wifi/HalDeviceManager$InterfaceCacheEntry.class |
287 | ?rwxrwxr-x··2.0·unx······165·b-·stor·80-Jan-01·00:00·com/android/server/wifi/HalDeviceManager$InterfaceDestroyedListener.class | 283 | ?rwxrwxr-x··2.0·unx······165·b-·stor·80-Jan-01·00:00·com/android/server/wifi/HalDeviceManager$InterfaceDestroyedListener.class |
288 | ?rwxrwxr-x··2.0·unx······274·b-·stor·80-Jan-01·00:00·com/android/server/wifi/HalDeviceManager$InterfaceRttControllerLifecycleCallback.class | 284 | ?rwxrwxr-x··2.0·unx······274·b-·stor·80-Jan-01·00:00·com/android/server/wifi/HalDeviceManager$InterfaceRttControllerLifecycleCallback.class |
289 | ?rwxrwxr-x··2.0·unx·····1574·b-·stor·80-Jan-01·00:00·com/android/server/wifi/HalDeviceManager$ListenerProxy.class | 285 | ?rwxrwxr-x··2.0·unx·····1574·b-·stor·80-Jan-01·00:00·com/android/server/wifi/HalDeviceManager$ListenerProxy.class |
Offset 321, 25 lines modified | Offset 317, 25 lines modified | ||
321 | ?rwxrwxr-x··2.0·unx······263·b-·stor·80-Jan-01·00:00·com/android/server/wifi/NetworkSuggestionStoreData$DataSource.class | 317 | ?rwxrwxr-x··2.0·unx······263·b-·stor·80-Jan-01·00:00·com/android/server/wifi/NetworkSuggestionStoreData$DataSource.class |
322 | ?rwxrwxr-x··2.0·unx······831·b-·stor·80-Jan-01·00:00·com/android/server/wifi/NetworkUpdateResult.class | 318 | ?rwxrwxr-x··2.0·unx······831·b-·stor·80-Jan-01·00:00·com/android/server/wifi/NetworkUpdateResult.class |
323 | ?rwxrwxr-x··2.0·unx······230·b-·stor·80-Jan-01·00:00·com/android/server/wifi/PropertyService.class | 319 | ?rwxrwxr-x··2.0·unx······230·b-·stor·80-Jan-01·00:00·com/android/server/wifi/PropertyService.class |
324 | ?rwxrwxr-x··2.0·unx·····2637·b-·stor·80-Jan-01·00:00·com/android/server/wifi/SarInfo.class | 320 | ?rwxrwxr-x··2.0·unx·····2637·b-·stor·80-Jan-01·00:00·com/android/server/wifi/SarInfo.class |
325 | ?rwxrwxr-x··2.0·unx·····1609·b-·stor·80-Jan-01·00:00·com/android/server/wifi/SarManager$1.class | 321 | ?rwxrwxr-x··2.0·unx·····1609·b-·stor·80-Jan-01·00:00·com/android/server/wifi/SarManager$1.class |
326 | ?rwxrwxr-x··2.0·unx·····1197·b-·stor·80-Jan-01·00:00·com/android/server/wifi/SarManager$WifiPhoneStateListener.class | 322 | ?rwxrwxr-x··2.0·unx·····1197·b-·stor·80-Jan-01·00:00·com/android/server/wifi/SarManager$WifiPhoneStateListener.class |
327 | ?rwxrwxr-x··2.0·unx·····7624·b-·stor·80-Jan-01·00:00·com/android/server/wifi/SarManager.class | 323 | ?rwxrwxr-x··2.0·unx·····7624·b-·stor·80-Jan-01·00:00·com/android/server/wifi/SarManager.class |
328 | ?rwxrwxr-x··2.0·unx·····45 | 324 | ?rwxrwxr-x··2.0·unx·····4580·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ScanDetail.class |
329 | ?rwxrwxr-x··2.0·unx······648·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ScanDetailCache$1.class | 325 | ?rwxrwxr-x··2.0·unx······648·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ScanDetailCache$1.class |
330 | ?rwxrwxr-x··2.0·unx······7 | 326 | ?rwxrwxr-x··2.0·unx······797·b-·stor·80-Jan-01·00:00·com/android/server/wifi/ScanDetailCache$2.class |
... Open expanded diff ... |
Offset 1, 16 lines modified | Offset 1, 7 lines modified | ||
1 | Filename:·android/net/networkstack/aidl/quirks/IPv6ProvisioningLossQuirk.class | ||
2 | Comment:· | ||
3 | Filename:·android/net/networkstack/aidl/quirks/IPv6ProvisioningLossQuirkParcelable$1.class | ||
4 | Comment:· | ||
5 | Filename:·android/net/networkstack/aidl/quirks/IPv6ProvisioningLossQuirkParcelable.class | ||
6 | Comment:· | ||
7 | Filename:·com/android/server/wifi/-$$Lambda$ActiveModeWarden$-Plt3MFTYdXeWBuvNCn1gi-5J5k.class | 1 | Filename:·com/android/server/wifi/-$$Lambda$ActiveModeWarden$-Plt3MFTYdXeWBuvNCn1gi-5J5k.class |
8 | Comment:· | 2 | Comment:· |
9 | Filename:·com/android/server/wifi/-$$Lambda$ActiveModeWarden$S7UNguyF36djptgCPj9SyKz9CEc.class | 3 | Filename:·com/android/server/wifi/-$$Lambda$ActiveModeWarden$S7UNguyF36djptgCPj9SyKz9CEc.class |
10 | Comment:· | 4 | Comment:· |
11 | Filename:·com/android/server/wifi/-$$Lambda$ActiveModeWarden$WifiController$EnabledState$eY1NyossFk5pfRDLOy4YXG2Puwg.class | 5 | Filename:·com/android/server/wifi/-$$Lambda$ActiveModeWarden$WifiController$EnabledState$eY1NyossFk5pfRDLOy4YXG2Puwg.class |
Offset 180, 17 lines modified | Offset 171, 14 lines modified | ||
180 | Filename:·com/android/server/wifi/-$$Lambda$SarManager$cF1vmoM2QYZACA-YzJsns9WSQI4.class | 171 | Filename:·com/android/server/wifi/-$$Lambda$SarManager$cF1vmoM2QYZACA-YzJsns9WSQI4.class |
181 | Comment:· | 172 | Comment:· |
182 | Filename:·com/android/server/wifi/-$$Lambda$Sgsg9Ml_dxoj_SCBslbH-6YHea8.class | 173 | Filename:·com/android/server/wifi/-$$Lambda$Sgsg9Ml_dxoj_SCBslbH-6YHea8.class |
183 | Comment:· | 174 | Comment:· |
184 | Filename:·com/android/server/wifi/-$$Lambda$SoftApManager$SoftApStateMachine$StartedState$tYFzLMZOtb2t4OliJUo3FJp_1j8.class | ||
185 | Comment:· | ||
186 | Filename:·com/android/server/wifi/-$$Lambda$SupplicantStaIfaceHal$52QH7A2r7a2LbE_6yFO8yWOvIiQ.class | 175 | Filename:·com/android/server/wifi/-$$Lambda$SupplicantStaIfaceHal$52QH7A2r7a2LbE_6yFO8yWOvIiQ.class |
187 | Comment:· | 176 | Comment:· |
188 | Filename:·com/android/server/wifi/-$$Lambda$SupplicantStaIfaceHal$ServiceManagerDeathRecipient$d-46woRLrt-A_5VzKq0teHo-f90.class | 177 | Filename:·com/android/server/wifi/-$$Lambda$SupplicantStaIfaceHal$ServiceManagerDeathRecipient$d-46woRLrt-A_5VzKq0teHo-f90.class |
189 | Comment:· | 178 | Comment:· |
190 | Filename:·com/android/server/wifi/-$$Lambda$SupplicantStaIfaceHal$SupplicantDeathRecipient$2qEgiCB3aUF88PzSSLK9dis2Y3s.class | 179 | Filename:·com/android/server/wifi/-$$Lambda$SupplicantStaIfaceHal$SupplicantDeathRecipient$2qEgiCB3aUF88PzSSLK9dis2Y3s.class |
Offset 441, 17 lines modified | Offset 429, 14 lines modified | ||
441 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$7XaXTxjE8ekIJ-lhcaxWokO3Yxk.class | 429 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$7XaXTxjE8ekIJ-lhcaxWokO3Yxk.class |
442 | Comment:· | 430 | Comment:· |
443 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$Bm0dB_Grybclx8PAiBvhzyRrmxE.class | 431 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$Bm0dB_Grybclx8PAiBvhzyRrmxE.class |
444 | Comment:· | 432 | Comment:· |
445 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$CjlUpg3xA5Ga7fshHhCZOkkIBvY.class | ||
446 | Comment:· | ||
447 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$DZKIXvqu60pFDrCIBkSA6b2OQQg.class | 433 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$DZKIXvqu60pFDrCIBkSA6b2OQQg.class |
448 | Comment:· | 434 | Comment:· |
449 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$ENZNS6Z4RWX6UdpPsBfibUJWGFs.class | 435 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$ENZNS6Z4RWX6UdpPsBfibUJWGFs.class |
450 | Comment:· | 436 | Comment:· |
451 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$EYLbkr5WTqD_nZP61v5uqvy9T4E.class | 437 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$EYLbkr5WTqD_nZP61v5uqvy9T4E.class |
Offset 495, 18 lines modified | Offset 480, 18 lines modified | ||
495 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$PjSNdf4TY8BbQ7xj9sso0ZCxTWw.class | 480 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$PjSNdf4TY8BbQ7xj9sso0ZCxTWw.class |
496 | Comment:· | 481 | Comment:· |
497 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$Pt1Ihcc2sM6HL3NuTqmuOdyOw4g.class | 482 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$Pt1Ihcc2sM6HL3NuTqmuOdyOw4g.class |
498 | Comment:· | 483 | Comment:· |
499 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$Q | 484 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$QEbQWjtkwU2ZCBwW2g7n2lupBkw.class |
500 | Comment:· | 485 | Comment:· |
501 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$Q | 486 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$QTrkj43kMMYhnmJ1D456-k88MNI.class |
502 | Comment:· | 487 | Comment:· |
503 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$R14oMkwaoCf0rYeV0TmP0uv4p6g.class | 488 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$R14oMkwaoCf0rYeV0TmP0uv4p6g.class |
504 | Comment:· | 489 | Comment:· |
505 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$RIoR2rNrE6KhWiTZT3kCXAI6cKY.class | 490 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$RIoR2rNrE6KhWiTZT3kCXAI6cKY.class |
506 | Comment:· | 491 | Comment:· |
Offset 522, 14 lines modified | Offset 507, 17 lines modified | ||
522 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$StFP6PHilSa9eLBz4cr3PF0zA98.class | 507 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$StFP6PHilSa9eLBz4cr3PF0zA98.class |
523 | Comment:· | 508 | Comment:· |
524 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$TfiCerdBC00WhQU_u5NTm_02ptA.class | 509 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$TfiCerdBC00WhQU_u5NTm_02ptA.class |
525 | Comment:· | 510 | Comment:· |
511 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$Tq6QN2Gof7SbZ6LPwxylkl6psmc.class | ||
512 | Comment:· | ||
526 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$UIxxCuF3gf-Q5VFVGv1egbbeWJ4.class | 513 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$UIxxCuF3gf-Q5VFVGv1egbbeWJ4.class |
527 | Comment:· | 514 | Comment:· |
528 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$U_QpZiXKpmvP1uJjmQ8VfBaaP4g.class | 515 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$U_QpZiXKpmvP1uJjmQ8VfBaaP4g.class |
529 | Comment:· | 516 | Comment:· |
530 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$VNzO3lUkAol8XsZ1LPOGiGlmXt0.class | 517 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$VNzO3lUkAol8XsZ1LPOGiGlmXt0.class |
Offset 594, 21 lines modified | Offset 582, 21 lines modified | ||
594 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$m_BZmhYmBBjTPFqrhwD4Z5fbFWk.class | 582 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$m_BZmhYmBBjTPFqrhwD4Z5fbFWk.class |
595 | Comment:· | 583 | Comment:· |
596 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$n8MaUZNbtfcoTADR65u5-MK3DoQ.class | 584 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$n8MaUZNbtfcoTADR65u5-MK3DoQ.class |
597 | Comment:· | 585 | Comment:· |
598 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$n | 586 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$nd20ljo_XFKM5CZPUsUAGNROuUs.class |
599 | Comment:· | 587 | Comment:· |
600 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$ | 588 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$nicZ_yj9jb7dBgb41kyp_jYSKaQ.class |
601 | Comment:· | 589 | Comment:· |
602 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$ | 590 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$o4WU9fA1GM_TxO7yZt0KuPOV2HU.class |
603 | Comment:· | 591 | Comment:· |
604 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$qSfaB0_LqgVmQVcZPFs_2AC5MM4.class | 592 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$qSfaB0_LqgVmQVcZPFs_2AC5MM4.class |
605 | Comment:· | 593 | Comment:· |
606 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$r1Ih-rTH5HNCcdI6fAq1Cv69h9M.class | 594 | Filename:·com/android/server/wifi/-$$Lambda$WifiServiceImpl$r1Ih-rTH5HNCcdI6fAq1Cv69h9M.class |
607 | Comment:· | 595 | Comment:· |
Offset 106, 15 lines modified | Offset 106, 15 lines modified | ||
106 | ················Log.e("WifiClientModeImpl",·sb2.toString()); | 106 | ················Log.e("WifiClientModeImpl",·sb2.toString()); |
107 | ················final·ClientModeImpl·this$3·=·this.this$0; | 107 | ················final·ClientModeImpl·this$3·=·this.this$0; |
108 | ················((StateMachine)this$3).sendMessage(n,·((WifiInfo)ClientModeImpl.access$800(this$3)).getRssi()); | 108 | ················((StateMachine)this$3).sendMessage(n,·((WifiInfo)ClientModeImpl.access$800(this$3)).getRssi()); |
109 | ················return; | 109 | ················return; |
110 | ············} | 110 | ············} |
111 | ············array[i]·=·(byte)n6; | 111 | ············array[i]·=·(byte)n6; |
112 | ········} | 112 | ········} |
113 | ········ClientModeImpl.access$8 | 113 | ········ClientModeImpl.access$8402(this.this$0,·array); |
114 | ········final·ClientModeImpl·this$4·=·this.this$0; | 114 | ········final·ClientModeImpl·this$4·=·this.this$0; |
115 | ········((StateMachine)this$4).sendMessage(131234,·((WifiInfo)ClientModeImpl.access$800(this$4)).getRssi()); | 115 | ········((StateMachine)this$4).sendMessage(131234,·((WifiInfo)ClientModeImpl.access$800(this$4)).getRssi()); |
116 | ····} | 116 | ····} |
117 | ···· | 117 | ···· |
118 | ····public·void·onStartSocketKeepalive(final·int·n,·final·Duration·duration,·final·KeepalivePacketData·keepalivePacketData)·{ | 118 | ····public·void·onStartSocketKeepalive(final·int·n,·final·Duration·duration,·final·KeepalivePacketData·keepalivePacketData)·{ |
119 | ········if·(this·!=·ClientModeImpl.access$3200(this.this$0))·{ | 119 | ········if·(this·!=·ClientModeImpl.access$3200(this.this$0))·{ |
120 | ············return; | 120 | ············return; |
Offset 63, 36 lines modified | Offset 63, 38 lines modified | ||
63 | ········else·{ | 63 | ········else·{ |
64 | ············notifierRequestCode·=·0; | 64 | ············notifierRequestCode·=·0; |
65 | ········} | 65 | ········} |
66 | ········return·this.mFrameworkFacade.getBroadcast((Context)this.mContext,·notifierRequestCode,·setPackage,·134217728); | 66 | ········return·this.mFrameworkFacade.getBroadcast((Context)this.mContext,·notifierRequestCode,·setPackage,·134217728); |
67 | ····} | 67 | ····} |
68 | ···· | 68 | ···· |
69 | ····public·Notification·createConnectToAvailableNetworkNotification(final·String·s,·final·ScanResult·scanResult)·{ | 69 | ····public·Notification·createConnectToAvailableNetworkNotification(final·String·s,·final·ScanResult·scanResult)·{ |
70 | ········final·int·hashCode·=·s.hashCode(); | ||
71 | ········final·int·visibility·=·-1; | ||
70 | ········int·n·=·0; | 72 | ········int·n·=·0; |
71 | ········Label_004 | 73 | ········Label_0047:·{ |
72 | ············if·( | 74 | ············if·(hashCode·==·2017428693)·{ |
73 | ················if·(s.equals("WifiOpenNetworkNotifier"))·{ | 75 | ················if·(s.equals("WifiOpenNetworkNotifier"))·{ |
74 | ····················n·=·0; | 76 | ····················n·=·0; |
75 | ····················break·Label_004 | 77 | ····················break·Label_0047; |
76 | ················} | 78 | ················} |
77 | ············} | 79 | ············} |
78 | ············n·=· | 80 | ············n·=·visibility; |
79 | ········} | 81 | ········} |
80 | ········if·(n·!=·0)·{ | 82 | ········if·(n·!=·0)·{ |
81 | ············final·StringBuilder·sb·=·new·StringBuilder(); | 83 | ············final·StringBuilder·sb·=·new·StringBuilder(); |
82 | ············sb.append("Unknown·network·notifier."); | 84 | ············sb.append("Unknown·network·notifier."); |
83 | ············sb.append(s); | 85 | ············sb.append(s); |
84 | ············Log.wtf("ConnectToNetworkNotificationBuilder",·sb.toString()); | 86 | ············Log.wtf("ConnectToNetworkNotificationBuilder",·sb.toString()); |
85 | ············return·null; | 87 | ············return·null; |
86 | ········} | 88 | ········} |
87 | ········final·CharSequence·text·=·((ContextWrapper)this.mContext).getText(2131165200); | 89 | ········final·CharSequence·text·=·((ContextWrapper)this.mContext).getText(2131165200); |
88 | ········final·Notification$Action·build·=·new·Notification$Action$Builder((Icon)null,·this.mContext.getResources().getText(2131165198),·this.getPrivateBroadcast("com.android.server.wifi.ConnectToNetworkNotification.CONNECT_TO_NETWORK",·s)).build(); | 90 | ········final·Notification$Action·build·=·new·Notification$Action$Builder((Icon)null,·this.mContext.getResources().getText(2131165198),·this.getPrivateBroadcast("com.android.server.wifi.ConnectToNetworkNotification.CONNECT_TO_NETWORK",·s)).build(); |
89 | ········final·CharSequence·text2·=·this.mContext.getResources().getText(2131165197); | 91 | ········final·CharSequence·text2·=·this.mContext.getResources().getText(2131165197); |
90 | ········final·String·s2·=·"com.android.server.wifi.ConnectToNetworkNotification.PICK_WIFI_NETWORK"; | 92 | ········final·String·s2·=·"com.android.server.wifi.ConnectToNetworkNotification.PICK_WIFI_NETWORK"; |
91 | ········return·this.createNotificationBuilder(text,·scanResult.SSID,·s).setContentIntent(this.getPrivateBroadcast(s2,·s)).addAction(build).addAction(new·Notification$Action$Builder((Icon)null,·text2,·this.getPrivateBroadcast(s2,·s)).build()).build(); | 93 | ········return·this.createNotificationBuilder(text,·scanResult.SSID,·s).setContentIntent(this.getPrivateBroadcast(s2,·s)).addAction(build).addAction(new·Notification$Action$Builder((Icon)null,·text2,·this.getPrivateBroadcast(s2,·s)).build()).setVisibility(visibility).build(); |
92 | ····} | 94 | ····} |
93 | ···· | 95 | ···· |
94 | ····public·Notification·createNetworkConnectedNotification(final·String·s,·final·ScanResult·scanResult)·{ | 96 | ····public·Notification·createNetworkConnectedNotification(final·String·s,·final·ScanResult·scanResult)·{ |
95 | ········return·this.createNotificationBuilder(((ContextWrapper)this.mContext).getText(2131165201),·scanResult.SSID,·s).build(); | 97 | ········return·this.createNotificationBuilder(((ContextWrapper)this.mContext).getText(2131165201),·scanResult.SSID,·s).build(); |
96 | ····} | 98 | ····} |
97 | ···· | 99 | ···· |
98 | ····public·Notification·createNetworkConnectingNotification(final·String·s,·final·ScanResult·scanResult)·{ | 100 | ····public·Notification·createNetworkConnectingNotification(final·String·s,·final·ScanResult·scanResult)·{ |
Offset 41, 26 lines modified | Offset 41, 26 lines modified | ||
41 | ····static·final·int·DEFAULT_HEALTH_MONITOR_SHORT_CONNECTION_DURATION_THR_MS·=·20000; | 41 | ····static·final·int·DEFAULT_HEALTH_MONITOR_SHORT_CONNECTION_DURATION_THR_MS·=·20000; |
42 | ····static·final·int·DEFAULT_MIN_CONFIRMATION_DURATION_SEND_HIGH_SCORE_MS·=·0; | 42 | ····static·final·int·DEFAULT_MIN_CONFIRMATION_DURATION_SEND_HIGH_SCORE_MS·=·0; |
43 | ····static·final·int·DEFAULT_MIN_CONFIRMATION_DURATION_SEND_LOW_SCORE_MS·=·5000; | 43 | ····static·final·int·DEFAULT_MIN_CONFIRMATION_DURATION_SEND_LOW_SCORE_MS·=·5000; |
44 | ····static·final·int·DEFAULT_NONSTATIONARY_SCAN_RSSI_VALID_TIME_MS·=·5000; | 44 | ····static·final·int·DEFAULT_NONSTATIONARY_SCAN_RSSI_VALID_TIME_MS·=·5000; |
45 | ····static·final·int·DEFAULT_OVERLAPPING_CONNECTION_DURATION_THRESHOLD_MS·=·75000; | 45 | ····static·final·int·DEFAULT_OVERLAPPING_CONNECTION_DURATION_THRESHOLD_MS·=·75000; |
46 | ····static·final·int·DEFAULT_RSSI_THRESHOLD_NOT_SEND_LOW_SCORE_TO_CS_DBM·=·189; | 46 | ····static·final·int·DEFAULT_RSSI_THRESHOLD_NOT_SEND_LOW_SCORE_TO_CS_DBM·=·189; |
47 | ····static·final·int·DEFAULT_RX_LINK_SPEED_LOW_THRESHOLD_MBPS·=·9; | 47 | ····static·final·int·DEFAULT_RX_LINK_SPEED_LOW_THRESHOLD_MBPS·=·9; |
48 | ····public·static·final·int·DEFAULT_RX_PACKET_PER_SECOND_THR·=· | 48 | ····public·static·final·int·DEFAULT_RX_PACKET_PER_SECOND_THR·=·1; |
49 | ····public·static·final·int·DEFAULT_RX_TPUT_SUFFICIENT_THR_HIGH_KBPS·=· | 49 | ····public·static·final·int·DEFAULT_RX_TPUT_SUFFICIENT_THR_HIGH_KBPS·=·4000; |
50 | ····public·static·final·int·DEFAULT_RX_TPUT_SUFFICIENT_THR_LOW_KBPS·=· | 50 | ····public·static·final·int·DEFAULT_RX_TPUT_SUFFICIENT_THR_LOW_KBPS·=·1000; |
51 | ····static·final·int·DEFAULT_SHORT_CONNECTION_NONLOCAL_COUNT_MIN·=·3; | 51 | ····static·final·int·DEFAULT_SHORT_CONNECTION_NONLOCAL_COUNT_MIN·=·3; |
52 | ····static·final·int·DEFAULT_SHORT_CONNECTION_NONLOCAL_HIGH_THR_PERCENT·=·20; | 52 | ····static·final·int·DEFAULT_SHORT_CONNECTION_NONLOCAL_HIGH_THR_PERCENT·=·20; |
53 | ····static·final·int·DEFAULT_STATIONARY_SCAN_RSSI_VALID_TIME_MS·=·8000; | 53 | ····static·final·int·DEFAULT_STATIONARY_SCAN_RSSI_VALID_TIME_MS·=·8000; |
54 | ····public·static·final·int·DEFAULT_TPUT_SUFFICIENT_RATIO_THR_DEN·=·1; | 54 | ····public·static·final·int·DEFAULT_TPUT_SUFFICIENT_RATIO_THR_DEN·=·1; |
55 | ····public·static·final·int·DEFAULT_TPUT_SUFFICIENT_RATIO_THR_NUM·=·2; | 55 | ····public·static·final·int·DEFAULT_TPUT_SUFFICIENT_RATIO_THR_NUM·=·2; |
56 | ····static·final·int·DEFAULT_TX_LINK_SPEED_LOW_THRESHOLD_MBPS·=·9; | 56 | ····static·final·int·DEFAULT_TX_LINK_SPEED_LOW_THRESHOLD_MBPS·=·9; |
57 | ····public·static·final·int·DEFAULT_TX_PACKET_PER_SECOND_THR·=·2; | 57 | ····public·static·final·int·DEFAULT_TX_PACKET_PER_SECOND_THR·=·2; |
58 | ····public·static·final·int·DEFAULT_TX_TPUT_SUFFICIENT_THR_HIGH_KBPS·=· | 58 | ····public·static·final·int·DEFAULT_TX_TPUT_SUFFICIENT_THR_HIGH_KBPS·=·4000; |
59 | ····public·static·final·int·DEFAULT_TX_TPUT_SUFFICIENT_THR_LOW_KBPS·=· | 59 | ····public·static·final·int·DEFAULT_TX_TPUT_SUFFICIENT_THR_LOW_KBPS·=·1000; |
60 | ····static·final·int·HEALTH_MONITOR_RATIO_THR_DENOMINATOR·=·2; | 60 | ····static·final·int·HEALTH_MONITOR_RATIO_THR_DENOMINATOR·=·2; |
61 | ····private·static·final·String·NAMESPACE·=·"wifi"; | 61 | ····private·static·final·String·NAMESPACE·=·"wifi"; |
62 | ····private·int·mAbnormalConnectionDurationMs; | 62 | ····private·int·mAbnormalConnectionDurationMs; |
63 | ····private·long·mAbnormalDisconnectionReasonCodeMask; | 63 | ····private·long·mAbnormalDisconnectionReasonCodeMask; |
64 | ····private·Set·mAggressiveMacRandomizationSsidAllowlist; | 64 | ····private·Set·mAggressiveMacRandomizationSsidAllowlist; |
65 | ····private·Set·mAggressiveMacRandomizationSsidBlocklist; | 65 | ····private·Set·mAggressiveMacRandomizationSsidBlocklist; |
66 | ····private·int·mAssocRejectionCountMin; | 66 | ····private·int·mAssocRejectionCountMin; |
Offset 148, 62 lines modified | Offset 148, 64 lines modified | ||
148 | ········this.mDataStallTxPerThr·=·DeviceConfig.getInt(s,·"data_stall_tx_per_thr",·90); | 148 | ········this.mDataStallTxPerThr·=·DeviceConfig.getInt(s,·"data_stall_tx_per_thr",·90); |
149 | ········this.mDataStallCcaLevelThr·=·DeviceConfig.getInt(s,·"data_stall_cca_level_thr",·256); | 149 | ········this.mDataStallCcaLevelThr·=·DeviceConfig.getInt(s,·"data_stall_cca_level_thr",·256); |
150 | ········this.mWifiMetrics.setDataStallDurationMs(this.mDataStallDurationMs); | 150 | ········this.mWifiMetrics.setDataStallDurationMs(this.mDataStallDurationMs); |
151 | ········this.mWifiMetrics.setDataStallTxTputThrKbps(this.mDataStallTxTputThrKbps); | 151 | ········this.mWifiMetrics.setDataStallTxTputThrKbps(this.mDataStallTxTputThrKbps); |
152 | ········this.mWifiMetrics.setDataStallRxTputThrKbps(this.mDataStallRxTputThrKbps); | 152 | ········this.mWifiMetrics.setDataStallRxTputThrKbps(this.mDataStallRxTputThrKbps); |
153 | ········this.mWifiMetrics.setDataStallTxPerThr(this.mDataStallTxPerThr); | 153 | ········this.mWifiMetrics.setDataStallTxPerThr(this.mDataStallTxPerThr); |
154 | ········this.mWifiMetrics.setDataStallCcaLevelThr(this.mDataStallCcaLevelThr); | 154 | ········this.mWifiMetrics.setDataStallCcaLevelThr(this.mDataStallCcaLevelThr); |
155 | ········ | 155 | ········final·int·n2·=·1000; |
156 | ········fin | 156 | ········this.mTxTputSufficientLowThrKbps·=·DeviceConfig.getInt(s,·"tput_sufficient_low_thr_kbps",·n2); |
157 | ········ | 157 | ········final·int·n3·=·4000; |
158 | ········this.m | 158 | ········this.mTxTputSufficientHighThrKbps·=·DeviceConfig.getInt(s,·"tput_sufficient_high_thr_kbps",·n3); |
159 | ········this.mRxTputSufficient | 159 | ········this.mRxTputSufficientLowThrKbps·=·DeviceConfig.getInt(s,·"rx_tput_sufficient_low_thr_kbps",·n2); |
160 | ········fin | 160 | ········this.mRxTputSufficientHighThrKbps·=·DeviceConfig.getInt(s,·"rx_tput_sufficient_high_thr_kbps",·n3); |
161 | ········ | 161 | ········final·int·n4·=·2; |
162 | ········this.mTputSufficientRatioThr | 162 | ········this.mTputSufficientRatioThrNum·=·DeviceConfig.getInt(s,·"tput_sufficient_ratio_thr_num",·n4); |
163 | ········ | 163 | ········final·int·n5·=·1; |
164 | ········this.m | 164 | ········this.mTputSufficientRatioThrDen·=·DeviceConfig.getInt(s,·"tput_sufficient_ratio_thr_den",·n5); |
165 | ········this.mTxPktPerSecondThr·=·DeviceConfig.getInt(s,·"tx_pkt_per_second_thr",·n4); | ||
166 | ········this.mRxPktPerSecondThr·=·DeviceConfig.getInt(s,·"rx_pkt_per_second_thr",·n5); | ||
165 | ········this.mConnectionFailureHighThrPercent·=·DeviceConfig.getInt(s,·"connection_failure_high_thr_percent",·40); | 167 | ········this.mConnectionFailureHighThrPercent·=·DeviceConfig.getInt(s,·"connection_failure_high_thr_percent",·40); |
166 | ········this.mConnectionFailureCountMin·=·DeviceConfig.getInt(s,·"connection_failure_count_min",·6); | 168 | ········this.mConnectionFailureCountMin·=·DeviceConfig.getInt(s,·"connection_failure_count_min",·6); |
167 | ········final·int·n | 169 | ········final·int·n6·=·30; |
168 | ········this.mAssocRejectionHighThrPercent·=·DeviceConfig.getInt(s,·"assoc_rejection_high_thr_percent",·n | 170 | ········this.mAssocRejectionHighThrPercent·=·DeviceConfig.getInt(s,·"assoc_rejection_high_thr_percent",·n6); |
169 | ········final·int·n | 171 | ········final·int·n7·=·3; |
170 | ········this.mAssocRejectionCountMin·=·DeviceConfig.getInt(s,·"assoc_rejection_count_min",·n | 172 | ········this.mAssocRejectionCountMin·=·DeviceConfig.getInt(s,·"assoc_rejection_count_min",·n7); |
171 | ········this.mAssocTimeoutHighThrPercent·=·DeviceConfig.getInt(s,·"assoc_timeout_high_thr_percent",·n | 173 | ········this.mAssocTimeoutHighThrPercent·=·DeviceConfig.getInt(s,·"assoc_timeout_high_thr_percent",·n6); |
172 | ········this.mAssocTimeoutCountMin·=·DeviceConfig.getInt(s,·"assoc_timeout_count_min",·n | 174 | ········this.mAssocTimeoutCountMin·=·DeviceConfig.getInt(s,·"assoc_timeout_count_min",·n7); |
173 | ········this.mAuthFailureHighThrPercent·=·DeviceConfig.getInt(s,·"auth_failure_high_thr_percent",·n | 175 | ········this.mAuthFailureHighThrPercent·=·DeviceConfig.getInt(s,·"auth_failure_high_thr_percent",·n6); |
174 | ········this.mAuthFailureCountMin·=·DeviceConfig.getInt(s,·"auth_failure_count_min",·n | 176 | ········this.mAuthFailureCountMin·=·DeviceConfig.getInt(s,·"auth_failure_count_min",·n7); |
175 | ········this.mShortConnectionNonlocalHighThrPercent·=·DeviceConfig.getInt(s,·"short_connection_nonlocal_high_thr_percent",·20); | 177 | ········this.mShortConnectionNonlocalHighThrPercent·=·DeviceConfig.getInt(s,·"short_connection_nonlocal_high_thr_percent",·20); |
176 | ········this.mShortConnectionNonlocalCountMin·=·DeviceConfig.getInt(s,·"short_connection_nonlocal_count_min",·n | 178 | ········this.mShortConnectionNonlocalCountMin·=·DeviceConfig.getInt(s,·"short_connection_nonlocal_count_min",·n7); |
177 | ········this.mDisconnectionNonlocalHighThrPercent·=·DeviceConfig.getInt(s,·"disconnection_nonlocal_high_thr_percent",·25); | 179 | ········this.mDisconnectionNonlocalHighThrPercent·=·DeviceConfig.getInt(s,·"disconnection_nonlocal_high_thr_percent",·25); |
178 | ········this.mDisconnectionNonlocalCountMin·=·DeviceConfig.getInt(s,·"disconnection_nonlocal_count_min",·n | 180 | ········this.mDisconnectionNonlocalCountMin·=·DeviceConfig.getInt(s,·"disconnection_nonlocal_count_min",·n7); |
179 | ········this.mHealthMonitorRatioThrNumerator·=·DeviceConfig.getInt(s,·"health_monitor_ratio_thr_numerator",·4); | 181 | ········this.mHealthMonitorRatioThrNumerator·=·DeviceConfig.getInt(s,·"health_monitor_ratio_thr_numerator",·4); |
180 | ········this.mHealthMonitorMinRssiThrDbm·=·DeviceConfig.getInt(s,·"health_monitor_min_rssi_thr_dbm",·-68); | 182 | ········this.mHealthMonitorMinRssiThrDbm·=·DeviceConfig.getInt(s,·"health_monitor_min_rssi_thr_dbm",·-68); |
181 | ········this.mRandomizationFlakySsidHotlist·=·this.getUnmodifiableSetQuoted("randomization_flaky_ssid_hotlist"); | 183 | ········this.mRandomizationFlakySsidHotlist·=·this.getUnmodifiableSetQuoted("randomization_flaky_ssid_hotlist"); |
182 | ········this.mAggressiveMacRandomizationSsidAllowlist·=·this.getUnmodifiableSetQuoted("aggressive_randomization_ssid_allowlist"); | 184 | ········this.mAggressiveMacRandomizationSsidAllowlist·=·this.getUnmodifiableSetQuoted("aggressive_randomization_ssid_allowlist"); |
183 | ········this.mAggressiveMacRandomizationSsidBlocklist·=·this.getUnmodifiableSetQuoted("aggressive_randomization_ssid_blocklist"); | 185 | ········this.mAggressiveMacRandomizationSsidBlocklist·=·this.getUnmodifiableSetQuoted("aggressive_randomization_ssid_blocklist"); |
184 | ········this.mIsAbnormalConnectionFailureBugreportEnabled·=·DeviceConfig.getBoolean(s,·"abnormal_connection_failure_bugreport_enabled",·false); | 186 | ········this.mIsAbnormalConnectionFailureBugreportEnabled·=·DeviceConfig.getBoolean(s,·"abnormal_connection_failure_bugreport_enabled",·false); |
185 | ········this.mIsAbnormalDisconnectionBugreportEnabled·=·DeviceConfig.getBoolean(s,·"abnormal_disconnection_bugreport_enabled",·false); | 187 | ········this.mIsAbnormalDisconnectionBugreportEnabled·=·DeviceConfig.getBoolean(s,·"abnormal_disconnection_bugreport_enabled",·false); |
186 | ········this.mHealthMonitorMinNumConnectionAttempt·=·DeviceConfig.getInt(s,·"health_monitor_min_num_connection_attempt",·10); | 188 | ········this.mHealthMonitorMinNumConnectionAttempt·=·DeviceConfig.getInt(s,·"health_monitor_min_num_connection_attempt",·10); |
187 | ········this.mBugReportMinWindowMs·=·DeviceConfig.getInt(s,·"bug_report_min_window_ms",·3600000); | 189 | ········this.mBugReportMinWindowMs·=·DeviceConfig.getInt(s,·"bug_report_min_window_ms",·3600000); |
188 | ········this.mBugReportThresholdExtraRatio·=·DeviceConfig.getInt(s,·"report_bug_report_threshold_extra_ratio",·n | 190 | ········this.mBugReportThresholdExtraRatio·=·DeviceConfig.getInt(s,·"report_bug_report_threshold_extra_ratio",·n4); |
189 | ········this.mIsOverlappingConnectionBugreportEnabled·=·DeviceConfig.getBoolean(s,·"overlapping_connection_bugreport_enabled",·false); | 191 | ········this.mIsOverlappingConnectionBugreportEnabled·=·DeviceConfig.getBoolean(s,·"overlapping_connection_bugreport_enabled",·false); |
190 | ········this.mOverlappingConnectionDurationThresholdMs·=·DeviceConfig.getInt(s,·"overlapping_connection_duration_threshold_ms",·75000); | 192 | ········this.mOverlappingConnectionDurationThresholdMs·=·DeviceConfig.getInt(s,·"overlapping_connection_duration_threshold_ms",·75000); |
191 | ········final·int·n | 193 | ········final·int·n8·=·9; |
192 | ········this.mTxLinkSpeedLowThresholdMbps·=·DeviceConfig.getInt(s,·"tx_link_speed_low_threshold_mbps",·n | 194 | ········this.mTxLinkSpeedLowThresholdMbps·=·DeviceConfig.getInt(s,·"tx_link_speed_low_threshold_mbps",·n8); |
193 | ········this.mRxLinkSpeedLowThresholdMbps·=·DeviceConfig.getInt(s,·"rx_link_speed_low_threshold_mbps",·n | 195 | ········this.mRxLinkSpeedLowThresholdMbps·=·DeviceConfig.getInt(s,·"rx_link_speed_low_threshold_mbps",·n8); |
194 | ········this.mHealthMonitorShortConnectionDurationThrMs·=·DeviceConfig.getInt(s,·"health_monitor_short_connection_duration_thr_ms",·20000); | 196 | ········this.mHealthMonitorShortConnectionDurationThrMs·=·DeviceConfig.getInt(s,·"health_monitor_short_connection_duration_thr_ms",·20000); |
195 | ········this.mAbnormalDisconnectionReasonCodeMask·=·DeviceConfig.getLong(s,·"abnormal_disconnection_reason_code_mask",·17179869397L); | 197 | ········this.mAbnormalDisconnectionReasonCodeMask·=·DeviceConfig.getLong(s,·"abnormal_disconnection_reason_code_mask",·17179869397L); |
196 | ········this.mHealthMonitorRssiPollValidTimeMs·=·DeviceConfig.getInt(s,·"health_monitor_rssi_poll_valid_time_ms",·2100); | 198 | ········this.mHealthMonitorRssiPollValidTimeMs·=·DeviceConfig.getInt(s,·"health_monitor_rssi_poll_valid_time_ms",·2100); |
197 | ········final·int·n | 199 | ········final·int·n9·=·5000; |
198 | ········this.mNonstationaryScanRssiValidTimeMs·=·DeviceConfig.getInt(s,·"nonstationary_scan_rssi_valid_time_ms",·n | 200 | ········this.mNonstationaryScanRssiValidTimeMs·=·DeviceConfig.getInt(s,·"nonstationary_scan_rssi_valid_time_ms",·n9); |
199 | ········this.mStationaryScanRssiValidTimeMs·=·DeviceConfig.getInt(s,·"stationary_scan_rssi_valid_time_ms",· | 201 | ········this.mStationaryScanRssiValidTimeMs·=·DeviceConfig.getInt(s,·"stationary_scan_rssi_valid_time_ms",·8000); |
200 | ········this.mHealthMonitorFwAlertValidTimeMs·=·DeviceConfig.getInt(s,·"health_monitor_fw_alert_valid_time_ms",·-1); | 202 | ········this.mHealthMonitorFwAlertValidTimeMs·=·DeviceConfig.getInt(s,·"health_monitor_fw_alert_valid_time_ms",·-1); |
201 | ········this.mWifiMetrics.setHealthMonitorRssiPollValidTimeMs(this.mHealthMonitorRssiPollValidTimeMs); | 203 | ········this.mWifiMetrics.setHealthMonitorRssiPollValidTimeMs(this.mHealthMonitorRssiPollValidTimeMs); |
202 | ········this.mMinConfirmationDurationSendLowScoreMs·=·DeviceConfig.getInt(s,·"min_confirmation_duration_send_low_score_ms",·n | 204 | ········this.mMinConfirmationDurationSendLowScoreMs·=·DeviceConfig.getInt(s,·"min_confirmation_duration_send_low_score_ms",·n9); |
203 | ········this.mMinConfirmationDurationSendHighScoreMs·=·DeviceConfig.getInt(s,·"min_confirmation_duration_send_high_score_ms",·0); | 205 | ········this.mMinConfirmationDurationSendHighScoreMs·=·DeviceConfig.getInt(s,·"min_confirmation_duration_send_high_score_ms",·0); |
204 | ········this.mRssiThresholdNotSendLowScoreToCsDbm·=·DeviceConfig.getInt(s,·"rssi_threshold_not_send_low_score_to_cs_dbm",·-67); | 206 | ········this.mRssiThresholdNotSendLowScoreToCsDbm·=·DeviceConfig.getInt(s,·"rssi_threshold_not_send_low_score_to_cs_dbm",·-67); |
205 | ····} | 207 | ····} |
206 | ···· | 208 | ···· |
207 | ····public·int·getAbnormalConnectionDurationMs()·{ | 209 | ····public·int·getAbnormalConnectionDurationMs()·{ |
208 | ········return·this.mAbnormalConnectionDurationMs; | 210 | ········return·this.mAbnormalConnectionDurationMs; |
209 | ····} | 211 | ····} |
Offset 76, 15 lines modified | Offset 76, 15 lines modified | ||
76 | ········final·Resources·resourcesForSubId·=·this.getResourcesForSubId(this.mContext,·this.mWifiCarrierInfoManager.getBestMatchSubscriptionId(wifiConfiguration)); | 76 | ········final·Resources·resourcesForSubId·=·this.getResourcesForSubId(this.mContext,·this.mWifiCarrierInfoManager.getBestMatchSubscriptionId(wifiConfiguration)); |
77 | ········if·(resourcesForSubId·==·null)·{ | 77 | ········if·(resourcesForSubId·==·null)·{ |
78 | ············return; | 78 | ············return; |
79 | ········} | 79 | ········} |
80 | ········final·StringBuilder·sb·=·new·StringBuilder(); | 80 | ········final·StringBuilder·sb·=·new·StringBuilder(); |
81 | ········sb.append("wifi_eap_error_message_code_"); | 81 | ········sb.append("wifi_eap_error_message_code_"); |
82 | ········sb.append(identifier); | 82 | ········sb.append(identifier); |
83 | ········identifier·=·resourcesForSubId.getIdentifier(sb.toString(),·"string",·this.mContext.getWifiOverlay | 83 | ········identifier·=·resourcesForSubId.getIdentifier(sb.toString(),·"string",·this.mContext.getWifiOverlayJavaPkgName()); |
84 | ········if·(identifier·==·0)·{ | 84 | ········if·(identifier·==·0)·{ |
85 | ············return; | 85 | ············return; |
86 | ········} | 86 | ········} |
87 | ········final·String·string·=·resourcesForSubId.getString(identifier,·new·Object[]·{·wifiConfiguration.SSID·}); | 87 | ········final·String·string·=·resourcesForSubId.getString(identifier,·new·Object[]·{·wifiConfiguration.SSID·}); |
88 | ········if·(TextUtils.isEmpty((CharSequence)string))·{ | 88 | ········if·(TextUtils.isEmpty((CharSequence)string))·{ |
89 | ············return; | 89 | ············return; |
90 | ········} | 90 | ········} |
Offset 18, 50 lines modified | Offset 18, 50 lines modified | ||
18 | ····ExtendedWifiInfo(final·Context·mContext)·{ | 18 | ····ExtendedWifiInfo(final·Context·mContext)·{ |
19 | ········this.mLastSource·=·0; | 19 | ········this.mLastSource·=·0; |
20 | ········this.mLastPacketCountUpdateTimeStamp·=·Long.MIN_VALUE; | 20 | ········this.mLastPacketCountUpdateTimeStamp·=·Long.MIN_VALUE; |
21 | ········this.mContext·=·mContext; | 21 | ········this.mContext·=·mContext; |
22 | ····} | 22 | ····} |
23 | ···· | 23 | ···· |
24 | ····private·void·update(final·int·mLastSource,·final·long·txSuccess,·final·long·txRetries,·final·long·txBad,·final·long·rxSuccess,·final·long·mLastPacketCountUpdateTimeStamp)·{ | 24 | ····private·void·update(final·int·mLastSource,·final·long·txSuccess,·final·long·txRetries,·final·long·txBad,·final·long·rxSuccess,·final·long·mLastPacketCountUpdateTimeStamp)·{ |
25 | ········Label_04 | 25 | ········Label_0433:·{ |
26 | ············if·(mLastSource·==·this.mLastSource)·{ | 26 | ············if·(mLastSource·==·this.mLastSource)·{ |
27 | ················final·long·mLastPacketCountUpdateTimeStamp2·=·this.mLastPacketCountUpdateTimeStamp; | 27 | ················final·long·mLastPacketCountUpdateTimeStamp2·=·this.mLastPacketCountUpdateTimeStamp; |
28 | ················if·(mLastPacketCountUpdateTimeStamp2·!=·Long.MIN_VALUE·&&·mLastPacketCountUpdateTimeStamp2·<·mLastPacketCountUpdateTimeStamp·&&· | 28 | ················if·(mLastPacketCountUpdateTimeStamp2·!=·Long.MIN_VALUE·&&·mLastPacketCountUpdateTimeStamp2·<·mLastPacketCountUpdateTimeStamp·&&·this.txBad·<=·txBad·&&·this.txSuccess·<=·txSuccess·&&·this.rxSuccess·<=·rxSuccess·&&·this.txRetries·<=·txRetries)·{ |
29 | ····················final·double·n·=·(double)(mLastPacketCountUpdateTimeStamp·-·mLastPacketCountUpdateTimeStamp | 29 | ····················final·double·n·=·(double)(mLastPacketCountUpdateTimeStamp·-·this.mLastPacketCountUpdateTimeStamp); |
30 | ····················final·double·exp·=·Math.exp(-1.0·*·n·/·3000.0); | 30 | ····················final·double·exp·=·Math.exp(-1.0·*·n·/·3000.0); |
31 | ····················final·double·n2·=·1.0·-·exp; | 31 | ····················final·double·n2·=·1.0·-·exp; |
32 | ····················final·double·n3·=·this.getLostTxPacketsPerSecond()·*·exp; | 32 | ····················final·double·n3·=·this.getLostTxPacketsPerSecond()·*·exp; |
33 | ····················final·double·n4·=·(double)(txBad·-· | 33 | ····················final·double·n4·=·(double)(txBad·-·this.txBad); |
34 | ····················final·double·n5·=·1000.0; | 34 | ····················final·double·n5·=·1000.0; |
35 | ····················this.setLostTxPacketsPerSecond(n3·+·n4·*·n5·/·n·*·n2); | 35 | ····················this.setLostTxPacketsPerSecond(n3·+·n4·*·n5·/·n·*·n2); |
36 | ····················this.setSuccessfulTxPacketsPerSecond(this.getSuccessfulTxPacketsPerSecond()·*·exp·+·(txSuccess·-· | 36 | ····················this.setSuccessfulTxPacketsPerSecond(this.getSuccessfulTxPacketsPerSecond()·*·exp·+·(txSuccess·-·this.txSuccess)·*·n5·/·n·*·n2); |
37 | ····················this.setSuccessfulRxPacketsPerSecond(this.getSuccessfulRxPacketsPerSecond()·*·exp·+·(rxSuccess·-· | 37 | ····················this.setSuccessfulRxPacketsPerSecond(this.getSuccessfulRxPacketsPerSecond()·*·exp·+·(rxSuccess·-·this.rxSuccess)·*·n5·/·n·*·n2); |
38 | ····················this.setRetriedTxPacketsRate(this.getRetriedTxPacketsPerSecond()·*·exp·+·(txRetries·-· | 38 | ····················this.setRetriedTxPacketsRate(this.getRetriedTxPacketsPerSecond()·*·exp·+·(txRetries·-·this.txRetries)·*·n5·/·n·*·n2); |
39 | ····················break·Label_04 | 39 | ····················break·Label_0433; |
40 | ················} | 40 | ················} |
41 | ············} | 41 | ············} |
42 | ············final·double·n6·=·0.0; | 42 | ············final·double·n6·=·0.0; |
43 | ············this.setLostTxPacketsPerSecond(n6); | 43 | ············this.setLostTxPacketsPerSecond(n6); |
44 | ············this.setSuccessfulTxPacketsPerSecond(n6); | 44 | ············this.setSuccessfulTxPacketsPerSecond(n6); |
45 | ············this.setSuccessfulRxPacketsPerSecond(n6); | 45 | ············this.setSuccessfulRxPacketsPerSecond(n6); |
46 | ············this.setRetriedTxPacketsRate(n6); | 46 | ············this.setRetriedTxPacketsRate(n6); |
47 | ············this.mLastSource·=·mLastSource; | 47 | ············this.mLastSource·=·mLastSource; |
48 | ········} | 48 | ········} |
49 | ········ | 49 | ········this.txBad·=·txBad; |
50 | ········ | 50 | ········this.txSuccess·=·txSuccess; |
51 | ········ | 51 | ········this.rxSuccess·=·rxSuccess; |
52 | ········ | 52 | ········this.txRetries·=·txRetries; |
53 | ········this.mLastPacketCountUpdateTimeStamp·=·mLastPacketCountUpdateTimeStamp; | 53 | ········this.mLastPacketCountUpdateTimeStamp·=·mLastPacketCountUpdateTimeStamp; |
54 | ····} | 54 | ····} |
55 | ···· | 55 | ···· |
56 | ····public·void·reset()·{ | 56 | ····public·void·reset()·{ |
57 | ········super.reset(); | 57 | ········super.reset(); |
58 | ········this.mLastSource·=·0; | 58 | ········this.mLastSource·=·0; |
59 | ········this.mLastPacketCountUpdateTimeStamp·=·Long.MIN_VALUE; | 59 | ········this.mLastPacketCountUpdateTimeStamp·=·Long.MIN_VALUE; |
60 | ········if·(this.mContext.getResources().getBoolean(213083753 | 60 | ········if·(this.mContext.getResources().getBoolean(2130837537))·{ |
61 | ············this.setMacAddress("02:00:00:00:00:00"); | 61 | ············this.setMacAddress("02:00:00:00:00:00"); |
62 | ········} | 62 | ········} |
63 | ····} | 63 | ····} |
64 | ···· | 64 | ···· |
65 | ····public·void·updatePacketRates(final·long·n,·final·long·n2,·final·long·n3)·{ | 65 | ····public·void·updatePacketRates(final·long·n,·final·long·n2,·final·long·n3)·{ |
66 | ········this.update(1,·n,·0L,·0L,·n2,·n3); | 66 | ········this.update(1,·n,·0L,·0L,·n2,·n3); |
67 | ····} | 67 | ····} |
Offset 1045, 15 lines modified | Offset 1045, 15 lines modified | ||
1045 | ········//·monitorenter(mLock) | 1045 | ········//·monitorenter(mLock) |
1046 | ········try·{ | 1046 | ········try·{ |
1047 | ············final·IHostapd$IfaceParams·v1_0·=·new·IHostapd$IfaceParams(); | 1047 | ············final·IHostapd$IfaceParams·v1_0·=·new·IHostapd$IfaceParams(); |
1048 | ············v1_0.ifaceName·=·string; | 1048 | ············v1_0.ifaceName·=·string; |
1049 | ············final·IHostapd$HwModeParams·hwModeParams·=·v1_0.hwModeParams; | 1049 | ············final·IHostapd$HwModeParams·hwModeParams·=·v1_0.hwModeParams; |
1050 | ············final·int·n·=·1; | 1050 | ············final·int·n·=·1; |
1051 | ············hwModeParams.enable80211N·=·(n·!=·0); | 1051 | ············hwModeParams.enable80211N·=·(n·!=·0); |
1052 | ············v1_0.hwModeParams.enable80211AC·=·this.mContext.getResources().getBoolean(213083755 | 1052 | ············v1_0.hwModeParams.enable80211AC·=·this.mContext.getResources().getBoolean(2130837550); |
1053 | ············if·(ApConfigUtil.isAcsSupported(this.mContext)·&&·softApConfiguration.getChannel()·==·0·&&·!this.mForceApChannel·&&·n)·{ | 1053 | ············if·(ApConfigUtil.isAcsSupported(this.mContext)·&&·softApConfiguration.getChannel()·==·0·&&·!this.mForceApChannel·&&·n)·{ |
1054 | ················v1_0.channelParams.enableAcs·=·(n·!=·0); | 1054 | ················v1_0.channelParams.enableAcs·=·(n·!=·0); |
1055 | ················v1_0.channelParams.acsShouldExcludeDfs·=·(!this.mContext.getResources().getBoolean(2130837523)·&&·n); | 1055 | ················v1_0.channelParams.acsShouldExcludeDfs·=·(!this.mContext.getResources().getBoolean(2130837523)·&&·n); |
1056 | ············} | 1056 | ············} |
1057 | ············final·IHostapd$ChannelParams·channelParams·=·v1_0.channelParams; | 1057 | ············final·IHostapd$ChannelParams·channelParams·=·v1_0.channelParams; |
1058 | ············int·channel; | 1058 | ············int·channel; |
1059 | ············if·(this.mForceApChannel)·{ | 1059 | ············if·(this.mForceApChannel)·{ |
Offset 104, 15 lines modified | Offset 104, 15 lines modified | ||
104 | ················} | 104 | ················} |
105 | ············} | 105 | ············} |
106 | ········} | 106 | ········} |
107 | ····} | 107 | ····} |
108 | ···· | 108 | ···· |
109 | ····private·boolean·isLinkProbingSupported()·{ | 109 | ····private·boolean·isLinkProbingSupported()·{ |
110 | ········if·(this.mLinkProbingSupported·==·null)·{ | 110 | ········if·(this.mLinkProbingSupported·==·null)·{ |
111 | ············final·Boolean·value·=·this.mContext.getResources().getBoolean(213083754 | 111 | ············final·Boolean·value·=·this.mContext.getResources().getBoolean(2130837544); |
112 | ············this.mLinkProbingSupported·=·value; | 112 | ············this.mLinkProbingSupported·=·value; |
113 | ············if·((boolean)value)·{ | 113 | ············if·((boolean)value)·{ |
114 | ················this.resetOnNewConnection(); | 114 | ················this.resetOnNewConnection(); |
115 | ················this.resetOnScreenTurnedOn(); | 115 | ················this.resetOnScreenTurnedOn(); |
116 | ············} | 116 | ············} |
117 | ········} | 117 | ········} |
118 | ········return·this.mLinkProbingSupported; | 118 | ········return·this.mLinkProbingSupported; |
Offset 129, 21 lines modified | Offset 129, 21 lines modified | ||
129 | ················Log.d(s,·sb2.toString()); | 129 | ················Log.d(s,·sb2.toString()); |
130 | ············} | 130 | ············} |
131 | ············this.updateSarScenario(); | 131 | ············this.updateSarScenario(); |
132 | ········} | 132 | ········} |
133 | ····} | 133 | ····} |
134 | ···· | 134 | ···· |
135 | ····private·void·readSarConfigs()·{ | 135 | ····private·void·readSarConfigs()·{ |
136 | ········if·(!(this.mSupportSarTxPowerLimit·=·this.mContext.getResources().getBoolean(213083754 | 136 | ········if·(!(this.mSupportSarTxPowerLimit·=·this.mContext.getResources().getBoolean(2130837541)))·{ |
137 | ············this.mSupportSarVoiceCall·=·false; | 137 | ············this.mSupportSarVoiceCall·=·false; |
138 | ············this.mSupportSarSoftAp·=·false; | 138 | ············this.mSupportSarSoftAp·=·false; |
139 | ············return; | 139 | ············return; |
140 | ········} | 140 | ········} |
141 | ········this.mSupportSarVoiceCall·=·true; | 141 | ········this.mSupportSarVoiceCall·=·true; |
142 | ········this.mSupportSarSoftAp·=·this.mContext.getResources().getBoolean(213083754 | 142 | ········this.mSupportSarSoftAp·=·this.mContext.getResources().getBoolean(2130837542); |
143 | ····} | 143 | ····} |
144 | ···· | 144 | ···· |
145 | ····private·void·registerListeners()·{ | 145 | ····private·void·registerListeners()·{ |
146 | ········if·(this.mSupportSarVoiceCall)·{ | 146 | ········if·(this.mSupportSarVoiceCall)·{ |
147 | ············this.registerPhoneStateListener(); | 147 | ············this.registerPhoneStateListener(); |
148 | ············this.registerVoiceStreamListener(); | 148 | ············this.registerVoiceStreamListener(); |
149 | ········} | 149 | ········} |
Offset 24, 49 lines modified | Offset 24, 52 lines modified | ||
24 | ···· | 24 | ···· |
25 | ····public·ScanDetail(ScanResult·mScanResult,·final·NetworkDetail·mNetworkDetail)·{ | 25 | ····public·ScanDetail(ScanResult·mScanResult,·final·NetworkDetail·mNetworkDetail)·{ |
26 | ········final·long·mSeen·=·0L; | 26 | ········final·long·mSeen·=·0L; |
27 | ········this.mSeen·=·mSeen; | 27 | ········this.mSeen·=·mSeen; |
28 | ········this.mScanResult·=·mScanResult; | 28 | ········this.mScanResult·=·mScanResult; |
29 | ········this.mNetworkDetail·=·mNetworkDetail; | 29 | ········this.mNetworkDetail·=·mNetworkDetail; |
30 | ········mScanResult·=·this.mScanResult; | 30 | ········mScanResult·=·this.mScanResult; |
31 | ········long·mSeen2 | 31 | ········long·mSeen2; |
32 | ········if·(mSee | 32 | ········if·(mScanResult.seen·==·mSeen)·{ |
33 | ············mSeen2·=·System.currentTimeMillis(); | 33 | ············mSeen2·=·System.currentTimeMillis(); |
34 | ········} | 34 | ········} |
35 | ········else·{ | ||
36 | ············mScanResult·=·this.mScanResult; | ||
37 | ············mSeen2·=·mScanResult.seen; | ||
38 | ········} | ||
35 | ········this.mSeen·=·mSeen2; | 39 | ········this.mSeen·=·mSeen2; |
36 | ····} | 40 | ····} |
37 | ···· | 41 | ···· |
38 | ····public·ScanDetail(final·WifiSsid·wifiSsid,·final·String·s,·final·String·s2,·final·int·n,·final·int·n2,·final·long·n3,·final·long·n4)·{ | 42 | ····public·ScanDetail(final·WifiSsid·wifiSsid,·final·String·s,·final·String·s2,·final·int·n,·final·int·n2,·final·long·n3,·final·long·n4)·{ |
39 | ········final·long·n5·=·0L; | 43 | ········final·long·n5·=·0L; |
40 | ········this.mSeen·=·n5; | 44 | ········this.mSeen·=·n5; |
41 | ········this.mNetworkDetail·=·null; | 45 | ········this.mNetworkDetail·=·null; |
42 | ········final·ScanResult·mScanResult·=·new·ScanResult(wifiSsid,·s,·0L,·-1,·(byte[])null,·s2,·n,·n2,·n3); | 46 | ········final·ScanResult·mScanResult·=·new·ScanResult(wifiSsid,·s,·0L,·-1,·(byte[])null,·s2,·n,·n2,·n3); |
43 | ········this.mScanResult·=·mScanResult; | 47 | ········this.mScanResult·=·mScanResult; |
44 | ········this.mSeen·=·n4; | 48 | ········this.mSeen·=·n4; |
45 | ········mScanResult.seen·=·n4; | 49 | ········mScanResult.seen·=·n4; |
46 | ········ | 50 | ········final·ScanResult·mScanResult2·=·this.mScanResult; |
47 | ········mScanResult.c | 51 | ········mScanResult2.channelWidth·=·0; |
48 | ········mScanResult.centerFreq | 52 | ········mScanResult2.centerFreq0·=·0; |
49 | ········mScanResult. | 53 | ········mScanResult2.centerFreq1·=·0; |
54 | ········mScanResult2.flags·=·n5; | ||
50 | ····} | 55 | ····} |
51 | ···· | 56 | ···· |
52 | ····public·ScanDetail(final·NetworkDetail·mNetworkDetail,·final·WifiSsid·wifiSsid,·final·String·s,·final·String·s2,·final·int·n,·final·int·n2,·final·long·n3,·final·ScanResult$InformationElement[]·informationElements,·final·List·anqpLines,·final·byte[]·mInformationElementRawData)·{ | 57 | ····public·ScanDetail(final·NetworkDetail·mNetworkDetail,·final·WifiSsid·wifiSsid,·final·String·s,·final·String·s2,·final·int·n,·final·int·n2,·final·long·n3,·final·ScanResult$InformationElement[]·informationElements,·final·List·anqpLines,·final·byte[]·mInformationElementRawData)·{ |
53 | ········this.mSeen·=·0L; | 58 | ········this.mSeen·=·0L; |
54 | ········this.mNetworkDetail·=·mNetworkDetail; | 59 | ········this.mNetworkDetail·=·mNetworkDetail; |
55 | ········this.mScanResult·=·new·ScanResult(wifiSsid,·s,·mNetworkDetail.getHESSID(),·mNetworkDetail.getAnqpDomainID(),·mNetworkDetail.getOsuProviders(),·s2,·n,·n2,·n3); | 60 | ········this.mScanResult·=·new·ScanResult(wifiSsid,·s,·mNetworkDetail.getHESSID(),·mNetworkDetail.getAnqpDomainID(),·mNetworkDetail.getOsuProviders(),·s2,·n,·n2,·n3); |
56 | ········final·long·currentTimeMillis·=·System.currentTimeMillis(); | 61 | ········final·long·currentTimeMillis·=·System.currentTimeMillis(); |
57 | ········this.mSeen·=·currentTimeMillis; | 62 | ········this.mSeen·=·currentTimeMillis; |
58 | ········ | 63 | ········this.mScanResult.seen·=·currentTimeMillis; |
59 | ········mScanResult. | 64 | ········this.mScanResult.channelWidth·=·mNetworkDetail.getChannelWidth(); |
60 | ········mScanResult.channelWidth·=·mNetworkDetail.getChannelWidth(); | ||
61 | ········this.mScanResult.centerFreq0·=·mNetworkDetail.getCenterfreq0(); | 65 | ········this.mScanResult.centerFreq0·=·mNetworkDetail.getCenterfreq0(); |
62 | ········this.mScanResult.centerFreq1·=·mNetworkDetail.getCenterfreq1(); | 66 | ········this.mScanResult.centerFreq1·=·mNetworkDetail.getCenterfreq1(); |
63 | ········ | 67 | ········this.mScanResult.informationElements·=·informationElements; |
64 | ········mScanResult | 68 | ········this.mScanResult.anqpLines·=·anqpLines; |
65 | ········mScanResult2.anqpLines·=·anqpLines; | ||
66 | ········if·(mNetworkDetail.is80211McResponderSupport())·{ | 69 | ········if·(mNetworkDetail.is80211McResponderSupport())·{ |
67 | ············this.mScanResult.setFlag((long)2); | 70 | ············this.mScanResult.setFlag((long)2); |
68 | ········} | 71 | ········} |
69 | ········if·(mNetworkDetail.isInterworking()·&&·mNetworkDetail.getHSRelease()·!=·null)·{ | 72 | ········if·(mNetworkDetail.isInterworking()·&&·mNetworkDetail.getHSRelease()·!=·null)·{ |
70 | ············this.mScanResult.setFlag(1L); | 73 | ············this.mScanResult.setFlag(1L); |
71 | ········} | 74 | ········} |
72 | ········this.mInformationElementRawData·=·mInformationElementRawData; | 75 | ········this.mInformationElementRawData·=·mInformationElementRawData; |
Offset 123, 22 lines modified | Offset 126, 23 lines modified | ||
123 | ············final·VenueNameElement·venueNameElement·=·(VenueNameElement)map.get(Constants$ANQPElementType.ANQPVenueName); | 126 | ············final·VenueNameElement·venueNameElement·=·(VenueNameElement)map.get(Constants$ANQPElementType.ANQPVenueName); |
124 | ············if·(venueNameElement·!=·null·&&·!venueNameElement.getNames().isEmpty())·{ | 127 | ············if·(venueNameElement·!=·null·&&·!venueNameElement.getNames().isEmpty())·{ |
125 | ················this.mScanResult.venueName·=·((I18Name)venueNameElement.getNames().get(0)).getText(); | 128 | ················this.mScanResult.venueName·=·((I18Name)venueNameElement.getNames().get(0)).getText(); |
126 | ············} | 129 | ············} |
127 | ········} | 130 | ········} |
128 | ········final·RawByteElement·rawByteElement·=·(RawByteElement)map.get(Constants$ANQPElementType.HSOSUProviders); | 131 | ········final·RawByteElement·rawByteElement·=·(RawByteElement)map.get(Constants$ANQPElementType.HSOSUProviders); |
129 | ········if·(rawByteElement·!=·null)·{ | 132 | ········if·(rawByteElement·!=·null)·{ |
130 | ············(this.mScanResult.anqpElements·=·new·AnqpInformationElement[ | 133 | ············(this.mScanResult.anqpElements·=·new·AnqpInformationElement[1])[0]·=·new·AnqpInformationElement(5271450,·8,·rawByteElement.getPayload()); |
131 | ········} | 134 | ········} |
132 | ····} | 135 | ····} |
133 | ···· | 136 | ···· |
134 | ····public·long·setSeen()·{ | 137 | ····public·long·setSeen()·{ |
135 | ········final·long·currentTimeMillis·=·System.currentTimeMillis(); | 138 | ········final·long·currentTimeMillis·=·System.currentTimeMillis(); |
136 | ········this.mSeen·=·currentTimeMillis; | 139 | ········this.mSeen·=·currentTimeMillis; |
137 | ········ | 140 | ········this.mScanResult.seen·=·currentTimeMillis; |
141 | ········return·this.mSeen; | ||
138 | ····} | 142 | ····} |
139 | ···· | 143 | ···· |
140 | ····public·String·toKeyString()·{ | 144 | ····public·String·toKeyString()·{ |
141 | ········final·NetworkDetail·mNetworkDetail·=·this.mNetworkDetail; | 145 | ········final·NetworkDetail·mNetworkDetail·=·this.mNetworkDetail; |
142 | ········if·(mNetworkDetail·!=·null)·{ | 146 | ········if·(mNetworkDetail·!=·null)·{ |
143 | ············return·mNetworkDetail.toKeyString(); | 147 | ············return·mNetworkDetail.toKeyString(); |
144 | ········} | 148 | ········} |
Offset 11, 22 lines modified | Offset 11, 20 lines modified | ||
11 | ····ScanDetailCache$2(final·ScanDetailCache·this$0)·{ | 11 | ····ScanDetailCache$2(final·ScanDetailCache·this$0)·{ |
12 | ········this.this$0·=·this$0; | 12 | ········this.this$0·=·this$0; |
13 | ····} | 13 | ····} |
14 | ···· | 14 | ···· |
15 | ····public·int·compare(final·Object·o,·final·Object·o2)·{ | 15 | ····public·int·compare(final·Object·o,·final·Object·o2)·{ |
16 | ········final·ScanResult·scanResult·=·((ScanDetail)o).getScanResult(); | 16 | ········final·ScanResult·scanResult·=·((ScanDetail)o).getScanResult(); |
17 | ········final·ScanResult·scanResult2·=·((ScanDetail)o2).getScanResult(); | 17 | ········final·ScanResult·scanResult2·=·((ScanDetail)o2).getScanResult(); |
18 | ········final·long·see | 18 | ········final·long·n·=·lcmp(scanResult.seen,·scanResult2.seen); |
19 | ········final·long·seen2·=·scanResult2.seen; | ||
20 | ········final·long·n·=·lcmp(seen,·seen2); | ||
21 | ········final·int·n2·=·-1; | 19 | ········final·int·n2·=·-1; |
22 | ········if·(n·>·0)·{ | 20 | ········if·(n·>·0)·{ |
23 | ············return·n2; | 21 | ············return·n2; |
24 | ········} | 22 | ········} |
25 | ········final·long·n3·=·lcmp(seen,·see | 23 | ········final·long·n3·=·lcmp(scanResult.seen,·scanResult2.seen); |
26 | ········final·boolean·b·=·true; | 24 | ········final·boolean·b·=·true; |
27 | ········if·(n3·<·0)·{ | 25 | ········if·(n3·<·0)·{ |
28 | ············return·b·?·1·:·0; | 26 | ············return·b·?·1·:·0; |
29 | ········} | 27 | ········} |
30 | ········final·int·level·=·scanResult.level; | 28 | ········final·int·level·=·scanResult.level; |
31 | ········final·int·level2·=·scanResult2.level; | 29 | ········final·int·level2·=·scanResult2.level; |
32 | ········if·(level·>·level2)·{ | 30 | ········if·(level·>·level2)·{ |
Offset 46, 15 lines modified | Offset 46, 15 lines modified | ||
46 | ····} | 46 | ····} |
47 | ···· | 47 | ···· |
48 | ····WifiConfiguration·getCandidateConfiguration(final·WifiNetworkSelector$NetworkNominator$OnConnectableListener·wifiNetworkSelector$NetworkNominator$OnConnectableListener)·{ | 48 | ····WifiConfiguration·getCandidateConfiguration(final·WifiNetworkSelector$NetworkNominator$OnConnectableListener·wifiNetworkSelector$NetworkNominator$OnConnectableListener)·{ |
49 | ········final·int·mBestCandidateType·=·this.mBestCandidateType; | 49 | ········final·int·mBestCandidateType·=·this.mBestCandidateType; |
50 | ········final·int·n·=·2; | 50 | ········final·int·n·=·2; |
51 | ········final·int·ephemeral·=·1; | 51 | ········final·int·ephemeral·=·1; |
52 | ········int·n3·=·0; | 52 | ········int·n3·=·0; |
53 | ········Label_06 | 53 | ········Label_0620:·{ |
54 | ············if·(mBestCandidateType·!=·ephemeral)·{ | 54 | ············if·(mBestCandidateType·!=·ephemeral)·{ |
55 | ················if·(mBestCandidateType·!=·n)·{ | 55 | ················if·(mBestCandidateType·!=·n)·{ |
56 | ····················ScoredNetworkNominator.access$300(this.this$0).log("ScoredNetworkNominator·did·not·see·any·good·candidates."); | 56 | ····················ScoredNetworkNominator.access$300(this.this$0).log("ScoredNetworkNominator·did·not·see·any·good·candidates."); |
57 | ················} | 57 | ················} |
58 | ················else·{ | 58 | ················else·{ |
59 | ····················final·WifiConfiguration·mEphemeralConfig·=·this.mEphemeralConfig; | 59 | ····················final·WifiConfiguration·mEphemeralConfig·=·this.mEphemeralConfig; |
60 | ····················final·int·n2·=·3; | 60 | ····················final·int·n2·=·3; |
Offset 62, 26 lines modified | Offset 62, 26 lines modified | ||
62 | ························n3·=·mEphemeralConfig.networkId; | 62 | ························n3·=·mEphemeralConfig.networkId; |
63 | ························final·LocalLog·access$300·=·ScoredNetworkNominator.access$300(this.this$0); | 63 | ························final·LocalLog·access$300·=·ScoredNetworkNominator.access$300(this.this$0); |
64 | ························final·Object[]·array·=·new·Object[n2]; | 64 | ························final·Object[]·array·=·new·Object[n2]; |
65 | ························array[0]·=·WifiNetworkSelector.toScanId(this.mScanResultCandidate); | 65 | ························array[0]·=·WifiNetworkSelector.toScanId(this.mScanResultCandidate); |
66 | ························array[ephemeral]·=·n3; | 66 | ························array[ephemeral]·=·n3; |
67 | ························array[n]·=·this.mEphemeralConfig.meteredHint; | 67 | ························array[n]·=·this.mEphemeralConfig.meteredHint; |
68 | ························access$300.log(String.format("existing·ephemeral·candidate·%s·network·ID:%d,·meteredHint=%b",·array)); | 68 | ························access$300.log(String.format("existing·ephemeral·candidate·%s·network·ID:%d,·meteredHint=%b",·array)); |
69 | ························break·Label_06 | 69 | ························break·Label_0620; |
70 | ····················} | 70 | ····················} |
71 | ····················final·Pair·access$301·=·ScoredNetworkNominator.access$600(this.this$0); | 71 | ····················final·Pair·access$301·=·ScoredNetworkNominator.access$600(this.this$0); |
72 | ····················if·(access$301·==·null)·{ | 72 | ····················if·(access$301·==·null)·{ |
73 | ························ScoredNetworkNominator.access$300(this.this$0).log("Can't·find·active·scorer·uid·and·package"); | 73 | ························ScoredNetworkNominator.access$300(this.this$0).log("Can't·find·active·scorer·uid·and·package"); |
74 | ····················} | 74 | ····················} |
75 | ····················else·{ | 75 | ····················else·{ |
76 | ························final·WifiConfiguration·networkFromScanResult·=·ScanResultUtil.createNetworkFromScanResult(this.mScanResultCandidate); | 76 | ························final·WifiConfiguration·networkFromScanResult·=·ScanResultUtil.createNetworkFromScanResult(this.mScanResultCandidate); |
77 | ························this.mEphemeralConfig·=·networkFromScanResult; | 77 | ························this.mEphemeralConfig·=·networkFromScanResult; |
78 | ························networkFromScanResult.ephemeral·=·(ephemeral·!=·0); | 78 | ························networkFromScanResult.ephemeral·=·(ephemeral·!=·0); |
79 | ························ | 79 | ························this.mEphemeralConfig.trusted·=·false; |
80 | ························ | 80 | ························this.mEphemeralConfig.meteredHint·=·ScoredNetworkNominator.access$100(this.this$0).getMeteredHint(this.mScanResultCandidate); |
81 | ························final·NetworkUpdateResult·addOrUpdateNetwork·=·ScoredNetworkNominator.access$500(this.this$0).addOrUpdateNetwork(this.mEphemeralConfig,·(int)(Integer)access$301.first,·(String)access$301.second); | 81 | ························final·NetworkUpdateResult·addOrUpdateNetwork·=·ScoredNetworkNominator.access$500(this.this$0).addOrUpdateNetwork(this.mEphemeralConfig,·(int)(Integer)access$301.first,·(String)access$301.second); |
82 | ························if·(!addOrUpdateNetwork.isSuccess())·{ | 82 | ························if·(!addOrUpdateNetwork.isSuccess())·{ |
83 | ····························ScoredNetworkNominator.access$300(this.this$0).log("Failed·to·add·ephemeral·network"); | 83 | ····························ScoredNetworkNominator.access$300(this.this$0).log("Failed·to·add·ephemeral·network"); |
84 | ························} | 84 | ························} |
85 | ························else·{ | 85 | ························else·{ |
86 | ····························if·(ScoredNetworkNominator.access$500(this.this$0).updateNetworkSelectionStatus(addOrUpdateNetwork.getNetworkId(),·0))·{ | 86 | ····························if·(ScoredNetworkNominator.access$500(this.this$0).updateNetworkSelectionStatus(addOrUpdateNetwork.getNetworkId(),·0))·{ |
87 | ································n3·=·addOrUpdateNetwork.getNetworkId(); | 87 | ································n3·=·addOrUpdateNetwork.getNetworkId(); |
Offset 91, 15 lines modified | Offset 91, 15 lines modified | ||
91 | ································ScoredNetworkNominator.access$500(this.this$0).setNetworkCandidateScanResult(n3,·this.mScanResultCandidate,·0); | 91 | ································ScoredNetworkNominator.access$500(this.this$0).setNetworkCandidateScanResult(n3,·this.mScanResultCandidate,·0); |
92 | ································final·LocalLog·access$302·=·ScoredNetworkNominator.access$300(this.this$0); | 92 | ································final·LocalLog·access$302·=·ScoredNetworkNominator.access$300(this.this$0); |
93 | ································final·Object[]·array2·=·new·Object[n2]; | 93 | ································final·Object[]·array2·=·new·Object[n2]; |
94 | ································array2[0]·=·WifiNetworkSelector.toScanId(this.mScanResultCandidate); | 94 | ································array2[0]·=·WifiNetworkSelector.toScanId(this.mScanResultCandidate); |
95 | ································array2[ephemeral]·=·n3; | 95 | ································array2[ephemeral]·=·n3; |
96 | ································array2[n]·=·this.mEphemeralConfig.meteredHint; | 96 | ································array2[n]·=·this.mEphemeralConfig.meteredHint; |
97 | ································access$302.log(String.format("new·ephemeral·candidate·%s·network·ID:%d,·meteredHint=%b",·array2)); | 97 | ································access$302.log(String.format("new·ephemeral·candidate·%s·network·ID:%d,·meteredHint=%b",·array2)); |
98 | ································break·Label_06 | 98 | ································break·Label_0620; |
99 | ····························} | 99 | ····························} |
100 | ····························ScoredNetworkNominator.access$300(this.this$0).log("Failed·to·make·ephemeral·network·selectable"); | 100 | ····························ScoredNetworkNominator.access$300(this.this$0).log("Failed·to·make·ephemeral·network·selectable"); |
101 | ························} | 101 | ························} |
102 | ····················} | 102 | ····················} |
103 | ················} | 103 | ················} |
104 | ················n3·=·-1; | 104 | ················n3·=·-1; |
105 | ············} | 105 | ············} |
Offset 50, 46 lines modified | Offset 50, 46 lines modified | ||
50 | ···· | 50 | ···· |
51 | ····private·void·loadResources(final·Context·context)·{ | 51 | ····private·void·loadResources(final·Context·context)·{ |
52 | ········if·(this.mVal·!=·null)·{ | 52 | ········if·(this.mVal·!=·null)·{ |
53 | ············return; | 53 | ············return; |
54 | ········} | 54 | ········} |
55 | ········final·ScoringParams$Values·mVal·=·new·ScoringParams$Values(this); | 55 | ········final·ScoringParams$Values·mVal·=·new·ScoringParams$Values(this); |
56 | ········this.mVal·=·mVal; | 56 | ········this.mVal·=·mVal; |
57 | ········mVal.rssi2[0]·=·context.getResources().getInteger(213103416 | 57 | ········mVal.rssi2[0]·=·context.getResources().getInteger(2131034163); |
58 | ········final·int[]·rssi2·=·this.mVal.rssi2; | 58 | ········final·int[]·rssi2·=·this.mVal.rssi2; |
59 | ········final·int·integer·=·context.getResources().getInteger(213103416 | 59 | ········final·int·integer·=·context.getResources().getInteger(2131034165); |
60 | ········final·int·n·=·1; | 60 | ········final·int·n·=·1; |
61 | ········rssi2[n]·=·integer; | 61 | ········rssi2[n]·=·integer; |
62 | ········final·int[]·rssi3·=·this.mVal.rssi2; | 62 | ········final·int[]·rssi3·=·this.mVal.rssi2; |
63 | ········final·int·integer2·=·context.getResources().getInteger(21310341 | 63 | ········final·int·integer2·=·context.getResources().getInteger(2131034169); |
64 | ········final·int·n2·=·2; | 64 | ········final·int·n2·=·2; |
65 | ········rssi3[n2]·=·integer2; | 65 | ········rssi3[n2]·=·integer2; |
66 | ········final·int[]·rssi4·=·this.mVal.rssi2; | 66 | ········final·int[]·rssi4·=·this.mVal.rssi2; |
67 | ········final·int·integer3·=·context.getResources().getInteger(21310341 | 67 | ········final·int·integer3·=·context.getResources().getInteger(2131034167); |
68 | ········final·int·n3·=·3; | 68 | ········final·int·n3·=·3; |
69 | ········rssi4[n3]·=·integer3; | 69 | ········rssi4[n3]·=·integer3; |
70 | ········this.mVal.rssi5[0]·=·context.getResources().getInteger(213103416 | 70 | ········this.mVal.rssi5[0]·=·context.getResources().getInteger(2131034164); |
71 | ········this.mVal.rssi5[n]·=·context.getResources().getInteger(213103416 | 71 | ········this.mVal.rssi5[n]·=·context.getResources().getInteger(2131034166); |
72 | ········this.mVal.rssi5[n2]·=·context.getResources().getInteger(213103417 | 72 | ········this.mVal.rssi5[n2]·=·context.getResources().getInteger(2131034170); |
73 | ········this.mVal.rssi5[n3]·=·context.getResources().getInteger(21310341 | 73 | ········this.mVal.rssi5[n3]·=·context.getResources().getInteger(2131034168); |
74 | ········this.mVal.rssi6[0]·=·context.getResources().getInteger(21310341 | 74 | ········this.mVal.rssi6[0]·=·context.getResources().getInteger(2131034139); |
75 | ········this.mVal.rssi6[n]·=·context.getResources().getInteger(213103414 | 75 | ········this.mVal.rssi6[n]·=·context.getResources().getInteger(2131034140); |
76 | ········this.mVal.rssi6[n2]·=·context.getResources().getInteger(213103414 | 76 | ········this.mVal.rssi6[n2]·=·context.getResources().getInteger(2131034142); |
77 | ········this.mVal.rssi6[n3]·=·context.getResources().getInteger(213103414 | 77 | ········this.mVal.rssi6[n3]·=·context.getResources().getInteger(2131034141); |
78 | ········this.mVal.throughputBonusNumerator·=·context.getResources().getInteger(21310341 | 78 | ········this.mVal.throughputBonusNumerator·=·context.getResources().getInteger(2131034147); |
79 | ········this.mVal.throughputBonusDenominator·=·context.getResources().getInteger(213103414 | 79 | ········this.mVal.throughputBonusDenominator·=·context.getResources().getInteger(2131034145); |
80 | ········this.mVal.throughputBonusLimit·=·context.getResources().getInteger(213103414 | 80 | ········this.mVal.throughputBonusLimit·=·context.getResources().getInteger(2131034146); |
81 | ········this.mVal.savedNetworkBonus·=·context.getResources().getInteger(21310341 | 81 | ········this.mVal.savedNetworkBonus·=·context.getResources().getInteger(2131034138); |
82 | ········this.mVal.unmeteredNetworkBonus·=·context.getResources().getInteger(21310341 | 82 | ········this.mVal.unmeteredNetworkBonus·=·context.getResources().getInteger(2131034148); |
83 | ········this.mVal.currentNetworkBonusMin·=·context.getResources().getInteger(213103413 | 83 | ········this.mVal.currentNetworkBonusMin·=·context.getResources().getInteger(2131034132); |
84 | ········this.mVal.currentNetworkBonusPercent·=·context.getResources().getInteger(213103413 | 84 | ········this.mVal.currentNetworkBonusPercent·=·context.getResources().getInteger(2131034133); |
85 | ········this.mVal.secureNetworkBonus·=·context.getResources().getInteger(213103414 | 85 | ········this.mVal.secureNetworkBonus·=·context.getResources().getInteger(2131034143); |
86 | ········this.mVal.lastSelectionMinutes·=·context.getResources().getInteger(213103413 | 86 | ········this.mVal.lastSelectionMinutes·=·context.getResources().getInteger(2131034134); |
87 | ········this.mVal.pps[n]·=·context.getResources().getInteger(213103413 | 87 | ········this.mVal.pps[n]·=·context.getResources().getInteger(2131034136); |
88 | ········this.mVal.pps[n2]·=·context.getResources().getInteger(21310341 | 88 | ········this.mVal.pps[n2]·=·context.getResources().getInteger(2131034137); |
89 | ········try·{ | 89 | ········try·{ |
90 | ············final·ScoringParams$Values·mVal2·=·this.mVal; | 90 | ············final·ScoringParams$Values·mVal2·=·this.mVal; |
91 | ············try·{ | 91 | ············try·{ |
92 | ················mVal2.validate(); | 92 | ················mVal2.validate(); |
93 | ············} | 93 | ············} |
94 | ············catch·(IllegalArgumentException·ex)·{ | 94 | ············catch·(IllegalArgumentException·ex)·{ |
95 | ················final·StringBuilder·sb·=·new·StringBuilder(); | 95 | ················final·StringBuilder·sb·=·new·StringBuilder(); |
Offset 52, 15 lines modified | Offset 52, 15 lines modified | ||
52 | ············return; | 52 | ············return; |
53 | ········} | 53 | ········} |
54 | ········final·StringBuilder·sb·=·new·StringBuilder(); | 54 | ········final·StringBuilder·sb·=·new·StringBuilder(); |
55 | ········sb.append("Triggering·recovery·for·reason:·"); | 55 | ········sb.append("Triggering·recovery·for·reason:·"); |
56 | ········sb.append(SelfRecovery.REASON_STRINGS[n]); | 56 | ········sb.append(SelfRecovery.REASON_STRINGS[n]); |
57 | ········Log.e(s,·sb.toString()); | 57 | ········Log.e(s,·sb.toString()); |
58 | ········if·(n·==·(b·?·1·:·0))·{ | 58 | ········if·(n·==·(b·?·1·:·0))·{ |
59 | ············final·int·integer·=·this.mContext.getResources().getInteger(213103415 | 59 | ············final·int·integer·=·this.mContext.getResources().getInteger(2131034154); |
60 | ············if·(integer·==·0)·{ | 60 | ············if·(integer·==·0)·{ |
61 | ················Log.e(s,·"Recovery·disabled.·Disabling·wifi"); | 61 | ················Log.e(s,·"Recovery·disabled.·Disabling·wifi"); |
62 | ················this.mActiveModeWarden.recoveryDisableWifi(); | 62 | ················this.mActiveModeWarden.recoveryDisableWifi(); |
63 | ················return; | 63 | ················return; |
64 | ············} | 64 | ············} |
65 | ············this.trimPastRestartTimes(); | 65 | ············this.trimPastRestartTimes(); |
66 | ············if·(this.mPastRestartTimes.size()·>=·integer)·{ | 66 | ············if·(this.mPastRestartTimes.size()·>=·integer)·{ |
Offset 129, 15 lines modified | Offset 129, 15 lines modified | ||
129 | ········this.mContext·=·mContext; | 129 | ········this.mContext·=·mContext; |
130 | ········this.mIfaceName·=·mIfaceName; | 130 | ········this.mIfaceName·=·mIfaceName; |
131 | ········this.mWifiMonitor·=·mWifiMonitor; | 131 | ········this.mWifiMonitor·=·mWifiMonitor; |
132 | ····} | 132 | ····} |
133 | ···· | 133 | ···· |
134 | ····private·BitSet·addFastTransitionFlags(final·BitSet·set)·{ | 134 | ····private·BitSet·addFastTransitionFlags(final·BitSet·set)·{ |
135 | ········synchronized·(this.mLock)·{ | 135 | ········synchronized·(this.mLock)·{ |
136 | ············if·(!this.mContext.getResources().getBoolean(21308375 | 136 | ············if·(!this.mContext.getResources().getBoolean(2130837539))·{ |
137 | ················return·set; | 137 | ················return·set; |
138 | ············} | 138 | ············} |
139 | ············final·BitSet·set2·=·(BitSet)set.clone(); | 139 | ············final·BitSet·set2·=·(BitSet)set.clone(); |
140 | ············if·(set.get(1))·{ | 140 | ············if·(set.get(1))·{ |
141 | ················set2.set(6); | 141 | ················set2.set(6); |
142 | ············} | 142 | ············} |
143 | ············if·(set.get(2))·{ | 143 | ············if·(set.get(2))·{ |
Offset 2198, 294 lines modified | Offset 2198, 298 lines modified | ||
2198 | ········Label_0015:·{ | 2198 | ········Label_0015:·{ |
2199 | ············if·(wifiEnterpriseConfig·!=·null)·{ | 2199 | ············if·(wifiEnterpriseConfig·!=·null)·{ |
2200 | ················break·Label_0015; | 2200 | ················break·Label_0015; |
2201 | ············} | 2201 | ············} |
2202 | ············try·{ | 2202 | ············try·{ |
2203 | ················//·monitorexit(mLock) | 2203 | ················//·monitorexit(mLock) |
2204 | ················return·false; | 2204 | ················return·false; |
2205 | ················//·iftrue(Label_0 | 2205 | ················//·iftrue(Label_0812:,·TextUtils.isEmpty((CharSequence)fieldValue3)·||·this.setEapEngineID(fieldValue3)) |
2206 | ················//·iftrue(Label_0 | 2206 | ················//·iftrue(Label_0551:,·TextUtils.isEmpty((CharSequence)fieldValue4)·||·this.setEapClientCert(fieldValue4)) |
2207 | ················//·iftrue(Label_1 | 2207 | ················//·iftrue(Label_1544:,·TextUtils.isEmpty((CharSequence)fieldValue6)·||·!fieldValue6.equals((Object)"1")·||·this.setEapErp(eapErp)) |
2208 | ················//·iftrue(Label_0 | 2208 | ················//·iftrue(Label_0934:,·empty·||·this.setEapEngine(fieldValue8.equals((Object)"1")·&&·eapErp)) |
2209 | ················//·iftrue(Label_0 | 2209 | ················//·iftrue(Label_0283:,·TextUtils.isEmpty((CharSequence)fieldValue9)·||·this.setEapIdentity(NativeUtil.stringToByteArrayList(fieldValue9))) |
2210 | ················//·iftrue(Label_1195:,·TextUtils.isEmpty((CharSequence)fieldValue9)·||·this.setEapDomainSuffixMatch(fieldValue9)) | ||
2211 | ················//·iftrue(Label_0377:,·TextUtils.isEmpty((CharSequence)fieldValue10)·||·this.setEapAnonymousIdentity(NativeUtil.stringToByteArrayList(fieldValue10))) | ||
2212 | ················//·iftrue(Label_1282:,·TextUtils.isEmpty((CharSequence)fieldValue5)·||·this.setEapCAPath(fieldValue5)) | ||
2213 | ················//·iftrue(Label_0102:,·this.setEapMethod(wifiConfigurationToSupplicantEapMethod(wifiEnterpriseConfig.getEapMethod()))) | 2210 | ················//·iftrue(Label_0102:,·this.setEapMethod(wifiConfigurationToSupplicantEapMethod(wifiEnterpriseConfig.getEapMethod()))) |
2214 | ················//·iftrue(Label_1 | 2211 | ················//·iftrue(Label_1282:,·TextUtils.isEmpty((CharSequence)fieldValue10)·||·this.setEapCAPath(fieldValue10)) |
2215 | ················//·iftrue(Label_ | 2212 | ················//·iftrue(Label_0464:,·TextUtils.isEmpty((CharSequence)fieldValue11)·||·this.setEapPassword(NativeUtil.stringToByteArrayList(fieldValue11))) |
2216 | ················//·iftrue(Label_1 | 2213 | ················//·iftrue(Label_1401:,·TextUtils.isEmpty((CharSequence)fieldValue5)·||·this.setEapProactiveKeyCaching(fieldValue5.equals((Object)"1")·&&·eapErp)) |
2217 | ················//·iftrue(Label_0 | 2214 | ················//·iftrue(Label_0189:,·this.setEapPhase2Method(wifiConfigurationToSupplicantEapPhase2Method(wifiEnterpriseConfig.getPhase2Method()))) |
2218 | ················//·iftrue(Label_1 | 2215 | ················//·iftrue(Label_1448:,·this.getV1_3StaNetwork()·==·null·||·this.setOcsp(wifiEnterpriseConfig.getOcsp())) |
2219 | ················//·iftrue(Label_ | 2216 | ················//·iftrue(Label_1108:,·TextUtils.isEmpty((CharSequence)fieldValue13)·||·this.setEapAltSubjectMatch(fieldValue13)) |
2220 | ················//·iftrue(Label_0638:,·TextUtils.isEmpty((CharSequence)fieldValue | 2217 | ················//·iftrue(Label_0638:,·TextUtils.isEmpty((CharSequence)fieldValue)·||·this.setEapCACert(fieldValue)) |
2221 | ················//·iftrue(Label_ | 2218 | ················//·iftrue(Label_1195:,·TextUtils.isEmpty((CharSequence)fieldValue12)·||·this.setEapDomainSuffixMatch(fieldValue12)) |
2222 | ················ | 2219 | ················//·iftrue(Label_1021:,·TextUtils.isEmpty((CharSequence)fieldValue14)·||·this.setEapPrivateKeyId(fieldValue14)) |
2223 | ················ | 2220 | ················//·iftrue(Label_0725:,·TextUtils.isEmpty((CharSequence)fieldValue2)·||·this.setEapSubjectMatch(fieldValue2)) |
2221 | ················//·iftrue(Label_0377:,·TextUtils.isEmpty((CharSequence)fieldValue7)·||·this.setEapAnonymousIdentity(NativeUtil.stringToByteArrayList(fieldValue7))) | ||
2222 | ················String·fieldValue8·=·null; | ||
2223 | ················Block_21:·{ | ||
2224 | ····················String·fieldValue14·=·null; | 2224 | ····················String·fieldValue14·=·null; |
2225 | ····················Block_2 | 2225 | ····················Block_23:·{ |
2226 | ························String·fieldValue1 | 2226 | ························String·fieldValue13·=·null; |
2227 | ························Block_2 | 2227 | ························Block_25:·{ |
2228 | ····························String·fieldValue | 2228 | ····························String·fieldValue10·=·null; |
2229 | ························Block_2 | 2229 | ························Block_29: |
2230 | ····························while·(true)·{ | 2230 | ····························while·(true)·{ |
2231 | ····························Block_2 | 2231 | ····························Block_27_Outer: |
2232 | ································while·(true)·{ | 2232 | ································while·(true)·{ |
2233 | ································Block_37: | ||
2234 | ····································while·(true)·{ | 2233 | ····································while·(true)·{ |
2235 | ········································String·fieldValue3·=·null; | 2234 | ········································String·fieldValue3·=·null; |
2236 | ········································Block_1 | 2235 | ········································Block_18:·{ |
2237 | ············································ | 2236 | ············································Block_10:·{ |
2238 | ············································Block_8:·{ | ||
2239 | ················································String·s2; | 2237 | ················································String·s2; |
2240 | ················································StringBuilder·sb; | 2238 | ················································StringBuilder·sb; |
2241 | ················································String·fieldValue·=·null; | 2239 | ················································String·fieldValue·=·null; |
2242 | ················································String·s3; | 2240 | ················································String·s3; |
2243 | ················································StringBuilder·sb2; | 2241 | ················································StringBuilder·sb2; |
2244 | ················································final·String·fieldValue2; | 2242 | ················································final·String·fieldValue2; |
2245 | ················································ | 2243 | ················································String·fieldValue4·=·null; |
2246 | ················································String·fieldValue4; | ||
2247 | ················································String·s4; | 2244 | ················································String·s4; |
2248 | ················································StringBuilder·sb3; | 2245 | ················································StringBuilder·sb3; |
2249 | ················································String·fieldValue5; | 2246 | ················································String·fieldValue5; |
2247 | ················································String·fieldValue6; | ||
2248 | ················································boolean·eapErp; | ||
2250 | ················································String·s5; | 2249 | ················································String·s5; |
2251 | ················································StringBuilder·sb4; | 2250 | ················································StringBuilder·sb4; |
2252 | ················································final·String·fieldValue | 2251 | ················································final·String·fieldValue7; |
2253 | ················································String·s6; | 2252 | ················································String·s6; |
2254 | ················································String·s7; | ||
2255 | ················································StringBuilder·sb5; | 2253 | ················································StringBuilder·sb5; |
2256 | ················································ | 2254 | ················································boolean·empty; |
2255 | ················································String·fieldValue9; | ||
2256 | ················································String·s7; | ||
2257 | ················································String·fieldValue11; | ||
2257 | ················································String·s8; | 2258 | ················································String·s8; |
2258 | ················································StringBuilder·sb6; | 2259 | ················································StringBuilder·sb6; |
2259 | ················································String·s9; | 2260 | ················································String·s9; |
2260 | ················································StringBuilder·sb7; | 2261 | ················································StringBuilder·sb7; |
2261 | ················································final·String·fieldValue1 | 2262 | ················································final·String·fieldValue12; |
2262 | ················································String·fieldValue13; | ||
2263 | ················································String·s10; | 2263 | ················································String·s10; |
2264 | ················································StringBuilder·sb8; | 2264 | ················································StringBuilder·sb8; |
2265 | ················································ | 2265 | ················································String·s11; |
2266 | ················································StringBuilder·sb9; | ||
2267 | ················································Block_12:Block_32_Outer:Block_34_Outer: | ||
2266 | ················································while·(true)·{ | 2268 | ················································while·(true)·{ |
2267 | ····················································s2·=·"SupplicantStaNetworkHal"; | 2269 | ····················································s2·=·"SupplicantStaNetworkHal"; |
2268 | ····················································sb·=·new·StringBuilder(); | 2270 | ····················································sb·=·new·StringBuilder(); |
2269 | ····················································sb.append(s); | 2271 | ····················································sb.append(s); |
2270 | ····················································s·=·":·failed·to·set·eap·c | 2272 | ····················································s·=·":·failed·to·set·eap·ca·cert:·"; |
2271 | ····················································sb.append(s); | 2273 | ····················································sb.append(s); |
2272 | ····················································sb.append(fieldValue); | 2274 | ····················································sb.append(fieldValue); |
2273 | ····················································s·=·sb.toString(); | 2275 | ····················································s·=·sb.toString(); |
2274 | ····················································Log.e(s2,·s); | 2276 | ····················································Log.e(s2,·s); |
2275 | ····················································return·false; | 2277 | ····················································return·false; |
2276 | ····················································s3·=·"SupplicantStaNetworkHal"; | 2278 | ····················································s3·=·"SupplicantStaNetworkHal"; |
2277 | ····················································sb2·=·new·StringBuilder(); | 2279 | ····················································sb2·=·new·StringBuilder(); |
2278 | ····················································sb2.append(s); | 2280 | ····················································sb2.append(s); |
2279 | ····················································s·=·":·failed·to·set·eap·c | 2281 | ····················································s·=·":·failed·to·set·eap·subject·match:·"; |
2280 | ····················································sb2.append(s); | 2282 | ····················································sb2.append(s); |
2281 | ····················································sb2.append(fieldValue2); | 2283 | ····················································sb2.append(fieldValue2); |
2282 | ····················································s·=·sb2.toString(); | 2284 | ····················································s·=·sb2.toString(); |
2283 | ····················································Log.e(s3,·s); | 2285 | ····················································Log.e(s3,·s); |
2284 | ····················································return·false; | 2286 | ····················································return·false; |
2285 | ····················································Label_0 | 2287 | ····················································Label_0725:·{ |
2286 | ························································fieldValue3·=·wifiEnterpriseConfig.getFieldValue(" | 2288 | ························································fieldValue3·=·wifiEnterpriseConfig.getFieldValue("engine_id"); |
2287 | ····················································} | 2289 | ····················································} |
2288 | ····················································break·Block_1 | 2290 | ····················································break·Block_18; |
2289 | ····················································Label_ | 2291 | ····················································Label_0464: |
2290 | ···················································· | 2292 | ····················································fieldValue4·=·wifiEnterpriseConfig.getFieldValue("client_cert"); |
2291 | ···················································· | 2293 | ····················································break·Block_12; |
2292 | ···················································· | 2294 | ····················································Block_6:·{ |
2293 | ···················································· | 2295 | ························································Block_3:·{ |
2294 | ····················································Block_4 | 2296 | ························································Block_4_Outer: |
2295 | ····················································Block_3_Outer: | ||
2296 | ························································while·(true)·{ | ||
2297 | ····························································while·(true)·{ | 2297 | ····························································while·(true)·{ |
2298 | ································································while·(true)·{ | 2298 | ································································while·(true)·{ |
... Open expanded diff ... |
Offset 295, 15 lines modified | Offset 295, 15 lines modified | ||
295 | ········final·String·s·=·"WifiThroughputPredictor"; | 295 | ········final·String·s·=·"WifiThroughputPredictor"; |
296 | ········if·(deviceWiphyCapabilities·==·null)·{ | 296 | ········if·(deviceWiphyCapabilities·==·null)·{ |
297 | ············Log.e(s,·"Null·device·capabilities·passed·to·throughput·predictor"); | 297 | ············Log.e(s,·"Null·device·capabilities·passed·to·throughput·predictor"); |
298 | ············return·0; | 298 | ············return·0; |
299 | ········} | 299 | ········} |
300 | ········int·n8·=·Math.min(deviceWiphyCapabilities.getMaxNumberTxSpatialStreams(),·deviceWiphyCapabilities.getMaxNumberRxSpatialStreams()); | 300 | ········int·n8·=·Math.min(deviceWiphyCapabilities.getMaxNumberTxSpatialStreams(),·deviceWiphyCapabilities.getMaxNumberRxSpatialStreams()); |
301 | ········if·(this.mContext.getResources().getBoolean(2130837509))·{ | 301 | ········if·(this.mContext.getResources().getBoolean(2130837509))·{ |
302 | ············n8·=·this.mContext.getResources().getInteger(213103413 | 302 | ············n8·=·this.mContext.getResources().getInteger(2131034135); |
303 | ········} | 303 | ········} |
304 | ········final·int·min·=·Math.min(n8,·n5); | 304 | ········final·int·min·=·Math.min(n8,·n5); |
305 | ········int·n9·=·6; | 305 | ········int·n9·=·6; |
306 | ········final·int·n10·=·5; | 306 | ········final·int·n10·=·5; |
307 | ········final·int·n11·=·4; | 307 | ········final·int·n11·=·4; |
308 | ········final·int·n12·=·1; | 308 | ········final·int·n12·=·1; |
309 | ········Label_0228:·{ | 309 | ········Label_0228:·{ |
Offset 188, 15 lines modified | Offset 188, 15 lines modified | ||
188 | ················Log.e(s,·string); | 188 | ················Log.e(s,·string); |
189 | ················return·false; | 189 | ················return·false; |
190 | ············} | 190 | ············} |
191 | ········} | 191 | ········} |
192 | ········catch·(IllegalArgumentException·ex2)·{} | 192 | ········catch·(IllegalArgumentException·ex2)·{} |
193 | ····} | 193 | ····} |
194 | ···· | 194 | ···· |
195 | ····static·boolean·validateApWifiConfiguration(final·SoftApConfiguration·softApConfiguration,·final·boolean·b | 195 | ····static·boolean·validateApWifiConfiguration(final·SoftApConfiguration·softApConfiguration,·final·boolean·b)·{ |
196 | ········if·(!validateApConfigSsid(softApConfiguration.getSsid()))·{ | 196 | ········if·(!validateApConfigSsid(softApConfiguration.getSsid()))·{ |
197 | ············return·false; | 197 | ············return·false; |
198 | ········} | 198 | ········} |
199 | ········final·MacAddress·bssid·=·softApConfiguration.getBssid(); | 199 | ········final·MacAddress·bssid·=·softApConfiguration.getBssid(); |
200 | ········final·String·s·=·"WifiApConfigStore"; | 200 | ········final·String·s·=·"WifiApConfigStore"; |
201 | ········if·(bssid·!=·null·&&·!b)·{ | 201 | ········if·(bssid·!=·null·&&·!b)·{ |
202 | ············Log.e(s,·"Config·BSSID·needs·NETWORK_SETTINGS·permission"); | 202 | ············Log.e(s,·"Config·BSSID·needs·NETWORK_SETTINGS·permission"); |
Offset 220, 18 lines modified | Offset 220, 14 lines modified | ||
220 | ····················Log.d(s,·"softap·configs·must·either·be·open·or·WPA2·PSK·networks"); | 220 | ····················Log.d(s,·"softap·configs·must·either·be·open·or·WPA2·PSK·networks"); |
221 | ····················return·false; | 221 | ····················return·false; |
222 | ················} | 222 | ················} |
223 | ················if·(!b3)·{ | 223 | ················if·(!b3)·{ |
224 | ····················Log.d(s,·"softap·network·password·must·be·set"); | 224 | ····················Log.d(s,·"softap·network·password·must·be·set"); |
225 | ····················return·false; | 225 | ····················return·false; |
226 | ················} | 226 | ················} |
227 | ················if·(context.getResources().getBoolean(2130837529)·&&·!StandardCharsets.US_ASCII.newEncoder().canEncode(passphrase))·{ | ||
228 | ····················Log.d(s,·"passphrase·not·ASCII·encodable"); | ||
229 | ····················return·false; | ||
230 | ················} | ||
231 | ················if·(securityType·!=·n·&&·!validateApConfigPreSharedKey(passphrase))·{ | 227 | ················if·(securityType·!=·n·&&·!validateApConfigPreSharedKey(passphrase))·{ |
232 | ····················return·false; | 228 | ····················return·false; |
233 | ················} | 229 | ················} |
234 | ············} | 230 | ············} |
235 | ············return·b2; | 231 | ············return·b2; |
236 | ········} | 232 | ········} |
237 | ········catch·(IllegalStateException·ex)·{ | 233 | ········catch·(IllegalStateException·ex)·{ |
Offset 256, 45 lines modified | Offset 252, 45 lines modified | ||
256 | ············} | 252 | ············} |
257 | ············return·this.mPersistentWifiApConfig; | 253 | ············return·this.mPersistentWifiApConfig; |
258 | ········} | 254 | ········} |
259 | ····} | 255 | ····} |
260 | ···· | 256 | ···· |
261 | ····SoftApConfiguration·randomizeBssidIfUnset(final·Context·context,·final·SoftApConfiguration·softApConfiguration)·{ | 257 | ····SoftApConfiguration·randomizeBssidIfUnset(final·Context·context,·final·SoftApConfiguration·softApConfiguration)·{ |
262 | ········final·SoftApConfiguration$Builder·softApConfiguration$Builder·=·new·SoftApConfiguration$Builder(softApConfiguration); | 258 | ········final·SoftApConfiguration$Builder·softApConfiguration$Builder·=·new·SoftApConfiguration$Builder(softApConfiguration); |
263 | ········if·(softApConfiguration.getBssid()·==·null·&&·context.getResources().getBoolean(213083753 | 259 | ········if·(softApConfiguration.getBssid()·==·null·&&·context.getResources().getBoolean(2130837535))·{ |
264 | ············MacAddress·bssid·=·this.mMacAddressUtil.calculatePersistentMac(softApConfiguration.getSsid(),·this.mMacAddressUtil.obtainMacRandHashFunctionForSap(1010)); | 260 | ············MacAddress·bssid·=·this.mMacAddressUtil.calculatePersistentMac(softApConfiguration.getSsid(),·this.mMacAddressUtil.obtainMacRandHashFunctionForSap(1010)); |
265 | ············if·(bssid·==·null)·{ | 261 | ············if·(bssid·==·null)·{ |
266 | ················Log.e("WifiApConfigStore",·"Failed·to·calculate·MAC·from·SSID.·Generating·new·random·MAC·instead."); | 262 | ················Log.e("WifiApConfigStore",·"Failed·to·calculate·MAC·from·SSID.·Generating·new·random·MAC·instead."); |
267 | ················bssid·=·MacAddressUtils.createRandomUnicastAddress(); | 263 | ················bssid·=·MacAddressUtils.createRandomUnicastAddress(); |
268 | ············} | 264 | ············} |
269 | ············softApConfiguration$Builder.setBssid(bssid); | 265 | ············softApConfiguration$Builder.setBssid(bssid); |
270 | ········} | 266 | ········} |
271 | ········return·softApConfiguration$Builder.build(); | 267 | ········return·softApConfiguration$Builder.build(); |
272 | ····} | 268 | ····} |
273 | ···· | 269 | ···· |
274 | ····public·SoftApConfiguration·resetToDefaultForUnsupportedConfig(final·SoftApConfiguration·softApConfiguration)·{ | 270 | ····public·SoftApConfiguration·resetToDefaultForUnsupportedConfig(final·SoftApConfiguration·softApConfiguration)·{ |
275 | ········final·SoftApConfiguration$Builder·softApConfiguration$Builder·=·new·SoftApConfiguration$Builder(softApConfiguration); | 271 | ········final·SoftApConfiguration$Builder·softApConfiguration$Builder·=·new·SoftApConfiguration$Builder(softApConfiguration); |
276 | ········final·boolean·clientForceDisconnectSupported·=·ApConfigUtil.isClientForceDisconnectSupported(this.mContext); | 272 | ········final·boolean·clientForceDisconnectSupported·=·ApConfigUtil.isClientForceDisconnectSupported(this.mContext); |
277 | ········final·String·s·=·"WifiApConfigStore"; | 273 | ········final·String·s·=·"WifiApConfigStore"; |
278 | ········if·((!clientForceDisconnectSupported·||·this.mContext.getResources().getBoolean(213083753 | 274 | ········if·((!clientForceDisconnectSupported·||·this.mContext.getResources().getBoolean(2130837533))·&&·(softApConfiguration.isClientControlByUserEnabled()·||·softApConfiguration.getBlockedClientList().size()·!=·0))·{ |
279 | ············softApConfiguration$Builder.setClientControlByUserEnabled(false); | 275 | ············softApConfiguration$Builder.setClientControlByUserEnabled(false); |
280 | ············softApConfiguration$Builder.setBlockedClientList((List)new·ArrayList()); | 276 | ············softApConfiguration$Builder.setBlockedClientList((List)new·ArrayList()); |
281 | ············Log.i(s,·"Reset·ClientControlByUser·to·false·due·to·device·doesn't·support"); | 277 | ············Log.i(s,·"Reset·ClientControlByUser·to·false·due·to·device·doesn't·support"); |
282 | ········} | 278 | ········} |
283 | ········if·((!ApConfigUtil.isClientForceDisconnectSupported(this.mContext)·||·this.mContext.getResources().getBoolean(213083753 | 279 | ········if·((!ApConfigUtil.isClientForceDisconnectSupported(this.mContext)·||·this.mContext.getResources().getBoolean(2130837532))·&&·softApConfiguration.getMaxNumberOfClients()·!=·0)·{ |
284 | ············softApConfiguration$Builder.setMaxNumberOfClients(0); | 280 | ············softApConfiguration$Builder.setMaxNumberOfClients(0); |
285 | ············Log.i(s,·"Reset·MaxNumberOfClients·to·0·due·to·device·doesn't·support"); | 281 | ············Log.i(s,·"Reset·MaxNumberOfClients·to·0·due·to·device·doesn't·support"); |
286 | ········} | 282 | ········} |
287 | ········final·boolean·wpa3SaeSupported·=·ApConfigUtil.isWpa3SaeSupported(this.mContext); | 283 | ········final·boolean·wpa3SaeSupported·=·ApConfigUtil.isWpa3SaeSupported(this.mContext); |
288 | ········final·int·n·=·1; | 284 | ········final·int·n·=·1; |
289 | ········if·(!wpa3SaeSupported·&&·(softApConfiguration.getSecurityType()·==·3·||·softApConfiguration.getSecurityType()·==·2))·{ | 285 | ········if·(!wpa3SaeSupported·&&·(softApConfiguration.getSecurityType()·==·3·||·softApConfiguration.getSecurityType()·==·2))·{ |
290 | ············softApConfiguration$Builder.setPassphrase(generatePassword(),·n); | 286 | ············softApConfiguration$Builder.setPassphrase(generatePassword(),·n); |
291 | ············Log.i(s,·"Device·doesn't·support·WPA3-SAE,·reset·config·to·WPA2"); | 287 | ············Log.i(s,·"Device·doesn't·support·WPA3-SAE,·reset·config·to·WPA2"); |
292 | ········} | 288 | ········} |
293 | ········if·(this.mContext.getResources().getBoolean(213083753 | 289 | ········if·(this.mContext.getResources().getBoolean(2130837530)·&&·softApConfiguration.getChannel()·!=·0)·{ |
294 | ············softApConfiguration$Builder.setBand(softApConfiguration.getBand()·|·n); | 290 | ············softApConfiguration$Builder.setBand(softApConfiguration.getBand()·|·n); |
295 | ············Log.i(s,·"Reset·SAP·channel·configuration"); | 291 | ············Log.i(s,·"Reset·SAP·channel·configuration"); |
296 | ········} | 292 | ········} |
297 | ········int·band·=·softApConfiguration.getBand(); | 293 | ········int·band·=·softApConfiguration.getBand(); |
298 | ········if·(!this.mContext.getResources().getBoolean(2130837506)·&&·(band·&·0x4)·!=·0x0)·{ | 294 | ········if·(!this.mContext.getResources().getBoolean(2130837506)·&&·(band·&·0x4)·!=·0x0)·{ |
299 | ············band·&=·0xFFFFFFFB; | 295 | ············band·&=·0xFFFFFFFB; |
300 | ············Log.i(s,·"Device·doesn't·support·6g,·remove·6G·band·from·band·setting"); | 296 | ············Log.i(s,·"Device·doesn't·support·6g,·remove·6G·band·from·band·setting"); |
Offset 309, 19 lines modified | Offset 305, 19 lines modified | ||
309 | ············sb.append(softApConfiguration.getBand()); | 305 | ············sb.append(softApConfiguration.getBand()); |
310 | ············sb.append("·to·"); | 306 | ············sb.append("·to·"); |
311 | ············final·int·band2·=·band·|·n; | 307 | ············final·int·band2·=·band·|·n; |
312 | ············sb.append(band2); | 308 | ············sb.append(band2); |
313 | ············Log.i(s,·sb.toString()); | 309 | ············Log.i(s,·sb.toString()); |
314 | ············softApConfiguration$Builder.setBand(band2); | 310 | ············softApConfiguration$Builder.setBand(band2); |
315 | ········} | 311 | ········} |
316 | ········if·(this.mContext.getResources().getBoolean(213083753 | 312 | ········if·(this.mContext.getResources().getBoolean(2130837531)·&&·softApConfiguration.isHiddenSsid())·{ |
317 | ············softApConfiguration$Builder.setHiddenSsid(false); | 313 | ············softApConfiguration$Builder.setHiddenSsid(false); |
318 | ············Log.i(s,·"Reset·SAP·Hidden·Network·configuration"); | 314 | ············Log.i(s,·"Reset·SAP·Hidden·Network·configuration"); |
319 | ········} | 315 | ········} |
320 | ········if·(this.mContext.getResources().getBoolean(21308375 | 316 | ········if·(this.mContext.getResources().getBoolean(2130837529))·{ |
321 | ············final·long·shutdownTimeoutMillis·=·softApConfiguration.getShutdownTimeoutMillis(); | 317 | ············final·long·shutdownTimeoutMillis·=·softApConfiguration.getShutdownTimeoutMillis(); |
322 | ············final·long·shutdownTimeoutMillis2·=·0L; | 318 | ············final·long·shutdownTimeoutMillis2·=·0L; |
323 | ············if·(shutdownTimeoutMillis·!=·shutdownTimeoutMillis2)·{ | 319 | ············if·(shutdownTimeoutMillis·!=·shutdownTimeoutMillis2)·{ |
324 | ················softApConfiguration$Builder.setShutdownTimeoutMillis(shutdownTimeoutMillis2); | 320 | ················softApConfiguration$Builder.setShutdownTimeoutMillis(shutdownTimeoutMillis2); |
325 | ················Log.i(s,·"Reset·SAP·auto·shutdown·configuration"); | 321 | ················Log.i(s,·"Reset·SAP·auto·shutdown·configuration"); |
326 | ············} | 322 | ············} |
327 | ········} | 323 | ········} |
Offset 27, 19 lines modified | Offset 27, 18 lines modified | ||
27 | ····public·static·final·String·SUPPLICANT_KEY_WEP_KEY3; | 27 | ····public·static·final·String·SUPPLICANT_KEY_WEP_KEY3; |
28 | ····public·static·final·String·SUPPLICANT_KEY_WEP_KEY_IDX·=·"wep_tx_keyidx"; | 28 | ····public·static·final·String·SUPPLICANT_KEY_WEP_KEY_IDX·=·"wep_tx_keyidx"; |
29 | ····private·static·final·String·WEP_KEYS_MASK_LINE_MATCH_PATTERN; | 29 | ····private·static·final·String·WEP_KEYS_MASK_LINE_MATCH_PATTERN; |
30 | ····private·static·final·String·WEP_KEYS_MASK_REPLACE_PATTERN·=·"$1*"; | 30 | ····private·static·final·String·WEP_KEYS_MASK_REPLACE_PATTERN·=·"$1*"; |
31 | ····private·static·final·String·WEP_KEYS_MASK_SEARCH_PATTERN; | 31 | ····private·static·final·String·WEP_KEYS_MASK_SEARCH_PATTERN; |
32 | ···· | 32 | ···· |
33 | ····static·{ | 33 | ····static·{ |
34 | ········ | 34 | ········SUPPLICANT_KEY_WEP_KEY0·=·WifiConfiguration.wepKeyVarNames[0]; |
35 | ········SUPPLICANT_KEY_WEP_KEY | 35 | ········SUPPLICANT_KEY_WEP_KEY1·=·WifiConfiguration.wepKeyVarNames[1]; |
36 | ········SUPPLICANT_KEY_WEP_KEY | 36 | ········SUPPLICANT_KEY_WEP_KEY2·=·WifiConfiguration.wepKeyVarNames[2]; |
37 | ········SUPPLICANT_KEY_WEP_KEY | 37 | ········SUPPLICANT_KEY_WEP_KEY3·=·WifiConfiguration.wepKeyVarNames[3]; |
38 | ········SUPPLICANT_KEY_WEP_KEY3·=·wepKeyVarNames[3]; | ||
39 | ········final·StringBuilder·sb·=·new·StringBuilder(); | 38 | ········final·StringBuilder·sb·=·new·StringBuilder(); |
40 | ········sb.append(".*"); | 39 | ········sb.append(".*"); |
41 | ········final·String·supplicant_KEY_WEP_KEY0·=·WifiBackupRestore$SupplicantBackupMigration.SUPPLICANT_KEY_WEP_KEY0; | 40 | ········final·String·supplicant_KEY_WEP_KEY0·=·WifiBackupRestore$SupplicantBackupMigration.SUPPLICANT_KEY_WEP_KEY0; |
42 | ········final·String·s·=·"0"; | 41 | ········final·String·s·=·"0"; |
43 | ········final·String·s2·=·""; | 42 | ········final·String·s2·=·""; |
44 | ········sb.append(supplicant_KEY_WEP_KEY0.replace((CharSequence)s,·(CharSequence)s2)); | 43 | ········sb.append(supplicant_KEY_WEP_KEY0.replace((CharSequence)s,·(CharSequence)s2)); |
45 | ········sb.append(".*=.*"); | 44 | ········sb.append(".*=.*"); |
Offset 583, 17 lines modified | Offset 583, 14 lines modified | ||
583 | ········create.show(); | 583 | ········create.show(); |
584 | ········this.mUserApprovalUiActive·=·(n2·!=·0); | 584 | ········this.mUserApprovalUiActive·=·(n2·!=·0); |
585 | ········this.mIsLastUserApprovalUiDialog·=·(n2·!=·0); | 585 | ········this.mIsLastUserApprovalUiDialog·=·(n2·!=·0); |
586 | ····} | 586 | ····} |
587 | ···· | 587 | ···· |
588 | ····private·void·sendImsiPrivacyNotification(final·int·n)·{ | 588 | ····private·void·sendImsiPrivacyNotification(final·int·n)·{ |
589 | ········final·String·carrierNameforSubId·=·this.getCarrierNameforSubId(this.getMatchingSubId(n)); | 589 | ········final·String·carrierNameforSubId·=·this.getCarrierNameforSubId(this.getMatchingSubId(n)); |
590 | ········if·(carrierNameforSubId·==·null)·{ | ||
591 | ············return; | ||
592 | ········} | ||
593 | ········final·CharSequence·text·=·this.mResources.getText(2131165235); | 590 | ········final·CharSequence·text·=·this.mResources.getText(2131165235); |
594 | ········final·String·s·=·"com.android.server.wifi.extra.CarrierNetwork.CARRIER_NAME"; | 591 | ········final·String·s·=·"com.android.server.wifi.extra.CarrierNetwork.CARRIER_NAME"; |
595 | ········final·Pair·create·=·Pair.create((Object)s,·(Object)carrierNameforSubId); | 592 | ········final·Pair·create·=·Pair.create((Object)s,·(Object)carrierNameforSubId); |
596 | ········final·Integer·value·=·n; | 593 | ········final·Integer·value·=·n; |
597 | ········final·String·s2·=·"com.android.server.wifi.extra.CarrierNetwork.CARRIER_ID"; | 594 | ········final·String·s2·=·"com.android.server.wifi.extra.CarrierNetwork.CARRIER_ID"; |
598 | ········final·Notification$Action·build·=·new·Notification$Action$Builder((Icon)null,·text,·this.getPrivateBroadcast("com.android.server.wifi.action.CarrierNetwork.USER_ALLOWED_CARRIER",·create,·Pair.create((Object)s2,·(Object)value))).build(); | 595 | ········final·Notification$Action·build·=·new·Notification$Action$Builder((Icon)null,·text,·this.getPrivateBroadcast("com.android.server.wifi.action.CarrierNetwork.USER_ALLOWED_CARRIER",·create,·Pair.create((Object)s2,·(Object)value))).build(); |
599 | ········final·Notification$Action·build2·=·new·Notification$Action$Builder((Icon)null,·this.mResources.getText(2131165238),·this.getPrivateBroadcast("com.android.server.wifi.action.CarrierNetwork.USER_DISALLOWED_CARRIER",·Pair.create((Object)s,·(Object)carrierNameforSubId),·Pair.create((Object)s2,·(Object)n))).build(); | 596 | ········final·Notification$Action·build2·=·new·Notification$Action$Builder((Icon)null,·this.mResources.getText(2131165238),·this.getPrivateBroadcast("com.android.server.wifi.action.CarrierNetwork.USER_DISALLOWED_CARRIER",·Pair.create((Object)s,·(Object)carrierNameforSubId),·Pair.create((Object)s2,·(Object)n))).build(); |
Offset 911, 19 lines modified | Offset 908, 19 lines modified | ||
911 | ····························Log.v(s2,·(String)wifiConfiguration); | 908 | ····························Log.v(s2,·(String)wifiConfiguration); |
912 | ····························wifiConfiguration·=·(WifiConfiguration)new·WifiCarrierInfoManager$SimAuthResponseData(s6,·(String)o3); | 909 | ····························wifiConfiguration·=·(WifiConfiguration)new·WifiCarrierInfoManager$SimAuthResponseData(s6,·(String)o3); |
913 | ····························return·(WifiCarrierInfoManager$SimAuthResponseData)wifiConfiguration; | 910 | ····························return·(WifiCarrierInfoManager$SimAuthResponseData)wifiConfiguration; |
914 | ························} | 911 | ························} |
915 | ························return·null; | 912 | ························return·null; |
916 | ························Log.e(s2,·s); | 913 | ························Log.e(s2,·s); |
917 | ························array2·=·null; | 914 | ························array2·=·null; |
918 | ························o·=·null; | ||
919 | ························continue; | 915 | ························continue; |
920 | ····················} | 916 | ····················} |
921 | ····················Log.e(s2,·s); | 917 | ····················Log.e(s2,·s); |
922 | ····················array2·=·null; | 918 | ····················array2·=·null; |
919 | ····················o·=·null; | ||
923 | ················} | 920 | ················} |
924 | ················catch·(NumberFormatException·ex3)·{} | 921 | ················catch·(NumberFormatException·ex3)·{} |
925 | ············} | 922 | ············} |
926 | ············catch·(NumberFormatException·ex4)·{} | 923 | ············catch·(NumberFormatException·ex4)·{} |
927 | ········} | 924 | ········} |
928 | ····} | 925 | ····} |
929 | ···· | 926 | ···· |
Offset 16, 42 lines modified | Offset 16, 41 lines modified | ||
16 | import·android.net.ProxyInfo; | 16 | import·android.net.ProxyInfo; |
17 | import·android.net.IpConfiguration$ProxySettings; | 17 | import·android.net.IpConfiguration$ProxySettings; |
18 | import·android.net.StaticIpConfiguration; | 18 | import·android.net.StaticIpConfiguration; |
19 | import·android.net.IpConfiguration$IpAssignment; | 19 | import·android.net.IpConfiguration$IpAssignment; |
20 | import·android.text.TextUtils; | 20 | import·android.text.TextUtils; |
21 | import·java.io.IOException; | 21 | import·java.io.IOException; |
22 | import·org.xmlpull.v1.XmlPullParserException; | 22 | import·org.xmlpull.v1.XmlPullParserException; |
23 | import·android.net.wifi.WifiConfiguration$NetworkSelectionStatus$DisableReasonInfo; | ||
24 | import·android.util.ArraySet; | 23 | import·android.util.ArraySet; |
25 | import·com.android.wifi.x.android.net.util.MacAddressUtils; | 24 | import·com.android.wifi.x.android.net.util.MacAddressUtils; |
25 | import·android.net.wifi.WifiConfiguration$NetworkSelectionStatus; | ||
26 | import·android.net.wifi.WifiConfiguration$NetworkSelectionStatus$DisableReasonInfo; | ||
26 | import·java.util.Collection; | 27 | import·java.util.Collection; |
27 | import·java.util.HashSet; | 28 | import·java.util.HashSet; |
28 | import·java.util.Set; | 29 | import·java.util.Set; |
29 | import·android.content.ContentResolver; | 30 | import·android.content.ContentResolver; |
30 | import·android.net.wifi.WifiEnterpriseConfig; | 31 | import·android.net.wifi.WifiEnterpriseConfig; |
31 | import·android.provider.Settings$Global; | 32 | import·android.provider.Settings$Global; |
32 | import·java.util.Iterator; | 33 | import·java.util.Iterator; |
33 | import·java.util.BitSet; | 34 | import·java.util.BitSet; |
34 | import·android.util.Log; | 35 | import·android.util.Log; |
35 | import·android.net.wifi.WifiConfiguration; | 36 | import·android.net.wifi.WifiConfiguration; |
36 | import·android.app.ActivityManager; | 37 | import·android.app.ActivityManager; |
37 | import·android.net.wifi.WifiConfiguration$NetworkSelectionStatus; | ||
38 | import·java.util.ArrayList; | 38 | import·java.util.ArrayList; |
39 | import·java.util.HashMap; | 39 | import·java.util.HashMap; |
40 | import·android.os.UserHandle; | 40 | import·android.os.UserHandle; |
41 | import·android.os.Handler; | 41 | import·android.os.Handler; |
42 | import·com.android.server.wifi.util.WifiPermissionsWrapper; | 42 | import·com.android.server.wifi.util.WifiPermissionsWrapper; |
43 | import·com.android.server.wifi.util.WifiPermissionsUtil; | 43 | import·com.android.server.wifi.util.WifiPermissionsUtil; |
44 | import·com.android.server.wifi.util.MissingCounterTimerLockList; | 44 | import·com.android.server.wifi.util.MissingCounterTimerLockList; |
45 | import·android.os.UserManager; | 45 | import·android.os.UserManager; |
46 | import·java.util.Map; | 46 | import·java.util.Map; |
47 | import·com.android.server.wifi.util.LruConnectionTracker; | 47 | import·com.android.server.wifi.util.LruConnectionTracker; |
48 | import·com.android.wifi.x.android.util.LocalLog; | 48 | import·com.android.wifi.x.android.util.LocalLog; |
49 | import·java.util.List; | 49 | import·java.util.List; |
50 | import·android.util.SparseArray; | ||
51 | import·android.content.Context; | 50 | import·android.content.Context; |
52 | import·android.net.MacAddress; | 51 | import·android.net.MacAddress; |
53 | public·class·WifiConfigManager | 52 | public·class·WifiConfigManager |
54 | { | 53 | { |
55 | ····protected·static·final·long·AGGRESSIVE_MAC_REFRESH_MS_MAX·=·86400000L; | 54 | ····protected·static·final·long·AGGRESSIVE_MAC_REFRESH_MS_MAX·=·86400000L; |
56 | ····protected·static·final·long·AGGRESSIVE_MAC_REFRESH_MS_MIN·=·1800000L; | 55 | ····protected·static·final·long·AGGRESSIVE_MAC_REFRESH_MS_MIN·=·1800000L; |
Offset 71, 15 lines modified | Offset 70, 14 lines modified | ||
71 | ····private·final·BackupManagerProxy·mBackupManagerProxy; | 70 | ····private·final·BackupManagerProxy·mBackupManagerProxy; |
72 | ····private·final·Clock·mClock; | 71 | ····private·final·Clock·mClock; |
73 | ····private·final·ConfigurationMap·mConfiguredNetworks; | 72 | ····private·final·ConfigurationMap·mConfiguredNetworks; |
74 | ····private·final·Context·mContext; | 73 | ····private·final·Context·mContext; |
75 | ····private·int·mCurrentUserId; | 74 | ····private·int·mCurrentUserId; |
76 | ····private·boolean·mDeferredUserUnlockRead; | 75 | ····private·boolean·mDeferredUserUnlockRead; |
77 | ····private·final·DeviceConfigFacade·mDeviceConfigFacade; | 76 | ····private·final·DeviceConfigFacade·mDeviceConfigFacade; |
78 | ····private·final·SparseArray·mDisableReasonInfo; | ||
79 | ····private·final·FrameworkFacade·mFrameworkFacade; | 77 | ····private·final·FrameworkFacade·mFrameworkFacade; |
80 | ····private·int·mLastSelectedNetworkId; | 78 | ····private·int·mLastSelectedNetworkId; |
81 | ····private·long·mLastSelectedTimeStamp; | 79 | ····private·long·mLastSelectedTimeStamp; |
82 | ····private·final·List·mListeners; | 80 | ····private·final·List·mListeners; |
83 | ····private·final·LocalLog·mLocalLog; | 81 | ····private·final·LocalLog·mLocalLog; |
84 | ····private·final·LruConnectionTracker·mLruConnectionTracker; | 82 | ····private·final·LruConnectionTracker·mLruConnectionTracker; |
85 | ····private·final·MacAddressUtil·mMacAddressUtil; | 83 | ····private·final·MacAddressUtil·mMacAddressUtil; |
Offset 138, 16 lines modified | Offset 136, 14 lines modified | ||
138 | ········this.mNetworkListUserStoreData·=·mNetworkListUserStoreData; | 136 | ········this.mNetworkListUserStoreData·=·mNetworkListUserStoreData; |
139 | ········this.mRandomizedMacStoreData·=·mRandomizedMacStoreData; | 137 | ········this.mRandomizedMacStoreData·=·mRandomizedMacStoreData; |
140 | ········this.mWifiConfigStore.registerStoreData((WifiConfigStore$StoreData)mNetworkListSharedStoreData); | 138 | ········this.mWifiConfigStore.registerStoreData((WifiConfigStore$StoreData)mNetworkListSharedStoreData); |
141 | ········this.mWifiConfigStore.registerStoreData((WifiConfigStore$StoreData)this.mNetworkListUserStoreData); | 139 | ········this.mWifiConfigStore.registerStoreData((WifiConfigStore$StoreData)this.mNetworkListUserStoreData); |
142 | ········this.mWifiConfigStore.registerStoreData((WifiConfigStore$StoreData)this.mRandomizedMacStoreData); | 140 | ········this.mWifiConfigStore.registerStoreData((WifiConfigStore$StoreData)this.mRandomizedMacStoreData); |
143 | ········this.mFrameworkFacade·=·mFrameworkFacade; | 141 | ········this.mFrameworkFacade·=·mFrameworkFacade; |
144 | ········this.mDeviceConfigFacade·=·mDeviceConfigFacade; | 142 | ········this.mDeviceConfigFacade·=·mDeviceConfigFacade; |
145 | ········this.mDisableReasonInfo·=·WifiConfiguration$NetworkSelectionStatus.DISABLE_REASON_INFOS.clone(); | ||
146 | ········this.loadCustomConfigsForDisableReasonInfos(); | ||
147 | ········int·n; | 143 | ········int·n; |
148 | ········if·(((ActivityManager)mContext.getSystemService((Class)ActivityManager.class)).isLowRamDevice())·{ | 144 | ········if·(((ActivityManager)mContext.getSystemService((Class)ActivityManager.class)).isLowRamDevice())·{ |
149 | ············n·=·128; | 145 | ············n·=·128; |
150 | ········} | 146 | ········} |
151 | ········else·{ | 147 | ········else·{ |
152 | ············n·=·256; | 148 | ············n·=·256; |
153 | ········} | 149 | ········} |
Offset 386, 15 lines modified | Offset 382, 15 lines modified | ||
386 | ········while·(true)·{ | 382 | ········while·(true)·{ |
387 | ············final·boolean·hasNext·=·iterator.hasNext(); | 383 | ············final·boolean·hasNext·=·iterator.hasNext(); |
388 | ············n·=·1; | 384 | ············n·=·1; |
389 | ············if·(!hasNext)·{ | 385 | ············if·(!hasNext)·{ |
390 | ················break; | 386 | ················break; |
391 | ············} | 387 | ············} |
392 | ············final·WifiConfiguration·wifiConfiguration·=·(WifiConfiguration)iterator.next(); | 388 | ············final·WifiConfiguration·wifiConfiguration·=·(WifiConfiguration)iterator.next(); |
393 | ············if·(( | 389 | ············if·((wifiConfiguration.shared·||·this.mWifiPermissionsUtil.doesUidBelongToCurrentUser(wifiConfiguration.creatorUid))·&&·!wifiConfiguration.ephemeral)·{ |
394 | ················continue; | 390 | ················continue; |
395 | ············} | 391 | ············} |
396 | ············set.add(wifiConfiguration.networkId); | 392 | ············set.add(wifiConfiguration.networkId); |
397 | ············final·StringBuilder·sb2·=·new·StringBuilder(); | 393 | ············final·StringBuilder·sb2·=·new·StringBuilder(); |
398 | ············sb2.append("clearInternalUserData:·removed·config.·netId="); | 394 | ············sb2.append("clearInternalUserData:·removed·config.·netId="); |
399 | ············sb2.append(wifiConfiguration.networkId); | 395 | ············sb2.append(wifiConfiguration.networkId); |
400 | ············sb2.append("·configKey="); | 396 | ············sb2.append("·configKey="); |
Offset 451, 30 lines modified | Offset 447, 14 lines modified | ||
451 | ········} | 447 | ········} |
452 | ········defaultsInWifiConfiguration.lastUpdateName·=·nameForUid; | 448 | ········defaultsInWifiConfiguration.lastUpdateName·=·nameForUid; |
453 | ········defaultsInWifiConfiguration.creatorName·=·nameForUid; | 449 | ········defaultsInWifiConfiguration.creatorName·=·nameForUid; |
454 | ········this.initRandomizedMacForInternalConfig(defaultsInWifiConfiguration); | 450 | ········this.initRandomizedMacForInternalConfig(defaultsInWifiConfiguration); |
455 | ········return·defaultsInWifiConfiguration; | 451 | ········return·defaultsInWifiConfiguration; |
456 | ····} | 452 | ····} |
457 | ···· | 453 | ···· |
458 | ····private·boolean·doesUidBelongToCurrentUser(final·int·n)·{ | ||
459 | ········boolean·b·=·true; | ||
460 | ········if·(n·!=·1000)·{ | ||
461 | ············if·(!this.mWifiPermissionsUtil.checkNetworkSettingsPermission(n))·{ | ||
462 | ················final·UserHandle·of·=·UserHandle.of(this.mCurrentUserId); | ||
463 | ················final·UserHandle·userHandleForUid·=·UserHandle.getUserHandleForUid(n); | ||
464 | ················if·(!of.equals((Object)userHandleForUid))·{ | ||
465 | ····················if·(!this.mUserManager.isSameProfileGroup(of,·userHandleForUid))·{ | ||
466 | ························b·=·false; | ||
467 | ····················} | ||
468 | ················} | ||
469 | ············} | ||
470 | ········} | ||
471 | ········return·b; | ||
472 | ····} | ||
473 | ···· | ||
474 | ····private·void·generateRandomizedMacAddresses()·{ | 454 | ····private·void·generateRandomizedMacAddresses()·{ |
475 | ········for·(final·WifiConfiguration·wifiConfiguration·:·this.getInternalConfiguredNetworks())·{ | 455 | ········for·(final·WifiConfiguration·wifiConfiguration·:·this.getInternalConfiguredNetworks())·{ |
476 | ············if·(WifiConfigManager.DEFAULT_MAC_ADDRESS.equals((Object)wifiConfiguration.getRandomizedMacAddress()))·{ | 456 | ············if·(WifiConfigManager.DEFAULT_MAC_ADDRESS.equals((Object)wifiConfiguration.getRandomizedMacAddress()))·{ |
477 | ················this.initRandomizedMacForInternalConfig(wifiConfiguration); | 457 | ················this.initRandomizedMacForInternalConfig(wifiConfiguration); |
478 | ············} | 458 | ············} |
479 | ········} | 459 | ········} |
480 | ····} | 460 | ····} |
Offset 547, 14 lines modified | Offset 527, 38 lines modified | ||
547 | ········return·byConfigKeyForCurrentUser; | 527 | ········return·byConfigKeyForCurrentUser; |
548 | ····} | 528 | ····} |
... Open expanded diff ... |
Offset 44, 16 lines modified | Offset 44, 15 lines modified | ||
44 | ····private·static·final·String·TAG·=·"WifiConfigurationUtil"; | 44 | ····private·static·final·String·TAG·=·"WifiConfigurationUtil"; |
45 | ····public·static·final·boolean·VALIDATE_FOR_ADD·=·true; | 45 | ····public·static·final·boolean·VALIDATE_FOR_ADD·=·true; |
46 | ····public·static·final·boolean·VALIDATE_FOR_UPDATE·=·false; | 46 | ····public·static·final·boolean·VALIDATE_FOR_UPDATE·=·false; |
47 | ···· | 47 | ···· |
48 | ····static·{ | 48 | ····static·{ |
49 | ········final·MacAddress·broadcast_ADDRESS·=·MacAddress.BROADCAST_ADDRESS; | 49 | ········final·MacAddress·broadcast_ADDRESS·=·MacAddress.BROADCAST_ADDRESS; |
50 | ········MATCH_NONE_BSSID_PATTERN·=·new·Pair((Object)broadcast_ADDRESS,·(Object)broadcast_ADDRESS); | 50 | ········MATCH_NONE_BSSID_PATTERN·=·new·Pair((Object)broadcast_ADDRESS,·(Object)broadcast_ADDRESS); |
51 | ········ | 51 | ········MATCH_ALL_BSSID_PATTERN·=·new·Pair((Object)WifiManager.ALL_ZEROS_MAC_ADDRESS,·(Object)WifiManager.ALL_ZEROS_MAC_ADDRESS); |
52 | ········MATCH_ALL_BSSID_PATTERN·=·new·Pair((Object)all_ZEROS_MAC_ADDRESS,·(Object)all_ZEROS_MAC_ADDRESS); | ||
53 | ····} | 52 | ····} |
54 | ···· | 53 | ···· |
55 | ····public·static·WifiScanner$PnoSettings$PnoNetwork·createPnoNetwork(final·WifiConfiguration·wifiConfiguration)·{ | 54 | ····public·static·WifiScanner$PnoSettings$PnoNetwork·createPnoNetwork(final·WifiConfiguration·wifiConfiguration)·{ |
56 | ········final·WifiScanner$PnoSettings$PnoNetwork·wifiScanner$PnoSettings$PnoNetwork·=·new·WifiScanner$PnoSettings$PnoNetwork(wifiConfiguration.SSID); | 55 | ········final·WifiScanner$PnoSettings$PnoNetwork·wifiScanner$PnoSettings$PnoNetwork·=·new·WifiScanner$PnoSettings$PnoNetwork(wifiConfiguration.SSID); |
57 | ········final·boolean·hiddenSSID·=·wifiConfiguration.hiddenSSID; | 56 | ········final·boolean·hiddenSSID·=·wifiConfiguration.hiddenSSID; |
58 | ········final·byte·b·=·1; | 57 | ········final·byte·b·=·1; |
59 | ········if·(hiddenSSID)·{ | 58 | ········if·(hiddenSSID)·{ |
Offset 1, 14 lines modified | Offset 1, 13 lines modified | ||
1 | package·com.android.server.wifi; | 1 | package·com.android.server.wifi; |
2 | import·android.util.Log; | 2 | import·android.util.Log; |
3 | import·android.net.wifi.WifiScanner; | 3 | import·android.net.wifi.WifiScanner; |
4 | import·android.net.wifi.WifiScanner$ScanData; | 4 | import·android.net.wifi.WifiScanner$ScanData; |
5 | import·android.net.wifi.ScanResult$RadioChainInfo; | ||
6 | import·com.android.server.wifi.util.ScanResultUtil; | 5 | import·com.android.server.wifi.util.ScanResultUtil; |
7 | import·android.net.wifi.ScanResult; | 6 | import·android.net.wifi.ScanResult; |
8 | import·java.util.ArrayList; | 7 | import·java.util.ArrayList; |
9 | import·java.util.List; | 8 | import·java.util.List; |
10 | import·android.net.wifi.WifiScanner$ScanListener; | 9 | import·android.net.wifi.WifiScanner$ScanListener; |
11 | class·WifiConnectivityManager$AllSingleScanListener·implements·WifiScanner$ScanListener | 10 | class·WifiConnectivityManager$AllSingleScanListener·implements·WifiScanner$ScanListener |
Offset 46, 23 lines modified | Offset 45, 20 lines modified | ||
46 | ····················final·StringBuilder·sb·=·new·StringBuilder(); | 45 | ····················final·StringBuilder·sb·=·new·StringBuilder(); |
47 | ····················sb.append("AllSingleScanListener·onFullResult:·"); | 46 | ····················sb.append("AllSingleScanListener·onFullResult:·"); |
48 | ····················sb.append(scanResult.SSID); | 47 | ····················sb.append(scanResult.SSID); |
49 | ····················sb.append("·capabilities·"); | 48 | ····················sb.append("·capabilities·"); |
50 | ····················sb.append(scanResult.capabilities); | 49 | ····················sb.append(scanResult.capabilities); |
51 | ····················WifiConnectivityManager.access$900(this$0,·sb.toString()); | 50 | ····················WifiConnectivityManager.access$900(this$0,·sb.toString()); |
52 | ················} | 51 | ················} |
53 | ················if·(!WifiConnectivityManager.access$2300(this.this$0).getResources().getBoolean(213083754 | 52 | ················if·(!WifiConnectivityManager.access$2300(this.this$0).getResources().getBoolean(2130837543)·&&·scanResult.radioChainInfos·!=·null)·{ |
54 | ····················final· | 53 | ····················final·int·length·=·scanResult.radioChainInfos.length; |
55 | ···················· | 54 | ····················final·int·n·=·1; |
56 | ···················· | 55 | ····················if·(length·==·n)·{ |
57 | ························ | 56 | ························this.mNumScanResultsIgnoredDueToSingleRadioChain·+=·n; |
58 | ························ | 57 | ························return; |
59 | ····························this.mNumScanResultsIgnoredDueToSingleRadioChain·+=·n; | ||
60 | ····························return; | ||
61 | ························} | ||
62 | ····················} | 58 | ····················} |
63 | ················} | 59 | ················} |
64 | ················this.mScanDetails.add(ScanResultUtil.toScanDetail(scanResult)); | 60 | ················this.mScanDetails.add(ScanResultUtil.toScanDetail(scanResult)); |
65 | ············} | 61 | ············} |
66 | ········} | 62 | ········} |
67 | ····} | 63 | ····} |
68 | ···· | 64 | ···· |
Offset 354, 33 lines modified | Offset 354, 33 lines modified | ||
354 | ············} | 354 | ············} |
355 | ············this.mStateMachine.startConnectToNetwork(wifiConfiguration.networkId,·1010,·bssid); | 355 | ············this.mStateMachine.startConnectToNetwork(wifiConfiguration.networkId,·1010,·bssid); |
356 | ········} | 356 | ········} |
357 | ····} | 357 | ····} |
358 | ···· | 358 | ···· |
359 | ····private·int·deviceMobilityStateToPnoScanIntervalMs(final·int·n)·{ | 359 | ····private·int·deviceMobilityStateToPnoScanIntervalMs(final·int·n)·{ |
360 | ········if·(n·==·0·||·n·==·1·||·n·==·2)·{ | 360 | ········if·(n·==·0·||·n·==·1·||·n·==·2)·{ |
361 | ············return·this.mContext.getResources().getInteger(213103415 | 361 | ············return·this.mContext.getResources().getInteger(2131034156); |
362 | ········} | 362 | ········} |
363 | ········if·(n·!=·3)·{ | 363 | ········if·(n·!=·3)·{ |
364 | ············return·-1; | 364 | ············return·-1; |
365 | ········} | 365 | ········} |
366 | ········return·this.mContext.getResources().getInteger(21310341 | 366 | ········return·this.mContext.getResources().getInteger(2131034159); |
367 | ····} | 367 | ····} |
368 | ···· | 368 | ···· |
369 | ····private·List·filterCandidatesHighMovement(final·List·list,·final·String·s,·final·boolean·b)·{ | 369 | ····private·List·filterCandidatesHighMovement(final·List·list,·final·String·s,·final·boolean·b)·{ |
370 | ········final·boolean·b2·=·b·||·s.equals("PnoScanListener"); | 370 | ········final·boolean·b2·=·b·||·s.equals("PnoScanListener"); |
371 | ········if·(list·!=·null·&&·!list.isEmpty())·{ | 371 | ········if·(list·!=·null·&&·!list.isEmpty())·{ |
372 | ············final·long·n·=·(long)this.mContext.getResources().getInteger(213103415 | 372 | ············final·long·n·=·(long)this.mContext.getResources().getInteger(2131034151); |
373 | ············final·WifiConnectivityManager$CachedWifiCandidates·mCachedWifiCandidates·=·this.mCachedWifiCandidates; | 373 | ············final·WifiConnectivityManager$CachedWifiCandidates·mCachedWifiCandidates·=·this.mCachedWifiCandidates; |
374 | ············if·(mCachedWifiCandidates·!=·null·&&·mCachedWifiCandidates.candidateRssiMap·!=·null)·{ | 374 | ············if·(mCachedWifiCandidates·!=·null·&&·mCachedWifiCandidates.candidateRssiMap·!=·null)·{ |
375 | ················if·(this.mClock.getElapsedSinceBootMillis()·-·this.mCachedWifiCandidates.timeSinceBootMs·<·n)·{ | 375 | ················if·(this.mClock.getElapsedSinceBootMillis()·-·this.mCachedWifiCandidates.timeSinceBootMs·<·n)·{ |
376 | ····················this.mWifiMetrics.incrementNumHighMovementConnectionSkipped(); | 376 | ····················this.mWifiMetrics.incrementNumHighMovementConnectionSkipped(); |
377 | ····················return·null; | 377 | ····················return·null; |
378 | ················} | 378 | ················} |
379 | ················final·List<?·super·Object>·list2·=·(List<?·super·Object>)list.stream().filter((Predicate<?·super·Object>)new·-$$Lambda$WifiConnectivityManager$axtJNPnNfJ9Q6ZyfvqnQxfGjodI(this,·this.mContext.getResources().getInteger(213103415 | 379 | ················final·List<?·super·Object>·list2·=·(List<?·super·Object>)list.stream().filter((Predicate<?·super·Object>)new·-$$Lambda$WifiConnectivityManager$axtJNPnNfJ9Q6ZyfvqnQxfGjodI(this,·this.mContext.getResources().getInteger(2131034150))).collect((Collector<?·super·Object,·Object,·List<?·super·Object>>)Collectors.toList()); |
380 | ················if·(!list2.isEmpty())·{ | 380 | ················if·(!list2.isEmpty())·{ |
381 | ····················if·(b2)·{ | 381 | ····················if·(b2)·{ |
382 | ························this.mCachedWifiCandidates·=·new·WifiConnectivityManager$CachedWifiCandidates(this,·this.mClock.getElapsedSinceBootMillis(),·list); | 382 | ························this.mCachedWifiCandidates·=·new·WifiConnectivityManager$CachedWifiCandidates(this,·this.mClock.getElapsedSinceBootMillis(),·list); |
383 | ····················} | 383 | ····················} |
384 | ····················this.mWifiMetrics.incrementNumHighMovementConnectionStarted(); | 384 | ····················this.mWifiMetrics.incrementNumHighMovementConnectionStarted(); |
385 | ····················return·list2; | 385 | ····················return·list2; |
386 | ················} | 386 | ················} |
Offset 700, 15 lines modified | Offset 700, 15 lines modified | ||
700 | ········this.mInitialScanState·=·mInitialScanState; | 700 | ········this.mInitialScanState·=·mInitialScanState; |
701 | ····} | 701 | ····} |
702 | ···· | 702 | ···· |
703 | ····private·boolean·setScanChannels(final·WifiScanner$ScanSettings·wifiScanner$ScanSettings)·{ | 703 | ····private·boolean·setScanChannels(final·WifiScanner$ScanSettings·wifiScanner$ScanSettings)·{ |
704 | ········final·WifiConfiguration·currentWifiConfiguration·=·this.mStateMachine.getCurrentWifiConfiguration(); | 704 | ········final·WifiConfiguration·currentWifiConfiguration·=·this.mStateMachine.getCurrentWifiConfiguration(); |
705 | ········Set·set; | 705 | ········Set·set; |
706 | ········if·(currentWifiConfiguration·==·null)·{ | 706 | ········if·(currentWifiConfiguration·==·null)·{ |
707 | ············set·=·this.fetchChannelSetForPartialScan(this.mContext.getResources().getInteger(213103415 | 707 | ············set·=·this.fetchChannelSetForPartialScan(this.mContext.getResources().getInteger(2131034153),·this.mContext.getResources().getInteger(2131034152)·*·60000); |
708 | ········} | 708 | ········} |
709 | ········else·{ | 709 | ········else·{ |
710 | ············set·=·this.fetchChannelSetForNetworkForPartialScan(currentWifiConfiguration.networkId); | 710 | ············set·=·this.fetchChannelSetForNetworkForPartialScan(currentWifiConfiguration.networkId); |
711 | ········} | 711 | ········} |
712 | ········int·n·=·0; | 712 | ········int·n·=·0; |
713 | ········if·(set·!=·null·&&·set.size()·!=·0)·{ | 713 | ········if·(set·!=·null·&&·set.size()·!=·0)·{ |
714 | ············wifiScanner$ScanSettings.channels·=·new·WifiScanner$ChannelSpec[set.size()]; | 714 | ············wifiScanner$ScanSettings.channels·=·new·WifiScanner$ChannelSpec[set.size()]; |
Offset 833, 15 lines modified | Offset 833, 15 lines modified | ||
833 | ········scanChannels.hiddenNetworks.addAll(this.mWifiNetworkSuggestionsManager.retrieveHiddenNetworkList()); | 833 | ········scanChannels.hiddenNetworks.addAll(this.mWifiNetworkSuggestionsManager.retrieveHiddenNetworkList()); |
834 | ········this.mScanner.startScan(scanChannels,·(Executor)new·HandlerExecutor(this.mEventHandler),·(WifiScanner$ScanListener)new·WifiConnectivityManager$SingleScanListener(this,·b),·workSource); | 834 | ········this.mScanner.startScan(scanChannels,·(Executor)new·HandlerExecutor(this.mEventHandler),·(WifiScanner$ScanListener)new·WifiConnectivityManager$SingleScanListener(this,·b),·workSource); |
835 | ········this.mWifiMetrics.incrementConnectivityOneshotScanCount(); | 835 | ········this.mWifiMetrics.incrementConnectivityOneshotScanCount(); |
836 | ····} | 836 | ····} |
837 | ···· | 837 | ···· |
838 | ····private·void·startPeriodicScan(final·boolean·b)·{ | 838 | ····private·void·startPeriodicScan(final·boolean·b)·{ |
839 | ········this.mPnoScanListener.resetLowRssiNetworkRetryDelay(); | 839 | ········this.mPnoScanListener.resetLowRssiNetworkRetryDelay(); |
840 | ········if·(this.mWifiState·==·1·&&·!this.mContext.getResources().getBoolean(213083754 | 840 | ········if·(this.mWifiState·==·1·&&·!this.mContext.getResources().getBoolean(2130837540))·{ |
841 | ············return; | 841 | ············return; |
842 | ········} | 842 | ········} |
843 | ········if·(b)·{ | 843 | ········if·(b)·{ |
844 | ············this.resetLastPeriodicSingleScanTimeStamp(); | 844 | ············this.resetLastPeriodicSingleScanTimeStamp(); |
845 | ········} | 845 | ········} |
846 | ········this.mCurrentSingleScanScheduleIndex·=·0; | 846 | ········this.mCurrentSingleScanScheduleIndex·=·0; |
847 | ········this.startPeriodicSingleScan(); | 847 | ········this.startPeriodicSingleScan(); |
Offset 1093, 15 lines modified | Offset 1093, 15 lines modified | ||
1093 | ····} | 1093 | ····} |
1094 | ···· | 1094 | ···· |
1095 | ····public·Set·fetchChannelSetForNetworkForPartialScan(final·int·n)·{ | 1095 | ····public·Set·fetchChannelSetForNetworkForPartialScan(final·int·n)·{ |
1096 | ········final·WifiConfiguration·configuredNetwork·=·this.mConfigManager.getConfiguredNetwork(n); | 1096 | ········final·WifiConfiguration·configuredNetwork·=·this.mConfigManager.getConfiguredNetwork(n); |
1097 | ········if·(configuredNetwork·==·null)·{ | 1097 | ········if·(configuredNetwork·==·null)·{ |
1098 | ············return·null; | 1098 | ············return·null; |
1099 | ········} | 1099 | ········} |
1100 | ········final·int·integer·=·this.mContext.getResources().getInteger(213103416 | 1100 | ········final·int·integer·=·this.mContext.getResources().getInteger(2131034161); |
1101 | ········final·HashSet<Integer>·set·=·new·HashSet<Integer>(); | 1101 | ········final·HashSet<Integer>·set·=·new·HashSet<Integer>(); |
1102 | ········if·(this.mWifiInfo.getFrequency()·>·0)·{ | 1102 | ········if·(this.mWifiInfo.getFrequency()·>·0)·{ |
1103 | ············set.add(this.mWifiInfo.getFrequency()); | 1103 | ············set.add(this.mWifiInfo.getFrequency()); |
1104 | ········} | 1104 | ········} |
1105 | ········this.addChannelFromWifiScoreCard(set,·configuredNetwork,·integer,·3600000L); | 1105 | ········this.addChannelFromWifiScoreCard(set,·configuredNetwork,·integer,·3600000L); |
1106 | ········return·set; | 1106 | ········return·set; |
1107 | ····} | 1107 | ····} |
Offset 17, 14 lines modified | Offset 17, 15 lines modified | ||
17 | import·android.content.res.AssetManager; | 17 | import·android.content.res.AssetManager; |
18 | import·android.content.ContextWrapper; | 18 | import·android.content.ContextWrapper; |
19 | public·class·WifiContext·extends·ContextWrapper | 19 | public·class·WifiContext·extends·ContextWrapper |
20 | { | 20 | { |
21 | ····private·static·final·String·ACTION_RESOURCES_APK·=·"com.android.server.wifi.intent.action.SERVICE_WIFI_RESOURCES_APK"; | 21 | ····private·static·final·String·ACTION_RESOURCES_APK·=·"com.android.server.wifi.intent.action.SERVICE_WIFI_RESOURCES_APK"; |
22 | ····private·static·final·String·TAG·=·"WifiContext"; | 22 | ····private·static·final·String·TAG·=·"WifiContext"; |
23 | ····private·static·final·String·WIFI_OVERLAY_JAVA_PKG_NAME·=·"com.android.wifi.resources"; | ||
23 | ····private·AssetManager·mWifiAssetsFromApk; | 24 | ····private·AssetManager·mWifiAssetsFromApk; |
24 | ····private·String·mWifiOverlayApkPkgName; | 25 | ····private·String·mWifiOverlayApkPkgName; |
25 | ····private·Resources·mWifiResourcesFromApk; | 26 | ····private·Resources·mWifiResourcesFromApk; |
26 | ····private·Resources$Theme·mWifiThemeFromApk; | 27 | ····private·Resources$Theme·mWifiThemeFromApk; |
27 | ···· | 28 | ···· |
28 | ····public·WifiContext(final·Context·context)·{ | 29 | ····public·WifiContext(final·Context·context)·{ |
29 | ········super(context); | 30 | ········super(context); |
Offset 92, 8 lines modified | Offset 93, 12 lines modified | ||
92 | ········this.mWifiOverlayApkPkgName·=·((ResolveInfo)queryIntentActivities.get(0)).activityInfo.applicationInfo.packageName; | 93 | ········this.mWifiOverlayApkPkgName·=·((ResolveInfo)queryIntentActivities.get(0)).activityInfo.applicationInfo.packageName; |
93 | ········final·StringBuilder·sb2·=·new·StringBuilder(); | 94 | ········final·StringBuilder·sb2·=·new·StringBuilder(); |
94 | ········sb2.append("Found·Wifi·Resources·APK·at:·"); | 95 | ········sb2.append("Found·Wifi·Resources·APK·at:·"); |
95 | ········sb2.append(this.mWifiOverlayApkPkgName); | 96 | ········sb2.append(this.mWifiOverlayApkPkgName); |
96 | ········Log.i(s,·sb2.toString()); | 97 | ········Log.i(s,·sb2.toString()); |
97 | ········return·this.mWifiOverlayApkPkgName; | 98 | ········return·this.mWifiOverlayApkPkgName; |
98 | ····} | 99 | ····} |
100 | ···· | ||
101 | ····public·String·getWifiOverlayJavaPkgName()·{ | ||
102 | ········return·"com.android.wifi.resources"; | ||
103 | ····} | ||
99 | } | 104 | } |
Offset 87, 15 lines modified | Offset 87, 15 lines modified | ||
87 | ········} | 87 | ········} |
88 | ········final·StringBuilder·sb·=·new·StringBuilder(); | 88 | ········final·StringBuilder·sb·=·new·StringBuilder(); |
89 | ········sb.append("Set·telephony·country·code·to:·"); | 89 | ········sb.append("Set·telephony·country·code·to:·"); |
90 | ········sb.append(upperCase); | 90 | ········sb.append(upperCase); |
91 | ········Log.d(s,·sb.toString()); | 91 | ········Log.d(s,·sb.toString()); |
92 | ········this.mTelephonyCountryTimestamp·=·WifiCountryCode.FORMATTER.format(new·Date(System.currentTimeMillis())); | 92 | ········this.mTelephonyCountryTimestamp·=·WifiCountryCode.FORMATTER.format(new·Date(System.currentTimeMillis())); |
93 | ········if·(TextUtils.isEmpty((CharSequence)upperCase))·{ | 93 | ········if·(TextUtils.isEmpty((CharSequence)upperCase))·{ |
94 | ············if·(this.mContext.getResources().getBoolean(213083754 | 94 | ············if·(this.mContext.getResources().getBoolean(2130837548))·{ |
95 | ················Log.d(s,·"Received·empty·country·code,·reset·to·default·country·code"); | 95 | ················Log.d(s,·"Received·empty·country·code,·reset·to·default·country·code"); |
96 | ················this.mTelephonyCountryCode·=·null; | 96 | ················this.mTelephonyCountryCode·=·null; |
97 | ············} | 97 | ············} |
98 | ········} | 98 | ········} |
99 | ········else·{ | 99 | ········else·{ |
100 | ············upperCase·=·upperCase.toUpperCase(Locale.US); | 100 | ············upperCase·=·upperCase.toUpperCase(Locale.US); |
101 | ············this.mTelephonyCountryCode·=·upperCase; | 101 | ············this.mTelephonyCountryCode·=·upperCase; |
Offset 162, 15 lines modified | Offset 162, 15 lines modified | ||
162 | ········} | 162 | ········} |
163 | ····} | 163 | ····} |
164 | ···· | 164 | ···· |
165 | ····public·void·dump(final·FileDescriptor·fileDescriptor,·final·PrintWriter·printWriter,·final·String[]·array)·{ | 165 | ····public·void·dump(final·FileDescriptor·fileDescriptor,·final·PrintWriter·printWriter,·final·String[]·array)·{ |
166 | ········synchronized·(this)·{ | 166 | ········synchronized·(this)·{ |
167 | ············final·StringBuilder·sb·=·new·StringBuilder(); | 167 | ············final·StringBuilder·sb·=·new·StringBuilder(); |
168 | ············sb.append("mRevertCountryCodeOnCellularLoss:·"); | 168 | ············sb.append("mRevertCountryCodeOnCellularLoss:·"); |
169 | ············sb.append(this.mContext.getResources().getBoolean(213083754 | 169 | ············sb.append(this.mContext.getResources().getBoolean(2130837548)); |
170 | ············printWriter.println(sb.toString()); | 170 | ············printWriter.println(sb.toString()); |
171 | ············final·StringBuilder·sb2·=·new·StringBuilder(); | 171 | ············final·StringBuilder·sb2·=·new·StringBuilder(); |
172 | ············sb2.append("mDefaultCountryCode:·"); | 172 | ············sb2.append("mDefaultCountryCode:·"); |
173 | ············sb2.append(this.mDefaultCountryCode); | 173 | ············sb2.append(this.mDefaultCountryCode); |
174 | ············printWriter.println(sb2.toString()); | 174 | ············printWriter.println(sb2.toString()); |
175 | ············final·StringBuilder·sb3·=·new·StringBuilder(); | 175 | ············final·StringBuilder·sb3·=·new·StringBuilder(); |
176 | ············sb3.append("mDriverCountryCode:·"); | 176 | ············sb3.append("mDriverCountryCode:·"); |
Offset 348, 15 lines modified | Offset 348, 15 lines modified | ||
348 | ························} | 348 | ························} |
349 | ························else·{ | 349 | ························else·{ |
350 | ····························this.mRxTputKbps·=·n9; | 350 | ····························this.mRxTputKbps·=·n9; |
351 | ····························b5·=·false; | 351 | ····························b5·=·false; |
352 | ························} | 352 | ························} |
353 | ························this.mWifiMetrics.incrementThroughputKbpsCount(this.mTxTputKbps,·this.mRxTputKbps,·frequency); | 353 | ························this.mWifiMetrics.incrementThroughputKbpsCount(this.mTxTputKbps,·this.mRxTputKbps,·frequency); |
354 | ························this.mIsThroughputSufficient·=·this.isThroughputSufficientInternal(this.mTxTputKbps,·this.mRxTputKbps,·b,·b2,·n5); | 354 | ························this.mIsThroughputSufficient·=·this.isThroughputSufficientInternal(this.mTxTputKbps,·this.mRxTputKbps,·b,·b2,·n5); |
355 | ························final·int·n13·=·this.mContext.getResources().getInteger(21310341 | 355 | ························final·int·n13·=·this.mContext.getResources().getInteger(2131034157)·+·200; |
356 | ························if·(n5·>·0·&&·n5·<=·n13)·{ | 356 | ························if·(n5·>·0·&&·n5·<=·n13)·{ |
357 | ····························this.mWifiMetrics.incrementConnectionDuration(n5,·this.mIsThroughputSufficient,·this.mIsCellularDataAvailable); | 357 | ····························this.mWifiMetrics.incrementConnectionDuration(n5,·this.mIsThroughputSufficient,·this.mIsCellularDataAvailable); |
358 | ····························this.reportWifiHealthStat(frequency,·n5,·this.mIsThroughputSufficient,·this.mIsCellularDataAvailable); | 358 | ····························this.reportWifiHealthStat(frequency,·n5,·this.mIsThroughputSufficient,·this.mIsCellularDataAvailable); |
359 | ························} | 359 | ························} |
360 | ························boolean·mDataStallTx·=·b4·||·n11·>=·this.mDeviceConfigFacade.getDataStallCcaLevelThr()·||·updateTxPer·>=·this.mDeviceConfigFacade.getDataStallTxPerThr(); | 360 | ························boolean·mDataStallTx·=·b4·||·n11·>=·this.mDeviceConfigFacade.getDataStallCcaLevelThr()·||·updateTxPer·>=·this.mDeviceConfigFacade.getDataStallTxPerThr(); |
361 | ························final·boolean·b6·=·b5·||·n11·>=·this.mDeviceConfigFacade.getDataStallCcaLevelThr(); | 361 | ························final·boolean·b6·=·b5·||·n11·>=·this.mDeviceConfigFacade.getDataStallCcaLevelThr(); |
362 | ························if·(!b)·{ | 362 | ························if·(!b)·{ |
Offset 254, 15 lines modified | Offset 254, 15 lines modified | ||
254 | ············this.mThroughputPredictor·=·mThroughputPredictor; | 254 | ············this.mThroughputPredictor·=·mThroughputPredictor; |
255 | ············(this.mWifiNetworkSelector·=·new·WifiNetworkSelector((Context)this.mContext,·this.mWifiScoreCard,·this.mScoringParams,·this.mWifiConfigManager,·this.mClock,·this.mConnectivityLocalLog,·this.mWifiMetrics,·this.mWifiNative,·mThroughputPredictor)).registerCandidateScorer((WifiCandidates$CandidateScorer)new·CompatibilityScorer(this.mScoringParams)); | 255 | ············(this.mWifiNetworkSelector·=·new·WifiNetworkSelector((Context)this.mContext,·this.mWifiScoreCard,·this.mScoringParams,·this.mWifiConfigManager,·this.mClock,·this.mConnectivityLocalLog,·this.mWifiMetrics,·this.mWifiNative,·mThroughputPredictor)).registerCandidateScorer((WifiCandidates$CandidateScorer)new·CompatibilityScorer(this.mScoringParams)); |
256 | ············this.mWifiNetworkSelector.registerCandidateScorer((WifiCandidates$CandidateScorer)new·ScoreCardBasedScorer(this.mScoringParams)); | 256 | ············this.mWifiNetworkSelector.registerCandidateScorer((WifiCandidates$CandidateScorer)new·ScoreCardBasedScorer(this.mScoringParams)); |
257 | ············this.mWifiNetworkSelector.registerCandidateScorer((WifiCandidates$CandidateScorer)new·BubbleFunScorer(this.mScoringParams)); | 257 | ············this.mWifiNetworkSelector.registerCandidateScorer((WifiCandidates$CandidateScorer)new·BubbleFunScorer(this.mScoringParams)); |
258 | ············this.mWifiNetworkSelector.registerCandidateScorer((WifiCandidates$CandidateScorer)new·ThroughputScorer(this.mScoringParams)); | 258 | ············this.mWifiNetworkSelector.registerCandidateScorer((WifiCandidates$CandidateScorer)new·ThroughputScorer(this.mScoringParams)); |
259 | ············this.mWifiMetrics.setWifiNetworkSelector(this.mWifiNetworkSelector); | 259 | ············this.mWifiMetrics.setWifiNetworkSelector(this.mWifiNetworkSelector); |
260 | ············this.mWifiNetworkSuggestionsManager·=·new·WifiNetworkSuggestionsManager(this.mContext,·handler4,·this,·this.mWifiPermissionsUtil,·this.mWifiConfigManager,·this.mWifiConfigStore,·this.mWifiMetrics,·this.mWifiCarrierInfoManager,·this.mWifiKeyStore,·this.mLruConnectionTracker); | 260 | ············this.mWifiNetworkSuggestionsManager·=·new·WifiNetworkSuggestionsManager(this.mContext,·handler4,·this,·this.mWifiPermissionsUtil,·this.mWifiConfigManager,·this.mWifiConfigStore,·this.mWifiMetrics,·this.mWifiCarrierInfoManager,·this.mWifiKeyStore,·this.mLruConnectionTracker); |
261 | ············final·PasspointManager·mPasspointManager·=·new·PasspointManager((Context)this.mContext,·this,·handler4,·this.mWifiNative,·this.mWifiKeyStore,·this.mClock,·new·PasspointObjectFactory(),·this.mWifiConfigManager,·this.mWifiConfigStore,·this.mWifiMetrics,·this.mWifiCarrierInfoManager,·this.mMacAddressUtil); | 261 | ············final·PasspointManager·mPasspointManager·=·new·PasspointManager((Context)this.mContext,·this,·handler4,·this.mWifiNative,·this.mWifiKeyStore,·this.mClock,·new·PasspointObjectFactory(),·this.mWifiConfigManager,·this.mWifiConfigStore,·this.mWifiMetrics,·this.mWifiCarrierInfoManager,·this.mMacAddressUtil,·this.mWifiPermissionsUtil); |
262 | ············this.mPasspointManager·=·mPasspointManager; | 262 | ············this.mPasspointManager·=·mPasspointManager; |
263 | ············final·PasspointNetworkNominateHelper·passpointNetworkNominateHelper·=·new·PasspointNetworkNominateHelper(mPasspointManager,·this.mWifiConfigManager,·this.mConnectivityLocalLog); | 263 | ············final·PasspointNetworkNominateHelper·passpointNetworkNominateHelper·=·new·PasspointNetworkNominateHelper(mPasspointManager,·this.mWifiConfigManager,·this.mConnectivityLocalLog); |
264 | ············this.mSavedNetworkNominator·=·new·SavedNetworkNominator(this.mWifiConfigManager,·passpointNetworkNominateHelper,·this.mConnectivityLocalLog,·this.mWifiCarrierInfoManager,·this.mWifiPermissionsUtil,·this.mWifiNetworkSuggestionsManager); | 264 | ············this.mSavedNetworkNominator·=·new·SavedNetworkNominator(this.mWifiConfigManager,·passpointNetworkNominateHelper,·this.mConnectivityLocalLog,·this.mWifiCarrierInfoManager,·this.mWifiPermissionsUtil,·this.mWifiNetworkSuggestionsManager); |
265 | ············this.mNetworkSuggestionNominator·=·new·NetworkSuggestionNominator(this.mWifiNetworkSuggestionsManager,·this.mWifiConfigManager,·passpointNetworkNominateHelper,·this.mConnectivityLocalLog,·this.mWifiCarrierInfoManager); | 265 | ············this.mNetworkSuggestionNominator·=·new·NetworkSuggestionNominator(this.mWifiNetworkSuggestionsManager,·this.mWifiConfigManager,·passpointNetworkNominateHelper,·this.mConnectivityLocalLog,·this.mWifiCarrierInfoManager); |
266 | ············final·WifiContext·mContext4·=·this.mContext; | 266 | ············final·WifiContext·mContext4·=·this.mContext; |
267 | ············this.mScoredNetworkNominator·=·new·ScoredNetworkNominator((Context)mContext4,·handler4,·this.mFrameworkFacade,·this.mNetworkScoreManager,·((ContextWrapper)mContext4).getPackageManager(),·this.mWifiConfigManager,·this.mConnectivityLocalLog,·this.mWifiNetworkScoreCache,·this.mWifiPermissionsUtil); | 267 | ············this.mScoredNetworkNominator·=·new·ScoredNetworkNominator((Context)mContext4,·handler4,·this.mFrameworkFacade,·this.mNetworkScoreManager,·((ContextWrapper)mContext4).getPackageManager(),·this.mWifiConfigManager,·this.mConnectivityLocalLog,·this.mWifiNetworkScoreCache,·this.mWifiPermissionsUtil); |
268 | ············this.mWifiMetrics.setPasspointManager(this.mPasspointManager); | 268 | ············this.mWifiMetrics.setPasspointManager(this.mPasspointManager); |
Offset 284, 27 lines modified | Offset 284, 28 lines modified | ||
284 | ············this.mMboOceController·=·new·MboOceController(this.makeTelephonyManager(),·this.mWifiNative); | 284 | ············this.mMboOceController·=·new·MboOceController(this.makeTelephonyManager(),·this.mWifiNative); |
285 | ············final·WifiHealthMonitor·wifiHealthMonitor·=·new·WifiHealthMonitor((Context)this.mContext,·this,·this.mClock,·this.mWifiConfigManager,·this.mWifiScoreCard,·handler4,·this.mWifiNative,·s,·this.mDeviceConfigFacade); | 285 | ············final·WifiHealthMonitor·wifiHealthMonitor·=·new·WifiHealthMonitor((Context)this.mContext,·this,·this.mClock,·this.mWifiConfigManager,·this.mWifiScoreCard,·handler4,·this.mWifiNative,·s,·this.mDeviceConfigFacade); |
286 | ············this.mWifiHealthMonitor·=·wifiHealthMonitor; | 286 | ············this.mWifiHealthMonitor·=·wifiHealthMonitor; |
287 | ············this.mWifiMetrics.setWifiHealthMonitor(wifiHealthMonitor); | 287 | ············this.mWifiMetrics.setWifiHealthMonitor(wifiHealthMonitor); |
288 | ············final·WifiContext·mContext7·=·this.mContext; | 288 | ············final·WifiContext·mContext7·=·this.mContext; |
289 | ············final·FrameworkFacade·mFrameworkFacade2·=·this.mFrameworkFacade; | 289 | ············final·FrameworkFacade·mFrameworkFacade2·=·this.mFrameworkFacade; |
290 | ············final·UserManager·mUserManager3·=·this.mUserManager; | 290 | ············final·UserManager·mUserManager3·=·this.mUserManager; |
291 | ············final·Looper·looper5·=·looper4; | ||
292 | ············final·UserManager·userManager·=·mUserManager3; | ||
293 | ············final·BackupManagerProxy·mBackupManagerProxy·=·this.mBackupManagerProxy; | 291 | ············final·BackupManagerProxy·mBackupManagerProxy·=·this.mBackupManagerProxy; |
294 | ············final·WifiCountryCode·mCountryCode·=·this.mCountryCode; | 292 | ············final·WifiCountryCode·mCountryCode·=·this.mCountryCode; |
295 | ············final·WifiNative·mWifiNative2·=·this.mWifiNative; | 293 | ············final·WifiNative·mWifiNative2·=·this.mWifiNative; |
296 | ············final·WrongPasswordNotifier·wrongPasswordNotifier·=·new·WrongPasswordNotifier(mContext7,·mFrameworkFacade2); | 294 | ············final·WrongPasswordNotifier·wrongPasswordNotifier·=·new·WrongPasswordNotifier(mContext7,·mFrameworkFacade2); |
297 | ············final·SarManager·mSarManager·=·this.mSarManager; | 295 | ············final·SarManager·mSarManager·=·this.mSarManager; |
298 | ············final·WifiTrafficPoller·mWifiTrafficPoller·=·this.mWifiTrafficPoller; | 296 | ············final·WifiTrafficPoller·mWifiTrafficPoller·=·this.mWifiTrafficPoller; |
299 | ············final·LinkProbeManager·mLinkProbeManager·=·this.mLinkProbeManager; | 297 | ············final·LinkProbeManager·mLinkProbeManager·=·this.mLinkProbeManager; |
300 | ············final·BatteryStatsManager·mBatteryStats·=·this.mBatteryStats; | 298 | ············final·BatteryStatsManager·mBatteryStats·=·this.mBatteryStats; |
301 | ············final·MboOceController·mMboOceController·=·this.mMboOceController; | 299 | ············final·MboOceController·mMboOceController·=·this.mMboOceController; |
302 | ············final·WifiCarrierInfoManager·mWifiCarrierInfoManager2·=·this.mWifiCarrierInfoManager; | 300 | ············final·WifiCarrierInfoManager·mWifiCarrierInfoManager2·=·this.mWifiCarrierInfoManager; |
303 | ············ | 301 | ············final·EapFailureNotifier·eapFailureNotifier·=·new·EapFailureNotifier(this.mContext,·this.mFrameworkFacade,·mWifiCarrierInfoManager2); |
302 | ············final·SimRequiredNotifier·simRequiredNotifier·=·new·SimRequiredNotifier(this.mContext,·this.mFrameworkFacade); | ||
303 | ············final·Looper·looper5·=·looper4; | ||
304 | ············this.mClientModeImpl·=·new·ClientModeImpl((Context)mContext7,·mFrameworkFacade2,·looper4,·mUserManager3,·this,·mBackupManagerProxy,·mCountryCode,·mWifiNative2,·wrongPasswordNotifier,·mSarManager,·mWifiTrafficPoller,·mLinkProbeManager,·mBatteryStats,·supplicantStateTracker,·mMboOceController,·mWifiCarrierInfoManager2,·eapFailureNotifier,·simRequiredNotifier); | ||
304 | ············final·ActiveModeWarden·mActiveModeWarden·=·new·ActiveModeWarden(this,·looper5,·this.mWifiNative,·new·DefaultModeManager((Context)this.mContext),·this.mBatteryStats,·this.mWifiDiagnostics,·(Context)this.mContext,·this.mClientModeImpl,·this.mSettingsStore,·this.mFrameworkFacade,·this.mWifiPermissionsUtil); | 305 | ············final·ActiveModeWarden·mActiveModeWarden·=·new·ActiveModeWarden(this,·looper5,·this.mWifiNative,·new·DefaultModeManager((Context)this.mContext),·this.mBatteryStats,·this.mWifiDiagnostics,·(Context)this.mContext,·this.mClientModeImpl,·this.mSettingsStore,·this.mFrameworkFacade,·this.mWifiPermissionsUtil); |
305 | ············this.mActiveModeWarden·=·mActiveModeWarden; | 306 | ············this.mActiveModeWarden·=·mActiveModeWarden; |
306 | ············this.mWifiScanAlwaysAvailableSettingsCompatibility·=·new·WifiScanAlwaysAvailableSettingsCompatibility((Context)this.mContext,·handler4,·this.mSettingsStore,·mActiveModeWarden,·this.mFrameworkFacade); | 307 | ············this.mWifiScanAlwaysAvailableSettingsCompatibility·=·new·WifiScanAlwaysAvailableSettingsCompatibility((Context)this.mContext,·handler4,·this.mSettingsStore,·mActiveModeWarden,·this.mFrameworkFacade); |
307 | ············this.mWifiApConfigStore·=·new·WifiApConfigStore((Context)this.mContext,·this,·handler4,·this.mBackupManagerProxy,·this.mWifiConfigStore,·this.mWifiConfigManager,·this.mActiveModeWarden,·this.mWifiMetrics); | 308 | ············this.mWifiApConfigStore·=·new·WifiApConfigStore((Context)this.mContext,·this,·handler4,·this.mBackupManagerProxy,·this.mWifiConfigStore,·this.mWifiConfigManager,·this.mActiveModeWarden,·this.mWifiMetrics); |
308 | ············this.mWakeupController·=·new·WakeupController((Context)this.mContext,·handler4,·new·WakeupLock(this.mWifiConfigManager,·this.mWifiMetrics.getWakeupMetrics(),·this.mClock),·new·WakeupEvaluator(this.mScoringParams),·new·WakeupOnboarding((Context)this.mContext,·this.mWifiConfigManager,·handler4,·this.mFrameworkFacade,·new·WakeupNotificationFactory(this.mContext,·this,·this.mFrameworkFacade)),·this.mWifiConfigManager,·this.mWifiConfigStore,·this.mWifiNetworkSuggestionsManager,·this.mWifiMetrics.getWakeupMetrics(),·this,·this.mFrameworkFacade,·this.mClock); | 309 | ············this.mWakeupController·=·new·WakeupController((Context)this.mContext,·handler4,·new·WakeupLock(this.mWifiConfigManager,·this.mWifiMetrics.getWakeupMetrics(),·this.mClock),·new·WakeupEvaluator(this.mScoringParams),·new·WakeupOnboarding((Context)this.mContext,·this.mWifiConfigManager,·handler4,·this.mFrameworkFacade,·new·WakeupNotificationFactory(this.mContext,·this,·this.mFrameworkFacade)),·this.mWifiConfigManager,·this.mWifiConfigStore,·this.mWifiNetworkSuggestionsManager,·this.mWifiMetrics.getWakeupMetrics(),·this,·this.mFrameworkFacade,·this.mClock); |
309 | ············this.mLockManager·=·new·WifiLockManager((Context)this.mContext,·this.mBatteryStats,·this.mClientModeImpl,·this.mFrameworkFacade,·handler4,·this.mWifiNative,·this.mClock,·this.mWifiMetrics); | 310 | ············this.mLockManager·=·new·WifiLockManager((Context)this.mContext,·this.mBatteryStats,·this.mClientModeImpl,·this.mFrameworkFacade,·handler4,·this.mWifiNative,·this.mClock,·this.mWifiMetrics); |
310 | ············this.mSelfRecovery·=·new·SelfRecovery((Context)this.mContext,·this.mActiveModeWarden,·this.mClock); | 311 | ············this.mSelfRecovery·=·new·SelfRecovery((Context)this.mContext,·this.mActiveModeWarden,·this.mClock); |
Offset 427, 15 lines modified | Offset 427, 15 lines modified | ||
427 | ···· | 427 | ···· |
428 | ····Map·getRecentAvailableNetworks()·{ | 428 | ····Map·getRecentAvailableNetworks()·{ |
429 | ········return·this.mRecentAvailableNetworks; | 429 | ········return·this.mRecentAvailableNetworks; |
430 | ····} | 430 | ····} |
431 | ···· | 431 | ···· |
432 | ····public·boolean·getWifiWatchdogFeature()·{ | 432 | ····public·boolean·getWifiWatchdogFeature()·{ |
433 | ········if·(this.mWatchdogFeatureEnabled·==·null)·{ | 433 | ········if·(this.mWatchdogFeatureEnabled·==·null)·{ |
434 | ············this.mWatchdogFeatureEnabled·=·this.mContext.getResources().getBoolean(213083755 | 434 | ············this.mWatchdogFeatureEnabled·=·this.mContext.getResources().getBoolean(2130837553); |
435 | ········} | 435 | ········} |
436 | ········return·this.mWatchdogFeatureEnabled; | 436 | ········return·this.mWatchdogFeatureEnabled; |
437 | ····} | 437 | ····} |
438 | ···· | 438 | ···· |
439 | ····public·boolean·isOverFailureThreshold(final·String·s)·{ | 439 | ····public·boolean·isOverFailureThreshold(final·String·s)·{ |
440 | ········int·n·=·1; | 440 | ········int·n·=·1; |
441 | ········if·(this.getFailureCount(s,·n)·+·this.getFailureCount(s,·2)·+·this.getFailureCount(s,·3)·<·7)·{ | 441 | ········if·(this.getFailureCount(s,·n)·+·this.getFailureCount(s,·2)·+·this.getFailureCount(s,·3)·<·7)·{ |
Offset 2, 60 lines modified | Offset 2, 52 lines modified | ||
2 | package·com.android.server.wifi; | 2 | package·com.android.server.wifi; |
3 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$ConnectionDurationStats; | 3 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$ConnectionDurationStats; |
4 | class·WifiMetrics$ConnectionDurationStats | 4 | class·WifiMetrics$ConnectionDurationStats |
5 | { | 5 | { |
6 | ····private·int·mConnectionDurationCellularDataOffMs; | 6 | ····private·int·mConnectionDurationCellularDataOffMs; |
7 | ····private·int·mConnectionDurationInSufficientThroughputDefaultWifiMs; | ||
8 | ····private·int·mConnectionDurationInSufficientThroughputMs; | 7 | ····private·int·mConnectionDurationInSufficientThroughputMs; |
9 | ····private·int·mConnectionDurationSufficientThroughputMs; | 8 | ····private·int·mConnectionDurationSufficientThroughputMs; |
10 | ····final·/*·synthetic·*/·WifiMetrics·this$0; | 9 | ····final·/*·synthetic·*/·WifiMetrics·this$0; |
11 | ···· | 10 | ···· |
12 | ····WifiMetrics$ConnectionDurationStats(final·WifiMetrics·this$0)·{ | 11 | ····WifiMetrics$ConnectionDurationStats(final·WifiMetrics·this$0)·{ |
13 | ········this.this$0·=·this$0; | 12 | ········this.this$0·=·this$0; |
14 | ····} | 13 | ····} |
15 | ···· | 14 | ···· |
16 | ····public·void·clear()·{ | 15 | ····public·void·clear()·{ |
17 | ········this.mConnectionDurationCellularDataOffMs·=·0; | 16 | ········this.mConnectionDurationCellularDataOffMs·=·0; |
18 | ········this.mConnectionDurationSufficientThroughputMs·=·0; | 17 | ········this.mConnectionDurationSufficientThroughputMs·=·0; |
19 | ········this.mConnectionDurationInSufficientThroughputMs·=·0; | 18 | ········this.mConnectionDurationInSufficientThroughputMs·=·0; |
20 | ········this.mConnectionDurationInSufficientThroughputDefaultWifiMs·=·0; | ||
21 | ····} | 19 | ····} |
22 | ···· | 20 | ···· |
23 | ····public·void·incrementDurationCount(final·int·n,·final·boolean·b,·final·boolean·b2 | 21 | ····public·void·incrementDurationCount(final·int·n,·final·boolean·b,·final·boolean·b2)·{ |
24 | ········if·(!b2)·{ | 22 | ········if·(!b2)·{ |
25 | ············this.mConnectionDurationCellularDataOffMs·+=·n; | 23 | ············this.mConnectionDurationCellularDataOffMs·+=·n; |
26 | ········} | 24 | ········} |
27 | ········else·if·(b)·{ | 25 | ········else·if·(b)·{ |
28 | ············this.mConnectionDurationSufficientThroughputMs·+=·n; | 26 | ············this.mConnectionDurationSufficientThroughputMs·+=·n; |
29 | ········} | 27 | ········} |
30 | ········else·{ | 28 | ········else·{ |
31 | ············this.mConnectionDurationInSufficientThroughputMs·+=·n; | 29 | ············this.mConnectionDurationInSufficientThroughputMs·+=·n; |
32 | ············if·(b3)·{ | ||
33 | ················this.mConnectionDurationInSufficientThroughputDefaultWifiMs·+=·n; | ||
34 | ············} | ||
35 | ········} | 30 | ········} |
36 | ····} | 31 | ····} |
37 | ···· | 32 | ···· |
38 | ····public·WifiMetricsProto$ConnectionDurationStats·toProto()·{ | 33 | ····public·WifiMetricsProto$ConnectionDurationStats·toProto()·{ |
39 | ········final·WifiMetricsProto$ConnectionDurationStats·wifiMetricsProto$ConnectionDurationStats·=·new·WifiMetricsProto$ConnectionDurationStats(); | 34 | ········final·WifiMetricsProto$ConnectionDurationStats·wifiMetricsProto$ConnectionDurationStats·=·new·WifiMetricsProto$ConnectionDurationStats(); |
40 | ········wifiMetricsProto$ConnectionDurationStats.totalTimeSufficientThroughputMs·=·this.mConnectionDurationSufficientThroughputMs; | 35 | ········wifiMetricsProto$ConnectionDurationStats.totalTimeSufficientThroughputMs·=·this.mConnectionDurationSufficientThroughputMs; |
41 | ········wifiMetricsProto$ConnectionDurationStats.totalTimeInsufficientThroughputMs·=·this.mConnectionDurationInSufficientThroughputMs; | 36 | ········wifiMetricsProto$ConnectionDurationStats.totalTimeInsufficientThroughputMs·=·this.mConnectionDurationInSufficientThroughputMs; |
42 | ········wifiMetricsProto$ConnectionDurationStats.totalTimeInsufficientThroughputDefaultWifiMs·=·this.mConnectionDurationInSufficientThroughputDefaultWifiMs; | ||
43 | ········wifiMetricsProto$ConnectionDurationStats.totalTimeCellularDataOffMs·=·this.mConnectionDurationCellularDataOffMs; | 37 | ········wifiMetricsProto$ConnectionDurationStats.totalTimeCellularDataOffMs·=·this.mConnectionDurationCellularDataOffMs; |
44 | ········return·wifiMetricsProto$ConnectionDurationStats; | 38 | ········return·wifiMetricsProto$ConnectionDurationStats; |
45 | ····} | 39 | ····} |
46 | ···· | 40 | ···· |
47 | ····public·String·toString()·{ | 41 | ····public·String·toString()·{ |
48 | ········final·StringBuilder·sb·=·new·StringBuilder(); | 42 | ········final·StringBuilder·sb·=·new·StringBuilder(); |
49 | ········sb.append("connectionDurationSufficientThroughputMs="); | 43 | ········sb.append("connectionDurationSufficientThroughputMs="); |
50 | ········sb.append(this.mConnectionDurationSufficientThroughputMs); | 44 | ········sb.append(this.mConnectionDurationSufficientThroughputMs); |
51 | ········sb.append(",·connectionDurationInSufficientThroughputMs="); | 45 | ········sb.append(",·connectionDurationInSufficientThroughputMs="); |
52 | ········sb.append(this.mConnectionDurationInSufficientThroughputMs); | 46 | ········sb.append(this.mConnectionDurationInSufficientThroughputMs); |
53 | ········sb.append(",·connectionDurationInSufficientThroughputDefaultWifiMs="); | ||
54 | ········sb.append(this.mConnectionDurationInSufficientThroughputDefaultWifiMs); | ||
55 | ········sb.append(",·connectionDurationCellularDataOffMs="); | 47 | ········sb.append(",·connectionDurationCellularDataOffMs="); |
56 | ········sb.append(this.mConnectionDurationCellularDataOffMs); | 48 | ········sb.append(this.mConnectionDurationCellularDataOffMs); |
57 | ········return·sb.toString(); | 49 | ········return·sb.toString(); |
58 | ····} | 50 | ····} |
59 | } | 51 | } |
Offset 1029, 15 lines modified | Offset 1029, 15 lines modified | ||
1029 | ············} | 1029 | ············} |
1030 | ············if·(this.mSoftApEventListLocalOnly.size()·>·0)·{ | 1030 | ············if·(this.mSoftApEventListLocalOnly.size()·>·0)·{ |
1031 | ················this.mWifiLogProto.softApConnectedClientsEventsLocalOnly·=·this.mSoftApEventListLocalOnly.toArray(this.mWifiLogProto.softApConnectedClientsEventsLocalOnly); | 1031 | ················this.mWifiLogProto.softApConnectedClientsEventsLocalOnly·=·this.mSoftApEventListLocalOnly.toArray(this.mWifiLogProto.softApConnectedClientsEventsLocalOnly); |
1032 | ············} | 1032 | ············} |
1033 | ············this.mWifiLogProto.wifiPowerStats·=·this.mWifiPowerMetrics.buildProto(); | 1033 | ············this.mWifiLogProto.wifiPowerStats·=·this.mWifiPowerMetrics.buildProto(); |
1034 | ············this.mWifiLogProto.wifiRadioUsage·=·this.mWifiPowerMetrics.buildWifiRadioUsageProto(); | 1034 | ············this.mWifiLogProto.wifiRadioUsage·=·this.mWifiPowerMetrics.buildWifiRadioUsageProto(); |
1035 | ············this.mWifiLogProto.wifiWakeStats·=·this.mWifiWakeMetrics.buildProto(); | 1035 | ············this.mWifiLogProto.wifiWakeStats·=·this.mWifiWakeMetrics.buildProto(); |
1036 | ············this.mWifiLogProto.isMacRandomizationOn·=·this.mContext.getResources().getBoolean(213083753 | 1036 | ············this.mWifiLogProto.isMacRandomizationOn·=·this.mContext.getResources().getBoolean(2130837537); |
1037 | ············this.mExperimentValues.wifiIsUnusableLoggingEnabled·=·this.mContext.getResources().getBoolean(2130837512); | 1037 | ············this.mExperimentValues.wifiIsUnusableLoggingEnabled·=·this.mContext.getResources().getBoolean(2130837512); |
1038 | ············this.mExperimentValues.linkSpeedCountsLoggingEnabled·=·this.mContext.getResources().getBoolean(2130837513); | 1038 | ············this.mExperimentValues.linkSpeedCountsLoggingEnabled·=·this.mContext.getResources().getBoolean(2130837513); |
1039 | ············this.mExperimentValues.wifiDataStallMinTxBad·=·this.mContext.getResources().getInteger(2131034129); | 1039 | ············this.mExperimentValues.wifiDataStallMinTxBad·=·this.mContext.getResources().getInteger(2131034129); |
1040 | ············this.mExperimentValues.wifiDataStallMinTxSuccessWithoutRx·=·this.mContext.getResources().getInteger(2131034130); | 1040 | ············this.mExperimentValues.wifiDataStallMinTxSuccessWithoutRx·=·this.mContext.getResources().getInteger(2131034130); |
1041 | ············this.mWifiLogProto.experimentValues·=·this.mExperimentValues; | 1041 | ············this.mWifiLogProto.experimentValues·=·this.mExperimentValues; |
1042 | ············this.mWifiLogProto.wifiIsUnusableEventList·=·new·WifiMetricsProto$WifiIsUnusableEvent[this.mWifiIsUnusableList.size()]; | 1042 | ············this.mWifiLogProto.wifiIsUnusableEventList·=·new·WifiMetricsProto$WifiIsUnusableEvent[this.mWifiIsUnusableList.size()]; |
1043 | ············for·(int·n12·=·0;·n12·<·this.mWifiIsUnusableList.size();·++n12)·{ | 1043 | ············for·(int·n12·=·0;·n12·<·this.mWifiIsUnusableList.size();·++n12)·{ |
Offset 3787, 15 lines modified | Offset 3787, 15 lines modified | ||
3787 | ································································································o·=·wifiMetrics.mWifiWakeMetrics; | 3787 | ································································································o·=·wifiMetrics.mWifiWakeMetrics; |
3788 | ································································································((WifiWakeMetrics)o).dump(printWriter); | 3788 | ································································································((WifiWakeMetrics)o).dump(printWriter); |
3789 | ································································································o·=·new·StringBuilder(); | 3789 | ································································································o·=·new·StringBuilder(); |
3790 | ································································································o2·=·"mWifiLogProto.isMacRandomizationOn="; | 3790 | ································································································o2·=·"mWifiLogProto.isMacRandomizationOn="; |
3791 | ································································································((StringBuilder)o).append((String)o2); | 3791 | ································································································((StringBuilder)o).append((String)o2); |
3792 | ································································································o2·=·wifiMetrics.mContext; | 3792 | ································································································o2·=·wifiMetrics.mContext; |
3793 | ································································································o2·=·((Context)o2).getResources(); | 3793 | ································································································o2·=·((Context)o2).getResources(); |
3794 | ································································································((StringBuilder)o).append(((Resources)o2).getBoolean(213083753 | 3794 | ································································································((StringBuilder)o).append(((Resources)o2).getBoolean(2130837537)); |
3795 | ································································································o·=·((StringBuilder)o).toString(); | 3795 | ································································································o·=·((StringBuilder)o).toString(); |
3796 | ································································································printWriter.println((String)o); | 3796 | ································································································printWriter.println((String)o); |
3797 | ································································································o·=·new·StringBuilder(); | 3797 | ································································································o·=·new·StringBuilder(); |
3798 | ································································································o2·=·"mWifiLogProto.scoreExperimentId="; | 3798 | ································································································o2·=·"mWifiLogProto.scoreExperimentId="; |
3799 | ································································································((StringBuilder)o).append((String)o2); | 3799 | ································································································((StringBuilder)o).append((String)o2); |
3800 | ································································································o2·=·wifiMetrics.mWifiLogProto; | 3800 | ································································································o2·=·wifiMetrics.mWifiLogProto; |
3801 | ································································································o2·=·((WifiMetricsProto$WifiLog)o2).scoreExperimentId; | 3801 | ································································································o2·=·((WifiMetricsProto$WifiLog)o2).scoreExperimentId; |
Offset 4759, 15 lines modified | Offset 4759, 15 lines modified | ||
4759 | ········finally·{ | 4759 | ········finally·{ |
4760 | ········} | 4760 | ········} |
4761 | ········//·monitorexit(mLock) | 4761 | ········//·monitorexit(mLock) |
4762 | ····} | 4762 | ····} |
4763 | ···· | 4763 | ···· |
4764 | ····public·void·incrementConnectionDuration(final·int·n,·final·boolean·b,·final·boolean·b2)·{ | 4764 | ····public·void·incrementConnectionDuration(final·int·n,·final·boolean·b,·final·boolean·b2)·{ |
4765 | ········synchronized·(this.mLock)·{ | 4765 | ········synchronized·(this.mLock)·{ |
4766 | ············this.mConnectionDurationStats.incrementDurationCount(n,·b,·b2 | 4766 | ············this.mConnectionDurationStats.incrementDurationCount(n,·b,·b2); |
4767 | ········} | 4767 | ········} |
4768 | ····} | 4768 | ····} |
4769 | ···· | 4769 | ···· |
4770 | ····public·void·incrementConnectivityOneshotScanCount()·{ | 4770 | ····public·void·incrementConnectivityOneshotScanCount()·{ |
4771 | ········synchronized·(this.mLock)·{ | 4771 | ········synchronized·(this.mLock)·{ |
4772 | ············final·WifiMetricsProto$WifiLog·mWifiLogProto·=·this.mWifiLogProto; | 4772 | ············final·WifiMetricsProto$WifiLog·mWifiLogProto·=·this.mWifiLogProto; |
4773 | ············++mWifiLogProto.numConnectivityOneshotScans; | 4773 | ············++mWifiLogProto.numConnectivityOneshotScans; |
Offset 5297, 22 lines modified | Offset 5297, 22 lines modified | ||
5297 | ····················//·iftrue(Label_0067:,·!b·||·b2) | 5297 | ····················//·iftrue(Label_0067:,·!b·||·b2) |
5298 | ····················while·(true)·{ | 5298 | ····················while·(true)·{ |
5299 | ························mWifiToggleStats2·=·this.mWifiToggleStats; | 5299 | ························mWifiToggleStats2·=·this.mWifiToggleStats; |
5300 | ························++mWifiToggleStats2.numToggleOffPrivileged; | 5300 | ························++mWifiToggleStats2.numToggleOffPrivileged; |
5301 | ························return; | 5301 | ························return; |
5302 | ························continue·Block_8_Outer; | 5302 | ························continue·Block_8_Outer; |
5303 | ····················} | 5303 | ····················} |
5304 | ···················· | 5304 | ····················Label_0095:·{ |
5305 | ························mWifiToggleStats3·=·this.mWifiToggleStats; | 5305 | ························mWifiToggleStats3·=·this.mWifiToggleStats; |
5306 | ···················· | 5306 | ····················} |
5307 | ···················· | 5307 | ····················++mWifiToggleStats3.numToggleOffNormal; |
5308 | ···················· | 5308 | ····················continue·Block_6_Outer; |
5309 | ···················· | 5309 | ····················while·(true)·{ |
5310 | ························ | 5310 | ························mWifiToggleStats4·=·this.mWifiToggleStats; |
5311 | ························++mWifiToggleStats4.numToggleO | 5311 | ························++mWifiToggleStats4.numToggleOnNormal; |
5312 | ························continue·Block_6_Outer; | 5312 | ························continue·Block_6_Outer; |
5313 | ························Label_0067: | 5313 | ························Label_0067: |
5314 | ························continue; | 5314 | ························continue; |
5315 | ····················} | 5315 | ····················} |
5316 | ················} | 5316 | ················} |
5317 | ················//·iftrue(Label_0095:,·b·||·!b2) | 5317 | ················//·iftrue(Label_0095:,·b·||·!b2) |
5318 | ················break; | 5318 | ················break; |
Offset 5549, 38 lines modified | Offset 5549, 34 lines modified | ||
5549 | ················int·n2·=·0; | 5549 | ················int·n2·=·0; |
5550 | ················Label_0133:·{ | 5550 | ················Label_0133:·{ |
5551 | ····················value·=·this.mSoftApManagerReturnCodeCounts.get(n2); | 5551 | ····················value·=·this.mSoftApManagerReturnCodeCounts.get(n2); |
5552 | ················} | 5552 | ················} |
5553 | ················final·SparseIntArray·mSoftApManagerReturnCodeCounts·=·this.mSoftApManagerReturnCodeCounts; | 5553 | ················final·SparseIntArray·mSoftApManagerReturnCodeCounts·=·this.mSoftApManagerReturnCodeCounts; |
5554 | ················value·+=·n; | 5554 | ················value·+=·n; |
5555 | ················mSoftApManagerReturnCodeCounts.put(n2,·value); | 5555 | ················mSoftApManagerReturnCodeCounts.put(n2,·value); |
5556 | ················//· | 5556 | ················//·iftrue(Label_0133:,·value·!=·n2) |
5557 | ················//·iftrue(Label_0092:,·value·!=·n) | 5557 | ················//·iftrue(Label_0092:,·value·!=·n) |
5558 | ················ | 5558 | ················Label_0162:·{ |
5559 | ················ | 5559 | ····················break·Label_0162; |
5560 | ····················while·(true)·{ | 5560 | ····················while·(true)·{ |
5561 | ························return; | 5561 | ························final·SparseIntArray·mSoftApManagerReturnCodeCounts2·=·this.mSoftApManagerReturnCodeCounts; |
5562 | ························ | 5562 | ························value·=·3; |
5563 | ························ | 5563 | ························this.mSoftApManagerReturnCodeCounts.put(value,·mSoftApManagerReturnCodeCounts2.get(value)·+·n); |
5564 | ························ | 5564 | ························break·Label_0162; |
5565 | ························ | 5565 | ························Label_0092: |
5566 | ························ | 5566 | ························n2·=·2; |
5567 | ····························continue; | ||
5568 | ························} | ||
5569 | ························final·SparseIntArray·mSoftApManagerReturnCodeCounts3·=·this.mSoftApManagerReturnCodeCounts; | 5567 | ························final·SparseIntArray·mSoftApManagerReturnCodeCounts3·=·this.mSoftApManagerReturnCodeCounts; |
5570 | ························value·=·4; | 5568 | ························value·=·4; |
5571 | ························this.mSoftApManagerReturnCodeCounts.put(value,·mSoftApManagerReturnCodeCounts3.get(value)·+·n); | 5569 | ························this.mSoftApManagerReturnCodeCounts.put(value,·mSoftApManagerReturnCodeCounts3.get(value)·+·n); |
5572 | ························ | 5570 | ························break·Label_0162; |
5571 | ························continue; | ||
5573 | ····················} | 5572 | ····················} |
5574 | ····················Label_0092: | ||
5575 | ····················n2·=·2; | ||
5576 | ····················continue; | ||
5577 | ················} | 5573 | ················} |
5578 | ············} | 5574 | ············} |
5579 | ············//· | 5575 | ············//·monitorexit(mLock) |
5580 | ········} | 5576 | ········} |
5581 | ····} | 5577 | ····} |
5582 | ···· | 5578 | ···· |
5583 | ····public·void·incrementSteeringRequestCountIncludingMboAssocRetryDelay()·{ | 5579 | ····public·void·incrementSteeringRequestCountIncludingMboAssocRetryDelay()·{ |
5584 | ········synchronized·(this.mLock)·{ | 5580 | ········synchronized·(this.mLock)·{ |
5585 | ············final·WifiMetricsProto$WifiLog·mWifiLogProto·=·this.mWifiLogProto; | 5581 | ············final·WifiMetricsProto$WifiLog·mWifiLogProto·=·this.mWifiLogProto; |
5586 | ············++mWifiLogProto.numSteeringRequestIncludingMboAssocRetryDelay; | 5582 | ············++mWifiLogProto.numSteeringRequestIncludingMboAssocRetryDelay; |
Offset 6252, 32 lines modified | Offset 6248, 28 lines modified | ||
6252 | ········Label_0019:·{ | 6248 | ········Label_0019:·{ |
6253 | ············if·(userChoice·!=·-1)·{ | 6249 | ············if·(userChoice·!=·-1)·{ |
6254 | ················break·Label_0019; | 6250 | ················break·Label_0019; |
6255 | ············} | 6251 | ············} |
6256 | ············try·{ | 6252 | ············try·{ |
6257 | ················//·monitorexit(mLock) | 6253 | ················//·monitorexit(mLock) |
6258 | ················return; | 6254 | ················return; |
6259 | ················Label_0071:·{ | ||
6260 | ····················return; | ||
6261 | ················} | ||
6262 | ················//·iftrue(Label_0071:,·networkId·!=·userChoice) | ||
6263 | ················while·(true)·{ | 6255 | ················while·(true)·{ |
6264 | ···················· | 6256 | ····················final·WifiMetrics$WifiStatusBuilder·mWifiStatusBuilder·=·this.mWifiStatusBuilder; |
6265 | ···················· | 6257 | ····················userChoice·=·1; |
6266 | ···················· | 6258 | ····················mWifiStatusBuilder.setUserChoice((boolean)(userChoice·!=·0)); |
6267 | ···················· | 6259 | ····················Label_0071:·{ |
... Open expanded diff ... |
Offset 68, 14 lines modified | Offset 68, 15 lines modified | ||
68 | ····public·static·final·int·WIFI_SCAN_RESULTS_AVAILABLE·=·0; | 68 | ····public·static·final·int·WIFI_SCAN_RESULTS_AVAILABLE·=·0; |
69 | ····public·static·final·int·WIFI_SCAN_THRESHOLD_NUM_SCANS·=·1; | 69 | ····public·static·final·int·WIFI_SCAN_THRESHOLD_NUM_SCANS·=·1; |
70 | ····public·static·final·int·WIFI_SCAN_THRESHOLD_PERCENT·=·2; | 70 | ····public·static·final·int·WIFI_SCAN_THRESHOLD_PERCENT·=·2; |
71 | ····private·final·Handler·mHandler; | 71 | ····private·final·Handler·mHandler; |
72 | ····private·final·HostapdHal·mHostapdHal; | 72 | ····private·final·HostapdHal·mHostapdHal; |
73 | ····private·final·WifiNative$IfaceManager·mIfaceMgr; | 73 | ····private·final·WifiNative$IfaceManager·mIfaceMgr; |
74 | ····private·boolean·mIsEnhancedOpenSupported; | 74 | ····private·boolean·mIsEnhancedOpenSupported; |
75 | ····private·boolean·mIsEnhancedOpenSupportedInitialized; | ||
75 | ····private·final·Object·mLock; | 76 | ····private·final·Object·mLock; |
76 | ····private·NetdWrapper·mNetdWrapper; | 77 | ····private·NetdWrapper·mNetdWrapper; |
77 | ····private·final·PropertyService·mPropertyService; | 78 | ····private·final·PropertyService·mPropertyService; |
78 | ····private·final·Random·mRandom; | 79 | ····private·final·Random·mRandom; |
79 | ····private·HashSet·mStatusListeners; | 80 | ····private·HashSet·mStatusListeners; |
80 | ····private·final·SupplicantStaIfaceHal·mSupplicantStaIfaceHal; | 81 | ····private·final·SupplicantStaIfaceHal·mSupplicantStaIfaceHal; |
81 | ····private·boolean·mVerboseLoggingEnabled; | 82 | ····private·boolean·mVerboseLoggingEnabled; |
Offset 83, 18 lines modified | Offset 84, 18 lines modified | ||
83 | ····private·final·WifiInjector·mWifiInjector; | 84 | ····private·final·WifiInjector·mWifiInjector; |
84 | ····private·final·WifiMetrics·mWifiMetrics; | 85 | ····private·final·WifiMetrics·mWifiMetrics; |
85 | ····private·final·WifiMonitor·mWifiMonitor; | 86 | ····private·final·WifiMonitor·mWifiMonitor; |
86 | ····private·final·WifiVendorHal·mWifiVendorHal; | 87 | ····private·final·WifiVendorHal·mWifiVendorHal; |
87 | ···· | 88 | ···· |
88 | ····public·WifiNative(final·WifiVendorHal·mWifiVendorHal,·final·SupplicantStaIfaceHal·mSupplicantStaIfaceHal,·final·HostapdHal·mHostapdHal,·final·WifiNl80211Manager·mWifiCondManager,·final·WifiMonitor·mWifiMonitor,·final·PropertyService·mPropertyService,·final·WifiMetrics·mWifiMetrics,·final·Handler·mHandler,·final·Random·mRandom,·final·WifiInjector·mWifiInjector)·{ | 89 | ····public·WifiNative(final·WifiVendorHal·mWifiVendorHal,·final·SupplicantStaIfaceHal·mSupplicantStaIfaceHal,·final·HostapdHal·mHostapdHal,·final·WifiNl80211Manager·mWifiCondManager,·final·WifiMonitor·mWifiMonitor,·final·PropertyService·mPropertyService,·final·WifiMetrics·mWifiMetrics,·final·Handler·mHandler,·final·Random·mRandom,·final·WifiInjector·mWifiInjector)·{ |
89 | ········this.mVerboseLoggingEnabled·=·false; | 90 | ········this.mVerboseLoggingEnabled·=·false; |
90 | ········this.mIsEnhancedOpenSupported·=·false; | ||
91 | ········this.mLock·=·new·Object(); | 91 | ········this.mLock·=·new·Object(); |
92 | ········this.mIfaceMgr·=·new·WifiNative$IfaceManager((WifiNative$1)null); | 92 | ········this.mIfaceMgr·=·new·WifiNative$IfaceManager((WifiNative$1)null); |
93 | ········this.mStatusListeners·=·new·HashSet(); | 93 | ········this.mStatusListeners·=·new·HashSet(); |
94 | ········this.mIsEnhancedOpenSupportedInitialized·=·false; | ||
94 | ········this.mWifiVendorHal·=·mWifiVendorHal; | 95 | ········this.mWifiVendorHal·=·mWifiVendorHal; |
95 | ········this.mSupplicantStaIfaceHal·=·mSupplicantStaIfaceHal; | 96 | ········this.mSupplicantStaIfaceHal·=·mSupplicantStaIfaceHal; |
96 | ········this.mHostapdHal·=·mHostapdHal; | 97 | ········this.mHostapdHal·=·mHostapdHal; |
97 | ········this.mWifiCondManager·=·mWifiCondManager; | 98 | ········this.mWifiCondManager·=·mWifiCondManager; |
98 | ········this.mWifiMonitor·=·mWifiMonitor; | 99 | ········this.mWifiMonitor·=·mWifiMonitor; |
99 | ········this.mPropertyService·=·mPropertyService; | 100 | ········this.mPropertyService·=·mPropertyService; |
100 | ········this.mWifiMetrics·=·mWifiMetrics; | 101 | ········this.mWifiMetrics·=·mWifiMetrics; |
Offset 137, 15 lines modified | Offset 138, 15 lines modified | ||
137 | ················sb.append(fromByteArray); | 138 | ················sb.append(fromByteArray); |
138 | ················Log.e((String)o,·sb.toString()); | 139 | ················Log.e((String)o,·sb.toString()); |
139 | ············} | 140 | ············} |
140 | ············else·{ | 141 | ············else·{ |
141 | ················Object·string·=·bssid.toString(); | 142 | ················Object·string·=·bssid.toString(); |
142 | ················final·ScanResult$InformationElement[]·informationElements·=·InformationElementUtil.parseInformationElements(nativeScanResult.getInformationElements()); | 143 | ················final·ScanResult$InformationElement[]·informationElements·=·InformationElementUtil.parseInformationElements(nativeScanResult.getInformationElements()); |
143 | ················final·InformationElementUtil$Capabilities·informationElementUtil$Capabilities·=·new·InformationElementUtil$Capabilities(); | 144 | ················final·InformationElementUtil$Capabilities·informationElementUtil$Capabilities·=·new·InformationElementUtil$Capabilities(); |
144 | ················informationElementUtil$Capabilities.from(informationElements,·nativeScanResult.getCapabilities(),·this. | 145 | ················informationElementUtil$Capabilities.from(informationElements,·nativeScanResult.getCapabilities(),·this.isEnhancedOpenSupported()); |
145 | ················final·String·generateCapabilitiesString·=·informationElementUtil$Capabilities.generateCapabilitiesString(); | 146 | ················final·String·generateCapabilitiesString·=·informationElementUtil$Capabilities.generateCapabilitiesString(); |
146 | ················try·{ | 147 | ················try·{ |
147 | ····················final·NetworkDetail·networkDetail·=·new·NetworkDetail((String)string,·informationElements,·(List)null,·nativeScanResult.getFrequencyMhz()); | 148 | ····················final·NetworkDetail·networkDetail·=·new·NetworkDetail((String)string,·informationElements,·(List)null,·nativeScanResult.getFrequencyMhz()); |
148 | ····················o·=·new·ScanDetail(networkDetail,·fromByteArray,·(String)string,·generateCapabilitiesString,·nativeScanResult.getSignalMbm()·/·100,·nativeScanResult.getFrequencyMhz(),·nativeScanResult.getTsf(),·informationElements,·(List)null,·nativeScanResult.getInformationElements()); | 149 | ····················o·=·new·ScanDetail(networkDetail,·fromByteArray,·(String)string,·generateCapabilitiesString,·nativeScanResult.getSignalMbm()·/·100,·nativeScanResult.getFrequencyMhz(),·nativeScanResult.getTsf(),·informationElements,·(List)null,·nativeScanResult.getInformationElements()); |
149 | ····················final·ScanResult·scanResult·=·((ScanDetail)o).getScanResult(); | 150 | ····················final·ScanResult·scanResult·=·((ScanDetail)o).getScanResult(); |
150 | ····················scanResult.setWifiStandard(wifiModeToWifiStandard(networkDetail.getWifiMode())); | 151 | ····················scanResult.setWifiStandard(wifiModeToWifiStandard(networkDetail.getWifiMode())); |
151 | ····················scanResult.radioChainInfos·=·new·ScanResult$RadioChainInfo[nativeScanResult.getRadioChainInfos().size()]; | 152 | ····················scanResult.radioChainInfos·=·new·ScanResult$RadioChainInfo[nativeScanResult.getRadioChainInfos().size()]; |
Offset 238, 14 lines modified | Offset 239, 31 lines modified | ||
238 | ········} | 239 | ········} |
239 | ········catch·(IllegalStateException·ex)·{ | 240 | ········catch·(IllegalStateException·ex)·{ |
240 | ············s·=·"WifiNative"; | 241 | ············s·=·"WifiNative"; |
241 | ············Log.e(s,·"Unable·to·change·interface·settings",·(Throwable)ex); | 242 | ············Log.e(s,·"Unable·to·change·interface·settings",·(Throwable)ex); |
242 | ········} | 243 | ········} |
243 | ····} | 244 | ····} |
244 | ···· | 245 | ···· |
246 | ····private·boolean·isEnhancedOpenSupported()·{ | ||
247 | ········if·(this.mIsEnhancedOpenSupportedInitialized)·{ | ||
248 | ············return·this.mIsEnhancedOpenSupported; | ||
249 | ········} | ||
250 | ········final·String·clientInterfaceName·=·this.getClientInterfaceName(); | ||
251 | ········boolean·mIsEnhancedOpenSupported·=·false; | ||
252 | ········if·(clientInterfaceName·==·null)·{ | ||
253 | ············return·false; | ||
254 | ········} | ||
255 | ········final·boolean·mIsEnhancedOpenSupportedInitialized·=·true; | ||
256 | ········this.mIsEnhancedOpenSupportedInitialized·=·mIsEnhancedOpenSupportedInitialized; | ||
257 | ········if·((this.getSupportedFeatureSet(clientInterfaceName)·&·0x20000000L)·!=·0x0L)·{ | ||
258 | ············mIsEnhancedOpenSupported·=·mIsEnhancedOpenSupportedInitialized; | ||
259 | ········} | ||
260 | ········return·this.mIsEnhancedOpenSupported·=·mIsEnhancedOpenSupported; | ||
261 | ····} | ||
262 | ···· | ||
245 | ····private·void·onClientInterfaceForConnectivityDestroyed(final·WifiNative$Iface·wifiNative$Iface)·{ | 263 | ····private·void·onClientInterfaceForConnectivityDestroyed(final·WifiNative$Iface·wifiNative$Iface)·{ |
246 | ········synchronized·(this.mLock)·{ | 264 | ········synchronized·(this.mLock)·{ |
247 | ············this.mWifiMonitor.stopMonitoring(wifiNative$Iface.name); | 265 | ············this.mWifiMonitor.stopMonitoring(wifiNative$Iface.name); |
248 | ············if·(!this.unregisterNetworkObserver(wifiNative$Iface.networkObserver))·{ | 266 | ············if·(!this.unregisterNetworkObserver(wifiNative$Iface.networkObserver))·{ |
249 | ················final·String·s·=·"WifiNative"; | 267 | ················final·String·s·=·"WifiNative"; |
250 | ················final·StringBuilder·sb·=·new·StringBuilder(); | 268 | ················final·StringBuilder·sb·=·new·StringBuilder(); |
251 | ················sb.append("Failed·to·unregister·network·observer·on·"); | 269 | ················sb.append("Failed·to·unregister·network·observer·on·"); |
Offset 1148, 17 lines modified | Offset 1166, 15 lines modified | ||
1148 | ················return·null; | 1166 | ················return·null; |
1149 | ············} | 1167 | ············} |
1150 | ············if·(!this.startSupplicant())·{ | 1168 | ············if·(!this.startSupplicant())·{ |
1151 | ················Log.e("WifiNative",·"Failed·to·start·supplicant"); | 1169 | ················Log.e("WifiNative",·"Failed·to·start·supplicant"); |
1152 | ················this.mWifiMetrics.incrementNumSetupClientInterfaceFailureDueToSupplicant(); | 1170 | ················this.mWifiMetrics.incrementNumSetupClientInterfaceFailureDueToSupplicant(); |
1153 | ················return·null; | 1171 | ················return·null; |
1154 | ············} | 1172 | ············} |
1155 | ············final·WifiNative$Iface | 1173 | ············final·WifiNative$Iface·access$2100·=·WifiNative$IfaceManager.access$2100(this.mIfaceMgr,·1); |
1156 | ············int·mIsEnhancedOpenSupported·=·1; | ||
1157 | ············final·WifiNative$Iface·access$2100·=·WifiNative$IfaceManager.access$2100(mIfaceMgr,·mIsEnhancedOpenSupported); | ||
1158 | ············if·(access$2100·==·null)·{ | 1174 | ············if·(access$2100·==·null)·{ |
1159 | ················Log.e("WifiNative",·"Failed·to·allocate·new·STA·iface"); | 1175 | ················Log.e("WifiNative",·"Failed·to·allocate·new·STA·iface"); |
1160 | ················return·null; | 1176 | ················return·null; |
1161 | ············} | 1177 | ············} |
1162 | ············access$2100.externalListener·=·externalListener; | 1178 | ············access$2100.externalListener·=·externalListener; |
1163 | ············final·String·staIface·=·this.createStaIface(access$2100); | 1179 | ············final·String·staIface·=·this.createStaIface(access$2100); |
1164 | ············access$2100.name·=·staIface; | 1180 | ············access$2100.name·=·staIface; |
Offset 1203, 20 lines modified | Offset 1219, 15 lines modified | ||
1203 | ············this.onInterfaceStateChanged(access$2100,·this.isInterfaceUp(access$2100.name)); | 1219 | ············this.onInterfaceStateChanged(access$2100,·this.isInterfaceUp(access$2100.name)); |
1204 | ············this.initializeNwParamsForClientInterface(access$2100.name); | 1220 | ············this.initializeNwParamsForClientInterface(access$2100.name); |
1205 | ············final·String·s4·=·"WifiNative"; | 1221 | ············final·String·s4·=·"WifiNative"; |
1206 | ············final·StringBuilder·sb4·=·new·StringBuilder(); | 1222 | ············final·StringBuilder·sb4·=·new·StringBuilder(); |
1207 | ············sb4.append("Successfully·setup·"); | 1223 | ············sb4.append("Successfully·setup·"); |
1208 | ············sb4.append(access$2100); | 1224 | ············sb4.append(access$2100); |
1209 | ············Log.i(s4,·sb4.toString()); | 1225 | ············Log.i(s4,·sb4.toString()); |
1210 | ············ | 1226 | ············access$2100.featureSet·=·this.getSupportedFeatureSetInternal(access$2100.name); |
1211 | ············access$2100.featureSet·=·supportedFeatureSetInternal; | ||
1212 | ············if·((supportedFeatureSetInternal·&·0x20000000L)·==·0x0L)·{ | ||
1213 | ················mIsEnhancedOpenSupported·=·0; | ||
1214 | ············} | ||
1215 | ············this.mIsEnhancedOpenSupported·=·(mIsEnhancedOpenSupported·!=·0); | ||
1216 | ············return·access$2100.name; | 1227 | ············return·access$2100.name; |
1217 | ········} | 1228 | ········} |
1218 | ····} | 1229 | ····} |
1219 | ···· | 1230 | ···· |
1220 | ····public·String·setupInterfaceForClientInScanMode(final·WifiNative$InterfaceCallback·externalListener)·{ | 1231 | ····public·String·setupInterfaceForClientInScanMode(final·WifiNative$InterfaceCallback·externalListener)·{ |
1221 | ········synchronized·(this.mLock)·{ | 1232 | ········synchronized·(this.mLock)·{ |
1222 | ············if·(!this.startHal())·{ | 1233 | ············if·(!this.startHal())·{ |
Offset 1481, 15 lines modified | Offset 1492, 14 lines modified | ||
1481 | ····public·int·stopSendingOffloadedPacket(final·String·s,·final·int·n)·{ | 1492 | ····public·int·stopSendingOffloadedPacket(final·String·s,·final·int·n)·{ |
1482 | ········return·this.mWifiVendorHal.stopSendingOffloadedPacket(s,·n); | 1493 | ········return·this.mWifiVendorHal.stopSendingOffloadedPacket(s,·n); |
1483 | ····} | 1494 | ····} |
1484 | ···· | 1495 | ···· |
... Open expanded diff ... |
Offset 318, 15 lines modified | Offset 318, 15 lines modified | ||
318 | ····private·boolean·isNetworkSelectionNeeded(final·List·list,·final·WifiInfo·wifiInfo,·final·boolean·b,·final·boolean·b2)·{ | 318 | ····private·boolean·isNetworkSelectionNeeded(final·List·list,·final·WifiInfo·wifiInfo,·final·boolean·b,·final·boolean·b2)·{ |
319 | ········if·(list.size()·==·0)·{ | 319 | ········if·(list.size()·==·0)·{ |
320 | ············this.localLog("Empty·connectivity·scan·results.·Skip·network·selection."); | 320 | ············this.localLog("Empty·connectivity·scan·results.·Skip·network·selection."); |
321 | ············return·false; | 321 | ············return·false; |
322 | ········} | 322 | ········} |
323 | ········final·boolean·b3·=·true; | 323 | ········final·boolean·b3·=·true; |
324 | ········if·(b)·{ | 324 | ········if·(b)·{ |
325 | ············if·(!this.mContext.getResources().getBoolean(213083754 | 325 | ············if·(!this.mContext.getResources().getBoolean(2130837540))·{ |
326 | ················this.localLog("Switching·networks·in·connected·state·is·not·allowed.·Skip·network·selection."); | 326 | ················this.localLog("Switching·networks·in·connected·state·is·not·allowed.·Skip·network·selection."); |
327 | ················return·false; | 327 | ················return·false; |
328 | ············} | 328 | ············} |
329 | ············if·(this.mLastNetworkSelectionTimeStamp·!=·Long.MIN_VALUE)·{ | 329 | ············if·(this.mLastNetworkSelectionTimeStamp·!=·Long.MIN_VALUE)·{ |
330 | ················final·long·n·=·this.mClock.getElapsedSinceBootMillis()·-·this.mLastNetworkSelectionTimeStamp; | 330 | ················final·long·n·=·this.mClock.getElapsedSinceBootMillis()·-·this.mLastNetworkSelectionTimeStamp; |
331 | ················if·(n·<·10000L)·{ | 331 | ················if·(n·<·10000L)·{ |
332 | ····················final·StringBuilder·sb·=·new·StringBuilder(); | 332 | ····················final·StringBuilder·sb·=·new·StringBuilder(); |
Offset 671, 15 lines modified | Offset 671, 15 lines modified | ||
671 | ········if·(configuredNetwork·==·null)·{ | 671 | ········if·(configuredNetwork·==·null)·{ |
672 | ············this.localLog("Current·network·was·removed"); | 672 | ············this.localLog("Current·network·was·removed"); |
673 | ············return·false; | 673 | ············return·false; |
674 | ········} | 674 | ········} |
675 | ········final·int·lastSelectedNetwork·=·this.mWifiConfigManager.getLastSelectedNetwork(); | 675 | ········final·int·lastSelectedNetwork·=·this.mWifiConfigManager.getLastSelectedNetwork(); |
676 | ········final·int·networkId·=·configuredNetwork.networkId; | 676 | ········final·int·networkId·=·configuredNetwork.networkId; |
677 | ········final·boolean·b·=·true; | 677 | ········final·boolean·b·=·true; |
678 | ········if·(lastSelectedNetwork·==·networkId·&&·this.mClock.getElapsedSinceBootMillis()·-·this.mWifiConfigManager.getLastSelectedTimeStamp()·<=·this.mContext.getResources().getInteger(213103416 | 678 | ········if·(lastSelectedNetwork·==·networkId·&&·this.mClock.getElapsedSinceBootMillis()·-·this.mWifiConfigManager.getLastSelectedTimeStamp()·<=·this.mContext.getResources().getInteger(2131034160))·{ |
679 | ············this.localLog("Current·network·is·recently·user-selected"); | 679 | ············this.localLog("Current·network·is·recently·user-selected"); |
680 | ············return·b; | 680 | ············return·b; |
681 | ········} | 681 | ········} |
682 | ········if·(configuredNetwork.osu)·{ | 682 | ········if·(configuredNetwork.osu)·{ |
683 | ············this.localLog("Current·connection·is·OSU"); | 683 | ············this.localLog("Current·connection·is·OSU"); |
684 | ············return·b; | 684 | ············return·b; |
685 | ········} | 685 | ········} |
Offset 1, 11 lines modified | Offset 1, 10 lines modified | ||
1 | package·com.android.server.wifi; | 1 | package·com.android.server.wifi; |
2 | import·android.net.wifi.hotspot2.PasspointConfiguration; | ||
3 | import·java.util.Objects; | 2 | import·java.util.Objects; |
4 | import·android.text.TextUtils; | 3 | import·android.text.TextUtils; |
5 | import·android.net.wifi.WifiConfiguration; | 4 | import·android.net.wifi.WifiConfiguration; |
6 | import·android.net.wifi.WifiNetworkSuggestion; | 5 | import·android.net.wifi.WifiNetworkSuggestion; |
7 | public·class·WifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion | 6 | public·class·WifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion |
8 | { | 7 | { |
Offset 16, 17 lines modified | Offset 15, 17 lines modified | ||
16 | ····public·WifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion(final·WifiNetworkSuggestion·wns,·final·WifiNetworkSuggestionsManager$PerAppInfo·perAppInfo,·final·boolean·isAutojoinEnabled)·{ | 15 | ····public·WifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion(final·WifiNetworkSuggestion·wns,·final·WifiNetworkSuggestionsManager$PerAppInfo·perAppInfo,·final·boolean·isAutojoinEnabled)·{ |
17 | ········this.wns·=·wns; | 16 | ········this.wns·=·wns; |
18 | ········this.perAppInfo·=·perAppInfo; | 17 | ········this.perAppInfo·=·perAppInfo; |
19 | ········this.isAutojoinEnabled·=·isAutojoinEnabled; | 18 | ········this.isAutojoinEnabled·=·isAutojoinEnabled; |
20 | ········final·WifiConfiguration·wifiConfiguration·=·wns.wifiConfiguration; | 19 | ········final·WifiConfiguration·wifiConfiguration·=·wns.wifiConfiguration; |
21 | ········final·boolean·b·=·true; | 20 | ········final·boolean·b·=·true; |
22 | ········wifiConfiguration.fromWifiNetworkSuggestion·=·b; | 21 | ········wifiConfiguration.fromWifiNetworkSuggestion·=·b; |
23 | ········wifiConfiguration.ephemeral·=·b; | 22 | ········this.wns.wifiConfiguration.ephemeral·=·b; |
24 | ········wifiConfiguration.creatorName·=·perAppInfo.packageName; | 23 | ········this.wns.wifiConfiguration.creatorName·=·perAppInfo.packageName; |
25 | ········wifiConfiguration.creatorUid·=·perAppInfo.uid; | 24 | ········this.wns.wifiConfiguration.creatorUid·=·perAppInfo.uid; |
26 | ····} | 25 | ····} |
27 | ···· | 26 | ···· |
28 | ····public·static·WifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion·fromWns(final·WifiNetworkSuggestion·wifiNetworkSuggestion,·final·WifiNetworkSuggestionsManager$PerAppInfo·wifiNetworkSuggestionsManager$PerAppInfo,·final·boolean·b)·{ | 27 | ····public·static·WifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion·fromWns(final·WifiNetworkSuggestion·wifiNetworkSuggestion,·final·WifiNetworkSuggestionsManager$PerAppInfo·wifiNetworkSuggestionsManager$PerAppInfo,·final·boolean·b)·{ |
29 | ········return·new·WifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion(wifiNetworkSuggestion,·wifiNetworkSuggestionsManager$PerAppInfo,·b); | 28 | ········return·new·WifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion(wifiNetworkSuggestion,·wifiNetworkSuggestionsManager$PerAppInfo,·b); |
30 | ····} | 29 | ····} |
31 | ···· | 30 | ···· |
32 | ····public·WifiConfiguration·createInternalWifiConfiguration()·{ | 31 | ····public·WifiConfiguration·createInternalWifiConfiguration()·{ |
Offset 57, 21 lines modified | Offset 56, 19 lines modified | ||
57 | ····} | 56 | ····} |
58 | ···· | 57 | ···· |
59 | ····public·int·hashCode()·{ | 58 | ····public·int·hashCode()·{ |
60 | ········return·Objects.hash(this.wns,·this.perAppInfo.uid,·this.perAppInfo.packageName); | 59 | ········return·Objects.hash(this.wns,·this.perAppInfo.uid,·this.perAppInfo.packageName); |
61 | ····} | 60 | ····} |
62 | ···· | 61 | ···· |
63 | ····public·void·setCarrierId(final·int·n)·{ | 62 | ····public·void·setCarrierId(final·int·n)·{ |
64 | ········fin | 63 | ········if·(this.wns.passpointConfiguration·==·null)·{ |
65 | ········ | 64 | ············this.wns.wifiConfiguration.carrierId·=·n; |
66 | ········if·(passpointConfiguration·==·null)·{ | ||
67 | ············wns.wifiConfiguration.carrierId·=·n; | ||
68 | ········} | 65 | ········} |
69 | ········else·{ | 66 | ········else·{ |
70 | ············passpointConfiguration.setCarrierId(n); | 67 | ············this.wns.passpointConfiguration.setCarrierId(n); |
71 | ········} | 68 | ········} |
72 | ····} | 69 | ····} |
73 | ···· | 70 | ···· |
74 | ····public·String·toString()·{ | 71 | ····public·String·toString()·{ |
75 | ········final·StringBuilder·sb·=·new·StringBuilder(this.wns.toString()); | 72 | ········final·StringBuilder·sb·=·new·StringBuilder(this.wns.toString()); |
76 | ········sb.append(",·isAutoJoinEnabled="); | 73 | ········sb.append(",·isAutoJoinEnabled="); |
77 | ········sb.append(this.isAutojoinEnabled); | 74 | ········sb.append(this.isAutojoinEnabled); |
Offset 5, 14 lines modified | Offset 5, 15 lines modified | ||
5 | import·android.net.wifi.WifiScanner$ScanSettings$HiddenNetwork; | 5 | import·android.net.wifi.WifiScanner$ScanSettings$HiddenNetwork; |
6 | import·android.os.IBinder; | 6 | import·android.os.IBinder; |
7 | import·java.io.PrintWriter; | 7 | import·java.io.PrintWriter; |
8 | import·java.io.FileDescriptor; | 8 | import·java.io.FileDescriptor; |
9 | import·java.util.Collections; | 9 | import·java.util.Collections; |
10 | import·com.android.server.wifi.hotspot2.PasspointManager; | 10 | import·com.android.server.wifi.hotspot2.PasspointManager; |
11 | import·android.net.wifi.WifiManager; | 11 | import·android.net.wifi.WifiManager; |
12 | import·android.net.wifi.WifiEnterpriseConfig; | ||
12 | import·android.app.AppOpsManager$OnOpChangedListener; | 13 | import·android.app.AppOpsManager$OnOpChangedListener; |
13 | import·android.app.Notification$Builder; | 14 | import·android.app.Notification$Builder; |
14 | import·android.app.Notification$Action; | 15 | import·android.app.Notification$Action; |
15 | import·android.app.Notification$Style; | 16 | import·android.app.Notification$Style; |
16 | import·android.app.Notification$BigTextStyle; | 17 | import·android.app.Notification$BigTextStyle; |
17 | import·android.graphics.drawable.Icon; | 18 | import·android.graphics.drawable.Icon; |
18 | import·android.app.Notification$Action$Builder; | 19 | import·android.app.Notification$Action$Builder; |
Offset 23, 26 lines modified | Offset 24, 25 lines modified | ||
23 | import·android.content.DialogInterface$OnClickListener; | 24 | import·android.content.DialogInterface$OnClickListener; |
24 | import·android.os.Parcelable; | 25 | import·android.os.Parcelable; |
25 | import·android.os.RemoteException; | 26 | import·android.os.RemoteException; |
26 | import·android.net.wifi.ISuggestionConnectionStatusListener; | 27 | import·android.net.wifi.ISuggestionConnectionStatusListener; |
27 | import·com.android.server.wifi.util.ExternalCallbackTracker; | 28 | import·com.android.server.wifi.util.ExternalCallbackTracker; |
28 | import·android.content.DialogInterface; | 29 | import·android.content.DialogInterface; |
29 | import·java.util.stream.Stream; | 30 | import·java.util.stream.Stream; |
30 | import·android.net.wifi. | 31 | import·android.net.wifi.hotspot2.PasspointConfiguration; |
31 | import·android.net.wifi.WifiInfo; | 32 | import·android.net.wifi.WifiInfo; |
32 | import·java.util.function.Predicate; | 33 | import·java.util.function.Predicate; |
33 | import·android.content.Context; | 34 | import·android.content.Context; |
34 | import·java.io.Serializable; | 35 | import·java.io.Serializable; |
35 | import·android.content.Intent; | 36 | import·android.content.Intent; |
36 | import·android.app.PendingIntent; | 37 | import·android.app.PendingIntent; |
38 | import·android.net.wifi.WifiNetworkSuggestion; | ||
37 | import·java.util.Iterator; | 39 | import·java.util.Iterator; |
38 | import·android.net.wifi.ScanResult; | 40 | import·android.net.wifi.ScanResult; |
39 | import·android.net.wifi.WifiConfiguration; | 41 | import·android.net.wifi.WifiConfiguration; |
40 | import·android.net.wifi.hotspot2.PasspointConfiguration; | ||
41 | import·android.net.wifi.WifiNetworkSuggestion; | ||
42 | import·android.content.pm.PackageManager$NameNotFoundException; | 42 | import·android.content.pm.PackageManager$NameNotFoundException; |
43 | import·android.util.Log; | 43 | import·android.util.Log; |
44 | import·android.content.pm.ApplicationInfo; | 44 | import·android.content.pm.ApplicationInfo; |
45 | import·android.os.UserHandle; | 45 | import·android.os.UserHandle; |
46 | import·java.util.stream.Collector; | 46 | import·java.util.stream.Collector; |
47 | import·java.util.function.Function; | 47 | import·java.util.function.Function; |
48 | import·java.util.stream.Collectors; | 48 | import·java.util.stream.Collectors; |
Offset 221, 20 lines modified | Offset 221, 18 lines modified | ||
221 | ············} | 221 | ············} |
222 | ············catch·(PackageManager$NameNotFoundException·ex2)·{} | 222 | ············catch·(PackageManager$NameNotFoundException·ex2)·{} |
223 | ········} | 223 | ········} |
224 | ········catch·(PackageManager$NameNotFoundException·ex3)·{} | 224 | ········catch·(PackageManager$NameNotFoundException·ex3)·{} |
225 | ····} | 225 | ····} |
226 | ···· | 226 | ···· |
227 | ····private·int·getCarrierIdFromSuggestion(final·WifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion)·{ | 227 | ····private·int·getCarrierIdFromSuggestion(final·WifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion)·{ |
228 | ········ | 228 | ········if·(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.wns.passpointConfiguration·==·null)·{ |
229 | ········ | 229 | ············return·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.wns.wifiConfiguration.carrierId; |
230 | ········if·(passpointConfiguration·==·null)·{ | ||
231 | ············return·wns.wifiConfiguration.carrierId; | ||
232 | ········} | 230 | ········} |
233 | ········return·passpointConfiguration.getCarrierId(); | 231 | ········return·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.wns.passpointConfiguration.getCarrierId(); |
234 | ····} | 232 | ····} |
235 | ···· | 233 | ···· |
236 | ····private·List·getMatchingScanResults(final·WifiConfiguration·wifiConfiguration,·final·List·list)·{ | 234 | ····private·List·getMatchingScanResults(final·WifiConfiguration·wifiConfiguration,·final·List·list)·{ |
237 | ········final·ScanResultMatchInfo·fromWifiConfiguration·=·ScanResultMatchInfo.fromWifiConfiguration(wifiConfiguration); | 235 | ········final·ScanResultMatchInfo·fromWifiConfiguration·=·ScanResultMatchInfo.fromWifiConfiguration(wifiConfiguration); |
238 | ········if·(fromWifiConfiguration·==·null)·{ | 236 | ········if·(fromWifiConfiguration·==·null)·{ |
239 | ············return·new·ArrayList(); | 237 | ············return·new·ArrayList(); |
240 | ········} | 238 | ········} |
Offset 394, 19 lines modified | Offset 392, 18 lines modified | ||
394 | ················} | 392 | ················} |
395 | ················if·(this.getCarrierIdFromSuggestion(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion2)·!=·this.getCarrierIdFromSuggestion(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion))·{ | 393 | ················if·(this.getCarrierIdFromSuggestion(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion2)·!=·this.getCarrierIdFromSuggestion(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion))·{ |
396 | ····················continue; | 394 | ····················continue; |
397 | ················} | 395 | ················} |
398 | ················if·(WifiConfiguration.isMetered(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion2.wns.wifiConfiguration,·(WifiInfo)null)·!=·metered)·{ | 396 | ················if·(WifiConfiguration.isMetered(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion2.wns.wifiConfiguration,·(WifiInfo)null)·!=·metered)·{ |
399 | ····················continue; | 397 | ····················continue; |
400 | ················} | 398 | ················} |
401 | ················fina | 399 | ················if·(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion2.wns.wifiConfiguration.priority·<·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.wns.wifiConfiguration.priority)·{ |
402 | ················if·(wifiConfiguration.priority·<·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.wns.wifiConfiguration.priority)·{ | ||
403 | ····················continue; | 400 | ····················continue; |
404 | ················} | 401 | ················} |
405 | ················final·WifiConfiguration·configuredNetwork·=·this.mWifiConfigManager.getConfiguredNetwork(wifiConfiguration.getKey()); | 402 | ················final·WifiConfiguration·configuredNetwork·=·this.mWifiConfigManager.getConfiguredNetwork(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion2.wns.wifiConfiguration.getKey()); |
406 | ················if·(configuredNetwork·!=·null·&&·!configuredNetwork.getNetworkSelectionStatus().isNetworkEnabled())·{ | 403 | ················if·(configuredNetwork·!=·null·&&·!configuredNetwork.getNetworkSelectionStatus().isNetworkEnabled())·{ |
407 | ····················continue; | 404 | ····················continue; |
408 | ················} | 405 | ················} |
409 | ················set.add(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion2); | 406 | ················set.add(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion2); |
410 | ············} | 407 | ············} |
411 | ········} | 408 | ········} |
412 | ········if·(set.isEmpty())·{ | 409 | ········if·(set.isEmpty())·{ |
Offset 436, 30 lines modified | Offset 433, 27 lines modified | ||
436 | ················return·0; | 433 | ················return·0; |
437 | ············} | 434 | ············} |
438 | ········} | 435 | ········} |
439 | ········return·1; | 436 | ········return·1; |
440 | ····} | 437 | ····} |
441 | ···· | 438 | ···· |
442 | ····private·boolean·isOpenSuggestion(final·WifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion)·{ | 439 | ····private·boolean·isOpenSuggestion(final·WifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion)·{ |
443 | ········fina | 440 | ········return·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.wns.passpointConfiguration·==·null·&&·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.wns.wifiConfiguration.isOpenNetwork(); |
444 | ········return·wns.passpointConfiguration·==·null·&&·wns.wifiConfiguration.isOpenNetwork(); | ||
445 | ····} | 441 | ····} |
446 | ···· | 442 | ···· |
447 | ····private·boolean·isSimBasedSuggestion(final·WifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion)·{ | 443 | ····private·boolean·isSimBasedSuggestion(final·WifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion)·{ |
448 | ········final· | 444 | ········final·PasspointConfiguration·passpointConfiguration·=·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.wns.passpointConfiguration; |
449 | ········final·PasspointConfiguration·passpointConfiguration·=·wns.passpointConfiguration; | ||
450 | ········boolean·b·=·true; | 445 | ········boolean·b·=·true; |
451 | ········if·(passpointConfiguration·==·null)·{ | 446 | ········if·(passpointConfiguration·==·null)·{ |
452 | ············fina | 447 | ············if·(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.wns.wifiConfiguration.enterpriseConfig·==·null·||·!wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.wns.wifiConfiguration.enterpriseConfig.isAuthenticationSimBased())·{ |
453 | ············if·(enterpriseConfig·==·null·||·!enterpriseConfig.isAuthenticationSimBased())·{ | ||
454 | ················b·=·false; | 448 | ················b·=·false; |
455 | ············} | 449 | ············} |
456 | ············return·b; | 450 | ············return·b; |
457 | ········} | 451 | ········} |
458 | ········if·(passpointConfiguration.getCredential().getSimCredential()·==·null)·{ | 452 | ········if·(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.wns.passpointConfiguration.getCredential().getSimCredential()·==·null)·{ |
459 | ············b·=·false; | 453 | ············b·=·false; |
460 | ········} | 454 | ········} |
461 | ········return·b; | 455 | ········return·b; |
462 | ····} | 456 | ····} |
463 | ···· | 457 | ···· |
464 | ····private·boolean·isSuggestionFromForegroundApp(final·String·s)·{ | 458 | ····private·boolean·isSuggestionFromForegroundApp(final·String·s)·{ |
465 | ········boolean·b·=·false; | 459 | ········boolean·b·=·false; |
Offset 552, 21 lines modified | Offset 546, 20 lines modified | ||
552 | ················sb.append(s); | 546 | ················sb.append(s); |
553 | ················Log.v("WifiNetworkSuggestionsManager",·sb.toString()); | 547 | ················Log.v("WifiNetworkSuggestionsManager",·sb.toString()); |
554 | ············} | 548 | ············} |
555 | ············this.stopTrackingAppOpsChange(s); | 549 | ············this.stopTrackingAppOpsChange(s); |
556 | ········} | 550 | ········} |
557 | ········final·ArrayList<WifiNetworkSuggestion>·list·=·new·ArrayList<WifiNetworkSuggestion>(); | 551 | ········final·ArrayList<WifiNetworkSuggestion>·list·=·new·ArrayList<WifiNetworkSuggestion>(); |
558 | ········for·(final·WifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion·:·set)·{ | 552 | ········for·(final·WifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion·:·set)·{ |
559 | ············ | 553 | ············if·(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.wns.passpointConfiguration·!=·null)·{ |
560 | ············if·(wns.passpointConfiguration·!=·null)·{ | ||
561 | ················this.mWifiInjector.getPasspointManager().removeProvider(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.perAppInfo.uid,·false,·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.wns.passpointConfiguration.getUniqueId(),·(String)null); | 554 | ················this.mWifiInjector.getPasspointManager().removeProvider(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.perAppInfo.uid,·false,·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.wns.passpointConfiguration.getUniqueId(),·(String)null); |
562 | ················this.removeFromPassPointInfoMap(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion); | 555 | ················this.removeFromPassPointInfoMap(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion); |
... Open expanded diff ... |
Offset 19, 15 lines modified | Offset 19, 15 lines modified | ||
19 | ···· | 19 | ···· |
20 | ····public·boolean·getValue()·{ | 20 | ····public·boolean·getValue()·{ |
21 | ········final·WifiScoreReport·this$0·=·this.this$0; | 21 | ········final·WifiScoreReport·this$0·=·this.this$0; |
22 | ········final·FrameworkFacade·mFrameworkFacade·=·this$0.mFrameworkFacade; | 22 | ········final·FrameworkFacade·mFrameworkFacade·=·this$0.mFrameworkFacade; |
23 | ········final·Context·access$1200·=·WifiScoreReport.access$1200(this$0); | 23 | ········final·Context·access$1200·=·WifiScoreReport.access$1200(this$0); |
24 | ········final·String·s·=·"adaptive_connectivity_enabled"; | 24 | ········final·String·s·=·"adaptive_connectivity_enabled"; |
25 | ········int·n·=·1; | 25 | ········int·n·=·1; |
26 | ········if·(mFrameworkFacade.get | 26 | ········if·(mFrameworkFacade.getIntegerSetting(access$1200,·s,·n)·!=·n)·{ |
27 | ············n·=·0; | 27 | ············n·=·0; |
28 | ········} | 28 | ········} |
29 | ········return·n·!=·0; | 29 | ········return·n·!=·0; |
30 | ····} | 30 | ····} |
31 | ···· | 31 | ···· |
32 | ····public·void·initialize()·{ | 32 | ····public·void·initialize()·{ |
33 | ········final·Uri·uri·=·Settings$Secure.getUriFor("adaptive_connectivity_enabled"); | 33 | ········final·Uri·uri·=·Settings$Secure.getUriFor("adaptive_connectivity_enabled"); |
Offset 197, 21 lines modified | Offset 197, 21 lines modified | ||
197 | ····private·void·reportNetworkScoreToConnectivityServiceIfNecessary(int·n)·{ | 197 | ····private·void·reportNetworkScoreToConnectivityServiceIfNecessary(int·n)·{ |
198 | ········if·(this.mNetworkAgent·==·null)·{ | 198 | ········if·(this.mNetworkAgent·==·null)·{ |
199 | ············return; | 199 | ············return; |
200 | ········} | 200 | ········} |
201 | ········if·(this.mWifiConnectedNetworkScorerHolder·==·null·&&·n·==·this.mWifiInfo.getScore())·{ | 201 | ········if·(this.mWifiConnectedNetworkScorerHolder·==·null·&&·n·==·this.mWifiInfo.getScore())·{ |
202 | ············return; | 202 | ············return; |
203 | ········} | 203 | ········} |
204 | ········ | 204 | ········if·(this.mWifiConnectedNetworkScorerHolder·!=·null·&&·this.mContext.getResources().getBoolean(2130837515))·{ |
205 | ········final·String·s·=·"WifiScoreReport"; | ||
206 | ········if·(mWifiConnectedNetworkScorerHolder·!=·null·&&·this.mContext.getResources().getBoolean(2130837515))·{ | ||
207 | ············final·long·wallClockMillis·=·this.mClock.getWallClockMillis(); | 205 | ············final·long·wallClockMillis·=·this.mClock.getWallClockMillis(); |
208 | ············final·long·mLastScoreBreachLowTimeMillis·=·this.mLastScoreBreachLowTimeMillis; | 206 | ············final·long·mLastScoreBreachLowTimeMillis·=·this.mLastScoreBreachLowTimeMillis; |
209 | ············final·long·n2·=·(long)(-1); | 207 | ············final·long·n2·=·(long)(-1); |
210 | ············i | 208 | ············final·long·n3·=·lcmp(mLastScoreBreachLowTimeMillis,·n2); |
209 | ············final·String·s·=·"WifiScoreReport"; | ||
210 | ············if·(n3·!=·0)·{ | ||
211 | ················if·(this.mWifiInfo.getRssi()·>=·this.mDeviceConfigFacade.getRssiThresholdNotSendLowScoreToCsDbm())·{ | 211 | ················if·(this.mWifiInfo.getRssi()·>=·this.mDeviceConfigFacade.getRssiThresholdNotSendLowScoreToCsDbm())·{ |
212 | ····················final·StringBuilder·sb·=·new·StringBuilder(); | 212 | ····················final·StringBuilder·sb·=·new·StringBuilder(); |
213 | ····················sb.append("Not·reporting·low·score·because·RSSI·is·high·"); | 213 | ····················sb.append("Not·reporting·low·score·because·RSSI·is·high·"); |
214 | ····················sb.append(this.mWifiInfo.getRssi()); | 214 | ····················sb.append(this.mWifiInfo.getRssi()); |
215 | ····················Log.d(s,·sb.toString()); | 215 | ····················Log.d(s,·sb.toString()); |
216 | ····················return; | 216 | ····················return; |
217 | ················} | 217 | ················} |
Offset 224, 17 lines modified | Offset 224, 14 lines modified | ||
224 | ············if·(mLastScoreBreachHighTimeMillis·!=·n2·&&·wallClockMillis·-·mLastScoreBreachHighTimeMillis·<·this.mDeviceConfigFacade.getMinConfirmationDurationSendHighScoreMs())·{ | 224 | ············if·(mLastScoreBreachHighTimeMillis·!=·n2·&&·wallClockMillis·-·mLastScoreBreachHighTimeMillis·<·this.mDeviceConfigFacade.getMinConfirmationDurationSendHighScoreMs())·{ |
225 | ················Log.d(s,·"Not·reporting·high·score·because·elapsed·time·is·shorter·than·the·minimum·confirmation·duration"); | 225 | ················Log.d(s,·"Not·reporting·high·score·because·elapsed·time·is·shorter·than·the·minimum·confirmation·duration"); |
226 | ················return; | 226 | ················return; |
227 | ············} | 227 | ············} |
228 | ········} | 228 | ········} |
229 | ········if·(!this.mAdaptiveConnectivityEnabled)·{ | 229 | ········if·(!this.mAdaptiveConnectivityEnabled)·{ |
230 | ············n·=·51; | 230 | ············n·=·51; |
231 | ············if·(this.mVerboseLoggingEnabled)·{ | ||
232 | ················Log.d(s,·"Adaptive·connectivity·disabled·-·Stay·a·notch·above·the·transition·score"); | ||
233 | ············} | ||
234 | ········} | 231 | ········} |
235 | ········this.mNetworkAgent.sendNetworkScore(n); | 232 | ········this.mNetworkAgent.sendNetworkScore(n); |
236 | ····} | 233 | ····} |
237 | ···· | 234 | ···· |
238 | ····private·void·revertToDefaultConnectedScorer()·{ | 235 | ····private·void·revertToDefaultConnectedScorer()·{ |
239 | ········Log.d("WifiScoreReport",·"Using·VelocityBasedConnectedScore"); | 236 | ········Log.d("WifiScoreReport",·"Using·VelocityBasedConnectedScore"); |
240 | ········this.mVelocityBasedConnectedScore·=·new·VelocityBasedConnectedScore(this.mScoringParams,·this.mClock); | 237 | ········this.mVelocityBasedConnectedScore·=·new·VelocityBasedConnectedScore(this.mScoringParams,·this.mClock); |
Offset 422, 17 lines modified | Offset 419, 14 lines modified | ||
422 | ············} | 419 | ············} |
423 | ········} | 420 | ········} |
424 | ········return·false; | 421 | ········return·false; |
425 | ····} | 422 | ····} |
426 | ···· | 423 | ···· |
427 | ····public·boolean·shouldCheckIpLayer()·{ | 424 | ····public·boolean·shouldCheckIpLayer()·{ |
428 | ········if·(!this.mAdaptiveConnectivityEnabled)·{ | 425 | ········if·(!this.mAdaptiveConnectivityEnabled)·{ |
429 | ············if·(this.mVerboseLoggingEnabled)·{ | ||
430 | ················Log.d("WifiScoreReport",·"Adaptive·connectivity·disabled·-·Don't·check·IP·layer"); | ||
431 | ············} | ||
432 | ············return·false; | 426 | ············return·false; |
433 | ········} | 427 | ········} |
434 | ········final·int·nudKnob·=·this.mScoringParams.getNudKnob(); | 428 | ········final·int·nudKnob·=·this.mScoringParams.getNudKnob(); |
435 | ········if·(nudKnob·==·0)·{ | 429 | ········if·(nudKnob·==·0)·{ |
436 | ············return·false; | 430 | ············return·false; |
437 | ········} | 431 | ········} |
438 | ········final·long·n·=·this.mClock.getWallClockMillis()·-·this.mLastKnownNudCheckTimeMillis; | 432 | ········final·long·n·=·this.mClock.getWallClockMillis()·-·this.mLastKnownNudCheckTimeMillis; |
Offset 151, 15 lines modified | Offset 151, 15 lines modified | ||
151 | ········int·n2·=·0; | 151 | ········int·n2·=·0; |
152 | ········Label_0143:·{ | 152 | ········Label_0143:·{ |
153 | ············if·(access$1000)·{ | 153 | ············if·(access$1000)·{ |
154 | ················if·(WifiServiceImpl.access$200(this.this$0).getResources().getBoolean(2130837514)·&&·WifiServiceImpl.access$200(this.this$0).getResources().getBoolean(2130837522)·&&·WifiServiceImpl.access$1100(this.this$0))·{ | 154 | ················if·(WifiServiceImpl.access$200(this.this$0).getResources().getBoolean(2130837514)·&&·WifiServiceImpl.access$200(this.this$0).getResources().getBoolean(2130837522)·&&·WifiServiceImpl.access$1100(this.this$0))·{ |
155 | ····················n2·=·4; | 155 | ····················n2·=·4; |
156 | ····················break·Label_0143; | 156 | ····················break·Label_0143; |
157 | ················} | 157 | ················} |
158 | ················if·(WifiServiceImpl.access$200(this.this$0).getResources().getBoolean(213083754 | 158 | ················if·(WifiServiceImpl.access$200(this.this$0).getResources().getBoolean(2130837545)·&&·WifiServiceImpl.access$1200(this.this$0))·{ |
159 | ····················n2·=·n; | 159 | ····················n2·=·n; |
160 | ····················break·Label_0143; | 160 | ····················break·Label_0143; |
161 | ················} | 161 | ················} |
162 | ············} | 162 | ············} |
163 | ············n2·=·mIsExclusive; | 163 | ············n2·=·mIsExclusive; |
164 | ········} | 164 | ········} |
165 | ········this.mActiveConfig·=·new·SoftApModeConfiguration(n,·WifiApConfigStore.generateLocalOnlyHotspotConfig(WifiServiceImpl.access$200(this.this$0),·n2,·localOnlyHotspotRequestInfo.getCustomConfig()),·WifiServiceImpl.access$100(this.this$0).getSoftApCapability()); | 165 | ········this.mActiveConfig·=·new·SoftApModeConfiguration(n,·WifiApConfigStore.generateLocalOnlyHotspotConfig(WifiServiceImpl.access$200(this.this$0),·n2,·localOnlyHotspotRequestInfo.getCustomConfig()),·WifiServiceImpl.access$100(this.this$0).getSoftApCapability()); |
Offset 203, 15 lines modified | Offset 203, 15 lines modified | ||
203 | ················return; | 203 | ················return; |
204 | ············} | 204 | ············} |
205 | ············final·PersistableBundle·configForSubId·=·carrierConfigManager.getConfigForSubId(n); | 205 | ············final·PersistableBundle·configForSubId·=·carrierConfigManager.getConfigForSubId(n); |
206 | ············if·(configForSubId·==·null)·{ | 206 | ············if·(configForSubId·==·null)·{ |
207 | ················return; | 207 | ················return; |
208 | ············} | 208 | ············} |
209 | ············n·=·configForSubId.getInt("wifi.hotspot_maximum_client_count"); | 209 | ············n·=·configForSubId.getInt("wifi.hotspot_maximum_client_count"); |
210 | ············int·maxSupportedClients·=·WifiServiceImpl.access$200(this.this$0).getResources().getInteger(21310341 | 210 | ············int·maxSupportedClients·=·WifiServiceImpl.access$200(this.this$0).getResources().getInteger(2131034149); |
211 | ············if·(n·>·0)·{ | 211 | ············if·(n·>·0)·{ |
212 | ················maxSupportedClients·=·Math.min(maxSupportedClients,·n); | 212 | ················maxSupportedClients·=·Math.min(maxSupportedClients,·n); |
213 | ············} | 213 | ············} |
214 | ············n·=·this.getSoftApCapability().getMaxSupportedClients(); | 214 | ············n·=·this.getSoftApCapability().getMaxSupportedClients(); |
215 | ············if·(maxSupportedClients·==·n)·{ | 215 | ············if·(maxSupportedClients·==·n)·{ |
216 | ················return; | 216 | ················return; |
217 | ············} | 217 | ············} |
Offset 77, 74 lines modified | Offset 77, 67 lines modified | ||
77 | ····} | 77 | ····} |
78 | ···· | 78 | ···· |
79 | ····static·WifiAwareDataPathStateManager$AwareNetworkRequestInformation·processNetworkSpecifier(final·NetworkRequest·networkRequest,·final·WifiAwareNetworkSpecifier·networkSpecifier,·final·WifiAwareStateManager·wifiAwareStateManager,·final·WifiPermissionsUtil·wifiPermissionsUtil,·final·WifiPermissionsWrapper·wifiPermissionsWrapper,·final·boolean·b)·{ | 79 | ····static·WifiAwareDataPathStateManager$AwareNetworkRequestInformation·processNetworkSpecifier(final·NetworkRequest·networkRequest,·final·WifiAwareNetworkSpecifier·networkSpecifier,·final·WifiAwareStateManager·wifiAwareStateManager,·final·WifiPermissionsUtil·wifiPermissionsUtil,·final·WifiPermissionsWrapper·wifiPermissionsWrapper,·final·boolean·b)·{ |
80 | ········byte[]·peerDiscoveryMac·=·networkSpecifier.peerMac; | 80 | ········byte[]·peerDiscoveryMac·=·networkSpecifier.peerMac; |
81 | ········final·int·type·=·networkSpecifier.type; | 81 | ········final·int·type·=·networkSpecifier.type; |
82 | ········final·String·s·=·"processNetworkSpecifier:·networkSpecifier="; | 82 | ········final·String·s·=·"processNetworkSpecifier:·networkSpecifier="; |
83 | ········final·String·s2·=·"WifiAwareDataPathStMgr"; | 83 | ········final·String·s2·=·"WifiAwareDataPathStMgr"; |
84 | ········if·(type·<·0·||·type·>·3)·{ | 84 | ········if·(type·<·0·||·networkSpecifier.type·>·3)·{ |
85 | ············final·StringBuilder·sb·=·new·StringBuilder(); | 85 | ············final·StringBuilder·sb·=·new·StringBuilder(); |
86 | ············sb.append(s); | 86 | ············sb.append(s); |
87 | ············sb.append(networkSpecifier); | 87 | ············sb.append(networkSpecifier); |
88 | ············sb.append(",·invalid·'type'·value"); | 88 | ············sb.append(",·invalid·'type'·value"); |
89 | ············Log.e(s2,·sb.toString()); | 89 | ············Log.e(s2,·sb.toString()); |
90 | ············return·null; | 90 | ············return·null; |
91 | ········} | 91 | ········} |
92 | ········final·int·role·=·networkSpecifier.role; | 92 | ········final·int·role·=·networkSpecifier.role; |
93 | ········final·boolean·b2·=·true; | 93 | ········final·boolean·b2·=·true; |
94 | ········if·(role·&&·role·!=·(b2·?·1·:·0))·{ | 94 | ········if·(role·!=·0·&&·networkSpecifier.role·!=·(b2·?·1·:·0))·{ |
95 | ············final·StringBuilder·sb2·=·new·StringBuilder(); | 95 | ············final·StringBuilder·sb2·=·new·StringBuilder(); |
96 | ············sb2.append(s); | 96 | ············sb2.append(s); |
97 | ············sb2.append(networkSpecifier); | 97 | ············sb2.append(networkSpecifier); |
98 | ············sb2.append("·--·invalid·'role'·value"); | 98 | ············sb2.append("·--·invalid·'role'·value"); |
99 | ············Log.e(s2,·sb2.toString()); | 99 | ············Log.e(s2,·sb2.toString()); |
100 | ············return·null; | 100 | ············return·null; |
101 | ········} | 101 | ········} |
102 | ········final·int·role2·=·networkSpecifier.role; | 102 | ········final·int·role2·=·networkSpecifier.role; |
103 | ········final·int·n·=·2; | 103 | ········final·int·n·=·2; |
104 | ········if·(role2·==·0)·{ | 104 | ········if·(role2·==·0·&&·networkSpecifier.type·!=·0·&&·networkSpecifier.type·!=·n)·{ |
105 | ············final·in | 105 | ············final·StringBuilder·sb3·=·new·StringBuilder(); |
106 | ············ | 106 | ············sb3.append(s); |
107 | ············ | 107 | ············sb3.append(networkSpecifier); |
108 | ················ | 108 | ············sb3.append("·--·invalid·'type'·value·for·INITIATOR·(only·IB·and·OOB·are·permitted)"); |
109 | ············ | 109 | ············Log.e(s2,·sb3.toString()); |
110 | ············ | 110 | ············return·null; |
111 | ················Log.e(s2,·sb3.toString()); | ||
112 | ················return·null; | ||
113 | ············} | ||
114 | ········} | 111 | ········} |
115 | ········final·WifiAwareClientState·client·=·wifiAwareStateManager.getClient(networkSpecifier.clientId); | 112 | ········final·WifiAwareClientState·client·=·wifiAwareStateManager.getClient(networkSpecifier.clientId); |
116 | ········if·(client·==·null)·{ | 113 | ········if·(client·==·null)·{ |
117 | ············final·StringBuilder·sb4·=·new·StringBuilder(); | 114 | ············final·StringBuilder·sb4·=·new·StringBuilder(); |
118 | ············sb4.append(s); | 115 | ············sb4.append(s); |
119 | ············sb4.append(networkSpecifier); | 116 | ············sb4.append(networkSpecifier); |
120 | ············sb4.append("·--·not·client·with·this·id·--·clientId="); | 117 | ············sb4.append("·--·not·client·with·this·id·--·clientId="); |
121 | ············sb4.append(networkSpecifier.clientId); | 118 | ············sb4.append(networkSpecifier.clientId); |
122 | ············Log.e(s2,·sb4.toString()); | 119 | ············Log.e(s2,·sb4.toString()); |
123 | ············return·null; | 120 | ············return·null; |
124 | ········} | 121 | ········} |
125 | ········final·int·uid·=·client.getUid(); | 122 | ········final·int·uid·=·client.getUid(); |
126 | ········final·String·callingPackage·=·client.getCallingPackage(); | 123 | ········final·String·callingPackage·=·client.getCallingPackage(); |
127 | ········if·(!b·&&·!wifiPermissionsUtil.isTargetSdkLessThan(client.getCallingPackage(),·28,·uid))·{ | 124 | ········if·(!b·&&·!wifiPermissionsUtil.isTargetSdkLessThan(client.getCallingPackage(),·28,·uid)·&&·networkSpecifier.type·!=·0·&&·networkSpecifier.type·!=·n)·{ |
128 | ············final·in | 125 | ············final·StringBuilder·sb5·=·new·StringBuilder(); |
129 | ············ | 126 | ············sb5.append(s); |
130 | ············ | 127 | ············sb5.append(networkSpecifier); |
131 | ················s | 128 | ············sb5.append("·--·no·ANY·specifications·allowed·for·this·API·level"); |
132 | ············ | 129 | ············Log.e(s2,·sb5.toString()); |
133 | ············ | 130 | ············return·null; |
134 | ················Log.e(s2,·sb5.toString()); | ||
135 | ················return·null; | ||
136 | ············} | ||
137 | ········} | 131 | ········} |
138 | ········ | 132 | ········if·(networkSpecifier.port·>=·0)·{ |
139 | ········if·(port·>=·0)·{ | ||
140 | ············final·int·transportProtocol·=·networkSpecifier.transportProtocol; | 133 | ············final·int·transportProtocol·=·networkSpecifier.transportProtocol; |
141 | ············final·int·n2·=·-1; | 134 | ············final·int·n2·=·-1; |
142 | ············if·(transportProtocol·>=·n2)·{ | 135 | ············if·(transportProtocol·>=·n2)·{ |
143 | ················if·(port·!=·0·||·transportProtocol·!=·n2)·{ | 136 | ················if·(networkSpecifier.port·!=·0·||·networkSpecifier.transportProtocol·!=·n2)·{ |
144 | ····················if·(networkSpecifier.role·!=·(b2·?·1·:·0))·{ | 137 | ····················if·(networkSpecifier.role·!=·(b2·?·1·:·0))·{ |
145 | ························final·StringBuilder·sb6·=·new·StringBuilder(); | 138 | ························final·StringBuilder·sb6·=·new·StringBuilder(); |
146 | ························sb6.append(s); | 139 | ························sb6.append(s); |
147 | ························sb6.append(networkSpecifier); | 140 | ························sb6.append(networkSpecifier); |
148 | ························sb6.append("·--·port/transportProtocol·can·only·be·specified·on·responder"); | 141 | ························sb6.append("·--·port/transportProtocol·can·only·be·specified·on·responder"); |
149 | ························Log.e(s2,·sb6.toString()); | 142 | ························Log.e(s2,·sb6.toString()); |
150 | ························return·null; | 143 | ························return·null; |
Offset 154, 19 lines modified | Offset 147, 19 lines modified | ||
154 | ························sb7.append(s); | 147 | ························sb7.append(s); |
155 | ························sb7.append(networkSpecifier); | 148 | ························sb7.append(networkSpecifier); |
156 | ························sb7.append("·--·port/transportProtocol·can·only·be·specified·on·secure·ndp"); | 149 | ························sb7.append("·--·port/transportProtocol·can·only·be·specified·on·secure·ndp"); |
157 | ························Log.e(s2,·sb7.toString()); | 150 | ························Log.e(s2,·sb7.toString()); |
158 | ························return·null; | 151 | ························return·null; |
159 | ····················} | 152 | ····················} |
160 | ················} | 153 | ················} |
161 | ················final·int·type | 154 | ················final·int·type2·=·networkSpecifier.type; |
162 | ················int·pubSubId·=·0; | 155 | ················int·pubSubId·=·0; |
163 | ················int·mInstanceId·=·0; | 156 | ················int·mInstanceId·=·0; |
164 | ················Label_09 | 157 | ················Label_0964:·{ |
165 | ····················if·(type | 158 | ····················if·(type2·==·0·||·networkSpecifier.type·==·(b2·?·1·:·0))·{ |
166 | ························final·WifiAwareDiscoverySessionState·session·=·client.getSession(networkSpecifier.sessionId); | 159 | ························final·WifiAwareDiscoverySessionState·session·=·client.getSession(networkSpecifier.sessionId); |
167 | ························if·(session·==·null)·{ | 160 | ························if·(session·==·null)·{ |
168 | ····························final·StringBuilder·sb8·=·new·StringBuilder(); | 161 | ····························final·StringBuilder·sb8·=·new·StringBuilder(); |
169 | ····························sb8.append(s); | 162 | ····························sb8.append(s); |
170 | ····························sb8.append(networkSpecifier); | 163 | ····························sb8.append(networkSpecifier); |
171 | ····························sb8.append("·--·no·session·with·this·id·--·sessionId="); | 164 | ····························sb8.append("·--·no·session·with·this·id·--·sessionId="); |
172 | ····························sb8.append(networkSpecifier.sessionId); | 165 | ····························sb8.append(networkSpecifier.sessionId); |
Offset 193, 15 lines modified | Offset 186, 15 lines modified | ||
193 | ································Log.e(s2,·sb10.toString()); | 186 | ································Log.e(s2,·sb10.toString()); |
194 | ································return·null; | 187 | ································return·null; |
195 | ····························} | 188 | ····························} |
196 | ····························mInstanceId·=·peerInfo.mInstanceId; | 189 | ····························mInstanceId·=·peerInfo.mInstanceId; |
197 | ····························try·{ | 190 | ····························try·{ |
198 | ································peerDiscoveryMac·=·peerInfo.mMac; | 191 | ································peerDiscoveryMac·=·peerInfo.mMac; |
199 | ································if·(peerDiscoveryMac·!=·null·&&·peerDiscoveryMac.length·==·6)·{ | 192 | ································if·(peerDiscoveryMac·!=·null·&&·peerDiscoveryMac.length·==·6)·{ |
200 | ····································break·Label_09 | 193 | ····································break·Label_0964; |
201 | ································} | 194 | ································} |
202 | ································try·{ | 195 | ································try·{ |
203 | ····································final·StringBuilder·sb12; | 196 | ····································final·StringBuilder·sb12; |
204 | ····································final·StringBuilder·sb11·=·sb12·=·new·StringBuilder(); | 197 | ····································final·StringBuilder·sb11·=·sb12·=·new·StringBuilder(); |
205 | ····································try·{ | 198 | ····································try·{ |
206 | ········································sb12.append(s); | 199 | ········································sb12.append(s); |
207 | ········································final·StringBuilder·sb13·=·sb11; | 200 | ········································final·StringBuilder·sb13·=·sb11; |
Offset 246, 16 lines modified | Offset 239, 15 lines modified | ||
246 | ····················sb16.append(s); | 239 | ····················sb16.append(s); |
247 | ····················sb16.append(networkSpecifier.toString()); | 240 | ····················sb16.append(networkSpecifier.toString()); |
248 | ····················sb16.append("·--·invalid·passphrase·length:·"); | 241 | ····················sb16.append("·--·invalid·passphrase·length:·"); |
249 | ····················sb16.append(networkSpecifier.passphrase.length()); | 242 | ····················sb16.append(networkSpecifier.passphrase.length()); |
250 | ····················Log.e(s2,·sb16.toString()); | 243 | ····················Log.e(s2,·sb16.toString()); |
251 | ····················return·null; | 244 | ····················return·null; |
252 | ················} | 245 | ················} |
253 | ················f | 246 | ················if·(networkSpecifier.pmk·!=·null·&&·!WifiAwareUtils.validatePmk(networkSpecifier.pmk))·{ |
254 | ················if·(pmk·!=·null·&&·!WifiAwareUtils.validatePmk(pmk))·{ | ||
255 | ····················final·StringBuilder·sb17·=·new·StringBuilder(); | 247 | ····················final·StringBuilder·sb17·=·new·StringBuilder(); |
256 | ····················sb17.append(s); | 248 | ····················sb17.append(s); |
257 | ····················sb17.append(networkSpecifier.toString()); | 249 | ····················sb17.append(networkSpecifier.toString()); |
258 | ····················sb17.append("·--·invalid·pmk·length:·"); | 250 | ····················sb17.append("·--·invalid·pmk·length:·"); |
259 | ····················sb17.append(networkSpecifier.pmk.length); | 251 | ····················sb17.append(networkSpecifier.pmk.length); |
260 | ····················Log.e(s2,·sb17.toString()); | 252 | ····················Log.e(s2,·sb17.toString()); |
261 | ····················return·null; | 253 | ····················return·null; |
... Open expanded diff ... |
Offset 652, 18 lines modified | Offset 652, 15 lines modified | ||
652 | ····················this.mNetworkRequestsCache.remove(wifiAwareNetworkSpecifier2); | 652 | ····················this.mNetworkRequestsCache.remove(wifiAwareNetworkSpecifier2); |
653 | ····················this.mNetworkFactory.letAppKnowThatRequestsAreUnavailable(wifiAwareDataPathStateManager$AwareNetworkRequestInformation2); | 653 | ····················this.mNetworkFactory.letAppKnowThatRequestsAreUnavailable(wifiAwareDataPathStateManager$AwareNetworkRequestInformation2); |
654 | ····················return·null; | 654 | ····················return·null; |
655 | ················} | 655 | ················} |
656 | ················wifiAwareDataPathStateManager$AwareNetworkRequestInformation2.state·=·105; | 656 | ················wifiAwareDataPathStateManager$AwareNetworkRequestInformation2.state·=·105; |
657 | ················wifiAwareDataPathStateManager$AwareNetworkRequestInformation2.ndpId·=·ndpId; | 657 | ················wifiAwareDataPathStateManager$AwareNetworkRequestInformation2.ndpId·=·ndpId; |
658 | ················wifiAwareDataPathStateManager$AwareNetworkRequestInformation2.startTimestamp·=·this.mClock.getElapsedSinceBootMillis(); | 658 | ················wifiAwareDataPathStateManager$AwareNetworkRequestInformation2.startTimestamp·=·this.mClock.getElapsedSinceBootMillis(); |
659 | ················fina | 659 | ················this.mMgr.respondToDataPathRequest(true,·ndpId,·wifiAwareDataPathStateManager$AwareNetworkRequestInformation2.interfaceName,·wifiAwareDataPathStateManager$AwareNetworkRequestInformation2.networkSpecifier.pmk,·wifiAwareDataPathStateManager$AwareNetworkRequestInformation2.networkSpecifier.passphrase,·WifiAwareDataPathStateManager$NetworkInformationData.buildTlv(wifiAwareDataPathStateManager$AwareNetworkRequestInformation2.networkSpecifier.port,·wifiAwareDataPathStateManager$AwareNetworkRequestInformation2.networkSpecifier.transportProtocol),·wifiAwareDataPathStateManager$AwareNetworkRequestInformation2.networkSpecifier.isOutOfBand()); |
660 | ················final·String·interfaceName·=·wifiAwareDataPathStateManager$AwareNetworkRequestInformation2.interfaceName; | ||
661 | ················final·WifiAwareNetworkSpecifier·networkSpecifier·=·wifiAwareDataPathStateManager$AwareNetworkRequestInformation2.networkSpecifier; | ||
662 | ················mMgr.respondToDataPathRequest(true,·ndpId,·interfaceName,·networkSpecifier.pmk,·networkSpecifier.passphrase,·WifiAwareDataPathStateManager$NetworkInformationData.buildTlv(networkSpecifier.port,·networkSpecifier.transportProtocol),·wifiAwareDataPathStateManager$AwareNetworkRequestInformation2.networkSpecifier.isOutOfBand()); | ||
663 | ················return·wifiAwareNetworkSpecifier2; | 660 | ················return·wifiAwareNetworkSpecifier2; |
664 | ············} | 661 | ············} |
665 | ············final·WifiAwareNetworkSpecifier·wifiAwareNetworkSpecifier2·=·null; | 662 | ············final·WifiAwareNetworkSpecifier·wifiAwareNetworkSpecifier2·=·null; |
666 | ············final·WifiAwareDataPathStateManager$AwareNetworkRequestInformation·wifiAwareDataPathStateManager$AwareNetworkRequestInformation2·=·null; | 663 | ············final·WifiAwareDataPathStateManager$AwareNetworkRequestInformation·wifiAwareDataPathStateManager$AwareNetworkRequestInformation2·=·null; |
667 | ············continue; | 664 | ············continue; |
668 | ········} | 665 | ········} |
669 | ····} | 666 | ····} |
Offset 849, 23 lines modified | Offset 849, 19 lines modified | ||
849 | ············int·n7; | 849 | ············int·n7; |
850 | ············if·(uid·==·n·&&·TextUtils.equals((CharSequence)wifiAwareDataPathStateManager$AwareNetworkRequestInformation.packageName,·(CharSequence)s))·{ | 850 | ············if·(uid·==·n·&&·TextUtils.equals((CharSequence)wifiAwareDataPathStateManager$AwareNetworkRequestInformation.packageName,·(CharSequence)s))·{ |
851 | ················n7·=·n6; | 851 | ················n7·=·n6; |
852 | ············} | 852 | ············} |
853 | ············else·{ | 853 | ············else·{ |
854 | ················n7·=·0; | 854 | ················n7·=·0; |
855 | ············} | 855 | ············} |
856 | ············int·n8 | 856 | ············int·n8; |
857 | ············ | 857 | ············if·(TextUtils.isEmpty((CharSequence)wifiAwareDataPathStateManager$AwareNetworkRequestInformation.networkSpecifier.passphrase)·&&·(wifiAwareDataPathStateManager$AwareNetworkRequestInformation.networkSpecifier.pmk·==·null·||·wifiAwareDataPathStateManager$AwareNetworkRequestInformation.networkSpecifier.pmk.length·==·0))·{ |
858 | ················ | 858 | ················n8·=·0; |
859 | ············ | 859 | ············} |
860 | ············ | 860 | ············else·{ |
861 | ························n8·=·0; | ||
862 | ························break·Label_0211; | ||
863 | ····················} | ||
864 | ················} | ||
865 | ················n8·=·n6; | 861 | ················n8·=·n6; |
866 | ············} | 862 | ············} |
867 | ············if·(n7·!=·0)·{ | 863 | ············if·(n7·!=·0)·{ |
868 | ················++n2; | 864 | ················++n2; |
869 | ················if·(n8·!=·0)·{ | 865 | ················if·(n8·!=·0)·{ |
870 | ····················++n5; | 866 | ····················++n5; |
871 | ················} | 867 | ················} |
Offset 47, 14 lines modified | Offset 47, 15 lines modified | ||
47 | import·android.net.wifi.WifiConfiguration; | 47 | import·android.net.wifi.WifiConfiguration; |
48 | import·com.android.server.wifi.WifiConfigStore$StoreData; | 48 | import·com.android.server.wifi.WifiConfigStore$StoreData; |
49 | import·java.util.HashMap; | 49 | import·java.util.HashMap; |
50 | import·com.android.server.wifi.WifiConfigStore; | 50 | import·com.android.server.wifi.WifiConfigStore; |
51 | import·com.android.server.wifi.Clock; | 51 | import·com.android.server.wifi.Clock; |
52 | import·com.android.server.wifi.WifiNative; | 52 | import·com.android.server.wifi.WifiNative; |
53 | import·android.content.Context; | 53 | import·android.content.Context; |
54 | import·com.android.server.wifi.util.WifiPermissionsUtil; | ||
54 | import·com.android.server.wifi.WifiMetrics; | 55 | import·com.android.server.wifi.WifiMetrics; |
55 | import·com.android.server.wifi.WifiInjector; | 56 | import·com.android.server.wifi.WifiInjector; |
56 | import·com.android.server.wifi.WifiConfigManager; | 57 | import·com.android.server.wifi.WifiConfigManager; |
57 | import·com.android.server.wifi.WifiCarrierInfoManager; | 58 | import·com.android.server.wifi.WifiCarrierInfoManager; |
58 | import·com.android.server.wifi.MacAddressUtil; | 59 | import·com.android.server.wifi.MacAddressUtil; |
59 | import·com.android.server.wifi.WifiKeyStore; | 60 | import·com.android.server.wifi.WifiKeyStore; |
60 | import·android.os.Handler; | 61 | import·android.os.Handler; |
Offset 78, 16 lines modified | Offset 79, 17 lines modified | ||
78 | ····private·long·mProviderIndex; | 79 | ····private·long·mProviderIndex; |
79 | ····private·final·Map·mProviders; | 80 | ····private·final·Map·mProviders; |
80 | ····private·boolean·mVerboseLoggingEnabled; | 81 | ····private·boolean·mVerboseLoggingEnabled; |
81 | ····private·final·WifiCarrierInfoManager·mWifiCarrierInfoManager; | 82 | ····private·final·WifiCarrierInfoManager·mWifiCarrierInfoManager; |
82 | ····private·final·WifiConfigManager·mWifiConfigManager; | 83 | ····private·final·WifiConfigManager·mWifiConfigManager; |
83 | ····private·final·WifiInjector·mWifiInjector; | 84 | ····private·final·WifiInjector·mWifiInjector; |
84 | ····private·final·WifiMetrics·mWifiMetrics; | 85 | ····private·final·WifiMetrics·mWifiMetrics; |
86 | ····private·final·WifiPermissionsUtil·mWifiPermissionsUtil; | ||
85 | ···· | 87 | ···· |
86 | ····public·PasspointManager(final·Context·context,·final·WifiInjector·mWifiInjector,·final·Handler·mHandler,·final·WifiNative·wifiNative,·final·WifiKeyStore·mKeyStore,·final·Clock·clock,·final·PasspointObjectFactory·mObjectFactory,·final·WifiConfigManager·mWifiConfigManager,·final·WifiConfigStore·wifiConfigStore,·final·WifiMetrics·mWifiMetrics,·final·WifiCarrierInfoManager·mWifiCarrierInfoManager,·final·MacAddressUtil·mMacAddressUtil)·{ | 88 | ····public·PasspointManager(final·Context·context,·final·WifiInjector·mWifiInjector,·final·Handler·mHandler,·final·WifiNative·wifiNative,·final·WifiKeyStore·mKeyStore,·final·Clock·clock,·final·PasspointObjectFactory·mObjectFactory,·final·WifiConfigManager·mWifiConfigManager,·final·WifiConfigStore·wifiConfigStore,·final·WifiMetrics·mWifiMetrics,·final·WifiCarrierInfoManager·mWifiCarrierInfoManager,·final·MacAddressUtil·mMacAddressUtil,·final·WifiPermissionsUtil·mWifiPermissionsUtil)·{ |
87 | ········this.mAppOpsChangedListenerPerApp·=·new·HashMap(); | 89 | ········this.mAppOpsChangedListenerPerApp·=·new·HashMap(); |
88 | ········this.mVerboseLoggingEnabled·=·false; | 90 | ········this.mVerboseLoggingEnabled·=·false; |
89 | ········this.mPasspointEventHandler·=·mObjectFactory.makePasspointEventHandler(wifiNative,·(PasspointEventHandler$Callbacks)new·PasspointManager$CallbackHandler(this,·context)); | 91 | ········this.mPasspointEventHandler·=·mObjectFactory.makePasspointEventHandler(wifiNative,·(PasspointEventHandler$Callbacks)new·PasspointManager$CallbackHandler(this,·context)); |
90 | ········this.mWifiInjector·=·mWifiInjector; | 92 | ········this.mWifiInjector·=·mWifiInjector; |
91 | ········this.mHandler·=·mHandler; | 93 | ········this.mHandler·=·mHandler; |
92 | ········this.mKeyStore·=·mKeyStore; | 94 | ········this.mKeyStore·=·mKeyStore; |
93 | ········this.mObjectFactory·=·mObjectFactory; | 95 | ········this.mObjectFactory·=·mObjectFactory; |
Offset 100, 14 lines modified | Offset 102, 15 lines modified | ||
100 | ········this.mWifiCarrierInfoManager·=·mWifiCarrierInfoManager; | 102 | ········this.mWifiCarrierInfoManager·=·mWifiCarrierInfoManager; |
101 | ········wifiConfigStore.registerStoreData((WifiConfigStore$StoreData)mObjectFactory.makePasspointConfigUserStoreData(this.mKeyStore,·mWifiCarrierInfoManager,·(PasspointConfigUserStoreData$DataSource)new·PasspointManager$UserDataSourceHandler(this,·(PasspointManager$1)null))); | 103 | ········wifiConfigStore.registerStoreData((WifiConfigStore$StoreData)mObjectFactory.makePasspointConfigUserStoreData(this.mKeyStore,·mWifiCarrierInfoManager,·(PasspointConfigUserStoreData$DataSource)new·PasspointManager$UserDataSourceHandler(this,·(PasspointManager$1)null))); |
102 | ········wifiConfigStore.registerStoreData((WifiConfigStore$StoreData)mObjectFactory.makePasspointConfigSharedStoreData((PasspointConfigSharedStoreData$DataSource)new·PasspointManager$SharedDataSourceHandler(this,·(PasspointManager$1)null))); | 104 | ········wifiConfigStore.registerStoreData((WifiConfigStore$StoreData)mObjectFactory.makePasspointConfigSharedStoreData((PasspointConfigSharedStoreData$DataSource)new·PasspointManager$SharedDataSourceHandler(this,·(PasspointManager$1)null))); |
103 | ········this.mPasspointProvisioner·=·mObjectFactory.makePasspointProvisioner(context,·wifiNative,·this,·mWifiMetrics); | 105 | ········this.mPasspointProvisioner·=·mObjectFactory.makePasspointProvisioner(context,·wifiNative,·this,·mWifiMetrics); |
104 | ········this.mAppOps·=·(AppOpsManager)context.getSystemService("appops"); | 106 | ········this.mAppOps·=·(AppOpsManager)context.getSystemService("appops"); |
105 | ········PasspointManager.sPasspointManager·=·this; | 107 | ········PasspointManager.sPasspointManager·=·this; |
106 | ········this.mMacAddressUtil·=·mMacAddressUtil; | 108 | ········this.mMacAddressUtil·=·mMacAddressUtil; |
109 | ········this.mWifiPermissionsUtil·=·mWifiPermissionsUtil; | ||
107 | ····} | 110 | ····} |
108 | ···· | 111 | ···· |
109 | ····public·static·boolean·addLegacyPasspointConfig(final·WifiConfiguration·wifiConfiguration)·{ | 112 | ····public·static·boolean·addLegacyPasspointConfig(final·WifiConfiguration·wifiConfiguration)·{ |
110 | ········final·PasspointManager·sPasspointManager·=·PasspointManager.sPasspointManager; | 113 | ········final·PasspointManager·sPasspointManager·=·PasspointManager.sPasspointManager; |
111 | ········final·String·s·=·"PasspointManager"; | 114 | ········final·String·s·=·"PasspointManager"; |
112 | ········if·(sPasspointManager·==·null)·{ | 115 | ········if·(sPasspointManager·==·null)·{ |
113 | ············Log.e(s,·"PasspointManager·have·not·been·initialized·yet"); | 116 | ············Log.e(s,·"PasspointManager·have·not·been·initialized·yet"); |
Offset 276, 39 lines modified | Offset 279, 48 lines modified | ||
276 | ················return·true; | 279 | ················return·true; |
277 | ············} | 280 | ············} |
278 | ········} | 281 | ········} |
279 | ········return·false; | 282 | ········return·false; |
280 | ····} | 283 | ····} |
281 | ···· | 284 | ···· |
282 | ····private·boolean·removeProviderInternal(final·PasspointProvider·passpointProvider,·final·int·n,·final·boolean·b)·{ | 285 | ····private·boolean·removeProviderInternal(final·PasspointProvider·passpointProvider,·final·int·n,·final·boolean·b)·{ |
283 | ········final·String·s·=·" | 286 | ········final·String·s·=·"UID·"; |
287 | ········final·String·s2·=·"PasspointManager"; | ||
284 | ········if·(!b·&&·n·!=·passpointProvider.getCreatorUid())·{ | 288 | ········if·(!b·&&·n·!=·passpointProvider.getCreatorUid())·{ |
285 | ············final·StringBuilder·sb·=·new·StringBuilder(); | 289 | ············final·StringBuilder·sb·=·new·StringBuilder(); |
286 | ············sb.append( | 290 | ············sb.append(s); |
287 | ············sb.append(n); | 291 | ············sb.append(n); |
288 | ············sb.append("·cannot·remove·profile·created·by·"); | 292 | ············sb.append("·cannot·remove·profile·created·by·"); |
289 | ············sb.append(passpointProvider.getCreatorUid()); | 293 | ············sb.append(passpointProvider.getCreatorUid()); |
290 | ············Log.e(s,·sb.toString()); | 294 | ············Log.e(s2,·sb.toString()); |
295 | ············return·false; | ||
296 | ········} | ||
297 | ········if·(!this.mWifiPermissionsUtil.doesUidBelongToCurrentUser(n))·{ | ||
298 | ············final·StringBuilder·sb2·=·new·StringBuilder(); | ||
299 | ············sb2.append(s); | ||
300 | ············sb2.append(n); | ||
301 | ············sb2.append("·not·visible·to·the·current·user"); | ||
302 | ············Log.e(s2,·sb2.toString()); | ||
291 | ············return·false; | 303 | ············return·false; |
292 | ········} | 304 | ········} |
293 | ········passpointProvider.uninstallCertsAndKeys(); | 305 | ········passpointProvider.uninstallCertsAndKeys(); |
294 | ········final·String·packageName·=·passpointProvider.getPackageName(); | 306 | ········final·String·packageName·=·passpointProvider.getPackageName(); |
295 | ········this.mWifiConfigManager.removePasspointConfiguredNetwork(passpointProvider.getWifiConfig().getKey()); | 307 | ········this.mWifiConfigManager.removePasspointConfiguredNetwork(passpointProvider.getWifiConfig().getKey()); |
296 | ········final·String·uniqueId·=·passpointProvider.getConfig().getUniqueId(); | 308 | ········final·String·uniqueId·=·passpointProvider.getConfig().getUniqueId(); |
297 | ········this.mProviders.remove(uniqueId); | 309 | ········this.mProviders.remove(uniqueId); |
298 | ········final·WifiConfigManager·mWifiConfigManager·=·this.mWifiConfigManager; | 310 | ········final·WifiConfigManager·mWifiConfigManager·=·this.mWifiConfigManager; |
299 | ········final·boolean·b2·=·true; | 311 | ········final·boolean·b2·=·true; |
300 | ········mWifiConfigManager.saveToStore(b2); | 312 | ········mWifiConfigManager.saveToStore(b2); |
301 | ········if·(this.mAppOpsChangedListenerPerApp.containsKey(packageName)·&&·this.getPasspointProviderWithPackage(packageName).size()·==·0)·{ | 313 | ········if·(this.mAppOpsChangedListenerPerApp.containsKey(packageName)·&&·this.getPasspointProviderWithPackage(packageName).size()·==·0)·{ |
302 | ············this.stopTrackingAppOpsChange(packageName); | 314 | ············this.stopTrackingAppOpsChange(packageName); |
303 | ········} | 315 | ········} |
304 | ········final·StringBuilder·sb | 316 | ········final·StringBuilder·sb3·=·new·StringBuilder(); |
305 | ········sb | 317 | ········sb3.append("Removed·Passpoint·configuration:·"); |
306 | ········sb | 318 | ········sb3.append(uniqueId); |
307 | ········Log.d(s,·sb | 319 | ········Log.d(s2,·sb3.toString()); |
308 | ········this.mWifiMetrics.incrementNumPasspointProviderUninstallSuccess(); | 320 | ········this.mWifiMetrics.incrementNumPasspointProviderUninstallSuccess(); |
309 | ········return·b2; | 321 | ········return·b2; |
310 | ····} | 322 | ····} |
311 | ···· | 323 | ···· |
312 | ····private·void·startTrackingAppOpsChange(final·String·s,·final·int·n)·{ | 324 | ····private·void·startTrackingAppOpsChange(final·String·s,·final·int·n)·{ |
313 | ········if·(this.mAppOpsChangedListenerPerApp.containsKey(s))·{ | 325 | ········if·(this.mAppOpsChangedListenerPerApp.containsKey(s))·{ |
314 | ············return; | 326 | ············return; |
Offset 379, 40 lines modified | Offset 391, 48 lines modified | ||
379 | ············Log.e(s2,·"Invalid·configuration"); | 391 | ············Log.e(s2,·"Invalid·configuration"); |
380 | ············return·false; | 392 | ············return·false; |
381 | ········} | 393 | ········} |
382 | ········if·(!b·&&·!trusted)·{ | 394 | ········if·(!b·&&·!trusted)·{ |
383 | ············Log.e(s2,·"Set·isTrusted·to·false·on·a·non·suggestion·passpoint·is·not·allowed"); | 395 | ············Log.e(s2,·"Set·isTrusted·to·false·on·a·non·suggestion·passpoint·is·not·allowed"); |
384 | ············return·false; | 396 | ············return·false; |
385 | ········} | 397 | ········} |
398 | ········if·(!this.mWifiPermissionsUtil.doesUidBelongToCurrentUser(n))·{ | ||
399 | ············final·StringBuilder·sb·=·new·StringBuilder(); | ||
400 | ············sb.append("UID·"); | ||
401 | ············sb.append(n); | ||
402 | ············sb.append("·not·visible·to·the·current·user"); | ||
403 | ············Log.e(s2,·sb.toString()); | ||
404 | ············return·false; | ||
405 | ········} | ||
386 | ········this.mWifiCarrierInfoManager.tryUpdateCarrierIdForPasspoint(passpointConfiguration); | 406 | ········this.mWifiCarrierInfoManager.tryUpdateCarrierIdForPasspoint(passpointConfiguration); |
387 | ········final·PasspointObjectFactory·mObjectFactory·=·this.mObjectFactory; | 407 | ········final·PasspointObjectFactory·mObjectFactory·=·this.mObjectFactory; |
388 | ········final·WifiKeyStore·mKeyStore·=·this.mKeyStore; | 408 | ········final·WifiKeyStore·mKeyStore·=·this.mKeyStore; |
389 | ········final·WifiCarrierInfoManager·mWifiCarrierInfoManager·=·this.mWifiCarrierInfoManager; | 409 | ········final·WifiCarrierInfoManager·mWifiCarrierInfoManager·=·this.mWifiCarrierInfoManager; |
390 | ········final·long·mProviderIndex·=·this.mProviderIndex; | 410 | ········final·long·mProviderIndex·=·this.mProviderIndex; |
391 | ········this.mProviderIndex·=·1L·+·mProviderIndex; | 411 | ········this.mProviderIndex·=·1L·+·mProviderIndex; |
392 | ········final·PasspointProvider·passpointProvider·=·mObjectFactory.makePasspointProvider(passpointConfiguration,·mKeyStore,·mWifiCarrierInfoManager,·mProviderIndex,·n,·s,·b); | 412 | ········final·PasspointProvider·passpointProvider·=·mObjectFactory.makePasspointProvider(passpointConfiguration,·mKeyStore,·mWifiCarrierInfoManager,·mProviderIndex,·n,·s,·b); |
393 | ········passpointProvider.setTrusted(trusted); | 413 | ········passpointProvider.setTrusted(trusted); |
394 | ········final·Credential$UserCredential·userCredential·=·passpointConfiguration.getCredential().getUserCredential(); | 414 | ········final·Credential$UserCredential·userCredential·=·passpointConfiguration.getCredential().getUserCredential(); |
395 | ········final·boolean·b2·=·true; | 415 | ········final·boolean·b2·=·true; |
396 | ········if·(userCredential·==·null·&&·passpointConfiguration.getCredential().getCertCredential()·==·null)·{ | 416 | ········if·(userCredential·==·null·&&·passpointConfiguration.getCredential().getCertCredential()·==·null)·{ |
397 | ············goto·Label_0 | 417 | ············goto·Label_0344; |
398 | ········} | 418 | ········} |
... Open expanded diff ... |
Offset 120, 21 lines modified | Offset 120, 14 lines modified | ||
120 | ········if·(anqpElements·==·null)·{ | 120 | ········if·(anqpElements·==·null)·{ |
121 | ············return·false; | 121 | ············return·false; |
122 | ········} | 122 | ········} |
123 | ········final·HSWanMetricsElement·hsWanMetricsElement·=·(HSWanMetricsElement)anqpElements.get(Constants$ANQPElementType.HSWANMetrics); | 123 | ········final·HSWanMetricsElement·hsWanMetricsElement·=·(HSWanMetricsElement)anqpElements.get(Constants$ANQPElementType.HSWANMetrics); |
124 | ········if·(hsWanMetricsElement·==·null)·{ | 124 | ········if·(hsWanMetricsElement·==·null)·{ |
125 | ············return·false; | 125 | ············return·false; |
126 | ········} | 126 | ········} |
127 | ········if·(hsWanMetricsElement.getStatus()·==·0·&&·!hsWanMetricsElement.isCapped()·&&·!hsWanMetricsElement.isSymmetric()·&&·hsWanMetricsElement.getDownlinkLoad()·==·0)·{ | ||
128 | ············final·long·downlinkSpeed·=·hsWanMetricsElement.getDownlinkSpeed(); | ||
129 | ············final·long·n·=·0L; | ||
130 | ············if·(downlinkSpeed·==·n·&&·hsWanMetricsElement.getUplinkLoad()·==·0·&&·hsWanMetricsElement.getUplinkSpeed()·==·n·&&·hsWanMetricsElement.getLMD()·==·0)·{ | ||
131 | ················return·false; | ||
132 | ············} | ||
133 | ········} | ||
134 | ········final·int·status·=·hsWanMetricsElement.getStatus(); | 127 | ········final·int·status·=·hsWanMetricsElement.getStatus(); |
135 | ········final·boolean·b2·=·true; | 128 | ········final·boolean·b2·=·true; |
136 | ········if·(status·!=·(b2·?·1·:·0)·||·hsWanMetricsElement.isCapped())·{ | 129 | ········if·(status·!=·(b2·?·1·:·0)·||·hsWanMetricsElement.isCapped())·{ |
137 | ············b·=·b2; | 130 | ············b·=·b2; |
138 | ········} | 131 | ········} |
139 | ········return·b; | 132 | ········return·b; |
140 | ····} | 133 | ····} |
Offset 177, 35 lines modified | Offset 177, 34 lines modified | ||
177 | ····} | 177 | ····} |
178 | ···· | 178 | ···· |
179 | ····public·boolean·p2pGroupAdd(final·int·n)·{ | 179 | ····public·boolean·p2pGroupAdd(final·int·n)·{ |
180 | ········return·this.mSupplicantP2pIfaceHal.groupAdd(n,·true); | 180 | ········return·this.mSupplicantP2pIfaceHal.groupAdd(n,·true); |
181 | ····} | 181 | ····} |
182 | ···· | 182 | ···· |
183 | ····public·boolean·p2pGroupAdd(final·WifiP2pConfig·wifiP2pConfig,·final·boolean·b)·{ | 183 | ····public·boolean·p2pGroupAdd(final·WifiP2pConfig·wifiP2pConfig,·final·boolean·b)·{ |
184 | ········int·groupOwnerBand·=·wifiP2pConfig.groupOwnerBand; | 184 | ········final·int·groupOwnerBand·=·wifiP2pConfig.groupOwnerBand; |
185 | ········ | 185 | ········int·groupOwnerBand2·=·2; |
186 | ········boolean·b2·=·true; | 186 | ········boolean·b2·=·true; |
187 | ········int·n2; | ||
188 | ········if·(groupOwnerBand·!=·(b2·?·1·:·0))·{ | 187 | ········if·(groupOwnerBand·!=·(b2·?·1·:·0))·{ |
189 | ············if·(groupOwnerBand· | 188 | ············if·(groupOwnerBand·!=·groupOwnerBand2)·{ |
190 | ················groupOwnerBand·=· | 189 | ················groupOwnerBand2·=·wifiP2pConfig.groupOwnerBand; |
190 | ············} | ||
191 | ············else·{ | ||
192 | ················groupOwnerBand2·=·5; | ||
191 | ············} | 193 | ············} |
192 | ············n2·=·groupOwnerBand; | ||
193 | ········} | ||
194 | ········else·{ | ||
195 | ············n2·=·n; | ||
196 | ········} | 194 | ········} |
195 | ········final·int·n·=·groupOwnerBand2; | ||
197 | ········this.abortWifiRunningScanIfNeeded(b); | 196 | ········this.abortWifiRunningScanIfNeeded(b); |
198 | ········final·SupplicantP2pIfaceHal·mSupplicantP2pIfaceHal·=·this.mSupplicantP2pIfaceHal; | 197 | ········final·SupplicantP2pIfaceHal·mSupplicantP2pIfaceHal·=·this.mSupplicantP2pIfaceHal; |
199 | ········final·String·networkName·=·wifiP2pConfig.networkName; | 198 | ········final·String·networkName·=·wifiP2pConfig.networkName; |
200 | ········final·String·passphrase·=·wifiP2pConfig.passphrase; | 199 | ········final·String·passphrase·=·wifiP2pConfig.passphrase; |
201 | ········if·(wifiP2pConfig.netId·!=·-2)·{ | 200 | ········if·(wifiP2pConfig.netId·!=·-2)·{ |
202 | ············b2·=·false; | 201 | ············b2·=·false; |
203 | ········} | 202 | ········} |
204 | ········return·mSupplicantP2pIfaceHal.groupAdd(networkName,·passphrase,·b2,·n | 203 | ········return·mSupplicantP2pIfaceHal.groupAdd(networkName,·passphrase,·b2,·n,·wifiP2pConfig.deviceAddress,·b); |
205 | ····} | 204 | ····} |
206 | ···· | 205 | ···· |
207 | ····public·boolean·p2pGroupAdd(final·boolean·b)·{ | 206 | ····public·boolean·p2pGroupAdd(final·boolean·b)·{ |
208 | ········return·this.mSupplicantP2pIfaceHal.groupAdd(b); | 207 | ········return·this.mSupplicantP2pIfaceHal.groupAdd(b); |
209 | ····} | 208 | ····} |
210 | ···· | 209 | ···· |
211 | ····public·boolean·p2pGroupRemove(final·String·s)·{ | 210 | ····public·boolean·p2pGroupRemove(final·String·s)·{ |
Offset 167, 74 lines modified | Offset 167, 71 lines modified | ||
167 | ········this.mRttServiceSynchronized·=·new·RttServiceImpl$RttServiceSynchronized(this,·looper,·mRttNative); | 167 | ········this.mRttServiceSynchronized·=·new·RttServiceImpl$RttServiceSynchronized(this,·looper,·mRttNative); |
168 | ········this.mActivityManager·=·(ActivityManager)this.mContext.getSystemService("activity"); | 168 | ········this.mActivityManager·=·(ActivityManager)this.mContext.getSystemService("activity"); |
169 | ········this.mPowerManager·=·(PowerManager)this.mContext.getSystemService((Class)PowerManager.class); | 169 | ········this.mPowerManager·=·(PowerManager)this.mContext.getSystemService((Class)PowerManager.class); |
170 | ········this.mRttServiceSynchronized.mHandler.post((Runnable)new·-$$Lambda$RttServiceImpl$5Uhs7aFq_yqcuyOWD6Csk6xpprA(this,·wifiSettingsConfigStore,·mRttNative)); | 170 | ········this.mRttServiceSynchronized.mHandler.post((Runnable)new·-$$Lambda$RttServiceImpl$5Uhs7aFq_yqcuyOWD6Csk6xpprA(this,·wifiSettingsConfigStore,·mRttNative)); |
171 | ····} | 171 | ····} |
172 | ···· | 172 | ···· |
173 | ····public·void·startRanging(final·IBinder·binder,·final·String·s,·final·String·s2,·final·WorkSource·workSource,·final·RangingRequest·rangingRequest,·final·IRttCallback·rttCallback)·{ | 173 | ····public·void·startRanging(final·IBinder·binder,·final·String·s,·final·String·s2,·final·WorkSource·workSource,·final·RangingRequest·rangingRequest,·final·IRttCallback·rttCallback)·{ |
174 | ········if·(binder· | 174 | ········if·(binder·==·null)·{ |
175 | ············ | 175 | ············throw·new·IllegalArgumentException("Binder·must·not·be·null"); |
176 | ········ | 176 | ········} |
177 | ············· | 177 | ········if·(rangingRequest·!=·null·&&·rangingRequest.mRttPeers·!=·null·&&·rangingRequest.mRttPeers.size()·!=·0)·{ |
178 | ············ | 178 | ············final·Iterator<ResponderConfig>·iterator·=·(Iterator<ResponderConfig>)rangingRequest.mRttPeers.iterator(); |
179 | ············ | 179 | ············while·(iterator.hasNext())·{ |
180 | ················ | 180 | ················if·(iterator.next()·!=·null)·{ |
181 | ···················· | 181 | ····················continue; |
182 | ················ | 182 | ················} |
183 | ················ | 183 | ················throw·new·IllegalArgumentException("Request·must·not·contain·null·Responders"); |
184 | ············} | ||
185 | ············if·(rttCallback·!=·null)·{ | ||
186 | ················final·WifiAwareManager·mAwareManager·=·this.mAwareManager; | ||
187 | ················final·boolean·b·=·true; | ||
188 | ················rangingRequest.enforceValidity(mAwareManager·!=·null·&&·b); | ||
189 | ················final·boolean·available·=·this.isAvailable(); | ||
190 | ················final·String·s3·=·"RttServiceImpl"; | ||
191 | ················if·(!available)·{ | ||
192 | ····················try·{ | ||
193 | ························this.mRttMetrics.recordOverallStatus(3); | ||
194 | ························rttCallback.onRangingFailure(2); | ||
184 | ····················} | 195 | ····················} |
185 | ···················· | 196 | ····················catch·(RemoteException·ex)·{ |
186 | ························final· | 197 | ························final·StringBuilder·sb·=·new·StringBuilder(); |
187 | ························ | 198 | ························sb.append("startRanging:·disabled,·callback·failed·--·"); |
188 | ························ | 199 | ························sb.append(ex); |
189 | ························ | 200 | ························Log.e(s3,·sb.toString()); |
190 | ························final·String·s3·=·"RttServiceImpl"; | ||
191 | ························if·(!available)·{ | ||
192 | ····························try·{ | ||
193 | ································this.mRttMetrics.recordOverallStatus(3); | ||
194 | ································rttCallback.onRangingFailure(2); | ||
195 | ····························} | ||
196 | ····························catch·(RemoteException·ex)·{ | ||
197 | ································final·StringBuilder·sb·=·new·StringBuilder(); | ||
198 | ································sb.append("startRanging:·disabled,·callback·failed·--·"); | ||
199 | ································sb.append(ex); | ||
200 | ································Log.e(s3,·sb.toString()); | ||
201 | ····························} | ||
202 | ····························return; | ||
203 | ························} | ||
204 | ························final·int·mockableCallingUid·=·this.getMockableCallingUid(); | ||
205 | ························this.enforceAccessPermission(); | ||
206 | ························this.enforceChangePermission(); | ||
207 | ························this.mWifiPermissionsUtil.enforceFineLocationPermission(s,·s2,·mockableCallingUid); | ||
208 | ························WorkSource·withoutNames; | ||
209 | ························if·(workSource·!=·null)·{ | ||
210 | ····························this.enforceLocationHardware(); | ||
211 | ····························withoutNames·=·workSource.withoutNames(); | ||
212 | ························} | ||
213 | ························else·{ | ||
214 | ····························withoutNames·=·null; | ||
215 | ························} | ||
216 | ························final·WorkSource·workSource2·=·withoutNames; | ||
217 | ························final·boolean·b2·=·this.checkLocationHardware()·&&·this.mShellCommand.getControlParam("override_assume_no_privilege")·==·0·&&·b; | ||
218 | ························final·RttServiceImpl$3·rttServiceImpl$4; | ||
219 | ························final·RttServiceImpl$3·rttServiceImpl$3·=·rttServiceImpl$4·=·new·RttServiceImpl$3(this,·mockableCallingUid,·binder); | ||
220 | ························try·{ | ||
221 | ····························binder.linkToDeath((IBinder$DeathRecipient)rttServiceImpl$4,·0); | ||
222 | ····························this.mRttServiceSynchronized.mHandler.post((Runnable)new·-$$Lambda$RttServiceImpl$JxYAg5dAUh3zR9NFuwxc6aUvX8w(this,·workSource2,·mockableCallingUid,·binder,·(IBinder$DeathRecipient)rttServiceImpl$3,·s,·s2,·rangingRequest,·rttCallback,·b2)); | ||
223 | ····························return; | ||
224 | ························} | ||
225 | ························catch·(RemoteException·ex2)·{ | ||
226 | ····························final·StringBuilder·sb2·=·new·StringBuilder(); | ||
227 | ····························sb2.append("Error·on·linkToDeath·-·"); | ||
228 | ····························sb2.append(ex2); | ||
229 | ····························Log.e(s3,·sb2.toString()); | ||
230 | ····························return; | ||
231 | ························} | ||
232 | ····················} | 201 | ····················} |
233 | ···················· | 202 | ····················return; |
203 | ················} | ||
204 | ················final·int·mockableCallingUid·=·this.getMockableCallingUid(); | ||
205 | ················this.enforceAccessPermission(); | ||
206 | ················this.enforceChangePermission(); | ||
207 | ················this.mWifiPermissionsUtil.enforceFineLocationPermission(s,·s2,·mockableCallingUid); | ||
208 | ················WorkSource·withoutNames; | ||
209 | ················if·(workSource·!=·null)·{ | ||
210 | ····················this.enforceLocationHardware(); | ||
211 | ····················withoutNames·=·workSource.withoutNames(); | ||
212 | ················} | ||
213 | ················else·{ | ||
214 | ····················withoutNames·=·null; | ||
215 | ················} | ||
216 | ················final·WorkSource·workSource2·=·withoutNames; | ||
217 | ················final·boolean·b2·=·this.checkLocationHardware()·&&·this.mShellCommand.getControlParam("override_assume_no_privilege")·==·0·&&·b; | ||
218 | ················final·RttServiceImpl$3·rttServiceImpl$4; | ||
219 | ················final·RttServiceImpl$3·rttServiceImpl$3·=·rttServiceImpl$4·=·new·RttServiceImpl$3(this,·mockableCallingUid,·binder); | ||
220 | ················try·{ | ||
221 | ····················binder.linkToDeath((IBinder$DeathRecipient)rttServiceImpl$4,·0); | ||
222 | ····················this.mRttServiceSynchronized.mHandler.post((Runnable)new·-$$Lambda$RttServiceImpl$JxYAg5dAUh3zR9NFuwxc6aUvX8w(this,·workSource2,·mockableCallingUid,·binder,·(IBinder$DeathRecipient)rttServiceImpl$3,·s,·s2,·rangingRequest,·rttCallback,·b2)); | ||
223 | ····················return; | ||
224 | ················} | ||
225 | ················catch·(RemoteException·ex2)·{ | ||
226 | ····················final·StringBuilder·sb2·=·new·StringBuilder(); | ||
227 | ····················sb2.append("Error·on·linkToDeath·-·"); | ||
228 | ····················sb2.append(ex2); | ||
229 | ····················Log.e(s3,·sb2.toString()); | ||
230 | ····················return; | ||
234 | ················} | 231 | ················} |
235 | ············} | 232 | ············} |
236 | ············throw·new·IllegalArgumentException(" | 233 | ············throw·new·IllegalArgumentException("Callback·must·not·be·null"); |
237 | ········} | 234 | ········} |
238 | ········throw·new·IllegalArgumentException(" | 235 | ········throw·new·IllegalArgumentException("Request·must·not·be·null·or·empty"); |
239 | ····} | 236 | ····} |
240 | } | 237 | } |
Offset 540, 15 lines modified | Offset 540, 15 lines modified | ||
540 | ················} | 540 | ················} |
541 | ············} | 541 | ············} |
542 | ········} | 542 | ········} |
543 | ········return·-1; | 543 | ········return·-1; |
544 | ····} | 544 | ····} |
545 | ···· | 545 | ···· |
546 | ····public·static·boolean·isAcsSupported(final·Context·context)·{ | 546 | ····public·static·boolean·isAcsSupported(final·Context·context)·{ |
547 | ········return·context.getResources().getBoolean(21308375 | 547 | ········return·context.getResources().getBoolean(2130837549); |
548 | ····} | 548 | ····} |
549 | ···· | 549 | ···· |
550 | ····public·static·boolean·isBandValid(int·n)·{ | 550 | ····public·static·boolean·isBandValid(int·n)·{ |
551 | ········if·(n·!=·0)·{ | 551 | ········if·(n·!=·0)·{ |
552 | ············n·&=·0xFFFFFFF8; | 552 | ············n·&=·0xFFFFFFF8; |
553 | ············if·(n·==·0)·{ | 553 | ············if·(n·==·0)·{ |
554 | ················n·=·1; | 554 | ················n·=·1; |
Offset 571, 15 lines modified | Offset 571, 15 lines modified | ||
571 | ········else·{ | 571 | ········else·{ |
572 | ············n·=·0; | 572 | ············n·=·0; |
573 | ········} | 573 | ········} |
574 | ········return·n·!=·0; | 574 | ········return·n·!=·0; |
575 | ····} | 575 | ····} |
576 | ···· | 576 | ···· |
577 | ····public·static·boolean·isWpa3SaeSupported(final·Context·context)·{ | 577 | ····public·static·boolean·isWpa3SaeSupported(final·Context·context)·{ |
578 | ········return·context.getResources().getBoolean(213083755 | 578 | ········return·context.getResources().getBoolean(2130837551); |
579 | ····} | 579 | ····} |
580 | ···· | 580 | ···· |
581 | ····public·static·int·updateApChannelConfig(final·WifiNative·wifiNative,·final·Resources·resources,·final·String·s,·final·SoftApConfiguration$Builder·softApConfiguration$Builder,·final·SoftApConfiguration·softApConfiguration,·final·boolean·b)·{ | 581 | ····public·static·int·updateApChannelConfig(final·WifiNative·wifiNative,·final·Resources·resources,·final·String·s,·final·SoftApConfiguration$Builder·softApConfiguration$Builder,·final·SoftApConfiguration·softApConfiguration,·final·boolean·b)·{ |
582 | ········final·boolean·halStarted·=·wifiNative.isHalStarted(); | 582 | ········final·boolean·halStarted·=·wifiNative.isHalStarted(); |
583 | ········final·int·n·=·1; | 583 | ········final·int·n·=·1; |
584 | ········if·(!halStarted)·{ | 584 | ········if·(!halStarted)·{ |
585 | ············softApConfiguration$Builder.setChannel(6,·n); | 585 | ············softApConfiguration$Builder.setChannel(6,·n); |
Offset 619, 15 lines modified | Offset 619, 15 lines modified | ||
619 | ············n·|=·0x2; | 619 | ············n·|=·0x2; |
620 | ········} | 620 | ········} |
621 | ········if·(isWpa3SaeSupported(context))·{ | 621 | ········if·(isWpa3SaeSupported(context))·{ |
622 | ············Log.d(s,·"Update·Softap·capability,·add·SAE·feature·support"); | 622 | ············Log.d(s,·"Update·Softap·capability,·add·SAE·feature·support"); |
623 | ············n·|=·0x4; | 623 | ············n·|=·0x4; |
624 | ········} | 624 | ········} |
625 | ········final·SoftApCapability·softApCapability·=·new·SoftApCapability(n); | 625 | ········final·SoftApCapability·softApCapability·=·new·SoftApCapability(n); |
626 | ········final·int·integer·=·context.getResources().getInteger(21310341 | 626 | ········final·int·integer·=·context.getResources().getInteger(2131034149); |
627 | ········if·(integer·>·0)·{ | 627 | ········if·(integer·>·0)·{ |
628 | ············final·StringBuilder·sb·=·new·StringBuilder(); | 628 | ············final·StringBuilder·sb·=·new·StringBuilder(); |
629 | ············sb.append("Update·Softap·capability,·max·client·=·"); | 629 | ············sb.append("Update·Softap·capability,·max·client·=·"); |
630 | ············sb.append(integer); | 630 | ············sb.append(integer); |
631 | ············Log.d(s,·sb.toString()); | 631 | ············Log.d(s,·sb.toString()); |
632 | ············softApCapability.setMaxSupportedClients(integer); | 632 | ············softApCapability.setMaxSupportedClients(integer); |
633 | ········} | 633 | ········} |
Offset 25, 17 lines modified | Offset 25, 16 lines modified | ||
25 | ····public·void·from(final·ScanResult$InformationElement·scanResult$InformationElement)·{ | 25 | ····public·void·from(final·ScanResult$InformationElement·scanResult$InformationElement)·{ |
26 | ········if·(scanResult$InformationElement.id·!=·11)·{ | 26 | ········if·(scanResult$InformationElement.id·!=·11)·{ |
27 | ············final·StringBuilder·sb·=·new·StringBuilder(); | 27 | ············final·StringBuilder·sb·=·new·StringBuilder(); |
28 | ············sb.append("Element·id·is·not·BSS_LOAD,·:·"); | 28 | ············sb.append("Element·id·is·not·BSS_LOAD,·:·"); |
29 | ············sb.append(scanResult$InformationElement.id); | 29 | ············sb.append(scanResult$InformationElement.id); |
30 | ············throw·new·IllegalArgumentException(sb.toString()); | 30 | ············throw·new·IllegalArgumentException(sb.toString()); |
31 | ········} | 31 | ········} |
32 | ········ | 32 | ········if·(scanResult$InformationElement.bytes.length·==·5)·{ |
33 | ········if·(bytes. | 33 | ············final·ByteBuffer·order·=·ByteBuffer.wrap(scanResult$InformationElement.bytes).order(ByteOrder.LITTLE_ENDIAN); |
34 | ············final·ByteBuffer·order·=·ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN); | ||
35 | ············final·short·short1·=·order.getShort(); | 34 | ············final·short·short1·=·order.getShort(); |
36 | ············final·char·c·=·(char)(-1); | 35 | ············final·char·c·=·(char)(-1); |
37 | ············this.stationCount·=·(short1·&·c); | 36 | ············this.stationCount·=·(short1·&·c); |
38 | ············this.channelUtilization·=·(order.get()·&·0xFF); | 37 | ············this.channelUtilization·=·(order.get()·&·0xFF); |
39 | ············this.capacity·=·(order.getShort()·&·c); | 38 | ············this.capacity·=·(order.getShort()·&·c); |
40 | ············return; | 39 | ············return; |
41 | ········} | 40 | ········} |
Offset 18, 19 lines modified | Offset 18, 18 lines modified | ||
18 | ········final·int·n·=·255; | 18 | ········final·int·n·=·255; |
19 | ········if·(id·!=·n·||·scanResult$InformationElement.idExt·!=·35)·{ | 19 | ········if·(id·!=·n·||·scanResult$InformationElement.idExt·!=·35)·{ |
20 | ············final·StringBuilder·sb·=·new·StringBuilder(); | 20 | ············final·StringBuilder·sb·=·new·StringBuilder(); |
21 | ············sb.append("Element·id·is·not·HE_CAPABILITIES:·"); | 21 | ············sb.append("Element·id·is·not·HE_CAPABILITIES:·"); |
22 | ············sb.append(scanResult$InformationElement.id); | 22 | ············sb.append(scanResult$InformationElement.id); |
23 | ············throw·new·IllegalArgumentException(sb.toString()); | 23 | ············throw·new·IllegalArgumentException(sb.toString()); |
24 | ········} | 24 | ········} |
25 | ········ | 25 | ········if·(scanResult$InformationElement.bytes.length·<·21)·{ |
26 | ········if·(bytes.length·<·21)·{ | ||
27 | ············return; | 26 | ············return; |
28 | ········} | 27 | ········} |
29 | ········this.mMaxNumberSpatialStreams·=·InformationElementUtil.access$000(((bytes[18]·&·n)·<<·8)·+·(bytes[17]·&·n)); | 28 | ········this.mMaxNumberSpatialStreams·=·InformationElementUtil.access$000(((scanResult$InformationElement.bytes[18]·&·n)·<<·8)·+·(scanResult$InformationElement.bytes[17]·&·n)); |
30 | ········this.mPresent·=·true; | 29 | ········this.mPresent·=·true; |
31 | ····} | 30 | ····} |
32 | ···· | 31 | ···· |
33 | ····public·int·getMaxNumberSpatialStreams()·{ | 32 | ····public·int·getMaxNumberSpatialStreams()·{ |
34 | ········return·this.mMaxNumberSpatialStreams; | 33 | ········return·this.mMaxNumberSpatialStreams; |
35 | ····} | 34 | ····} |
36 | ···· | 35 | ···· |
Offset 31, 20 lines modified | Offset 31, 20 lines modified | ||
31 | ···· | 31 | ···· |
32 | ····public·void·from(final·ScanResult$InformationElement·scanResult$InformationElement)·{ | 32 | ····public·void·from(final·ScanResult$InformationElement·scanResult$InformationElement)·{ |
33 | ········final·int·id·=·scanResult$InformationElement.id; | 33 | ········final·int·id·=·scanResult$InformationElement.id; |
34 | ········final·int·n·=·255; | 34 | ········final·int·n·=·255; |
35 | ········if·(id·!=·n·||·scanResult$InformationElement.idExt·!=·36)·{ | 35 | ········if·(id·!=·n·||·scanResult$InformationElement.idExt·!=·36)·{ |
36 | ············throw·new·IllegalArgumentException("Element·id·is·not·HE_OPERATION"); | 36 | ············throw·new·IllegalArgumentException("Element·id·is·not·HE_OPERATION"); |
37 | ········} | 37 | ········} |
38 | ········final· | 38 | ········final·int·length·=·scanResult$InformationElement.bytes.length; |
39 | ········final·int·length·=·bytes.length; | ||
40 | ········final·byte·b·=·6; | 39 | ········final·byte·b·=·6; |
41 | ········if·(length·<·b)·{ | 40 | ········if·(length·<·b)·{ |
42 | ············return; | 41 | ············return; |
43 | ········} | 42 | ········} |
43 | ········final·byte[]·bytes·=·scanResult$InformationElement.bytes; | ||
44 | ········final·byte·mPresent·=·1; | 44 | ········final·byte·mPresent·=·1; |
45 | ········final·byte·b2·=·(byte)(bytes[mPresent]·&·0x40); | 45 | ········final·byte·b2·=·(byte)(bytes[mPresent]·&·0x40); |
46 | ········byte·b3·=·0; | 46 | ········byte·b3·=·0; |
47 | ········boolean·mVhtInfoPresent; | 47 | ········boolean·mVhtInfoPresent; |
48 | ········if·(b2·!=·0)·{ | 48 | ········if·(b2·!=·0)·{ |
49 | ············mVhtInfoPresent·=·(mPresent·!=·0); | 49 | ············mVhtInfoPresent·=·(mPresent·!=·0); |
50 | ········} | 50 | ········} |
Offset 92, 28 lines modified | Offset 92, 26 lines modified | ||
92 | ············return; | 92 | ············return; |
93 | ········} | 93 | ········} |
94 | ········this.mPresent·=·(mPresent·!=·0); | 94 | ········this.mPresent·=·(mPresent·!=·0); |
95 | ········if·(this.mVhtInfoPresent)·{ | 95 | ········if·(this.mVhtInfoPresent)·{ |
96 | ············final·ScanResult$InformationElement·mVhtInfo·=·new·ScanResult$InformationElement(); | 96 | ············final·ScanResult$InformationElement·mVhtInfo·=·new·ScanResult$InformationElement(); |
97 | ············this.mVhtInfo·=·mVhtInfo; | 97 | ············this.mVhtInfo·=·mVhtInfo; |
98 | ············mVhtInfo.id·=·192; | 98 | ············mVhtInfo.id·=·192; |
99 | ············ | 99 | ············this.mVhtInfo.bytes·=·new·byte[b9]; |
100 | ············m | 100 | ············System.arraycopy(scanResult$InformationElement.bytes,·b,·this.mVhtInfo.bytes,·0,·b6); |
101 | ············System.arraycopy(scanResult$InformationElement.bytes,·b,·bytes3,·0,·b6); | ||
102 | ········} | 101 | ········} |
103 | ········if·(this.m6GhzInfoPresent)·{ | 102 | ········if·(this.m6GhzInfoPresent)·{ |
104 | ············if·(this.mVhtInfoPresent)·{ | 103 | ············if·(this.mVhtInfoPresent)·{ |
105 | ················b3·=·b6; | 104 | ················b3·=·b6; |
106 | ············} | 105 | ············} |
107 | ············final·byte·b11·=·(byte)(b3·+·b·+·b5); | 106 | ············final·byte·b11·=·(byte)(b3·+·b·+·b5); |
108 | ············ | 107 | ············this.mChannelWidth·=·(scanResult$InformationElement.bytes[b11·+·1]·&·b6); |
109 | ············this.mChannel | 108 | ············this.mPrimaryChannel·=·(scanResult$InformationElement.bytes[b11]·&·n); |
110 | ············this.m | 109 | ············this.mCenterFreqSeg0·=·(scanResult$InformationElement.bytes[b11·+·2]·&·n); |
111 | ············this.mCenterFreqSeg | 110 | ············this.mCenterFreqSeg1·=·(scanResult$InformationElement.bytes[b11·+·b6]·&·n); |
112 | ············this.mCenterFreqSeg1·=·(bytes4[b11·+·b6]·&·n); | ||
113 | ········} | 111 | ········} |
114 | ····} | 112 | ····} |
115 | ···· | 113 | ···· |
116 | ····public·int·getCenterFreq0()·{ | 114 | ····public·int·getCenterFreq0()·{ |
117 | ········if·(!this.m6GhzInfoPresent)·{ | 115 | ········if·(!this.m6GhzInfoPresent)·{ |
118 | ············return·0; | 116 | ············return·0; |
119 | ········} | 117 | ········} |
Offset 16, 24 lines modified | Offset 16, 25 lines modified | ||
16 | ····public·void·from(final·ScanResult$InformationElement·scanResult$InformationElement)·{ | 16 | ····public·void·from(final·ScanResult$InformationElement·scanResult$InformationElement)·{ |
17 | ········if·(scanResult$InformationElement.id·!=·45)·{ | 17 | ········if·(scanResult$InformationElement.id·!=·45)·{ |
18 | ············final·StringBuilder·sb·=·new·StringBuilder(); | 18 | ············final·StringBuilder·sb·=·new·StringBuilder(); |
19 | ············sb.append("Element·id·is·not·HT_CAPABILITIES:·"); | 19 | ············sb.append("Element·id·is·not·HT_CAPABILITIES:·"); |
20 | ············sb.append(scanResult$InformationElement.id); | 20 | ············sb.append(scanResult$InformationElement.id); |
21 | ············throw·new·IllegalArgumentException(sb.toString()); | 21 | ············throw·new·IllegalArgumentException(sb.toString()); |
22 | ········} | 22 | ········} |
23 | ········ | 23 | ········if·(scanResult$InformationElement.bytes.length·<·26)·{ |
24 | ········if·(bytes.length·<·26)·{ | ||
25 | ············return; | 24 | ············return; |
26 | ········} | 25 | ········} |
26 | ········final·byte[]·bytes·=·scanResult$InformationElement.bytes; | ||
27 | ········int·mMaxNumberSpatialStreams·=·3; | 27 | ········int·mMaxNumberSpatialStreams·=·3; |
28 | ········final·byte·b·=·bytes[mMaxNumberSpatialStreams]; | 28 | ········final·byte·b·=·bytes[mMaxNumberSpatialStreams]; |
29 | ········final·byte[]·bytes2·=·scanResult$InformationElement.bytes; | ||
29 | ········final·int·n·=·4; | 30 | ········final·int·n·=·4; |
30 | ········final·int·n2·=·bytes[n]·&·0xFF; | 31 | ········final·int·n2·=·bytes2[n]·&·0xFF; |
31 | ········final·int·n3·=·bytes[5]·&·0xFF; | 32 | ········final·int·n3·=·scanResult$InformationElement.bytes[5]·&·0xFF; |
32 | ········final·int·n4·=·bytes[6]·&·0xFF; | 33 | ········final·int·n4·=·scanResult$InformationElement.bytes[6]·&·0xFF; |
33 | ········final·int·mPresent·=·1; | 34 | ········final·int·mPresent·=·1; |
34 | ········if·(n4·>·0)·{ | 35 | ········if·(n4·>·0)·{ |
35 | ············mMaxNumberSpatialStreams·=·n; | 36 | ············mMaxNumberSpatialStreams·=·n; |
36 | ········} | 37 | ········} |
37 | ········else·if·(n3·<=·0)·{ | 38 | ········else·if·(n3·<=·0)·{ |
38 | ············if·(n2·>·0)·{ | 39 | ············if·(n2·>·0)·{ |
39 | ················mMaxNumberSpatialStreams·=·2; | 40 | ················mMaxNumberSpatialStreams·=·2; |
Offset 18, 19 lines modified | Offset 18, 18 lines modified | ||
18 | ····public·void·from(final·ScanResult$InformationElement·scanResult$InformationElement)·{ | 18 | ····public·void·from(final·ScanResult$InformationElement·scanResult$InformationElement)·{ |
19 | ········if·(scanResult$InformationElement.id·!=·61)·{ | 19 | ········if·(scanResult$InformationElement.id·!=·61)·{ |
20 | ············final·StringBuilder·sb·=·new·StringBuilder(); | 20 | ············final·StringBuilder·sb·=·new·StringBuilder(); |
21 | ············sb.append("Element·id·is·not·HT_OPERATION,·:·"); | 21 | ············sb.append("Element·id·is·not·HT_OPERATION,·:·"); |
22 | ············sb.append(scanResult$InformationElement.id); | 22 | ············sb.append(scanResult$InformationElement.id); |
23 | ············throw·new·IllegalArgumentException(sb.toString()); | 23 | ············throw·new·IllegalArgumentException(sb.toString()); |
24 | ········} | 24 | ········} |
25 | ········ | 25 | ········if·(scanResult$InformationElement.bytes.length·>=·22)·{ |
26 | ········if·(bytes.length·>=·22)·{ | ||
27 | ············final·int·mPresent·=·1; | 26 | ············final·int·mPresent·=·1; |
28 | ············this.mPresent·=·(mPresent·!=·0); | 27 | ············this.mPresent·=·(mPresent·!=·0); |
29 | ············this.mSecondChannelOffset·=·(bytes[mPresent]·&·0x3); | 28 | ············this.mSecondChannelOffset·=·(scanResult$InformationElement.bytes[mPresent]·&·0x3); |
30 | ············return; | 29 | ············return; |
31 | ········} | 30 | ········} |
32 | ········final·StringBuilder·sb2·=·new·StringBuilder(); | 31 | ········final·StringBuilder·sb2·=·new·StringBuilder(); |
33 | ········sb2.append("Invalid·HT_OPERATION·len:·"); | 32 | ········sb2.append("Invalid·HT_OPERATION·len:·"); |
34 | ········sb2.append(scanResult$InformationElement.bytes.length); | 33 | ········sb2.append(scanResult$InformationElement.bytes.length); |
35 | ········throw·new·IllegalArgumentException(sb2.toString()); | 34 | ········throw·new·IllegalArgumentException(sb2.toString()); |
36 | ····} | 35 | ····} |
Offset 28, 28 lines modified | Offset 28, 25 lines modified | ||
28 | ········} | 28 | ········} |
29 | ········final·ByteBuffer·order·=·ByteBuffer.wrap(scanResult$InformationElement.bytes).order(ByteOrder.LITTLE_ENDIAN); | 29 | ········final·ByteBuffer·order·=·ByteBuffer.wrap(scanResult$InformationElement.bytes).order(ByteOrder.LITTLE_ENDIAN); |
30 | ········final·int·n·=·order.get()·&·0xFF; | 30 | ········final·int·n·=·order.get()·&·0xFF; |
31 | ········this.ant·=·NetworkDetail$Ant.values()[n·&·0xF]; | 31 | ········this.ant·=·NetworkDetail$Ant.values()[n·&·0xF]; |
32 | ········final·int·n2·=·n·&·0x10; | 32 | ········final·int·n2·=·n·&·0x10; |
33 | ········final·boolean·b·=·true; | 33 | ········final·boolean·b·=·true; |
34 | ········this.internet·=·(n2·!=·0·&&·b); | 34 | ········this.internet·=·(n2·!=·0·&&·b); |
35 | ········final· | 35 | ········final·int·length·=·scanResult$InformationElement.bytes.length; |
36 | ········final·int·length·=·bytes.length; | ||
37 | ········final·int·n3·=·7; | 36 | ········final·int·n3·=·7; |
38 | ········final·int·n4·=·3; | 37 | ········final·int·n4·=·3; |
39 | ········final·int·n5·=·9; | 38 | ········final·int·n5·=·9; |
40 | ········if·(length·!=·(b·?·1·:·0)·&&·bytes.length·!=·n4·&&·bytes.length·!=·n3·&&·bytes.length·!=·n5)·{ | 39 | ········if·(length·!=·(b·?·1·:·0)·&&·scanResult$InformationElement.bytes.length·!=·n4·&&·scanResult$InformationElement.bytes.length·!=·n3·&&·scanResult$InformationElement.bytes.length·!=·n5)·{ |
41 | ············final·StringBuilder·sb2·=·new·StringBuilder(); | 40 | ············final·StringBuilder·sb2·=·new·StringBuilder(); |
42 | ············sb2.append("Bad·Interworking·element·length:·"); | 41 | ············sb2.append("Bad·Interworking·element·length:·"); |
43 | ············sb2.append(scanResult$InformationElement.bytes.length); | 42 | ············sb2.append(scanResult$InformationElement.bytes.length); |
44 | ············throw·new·IllegalArgumentException(sb2.toString()); | 43 | ············throw·new·IllegalArgumentException(sb2.toString()); |
45 | ········} | 44 | ········} |
46 | ········f | 45 | ········if·(scanResult$InformationElement.bytes.length·==·n4·||·scanResult$InformationElement.bytes.length·==·n5)·{ |
47 | ········if·(bytes2.length·==·n4·||·bytes2.length·==·n5)·{ | ||
48 | ············ByteBufferReader.readInteger(order,·ByteOrder.BIG_ENDIAN,·2); | 46 | ············ByteBufferReader.readInteger(order,·ByteOrder.BIG_ENDIAN,·2); |
49 | ········} | 47 | ········} |
50 | ········f | 48 | ········if·(scanResult$InformationElement.bytes.length·==·n3·||·scanResult$InformationElement.bytes.length·==·n5)·{ |
51 | ········if·(bytes3.length·==·n3·||·bytes3.length·==·n5)·{ | ||
52 | ············this.hessid·=·ByteBufferReader.readInteger(order,·ByteOrder.BIG_ENDIAN,·6); | 49 | ············this.hessid·=·ByteBufferReader.readInteger(order,·ByteOrder.BIG_ENDIAN,·6); |
53 | ········} | 50 | ········} |
54 | ····} | 51 | ····} |
55 | } | 52 | } |
Offset 69, 34 lines modified | Offset 69, 30 lines modified | ||
69 | ············} | 69 | ············} |
70 | ········} | 70 | ········} |
71 | ····} | 71 | ····} |
72 | ···· | 72 | ···· |
73 | ····public·void·from(final·ScanResult$InformationElement·scanResult$InformationElement)·{ | 73 | ····public·void·from(final·ScanResult$InformationElement·scanResult$InformationElement)·{ |
74 | ········int·n·=·0; | 74 | ········int·n·=·0; |
75 | ········this.mValid·=·false; | 75 | ········this.mValid·=·false; |
76 | ········if·(scanResult$InformationElement·==·null)·{ | 76 | ········if·(scanResult$InformationElement·==·null·||·scanResult$InformationElement.bytes·==·null·||·scanResult$InformationElement.bytes.length·>·8)·{ |
77 | ············return; | 77 | ············return; |
78 | ········} | 78 | ········} |
79 | ········final· | 79 | ········final·int·length·=·scanResult$InformationElement.bytes.length; |
80 | ········if·(bytes·==·null·||·bytes.length·>·8)·{ | ||
81 | ············return; | ||
82 | ········} | ||
83 | ········final·int·length·=·bytes.length; | ||
84 | ········final·int·mValid·=·1; | 80 | ········final·int·mValid·=·1; |
85 | ········if·(length·<·mValid)·{ | 81 | ········if·(length·<·mValid)·{ |
86 | ············return; | 82 | ············return; |
87 | ········} | 83 | ········} |
88 | ········final·ByteBuffer·order·=·ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN); | 84 | ········final·ByteBuffer·order·=·ByteBuffer.wrap(scanResult$InformationElement.bytes).order(ByteOrder.LITTLE_ENDIAN); |
89 | ········try·{ | 85 | ········try·{ |
90 | ············while·(true)·{ | 86 | ············while·(true)·{ |
91 | ················final·byte[]·bytes | 87 | ················final·byte[]·bytes·=·scanResult$InformationElement.bytes; |
92 | ················try·{ | 88 | ················try·{ |
93 | ····················Label_01 | 89 | ····················Label_0146:·{ |
94 | ························if·(n·>=·bytes | 90 | ························if·(n·>=·bytes.length)·{ |
95 | ····························break·Label_01 | 91 | ····························break·Label_0146; |
96 | ························} | 92 | ························} |
97 | ························final·byte·value·=·order.get(); | 93 | ························final·byte·value·=·order.get(); |
98 | ························try·{ | 94 | ························try·{ |
99 | ····························final·int·rateFromByte·=·getRateFromByte(value); | 95 | ····························final·int·rateFromByte·=·getRateFromByte(value); |
100 | ····························if·(rateFromByte·<=·0)·{ | 96 | ····························if·(rateFromByte·<=·0)·{ |
101 | ································return; | 97 | ································return; |
102 | ····························} | 98 | ····························} |
Offset 25, 20 lines modified | Offset 25, 19 lines modified | ||
25 | ····} | 25 | ····} |
26 | ···· | 26 | ···· |
27 | ····public·void·from(final·ScanResult$InformationElement·scanResult$InformationElement)·{ | 27 | ····public·void·from(final·ScanResult$InformationElement·scanResult$InformationElement)·{ |
28 | ········this.mValid·=·false; | 28 | ········this.mValid·=·false; |
29 | ········if·(scanResult$InformationElement·==·null)·{ | 29 | ········if·(scanResult$InformationElement·==·null)·{ |
30 | ············return; | 30 | ············return; |
31 | ········} | 31 | ········} |
32 | ········ | 32 | ········if·(scanResult$InformationElement.bytes·==·null)·{ |
33 | ········if·(bytes·==·null)·{ | ||
34 | ············return; | 33 | ············return; |
35 | ········} | 34 | ········} |
36 | ········this.mLength·=·bytes.length; | 35 | ········this.mLength·=·scanResult$InformationElement.bytes.length; |
37 | ········final·ByteBuffer·order·=·ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN); | 36 | ········final·ByteBuffer·order·=·ByteBuffer.wrap(scanResult$InformationElement.bytes).order(ByteOrder.LITTLE_ENDIAN); |
38 | ········try·{ | 37 | ········try·{ |
39 | ············this.mDtimCount·=·(order.get()·&·0xFF); | 38 | ············this.mDtimCount·=·(order.get()·&·0xFF); |
40 | ············this.mDtimPeriod·=·(order.get()·&·0xFF); | 39 | ············this.mDtimPeriod·=·(order.get()·&·0xFF); |
41 | ············this.mBitmapControl·=·(order.get()·&·0xFF); | 40 | ············this.mBitmapControl·=·(order.get()·&·0xFF); |
42 | ············order.get(); | 41 | ············order.get(); |
43 | ············if·(this.mLength·<=·254·&&·this.mDtimPeriod·>·0)·{ | 42 | ············if·(this.mLength·<=·254·&&·this.mDtimPeriod·>·0)·{ |
44 | ················this.mValid·=·true; | 43 | ················this.mValid·=·true; |
Offset 16, 19 lines modified | Offset 16, 18 lines modified | ||
16 | ····public·void·from(final·ScanResult$InformationElement·scanResult$InformationElement)·{ | 16 | ····public·void·from(final·ScanResult$InformationElement·scanResult$InformationElement)·{ |
17 | ········if·(scanResult$InformationElement.id·!=·191)·{ | 17 | ········if·(scanResult$InformationElement.id·!=·191)·{ |
18 | ············final·StringBuilder·sb·=·new·StringBuilder(); | 18 | ············final·StringBuilder·sb·=·new·StringBuilder(); |
19 | ············sb.append("Element·id·is·not·VHT_CAPABILITIES:·"); | 19 | ············sb.append("Element·id·is·not·VHT_CAPABILITIES:·"); |
20 | ············sb.append(scanResult$InformationElement.id); | 20 | ············sb.append(scanResult$InformationElement.id); |
21 | ············throw·new·IllegalArgumentException(sb.toString()); | 21 | ············throw·new·IllegalArgumentException(sb.toString()); |
22 | ········} | 22 | ········} |
23 | ········ | 23 | ········if·(scanResult$InformationElement.bytes.length·<·12)·{ |
24 | ········if·(bytes.length·<·12)·{ | ||
25 | ············return; | 24 | ············return; |
26 | ········} | 25 | ········} |
27 | ········this.mMaxNumberSpatialStreams·=·InformationElementUtil.access$000(((bytes[5]·&·0xFF)·<<·8)·+·(bytes[4]·&·0xFF)); | 26 | ········this.mMaxNumberSpatialStreams·=·InformationElementUtil.access$000(((scanResult$InformationElement.bytes[5]·&·0xFF)·<<·8)·+·(scanResult$InformationElement.bytes[4]·&·0xFF)); |
28 | ········this.mPresent·=·true; | 27 | ········this.mPresent·=·true; |
29 | ····} | 28 | ····} |
30 | ···· | 29 | ···· |
31 | ····public·int·getMaxNumberSpatialStreams()·{ | 30 | ····public·int·getMaxNumberSpatialStreams()·{ |
32 | ········return·this.mMaxNumberSpatialStreams; | 31 | ········return·this.mMaxNumberSpatialStreams; |
33 | ····} | 32 | ····} |
34 | ···· | 33 | ···· |
Offset 22, 21 lines modified | Offset 22, 20 lines modified | ||
22 | ····public·void·from(final·ScanResult$InformationElement·scanResult$InformationElement)·{ | 22 | ····public·void·from(final·ScanResult$InformationElement·scanResult$InformationElement)·{ |
23 | ········if·(scanResult$InformationElement.id·!=·192)·{ | 23 | ········if·(scanResult$InformationElement.id·!=·192)·{ |
24 | ············final·StringBuilder·sb·=·new·StringBuilder(); | 24 | ············final·StringBuilder·sb·=·new·StringBuilder(); |
25 | ············sb.append("Element·id·is·not·VHT_OPERATION,·:·"); | 25 | ············sb.append("Element·id·is·not·VHT_OPERATION,·:·"); |
26 | ············sb.append(scanResult$InformationElement.id); | 26 | ············sb.append(scanResult$InformationElement.id); |
27 | ············throw·new·IllegalArgumentException(sb.toString()); | 27 | ············throw·new·IllegalArgumentException(sb.toString()); |
28 | ········} | 28 | ········} |
29 | ········ | 29 | ········if·(scanResult$InformationElement.bytes.length·>=·5)·{ |
30 | ········if·(bytes.length·>=·5)·{ | ||
31 | ············final·int·mPresent·=·1; | 30 | ············final·int·mPresent·=·1; |
32 | ············this.mPresent·=·(mPresent·!=·0); | 31 | ············this.mPresent·=·(mPresent·!=·0); |
33 | ············this.mChannelMode·=·(bytes[0]·&·0xFF); | 32 | ············this.mChannelMode·=·(scanResult$InformationElement.bytes[0]·&·0xFF); |
34 | ············this.mCenterFreqIndex1·=·(bytes[mPresent]·&·0xFF); | 33 | ············this.mCenterFreqIndex1·=·(scanResult$InformationElement.bytes[mPresent]·&·0xFF); |
35 | ············this.mCenterFreqIndex2·=·(bytes[2]·&·0xFF); | 34 | ············this.mCenterFreqIndex2·=·(scanResult$InformationElement.bytes[2]·&·0xFF); |
36 | ············return; | 35 | ············return; |
37 | ········} | 36 | ········} |
38 | ········final·StringBuilder·sb2·=·new·StringBuilder(); | 37 | ········final·StringBuilder·sb2·=·new·StringBuilder(); |
39 | ········sb2.append("Invalid·VHT_OPERATION·len:·"); | 38 | ········sb2.append("Invalid·VHT_OPERATION·len:·"); |
40 | ········sb2.append(scanResult$InformationElement.bytes.length); | 39 | ········sb2.append(scanResult$InformationElement.bytes.length); |
41 | ········throw·new·IllegalArgumentException(sb2.toString()); | 40 | ········throw·new·IllegalArgumentException(sb2.toString()); |
42 | ····} | 41 | ····} |
Offset 114, 24 lines modified | Offset 114, 23 lines modified | ||
114 | ················} | 114 | ················} |
115 | ················this.IsMboApCellularDataAware·=·(isMboApCellularDataAware·!=·0); | 115 | ················this.IsMboApCellularDataAware·=·(isMboApCellularDataAware·!=·0); |
116 | ············} | 116 | ············} |
117 | ········} | 117 | ········} |
118 | ····} | 118 | ····} |
119 | ···· | 119 | ···· |
120 | ····public·void·from(final·ScanResult$InformationElement·scanResult$InformationElement)·{ | 120 | ····public·void·from(final·ScanResult$InformationElement·scanResult$InformationElement)·{ |
121 | ········final· | 121 | ········final·int·length·=·scanResult$InformationElement.bytes.length; |
122 | ········final·int·length·=·bytes.length; | ||
123 | ········final·int·n·=·3; | 122 | ········final·int·n·=·3; |
124 | ········if·(length·<·n)·{ | 123 | ········if·(length·<·n)·{ |
125 | ············return; | 124 | ············return; |
126 | ········} | 125 | ········} |
127 | ········final·int·n2·=·bytes[0]·&·0xFF; | 126 | ········final·int·n2·=·scanResult$InformationElement.bytes[0]·&·0xFF; |
128 | ········final·byte·b·=·16; | 127 | ········final·byte·b·=·16; |
129 | ········if·((n2·<<·b·|·(bytes[1]·&·0xFF)·<<·8·|·(bytes[2]·&·0xFF))·==·0x506F9A·&&·bytes.length·>=·4)·{ | 128 | ········if·((n2·<<·b·|·(scanResult$InformationElement.bytes[1]·&·0xFF)·<<·8·|·(scanResult$InformationElement.bytes[2]·&·0xFF))·==·0x506F9A·&&·scanResult$InformationElement.bytes.length·>=·4)·{ |
130 | ············final·byte·b2·=·bytes[n]; | 129 | ············final·byte·b2·=·scanResult$InformationElement.bytes[n]; |
131 | ············if·(b2·!=·b)·{ | 130 | ············if·(b2·!=·b)·{ |
132 | ················if·(b2·==·22)·{ | 131 | ················if·(b2·==·22)·{ |
133 | ····················this.parseVsaMboOce(scanResult$InformationElement); | 132 | ····················this.parseVsaMboOce(scanResult$InformationElement); |
134 | ················} | 133 | ················} |
135 | ············} | 134 | ············} |
136 | ············else·{ | 135 | ············else·{ |
137 | ················this.parseVsaHs20(scanResult$InformationElement); | 136 | ················this.parseVsaHs20(scanResult$InformationElement); |
Offset 437, 15 lines modified | Offset 437, 15 lines modified | ||
437 | ········34:·aload_0 | 437 | ········34:·aload_0 |
438 | ········35:·invokevirtual·#95·················//·Method·java/nio/ByteBuffer.remaining:()I | 438 | ········35:·invokevirtual·#95·················//·Method·java/nio/ByteBuffer.remaining:()I |
439 | ········38:·istore_3 | 439 | ········38:·istore_3 |
440 | ········39:·iconst_1 | 440 | ········39:·iconst_1 |
441 | ········40:·istore········4 | 441 | ········40:·istore········4 |
442 | ········42:·iload_3 | 442 | ········42:·iload_3 |
443 | ········43:·iload·········4 | 443 | ········43:·iload·········4 |
444 | ········45:·if_icmple····· | 444 | ········45:·if_icmple·····201 |
445 | ········48:·aload_0 | 445 | ········48:·aload_0 |
446 | ········49:·invokevirtual·#100················//·Method·java/nio/ByteBuffer.get:()B | 446 | ········49:·invokevirtual·#100················//·Method·java/nio/ByteBuffer.get:()B |
447 | ········52:·istore_3 | 447 | ········52:·istore_3 |
448 | ········53:·sipush········255 | 448 | ········53:·sipush········255 |
449 | ········56:·istore········5 | 449 | ········56:·istore········5 |
450 | ········58:·iload_3 | 450 | ········58:·iload_3 |
451 | ········59:·iload·········5 | 451 | ········59:·iload·········5 |
Offset 457, 31 lines modified | Offset 457, 31 lines modified | ||
457 | ········69:·iand | 457 | ········69:·iand |
458 | ········70:·istore········6 | 458 | ········70:·istore········6 |
459 | ········72:·aload_0 | 459 | ········72:·aload_0 |
460 | ········73:·invokevirtual·#95·················//·Method·java/nio/ByteBuffer.remaining:()I | 460 | ········73:·invokevirtual·#95·················//·Method·java/nio/ByteBuffer.remaining:()I |
461 | ········76:·istore········7 | 461 | ········76:·istore········7 |
462 | ········78:·iload·········6 | 462 | ········78:·iload·········6 |
463 | ········80:·iload·········7 | 463 | ········80:·iload·········7 |
464 | ········82:·if_icmpgt····· | 464 | ········82:·if_icmpgt·····201 |
465 | ········85:·iload_3 | 465 | ········85:·iload_3 |
466 | ········86:·ifne··········96 | 466 | ········86:·ifne··········96 |
467 | ········89:·iload_2 | 467 | ········89:·iload_2 |
468 | ········90:·ifeq··········96 | 468 | ········90:·ifeq··········96 |
469 | ········93:·goto·········· | 469 | ········93:·goto··········201 |
470 | ········96:·iload_3 | 470 | ········96:·iload_3 |
471 | ········97:·ifne··········106 | 471 | ········97:·ifne··········106 |
472 | ·······100:·iload·········4 | 472 | ·······100:·iload·········4 |
473 | ·······102:·istore_2 | 473 | ·······102:·istore_2 |
474 | ·······103:·goto··········138 | 474 | ·······103:·goto··········138 |
475 | ·······106:·iload_3 | 475 | ·······106:·iload_3 |
476 | ·······107:·iload·········5 | 476 | ·······107:·iload·········5 |
477 | ·······109:·if_icmpne·····138 | 477 | ·······109:·if_icmpne·····138 |
478 | ·······112:·iload·········6 | 478 | ·······112:·iload·········6 |
479 | ·······114:·ifne··········120 | 479 | ·······114:·ifne··········120 |
480 | ·······117:·goto·········· | 480 | ·······117:·goto··········201 |
481 | ·······120:·aload_0 | 481 | ·······120:·aload_0 |
482 | ·······121:·invokevirtual·#100················//·Method·java/nio/ByteBuffer.get:()B | 482 | ·······121:·invokevirtual·#100················//·Method·java/nio/ByteBuffer.get:()B |
483 | ·······124:·iload·········5 | 483 | ·······124:·iload·········5 |
484 | ·······126:·iand | 484 | ·······126:·iand |
485 | ·······127:·istore········4 | 485 | ·······127:·istore········4 |
486 | ·······129:·iload·········6 | 486 | ·······129:·iload·········6 |
487 | ·······131:·iconst_m1 | 487 | ·······131:·iconst_m1 |
Offset 502, 32 lines modified | Offset 502, 35 lines modified | ||
502 | ·······161:·putfield······#105················//·Field·android/net/wifi/ScanResult$InformationElement.idExt:I | 502 | ·······161:·putfield······#105················//·Field·android/net/wifi/ScanResult$InformationElement.idExt:I |
503 | ·······164:·iload·········6 | 503 | ·······164:·iload·········6 |
504 | ·······166:·newarray·······byte | 504 | ·······166:·newarray·······byte |
505 | ·······168:·astore········9 | 505 | ·······168:·astore········9 |
506 | ·······170:·aload·········8 | 506 | ·······170:·aload·········8 |
507 | ·······172:·aload·········9 | 507 | ·······172:·aload·········9 |
508 | ·······174:·putfield······#109················//·Field·android/net/wifi/ScanResult$InformationElement.bytes:[B | 508 | ·······174:·putfield······#109················//·Field·android/net/wifi/ScanResult$InformationElement.bytes:[B |
509 | ·······177:·aload | 509 | ·······177:·aload·········8 |
510 | ·······17 | 510 | ·······179:·getfield······#109················//·Field·android/net/wifi/ScanResult$InformationElement.bytes:[B |
511 | ·······18 | 511 | ·······182:·astore········9 |
512 | ·······18 | 512 | ·······184:·aload_0 |
513 | ·······18 | 513 | ·······185:·aload·········9 |
514 | ·······18 | 514 | ·······187:·invokevirtual·#111················//·Method·java/nio/ByteBuffer.get:([B)Ljava/nio/ByteBuffer; |
515 | ·······187:·invokevirtual·#115················//·Method·java/util/ArrayList.add:(Ljava/lang/Object;)Z | ||
516 | ·······190:·pop | 515 | ·······190:·pop |
517 | ·······191:· | 516 | ·······191:·aload_1 |
518 | ·······19 | 517 | ·······192:·aload·········8 |
519 | ·······19 | 518 | ·······194:·invokevirtual·#115················//·Method·java/util/ArrayList.add:(Ljava/lang/Object;)Z |
520 | ·······19 | 519 | ·······197:·pop |
521 | ······· | 520 | ·······198:·goto··········34 |
522 | ·······20 | 521 | ·······201:·aload_1 |
523 | ·······20 | 522 | ·······202:·invokevirtual·#118················//·Method·java/util/ArrayList.size:()I |
524 | ·······20 | 523 | ·······205:·anewarray·····#25·················//·class·android/net/wifi/ScanResult$InformationElement |
525 | ·······20 | 524 | ·······208:·astore_0 |
526 | ·······2 | 525 | ·······209:·aload_1 |
526 | ·······210:·aload_0 | ||
527 | ·······211:·invokevirtual·#122················//·Method·java/util/ArrayList.toArray:([Ljava/lang/Object;)[Ljava/lang/Object; | ||
528 | ·······214:·checkcast·····#124················//·class·"[Landroid/net/wifi/ScanResult$InformationElement;" | ||
529 | ·······217:·areturn | ||
527 | ··private·static·int·parseMaxNumberSpatialStreamsFromMcsMap(int); | 530 | ··private·static·int·parseMaxNumberSpatialStreamsFromMcsMap(int); |
528 | ····descriptor:·(I)I | 531 | ····descriptor:·(I)I |
529 | ····flags:·ACC_PRIVATE,·ACC_STATIC | 532 | ····flags:·ACC_PRIVATE,·ACC_STATIC |
530 | ····Code: | 533 | ····Code: |
531 | ······stack=300,·locals=4,·args_size=1 | 534 | ······stack=300,·locals=4,·args_size=1 |
532 | ·········0:·bipush········8 | 535 | ·········0:·bipush········8 |
Offset 24, 14 lines modified | Offset 24, 14 lines modified | ||
24 | ········if·(index·<·0)·{ | 24 | ········if·(index·<·0)·{ |
25 | ············index·=·-1·>>>·1; | 25 | ············index·=·-1·>>>·1; |
26 | ········} | 26 | ········} |
27 | ········return·index; | 27 | ········return·index; |
28 | ····} | 28 | ····} |
29 | ···· | 29 | ···· |
30 | ····public·boolean·isMostRecentlyConnected(final·WifiConfiguration·wifiConfiguration)·{ | 30 | ····public·boolean·isMostRecentlyConnected(final·WifiConfiguration·wifiConfiguration)·{ |
31 | ········return·this.getAgeIndexOfNetwork(wifiConfiguration)·<·this.mContext.getResources().getInteger(213103415 | 31 | ········return·this.getAgeIndexOfNetwork(wifiConfiguration)·<·this.mContext.getResources().getInteger(2131034155); |
32 | ····} | 32 | ····} |
33 | ···· | 33 | ···· |
34 | ····public·void·removeNetwork(final·WifiConfiguration·wifiConfiguration)·{ | 34 | ····public·void·removeNetwork(final·WifiConfiguration·wifiConfiguration)·{ |
35 | ········this.mList.remove((Object)ScanResultMatchInfo.fromWifiConfiguration(wifiConfiguration)); | 35 | ········this.mList.remove((Object)ScanResultMatchInfo.fromWifiConfiguration(wifiConfiguration)); |
36 | ····} | 36 | ····} |
37 | } | 37 | } |
Offset 1, 14 lines modified | Offset 1, 15 lines modified | ||
1 | package·com.android.server.wifi.util; | 1 | package·com.android.server.wifi.util; |
2 | import·android.content.pm.ApplicationInfo; | 2 | import·android.content.pm.ApplicationInfo; |
3 | import·android.content.pm.PackageManager; | 3 | import·android.content.pm.PackageManager; |
4 | import·android.content.ComponentName; | 4 | import·android.content.ComponentName; |
5 | import·android.os.Binder; | 5 | import·android.os.Binder; |
6 | import·android.util.EventLog; | ||
6 | import·android.content.pm.PackageManager$NameNotFoundException; | 7 | import·android.content.pm.PackageManager$NameNotFoundException; |
7 | import·android.util.Log; | 8 | import·android.util.Log; |
8 | import·android.app.admin.DevicePolicyManager; | 9 | import·android.app.admin.DevicePolicyManager; |
9 | import·android.os.UserHandle; | 10 | import·android.os.UserHandle; |
10 | import·com.android.server.wifi.WifiInjector; | 11 | import·com.android.server.wifi.WifiInjector; |
11 | import·android.os.UserManager; | 12 | import·android.os.UserManager; |
12 | import·com.android.server.wifi.WifiLog; | 13 | import·com.android.server.wifi.WifiLog; |
Offset 237, 14 lines modified | Offset 238, 30 lines modified | ||
237 | ········} | 238 | ········} |
238 | ········if·(noteOp·!=·0)·{ | 239 | ········if·(noteOp·!=·0)·{ |
239 | ············b·=·false; | 240 | ············b·=·false; |
240 | ········} | 241 | ········} |
241 | ········return·b; | 242 | ········return·b; |
242 | ····} | 243 | ····} |
243 | ···· | 244 | ···· |
245 | ····public·boolean·doesUidBelongToCurrentUser(int·n)·{ | ||
246 | ········final·int·n2·=·1; | ||
247 | ········if·(n·!=·1000·&&·!this.checkNetworkSettingsPermission(n))·{ | ||
248 | ············final·boolean·currentProfile·=·this.isCurrentProfile(n); | ||
249 | ············if·(!currentProfile)·{ | ||
250 | ················n·=·1397638484; | ||
251 | ················final·Object[]·array·=·{·"174749461",·null,·null·}; | ||
252 | ················array[n2]·=·-1; | ||
253 | ················array[2]·=·"Non·foreground·user·trying·to·modify·wifi·configuration"; | ||
254 | ················EventLog.writeEvent(n,·array); | ||
255 | ············} | ||
256 | ············return·currentProfile; | ||
257 | ········} | ||
258 | ········return·n2·!=·0; | ||
259 | ····} | ||
260 | ···· | ||
244 | ····public·void·enforceCanAccessScanResults(String·s,·final·String·s2,·final·int·n,·final·String·s3)·{ | 261 | ····public·void·enforceCanAccessScanResults(String·s,·final·String·s2,·final·int·n,·final·String·s3)·{ |
245 | ········this.checkPackage(n,·s); | 262 | ········this.checkPackage(n,·s); |
246 | ········if·(this.checkNetworkSettingsPermission(n)·||·this.checkNetworkSetupWizardPermission(n)·||·this.checkNetworkManagedProvisioningPermission(n)·||·this.checkNetworkStackPermission(n)·||·this.checkMainlineNetworkStackPermission(n)·||·this.checkScanWithoutLocationPermission(n))·{ | 263 | ········if·(this.checkNetworkSettingsPermission(n)·||·this.checkNetworkSetupWizardPermission(n)·||·this.checkNetworkManagedProvisioningPermission(n)·||·this.checkNetworkStackPermission(n)·||·this.checkMainlineNetworkStackPermission(n)·||·this.checkScanWithoutLocationPermission(n))·{ |
247 | ············return; | 264 | ············return; |
248 | ········} | 265 | ········} |
249 | ········if·(!this.isLocationModeEnabled())·{ | 266 | ········if·(!this.isLocationModeEnabled())·{ |
250 | ············throw·new·SecurityException("Location·mode·is·disabled·for·the·device"); | 267 | ············throw·new·SecurityException("Location·mode·is·disabled·for·the·device"); |
Offset 1, 25 lines modified | Offset 1, 23 lines modified | ||
1 | package·com.android.wifi.x.android.net.ipmemorystore; | 1 | package·com.android.wifi.x.android.net.ipmemorystore; |
2 | import·android.net.networkstack.aidl.quirks.IPv6ProvisioningLossQuirk; | ||
3 | import·java.util.List; | 2 | import·java.util.List; |
4 | import·java.net.Inet4Address; | 3 | import·java.net.Inet4Address; |
5 | public·class·NetworkAttributes$Builder | 4 | public·class·NetworkAttributes$Builder |
6 | { | 5 | { |
7 | ····private·Inet4Address·mAssignedAddress; | 6 | ····private·Inet4Address·mAssignedAddress; |
8 | ····private·Long·mAssignedAddressExpiry; | 7 | ····private·Long·mAssignedAddressExpiry; |
9 | ····private·String·mCluster; | 8 | ····private·String·mCluster; |
10 | ····private·List·mDnsAddresses; | 9 | ····private·List·mDnsAddresses; |
11 | ····private·IPv6ProvisioningLossQuirk·mIpv6ProvLossQuirk; | ||
12 | ····private·Integer·mMtu; | 10 | ····private·Integer·mMtu; |
13 | ···· | 11 | ···· |
14 | ····public·NetworkAttributes·build()·{ | 12 | ····public·NetworkAttributes·build()·{ |
15 | ········return·new·NetworkAttributes(this.mAssignedAddress,·this.mAssignedAddressExpiry,·this.mCluster,·this.mDnsAddresses,·this.mMtu | 13 | ········return·new·NetworkAttributes(this.mAssignedAddress,·this.mAssignedAddressExpiry,·this.mCluster,·this.mDnsAddresses,·this.mMtu); |
16 | ····} | 14 | ····} |
17 | ···· | 15 | ···· |
18 | ····public·NetworkAttributes$Builder·setCluster(final·String·mCluster)·{ | 16 | ····public·NetworkAttributes$Builder·setCluster(final·String·mCluster)·{ |
19 | ········this.mCluster·=·mCluster; | 17 | ········this.mCluster·=·mCluster; |
20 | ········return·this; | 18 | ········return·this; |
21 | ····} | 19 | ····} |
22 | } | 20 | } |
Offset 1, 31 lines modified | Offset 1, 28 lines modified | ||
1 | package·com.android.wifi.x.android.net.ipmemorystore; | 1 | package·com.android.wifi.x.android.net.ipmemorystore; |
2 | import·java.util.Iterator; | 2 | import·java.util.Iterator; |
3 | import·java.util.StringJoiner; | 3 | import·java.util.StringJoiner; |
4 | import·android.net.networkstack.aidl.quirks.IPv6ProvisioningLossQuirkParcelable; | ||
5 | import·java.util.Objects; | 4 | import·java.util.Objects; |
6 | import·java.net.UnknownHostException; | 5 | import·java.net.UnknownHostException; |
7 | import·java.net.InetAddress; | 6 | import·java.net.InetAddress; |
8 | import·java.util.Collections; | 7 | import·java.util.Collections; |
9 | import·java.util.Collection; | 8 | import·java.util.Collection; |
10 | import·java.util.ArrayList; | 9 | import·java.util.ArrayList; |
11 | import·android.net.networkstack.aidl.quirks.IPv6ProvisioningLossQuirk; | ||
12 | import·java.util.List; | 10 | import·java.util.List; |
13 | import·java.net.Inet4Address; | 11 | import·java.net.Inet4Address; |
14 | public·class·NetworkAttributes | 12 | public·class·NetworkAttributes |
15 | { | 13 | { |
16 | ····public·static·final·float·TOTAL_WEIGHT·=·850.0f; | 14 | ····public·static·final·float·TOTAL_WEIGHT·=·850.0f; |
17 | ····public·final·Inet4Address·assignedV4Address; | 15 | ····public·final·Inet4Address·assignedV4Address; |
18 | ····public·final·Long·assignedV4AddressExpiry; | 16 | ····public·final·Long·assignedV4AddressExpiry; |
19 | ····public·final·String·cluster; | 17 | ····public·final·String·cluster; |
20 | ····public·final·List·dnsAddresses; | 18 | ····public·final·List·dnsAddresses; |
21 | ····public·final·IPv6ProvisioningLossQuirk·ipv6ProvisioningLossQuirk; | ||
22 | ····public·final·Integer·mtu; | 19 | ····public·final·Integer·mtu; |
23 | ···· | 20 | ···· |
24 | ····public·NetworkAttributes(final·NetworkAttributesParcelable·networkAttributesParcelable)·{ | 21 | ····public·NetworkAttributes(final·NetworkAttributesParcelable·networkAttributesParcelable)·{ |
25 | ········final·Inet4Address·inet4Address·=·(Inet4Address)getByAddressOrNull(networkAttributesParcelable.assignedV4Address); | 22 | ········final·Inet4Address·inet4Address·=·(Inet4Address)getByAddressOrNull(networkAttributesParcelable.assignedV4Address); |
26 | ········final·long·assignedV4AddressExpiry·=·networkAttributesParcelable.assignedV4AddressExpiry; | 23 | ········final·long·assignedV4AddressExpiry·=·networkAttributesParcelable.assignedV4AddressExpiry; |
27 | ········Long·value; | 24 | ········Long·value; |
28 | ········if·(assignedV4AddressExpiry·>·0L)·{ | 25 | ········if·(assignedV4AddressExpiry·>·0L)·{ |
Offset 40, 18 lines modified | Offset 37, 18 lines modified | ||
40 | ········Integer·value2; | 37 | ········Integer·value2; |
41 | ········if·(mtu·>=·0)·{ | 38 | ········if·(mtu·>=·0)·{ |
42 | ············value2·=·mtu; | 39 | ············value2·=·mtu; |
43 | ········} | 40 | ········} |
44 | ········else·{ | 41 | ········else·{ |
45 | ············value2·=·null; | 42 | ············value2·=·null; |
46 | ········} | 43 | ········} |
47 | ········this(inet4Address,·value,·cluster,·blobArrayToInetAddressList,·value2 | 44 | ········this(inet4Address,·value,·cluster,·blobArrayToInetAddressList,·value2); |
48 | ····} | 45 | ····} |
49 | ···· | 46 | ···· |
50 | ····public·NetworkAttributes(final·Inet4Address·assignedV4Address,·final·Long·assignedV4AddressExpiry,·final·String·cluster,·final·List·list,·final·Integer·mtu | 47 | ····public·NetworkAttributes(final·Inet4Address·assignedV4Address,·final·Long·assignedV4AddressExpiry,·final·String·cluster,·final·List·list,·final·Integer·mtu)·{ |
51 | ········if·(mtu·!=·null·&&·mtu·<·0)·{ | 48 | ········if·(mtu·!=·null·&&·mtu·<·0)·{ |
52 | ············throw·new·IllegalArgumentException("MTU·can't·be·negative"); | 49 | ············throw·new·IllegalArgumentException("MTU·can't·be·negative"); |
53 | ········} | 50 | ········} |
54 | ········if·(assignedV4AddressExpiry·!=·null·&&·assignedV4AddressExpiry·<=·0L)·{ | 51 | ········if·(assignedV4AddressExpiry·!=·null·&&·assignedV4AddressExpiry·<=·0L)·{ |
55 | ············throw·new·IllegalArgumentException("lease·expiry·can't·be·negative·or·zero"); | 52 | ············throw·new·IllegalArgumentException("lease·expiry·can't·be·negative·or·zero"); |
56 | ········} | 53 | ········} |
57 | ········this.assignedV4Address·=·assignedV4Address; | 54 | ········this.assignedV4Address·=·assignedV4Address; |
Offset 62, 15 lines modified | Offset 59, 14 lines modified | ||
62 | ············unmodifiableList·=·null; | 59 | ············unmodifiableList·=·null; |
63 | ········} | 60 | ········} |
64 | ········else·{ | 61 | ········else·{ |
65 | ············unmodifiableList·=·Collections.unmodifiableList((List<?>)new·ArrayList<Object>(list)); | 62 | ············unmodifiableList·=·Collections.unmodifiableList((List<?>)new·ArrayList<Object>(list)); |
66 | ········} | 63 | ········} |
67 | ········this.dnsAddresses·=·unmodifiableList; | 64 | ········this.dnsAddresses·=·unmodifiableList; |
68 | ········this.mtu·=·mtu; | 65 | ········this.mtu·=·mtu; |
69 | ········this.ipv6ProvisioningLossQuirk·=·ipv6ProvisioningLossQuirk; | ||
70 | ····} | 66 | ····} |
71 | ···· | 67 | ···· |
72 | ····private·static·List·blobArrayToInetAddressList(final·Blob[]·array)·{ | 68 | ····private·static·List·blobArrayToInetAddressList(final·Blob[]·array)·{ |
73 | ········if·(array·==·null)·{ | 69 | ········if·(array·==·null)·{ |
74 | ············return·null; | 70 | ············return·null; |
75 | ········} | 71 | ········} |
76 | ········final·ArrayList<InetAddress>·list·=·new·ArrayList<InetAddress>(array.length); | 72 | ········final·ArrayList<InetAddress>·list·=·new·ArrayList<InetAddress>(array.length); |
Offset 114, 28 lines modified | Offset 110, 27 lines modified | ||
114 | ····public·boolean·equals(final·Object·o)·{ | 110 | ····public·boolean·equals(final·Object·o)·{ |
115 | ········final·boolean·b·=·o·instanceof·NetworkAttributes; | 111 | ········final·boolean·b·=·o·instanceof·NetworkAttributes; |
116 | ········boolean·b2·=·false; | 112 | ········boolean·b2·=·false; |
117 | ········if·(!b)·{ | 113 | ········if·(!b)·{ |
118 | ············return·false; | 114 | ············return·false; |
119 | ········} | 115 | ········} |
120 | ········final·NetworkAttributes·networkAttributes·=·(NetworkAttributes)o; | 116 | ········final·NetworkAttributes·networkAttributes·=·(NetworkAttributes)o; |
121 | ········if·(Objects.equals(this.assignedV4Address,·networkAttributes.assignedV4Address)·&&·Objects.equals(this.assignedV4AddressExpiry,·networkAttributes.assignedV4AddressExpiry)·&&·Objects.equals(this.cluster,·networkAttributes.cluster)·&&·Objects.equals(this.dnsAddresses,·networkAttributes.dnsAddresses)·&&·Objects.equals(this.mtu,·networkAttributes.mtu) | 117 | ········if·(Objects.equals(this.assignedV4Address,·networkAttributes.assignedV4Address)·&&·Objects.equals(this.assignedV4AddressExpiry,·networkAttributes.assignedV4AddressExpiry)·&&·Objects.equals(this.cluster,·networkAttributes.cluster)·&&·Objects.equals(this.dnsAddresses,·networkAttributes.dnsAddresses)·&&·Objects.equals(this.mtu,·networkAttributes.mtu))·{ |
122 | ············b2·=·true; | 118 | ············b2·=·true; |
123 | ········} | 119 | ········} |
124 | ········return·b2; | 120 | ········return·b2; |
125 | ····} | 121 | ····} |
126 | ···· | 122 | ···· |
127 | ····public·int·hashCode()·{ | 123 | ····public·int·hashCode()·{ |
128 | ········return·Objects.hash(this.assignedV4Address,·this.assignedV4AddressExpiry,·this.cluster,·this.dnsAddresses,·this.mtu | 124 | ········return·Objects.hash(this.assignedV4Address,·this.assignedV4AddressExpiry,·this.cluster,·this.dnsAddresses,·this.mtu); |
129 | ····} | 125 | ····} |
130 | ···· | 126 | ···· |
131 | ····public·NetworkAttributesParcelable·toParcelable()·{ | 127 | ····public·NetworkAttributesParcelable·toParcelable()·{ |
132 | ········final·NetworkAttributesParcelable·networkAttributesParcelable·=·new·NetworkAttributesParcelable(); | 128 | ········final·NetworkAttributesParcelable·networkAttributesParcelable·=·new·NetworkAttributesParcelable(); |
133 | ········final·Inet4Address·assignedV4Address·=·this.assignedV4Address; | 129 | ········final·Inet4Address·assignedV4Address·=·this.assignedV4Address; |
134 | ········IPv6ProvisioningLossQuirkParcelable·stableParcelable·=·null; | ||
135 | ········byte[]·address; | 130 | ········byte[]·address; |
136 | ········if·(assignedV4Address·==·null)·{ | 131 | ········if·(assignedV4Address·==·null)·{ |
137 | ············address·=·null; | 132 | ············address·=·null; |
138 | ········} | 133 | ········} |
139 | ········else·{ | 134 | ········else·{ |
140 | ············address·=·assignedV4Address.getAddress(); | 135 | ············address·=·assignedV4Address.getAddress(); |
141 | ········} | 136 | ········} |
Offset 156, 19 lines modified | Offset 151, 14 lines modified | ||
156 | ········if·(mtu·==·null)·{ | 151 | ········if·(mtu·==·null)·{ |
157 | ············intValue·=·-1; | 152 | ············intValue·=·-1; |
158 | ········} | 153 | ········} |
159 | ········else·{ | 154 | ········else·{ |
160 | ············intValue·=·mtu; | 155 | ············intValue·=·mtu; |
161 | ········} | 156 | ········} |
162 | ········networkAttributesParcelable.mtu·=·intValue; | 157 | ········networkAttributesParcelable.mtu·=·intValue; |
163 | ········final·IPv6ProvisioningLossQuirk·ipv6ProvisioningLossQuirk·=·this.ipv6ProvisioningLossQuirk; | ||
164 | ········if·(ipv6ProvisioningLossQuirk·!=·null)·{ | ||
165 | ············stableParcelable·=·ipv6ProvisioningLossQuirk.toStableParcelable(); | ||
166 | ········} | ||
167 | ········networkAttributesParcelable.ipv6ProvisioningLossQuirk·=·stableParcelable; | ||
168 | ········return·networkAttributesParcelable; | 158 | ········return·networkAttributesParcelable; |
169 | ····} | 159 | ····} |
170 | ···· | 160 | ···· |
171 | ····public·String·toString()·{ | 161 | ····public·String·toString()·{ |
172 | ········final·StringJoiner·stringJoiner·=·new·StringJoiner("·",·"{",·"}"); | 162 | ········final·StringJoiner·stringJoiner·=·new·StringJoiner("·",·"{",·"}"); |
173 | ········final·ArrayList<String>·list·=·new·ArrayList<String>(); | 163 | ········final·ArrayList<String>·list·=·new·ArrayList<String>(); |
174 | ········if·(this.assignedV4Address·!=·null)·{ | 164 | ········if·(this.assignedV4Address·!=·null)·{ |
Offset 208, 22 lines modified | Offset 198, 14 lines modified | ||
208 | ········if·(this.mtu·!=·null)·{ | 198 | ········if·(this.mtu·!=·null)·{ |
209 | ············stringJoiner.add("mtu·:"); | 199 | ············stringJoiner.add("mtu·:"); |
210 | ············stringJoiner.add(this.mtu.toString()); | 200 | ············stringJoiner.add(this.mtu.toString()); |
211 | ········} | 201 | ········} |
212 | ········else·{ | 202 | ········else·{ |
213 | ············list.add("mtu"); | 203 | ············list.add("mtu"); |
214 | ········} | 204 | ········} |
215 | ········if·(this.ipv6ProvisioningLossQuirk·!=·null)·{ | ||
216 | ············stringJoiner.add("ipv6ProvisioningLossQuirk·:·["); | ||
217 | ············stringJoiner.add(this.ipv6ProvisioningLossQuirk.toString()); | ||
218 | ············stringJoiner.add(s); | ||
... Open expanded diff ... |
Offset 1, 23 lines modified | Offset 1, 21 lines modified | ||
1 | package·com.android.wifi.x.android.net.ipmemorystore; | 1 | package·com.android.wifi.x.android.net.ipmemorystore; |
2 | import·android.os.Parcel; | 2 | import·android.os.Parcel; |
3 | import·android.net.networkstack.aidl.quirks.IPv6ProvisioningLossQuirkParcelable; | ||
4 | import·android.os.Parcelable$Creator; | 3 | import·android.os.Parcelable$Creator; |
5 | import·android.os.Parcelable; | 4 | import·android.os.Parcelable; |
6 | public·class·NetworkAttributesParcelable·implements·Parcelable | 5 | public·class·NetworkAttributesParcelable·implements·Parcelable |
7 | { | 6 | { |
8 | ····public·static·final·Parcelable$Creator·CREATOR; | 7 | ····public·static·final·Parcelable$Creator·CREATOR; |
9 | ····public·byte[]·assignedV4Address; | 8 | ····public·byte[]·assignedV4Address; |
10 | ····public·long·assignedV4AddressExpiry; | 9 | ····public·long·assignedV4AddressExpiry; |
11 | ····public·String·cluster; | 10 | ····public·String·cluster; |
12 | ····public·Blob[]·dnsAddresses; | 11 | ····public·Blob[]·dnsAddresses; |
13 | ····public·IPv6ProvisioningLossQuirkParcelable·ipv6ProvisioningLossQuirk; | ||
14 | ····public·int·mtu; | 12 | ····public·int·mtu; |
15 | ···· | 13 | ···· |
16 | ····static·{ | 14 | ····static·{ |
17 | ········CREATOR·=·(Parcelable$Creator)new·NetworkAttributesParcelable$1(); | 15 | ········CREATOR·=·(Parcelable$Creator)new·NetworkAttributesParcelable$1(); |
18 | ····} | 16 | ····} |
19 | ···· | 17 | ···· |
20 | ····public·int·describeContents()·{ | 18 | ····public·int·describeContents()·{ |
Offset 37, 23 lines modified | Offset 35, 15 lines modified | ||
37 | ················if·(parcel.dataPosition()·-·dataPosition·<·int1)·{ | 35 | ················if·(parcel.dataPosition()·-·dataPosition·<·int1)·{ |
38 | ····················this.cluster·=·parcel.readString(); | 36 | ····················this.cluster·=·parcel.readString(); |
39 | ····················if·(parcel.dataPosition()·-·dataPosition·<·int1)·{ | 37 | ····················if·(parcel.dataPosition()·-·dataPosition·<·int1)·{ |
40 | ························this.dnsAddresses·=·(Blob[])parcel.createTypedArray(Blob.CREATOR); | 38 | ························this.dnsAddresses·=·(Blob[])parcel.createTypedArray(Blob.CREATOR); |
41 | ························if·(parcel.dataPosition()·-·dataPosition·<·int1)·{ | 39 | ························if·(parcel.dataPosition()·-·dataPosition·<·int1)·{ |
42 | ····························this.mtu·=·parcel.readInt(); | 40 | ····························this.mtu·=·parcel.readInt(); |
43 | ····························if·(parcel.dataPosition()·-·dataPosition·<·int1)·{ | 41 | ····························if·(parcel.dataPosition()·-·dataPosition·<·int1)·{ |
44 | ································ | 42 | ································return; |
45 | ····································this.ipv6ProvisioningLossQuirk·=·(IPv6ProvisioningLossQuirkParcelable)IPv6ProvisioningLossQuirkParcelable.CREATOR.createFromParcel(parcel); | ||
46 | ································} | ||
47 | ································else·{ | ||
48 | ····································this.ipv6ProvisioningLossQuirk·=·null; | ||
49 | ································} | ||
50 | ································if·(parcel.dataPosition()·-·dataPosition·<·int1)·{ | ||
51 | ····································return; | ||
52 | ································} | ||
53 | ····························} | 43 | ····························} |
54 | ························} | 44 | ························} |
55 | ····················} | 45 | ····················} |
56 | ················} | 46 | ················} |
57 | ············} | 47 | ············} |
58 | ········} | 48 | ········} |
59 | ········finally·{ | 49 | ········finally·{ |
Offset 65, 21 lines modified | Offset 55, 14 lines modified | ||
65 | ········dataPosition·=·parcel.dataPosition(); | 55 | ········dataPosition·=·parcel.dataPosition(); |
66 | ········parcel.writeInt(0); | 56 | ········parcel.writeInt(0); |
67 | ········parcel.writeByteArray(this.assignedV4Address); | 57 | ········parcel.writeByteArray(this.assignedV4Address); |
68 | ········parcel.writeLong(this.assignedV4AddressExpiry); | 58 | ········parcel.writeLong(this.assignedV4AddressExpiry); |
69 | ········parcel.writeString(this.cluster); | 59 | ········parcel.writeString(this.cluster); |
70 | ········parcel.writeTypedArray((Parcelable[])this.dnsAddresses,·0); | 60 | ········parcel.writeTypedArray((Parcelable[])this.dnsAddresses,·0); |
71 | ········parcel.writeInt(this.mtu); | 61 | ········parcel.writeInt(this.mtu); |
72 | ········if·(this.ipv6ProvisioningLossQuirk·!=·null)·{ | ||
73 | ············parcel.writeInt(1); | ||
74 | ············this.ipv6ProvisioningLossQuirk.writeToParcel(parcel,·0); | ||
75 | ········} | ||
76 | ········else·{ | ||
77 | ············parcel.writeInt(0); | ||
78 | ········} | ||
79 | ········final·int·dataPosition2·=·parcel.dataPosition(); | 62 | ········final·int·dataPosition2·=·parcel.dataPosition(); |
80 | ········parcel.setDataPosition(dataPosition); | 63 | ········parcel.setDataPosition(dataPosition); |
81 | ········dataPosition·=·dataPosition2·-·dataPosition; | 64 | ········dataPosition·=·dataPosition2·-·dataPosition; |
82 | ········parcel.writeInt(dataPosition); | 65 | ········parcel.writeInt(dataPosition); |
83 | ········parcel.setDataPosition(dataPosition2); | 66 | ········parcel.setDataPosition(dataPosition2); |
84 | ····} | 67 | ····} |
85 | } | 68 | } |
Offset 46, 15 lines modified | Offset 46, 15 lines modified | ||
46 | ········this.addState((State)this.mDisabledState,·(State)activeModeWarden$WifiController$DefaultState); | 46 | ········this.addState((State)this.mDisabledState,·(State)activeModeWarden$WifiController$DefaultState); |
47 | ········this.addState((State)this.mEnabledState,·(State)activeModeWarden$WifiController$DefaultState); | 47 | ········this.addState((State)this.mEnabledState,·(State)activeModeWarden$WifiController$DefaultState); |
48 | ········this.setLogRecSize(100); | 48 | ········this.setLogRecSize(100); |
49 | ········this.setLogOnlyTransitions(false); | 49 | ········this.setLogOnlyTransitions(false); |
50 | ····} | 50 | ····} |
51 | ···· | 51 | ···· |
52 | ····private·int·readWifiRecoveryDelay()·{ | 52 | ····private·int·readWifiRecoveryDelay()·{ |
53 | ········int·integer·=·ActiveModeWarden.access$1100(this.this$0).getResources().getInteger(213103416 | 53 | ········int·integer·=·ActiveModeWarden.access$1100(this.this$0).getResources().getInteger(2131034162); |
54 | ········final·int·n·=·4000; | 54 | ········final·int·n·=·4000; |
55 | ········if·(integer·>·n)·{ | 55 | ········if·(integer·>·n)·{ |
56 | ············Log.w("WifiController",·"Overriding·timeout·delay·with·maximum·limit·value"); | 56 | ············Log.w("WifiController",·"Overriding·timeout·delay·with·maximum·limit·value"); |
57 | ············integer·=·n; | 57 | ············integer·=·n; |
58 | ········} | 58 | ········} |
59 | ········return·integer; | 59 | ········return·integer; |
60 | ····} | 60 | ····} |
Offset 245, 15 lines modified | Offset 245, 14 lines modified | ||
245 | ····private·long·mLastConnectAttemptTimestamp; | 245 | ····private·long·mLastConnectAttemptTimestamp; |
246 | ····private·long·mLastDriverRoamAttempt; | 246 | ····private·long·mLastDriverRoamAttempt; |
247 | ····private·Pair·mLastL2KeyAndGroupHint; | 247 | ····private·Pair·mLastL2KeyAndGroupHint; |
248 | ····private·WifiLinkLayerStats·mLastLinkLayerStats; | 248 | ····private·WifiLinkLayerStats·mLastLinkLayerStats; |
249 | ····private·long·mLastLinkLayerStatsUpdate; | 249 | ····private·long·mLastLinkLayerStatsUpdate; |
250 | ····private·int·mLastNetworkId; | 250 | ····private·int·mLastNetworkId; |
251 | ····private·long·mLastOntimeReportTimeStamp; | 251 | ····private·long·mLastOntimeReportTimeStamp; |
252 | ····private·int·mLastScanRssi; | ||
253 | ····private·long·mLastScreenStateChangeTimeStamp; | 252 | ····private·long·mLastScreenStateChangeTimeStamp; |
254 | ····private·int·mLastSignalLevel; | 253 | ····private·int·mLastSignalLevel; |
255 | ····private·String·mLastSimBasedConnectionCarrierName; | 254 | ····private·String·mLastSimBasedConnectionCarrierName; |
256 | ····private·int·mLastStatusDataStall; | 255 | ····private·int·mLastStatusDataStall; |
257 | ····private·int·mLastSubId; | 256 | ····private·int·mLastSubId; |
258 | ····private·final·LinkProbeManager·mLinkProbeManager; | 257 | ····private·final·LinkProbeManager·mLinkProbeManager; |
259 | ····private·LinkProperties·mLinkProperties; | 258 | ····private·LinkProperties·mLinkProperties; |
Offset 336, 15 lines modified | Offset 335, 14 lines modified | ||
336 | ········this.mVerboseLoggingEnabled·=·false; | 335 | ········this.mVerboseLoggingEnabled·=·false; |
337 | ········this.mDidBlackListBSSID·=·false; | 336 | ········this.mDidBlackListBSSID·=·false; |
338 | ········this.mP2pConnected·=·new·AtomicBoolean(false); | 337 | ········this.mP2pConnected·=·new·AtomicBoolean(false); |
339 | ········this.mTemporarilyDisconnectWifi·=·false; | 338 | ········this.mTemporarilyDisconnectWifi·=·false; |
340 | ········this.mScreenOn·=·false; | 339 | ········this.mScreenOn·=·false; |
341 | ········final·int·n·=·-1; | 340 | ········final·int·n·=·-1; |
342 | ········this.mLastSignalLevel·=·n; | 341 | ········this.mLastSignalLevel·=·n; |
343 | ········this.mLastScanRssi·=·-127; | ||
344 | ········final·int·mIpReachabilityDisconnectEnabled·=·1; | 342 | ········final·int·mIpReachabilityDisconnectEnabled·=·1; |
345 | ········this.mIpReachabilityDisconnectEnabled·=·(mIpReachabilityDisconnectEnabled·!=·0); | 343 | ········this.mIpReachabilityDisconnectEnabled·=·(mIpReachabilityDisconnectEnabled·!=·0); |
346 | ········this.mEnableRssiPolling·=·false; | 344 | ········this.mEnableRssiPolling·=·false; |
347 | ········this.mPollRssiIntervalMsecs·=·n; | 345 | ········this.mPollRssiIntervalMsecs·=·n; |
348 | ········this.mRssiPollToken·=·0; | 346 | ········this.mRssiPollToken·=·0; |
349 | ········this.mOperationalMode·=·4; | 347 | ········this.mOperationalMode·=·4; |
350 | ········this.mModeChange·=·false; | 348 | ········this.mModeChange·=·false; |
Offset 509, 18 lines modified | Offset 507, 18 lines modified | ||
509 | ········} | 507 | ········} |
510 | ········return·true; | 508 | ········return·true; |
511 | ····} | 509 | ····} |
512 | ···· | 510 | ···· |
513 | ····private·void·cleanWifiScore()·{ | 511 | ····private·void·cleanWifiScore()·{ |
514 | ········final·ExtendedWifiInfo·mWifiInfo·=·this.mWifiInfo; | 512 | ········final·ExtendedWifiInfo·mWifiInfo·=·this.mWifiInfo; |
515 | ········final·double·n·=·0.0; | 513 | ········final·double·n·=·0.0; |
516 | ········ | 514 | ········mWifiInfo.setLostTxPacketsPerSecond(n); |
517 | ········ | 515 | ········this.mWifiInfo.setSuccessfulTxPacketsPerSecond(n); |
518 | ········ | 516 | ········this.mWifiInfo.setRetriedTxPacketsRate(n); |
519 | ········ | 517 | ········this.mWifiInfo.setSuccessfulRxPacketsPerSecond(n); |
520 | ········this.mWifiScoreReport.reset(); | 518 | ········this.mWifiScoreReport.reset(); |
521 | ········this.mLastLinkLayerStats·=·null; | 519 | ········this.mLastLinkLayerStats·=·null; |
522 | ····} | 520 | ····} |
523 | ···· | 521 | ···· |
524 | ····private·void·clearLinkProperties()·{ | 522 | ····private·void·clearLinkProperties()·{ |
525 | ········Object·o·=·this.mDhcpResultsParcelableLock; | 523 | ········Object·o·=·this.mDhcpResultsParcelableLock; |
526 | ········synchronized·(o)·{ | 524 | ········synchronized·(o)·{ |
Offset 713, 35 lines modified | Offset 711, 35 lines modified | ||
713 | ············if·(currentRssiDbm·>·129)·{ | 711 | ············if·(currentRssiDbm·>·129)·{ |
714 | ················final·StringBuilder·sb2·=·new·StringBuilder(); | 712 | ················final·StringBuilder·sb2·=·new·StringBuilder(); |
715 | ················sb2.append("Error!·+ve·value·RSSI:·"); | 713 | ················sb2.append("Error!·+ve·value·RSSI:·"); |
716 | ················sb2.append(currentRssiDbm); | 714 | ················sb2.append(currentRssiDbm); |
717 | ················Log.wtf("WifiClientModeImpl",·sb2.toString()); | 715 | ················Log.wtf("WifiClientModeImpl",·sb2.toString()); |
718 | ················currentRssiDbm·-=·256; | 716 | ················currentRssiDbm·-=·256; |
719 | ············} | 717 | ············} |
720 | ············ | 718 | ············this.mWifiInfo.setRssi(currentRssiDbm); |
721 | ············final·int·calculateSignalLevel·=·RssiUtil.calculateSignalLevel(this.mContext,·currentRssiDbm); | 719 | ············final·int·calculateSignalLevel·=·RssiUtil.calculateSignalLevel(this.mContext,·currentRssiDbm); |
722 | ············if·(calculateSignalLevel·!=·this.mLastSignalLevel)·{ | 720 | ············if·(calculateSignalLevel·!=·this.mLastSignalLevel)·{ |
723 | ················this.updateCapabilities(); | 721 | ················this.updateCapabilities(); |
724 | ················this.sendRssiChangeBroadcast(currentRssiDbm); | 722 | ················this.sendRssiChangeBroadcast(currentRssiDbm); |
725 | ············} | 723 | ············} |
726 | ············this.mLastSignalLevel·=·calculateSignalLevel; | 724 | ············this.mLastSignalLevel·=·calculateSignalLevel; |
727 | ········} | 725 | ········} |
728 | ········else·{ | 726 | ········else·{ |
729 | ············ | 727 | ············this.mWifiInfo.setRssi(rssi); |
730 | ············this.updateCapabilities(); | 728 | ············this.updateCapabilities(); |
731 | ········} | 729 | ········} |
732 | ········if·(txBitrateMbps·>·0)·{ | 730 | ········if·(txBitrateMbps·>·0)·{ |
733 | ············ | 731 | ············this.mWifiInfo.setLinkSpeed(txBitrateMbps); |
734 | ············ | 732 | ············this.mWifiInfo.setTxLinkSpeedMbps(txBitrateMbps); |
735 | ········} | 733 | ········} |
736 | ········if·(rxBitrateMbps·>·0)·{ | 734 | ········if·(rxBitrateMbps·>·0)·{ |
737 | ············ | 735 | ············this.mWifiInfo.setRxLinkSpeedMbps(rxBitrateMbps); |
738 | ········} | 736 | ········} |
739 | ········if·(associationFrequencyMHz·>·0)·{ | 737 | ········if·(associationFrequencyMHz·>·0)·{ |
740 | ············ | 738 | ············this.mWifiInfo.setFrequency(associationFrequencyMHz); |
741 | ········} | 739 | ········} |
742 | ········this.mWifiConfigManager.updateScanDetailCacheFromWifiInfo((WifiInfo)this.mWifiInfo); | 740 | ········this.mWifiConfigManager.updateScanDetailCacheFromWifiInfo((WifiInfo)this.mWifiInfo); |
743 | ········this.mWifiMetrics.handlePollResult((WifiInfo)this.mWifiInfo); | 741 | ········this.mWifiMetrics.handlePollResult((WifiInfo)this.mWifiInfo); |
744 | ····} | 742 | ····} |
745 | ···· | 743 | ···· |
746 | ····private·void·getAdditionalWifiServiceInterfaces()·{ | 744 | ····private·void·getAdditionalWifiServiceInterfaces()·{ |
747 | ········if·(this.mP2pSupported)·{ | 745 | ········if·(this.mP2pSupported)·{ |
Offset 754, 15 lines modified | Offset 752, 15 lines modified | ||
754 | ···· | 752 | ···· |
755 | ····private·NetworkCapabilities·getCapabilities(final·WifiConfiguration·wifiConfiguration)·{ | 753 | ····private·NetworkCapabilities·getCapabilities(final·WifiConfiguration·wifiConfiguration)·{ |
756 | ········final·NetworkCapabilities$Builder·networkCapabilities$Builder·=·new·NetworkCapabilities$Builder(this.mNetworkCapabilitiesFilter); | 754 | ········final·NetworkCapabilities$Builder·networkCapabilities$Builder·=·new·NetworkCapabilities$Builder(this.mNetworkCapabilitiesFilter); |
757 | ········networkCapabilities$Builder.setNetworkSpecifier((NetworkSpecifier)null); | 755 | ········networkCapabilities$Builder.setNetworkSpecifier((NetworkSpecifier)null); |
758 | ········if·(wifiConfiguration·==·null)·{ | 756 | ········if·(wifiConfiguration·==·null)·{ |
759 | ············return·networkCapabilities$Builder.build(); | 757 | ············return·networkCapabilities$Builder.build(); |
760 | ········} | 758 | ········} |
761 | ········final·boolean·trusted·=· | 759 | ········final·boolean·trusted·=·this.mWifiInfo.isTrusted(); |
762 | ········final·int·n·=·14; | 760 | ········final·int·n·=·14; |
763 | ········if·(trusted)·{ | 761 | ········if·(trusted)·{ |
764 | ············networkCapabilities$Builder.addCapability(n); | 762 | ············networkCapabilities$Builder.addCapability(n); |
765 | ········} | 763 | ········} |
766 | ········else·{ | 764 | ········else·{ |
767 | ············networkCapabilities$Builder.removeCapability(n); | 765 | ············networkCapabilities$Builder.removeCapability(n); |
768 | ········} | 766 | ········} |
Offset 1019, 47 lines modified | Offset 1017, 47 lines modified | ||
1019 | ····················((StringBuilder)o).append(this.mWifiInfo); | 1017 | ····················((StringBuilder)o).append(this.mWifiInfo); |
1020 | ····················((StringBuilder)o).append("·got:·"); | 1018 | ····················((StringBuilder)o).append("·got:·"); |
1021 | ····················((StringBuilder)o).append(inetAddress); | 1019 | ····················((StringBuilder)o).append(inetAddress); |
1022 | ····················o·=·((StringBuilder)o).toString(); | 1020 | ····················o·=·((StringBuilder)o).toString(); |
1023 | ····················this.logd((String)o); | 1021 | ····················this.logd((String)o); |
1024 | ················} | 1022 | ················} |
1025 | ············} | 1023 | ············} |
1026 | ············ | 1024 | ············this.mWifiInfo.setInetAddress((InetAddress)inetAddress); |
1027 | ············o·=·this.getCurrentWifiConfiguration(); | 1025 | ············o·=·this.getCurrentWifiConfiguration(); |
1028 | ············if·(o·!=·null)·{ | 1026 | ············if·(o·!=·null)·{ |
1029 | ················ | 1027 | ················this.mWifiInfo.setEphemeral(((WifiConfiguration)o).ephemeral); |
1030 | ················ | 1028 | ················this.mWifiInfo.setTrusted(((WifiConfiguration)o).trusted); |
1031 | ················this.mWifiConfigManager.updateRandomizedMacExpireTime((WifiConfiguration)o,·(long)mDhcpResultsParcelable.leaseDuration); | 1029 | ················this.mWifiConfigManager.updateRandomizedMacExpireTime((WifiConfiguration)o,·(long)mDhcpResultsParcelable.leaseDuration); |
1032 | ················this.mBssidBlocklistMonitor.handleDhcpProvisioningSuccess(this.mLastBssid,·((WifiInfo)this.mWifiInfo).getSSID()); | 1030 | ················this.mBssidBlocklistMonitor.handleDhcpProvisioningSuccess(this.mLastBssid,·((WifiInfo)this.mWifiInfo).getSSID()); |
1033 | ············} | 1031 | ············} |
1034 | ············final·String·vendorInfo·=·mDhcpResultsParcelable.vendorInfo; | 1032 | ············final·String·vendorInfo·=·mDhcpResultsParcelable.vendorInfo; |
1035 | ············if·(vendorInfo·!=·null·&&·vendorInfo.contains("ANDROID_METERED"))·{ | 1033 | ············if·(vendorInfo·!=·null·&&·vendorInfo.contains("ANDROID_METERED"))·{ |
1036 | ················final·ExtendedWifiInfo·mWifiInfo·=·this.mWifiInfo; | 1034 | ················final·ExtendedWifiInfo·mWifiInfo·=·this.mWifiInfo; |
1037 | ················final·boolean·meteredHint·=·true; | 1035 | ················final·boolean·meteredHint·=·true; |
1038 | ················ | 1036 | ················mWifiInfo.setMeteredHint(meteredHint); |
1039 | ················this.mWifiMetrics.addMeteredStat((WifiConfiguration)o,·meteredHint); | 1037 | ················this.mWifiMetrics.addMeteredStat((WifiConfiguration)o,·meteredHint); |
1040 | ············} | 1038 | ············} |
1041 | ············else·{ | 1039 | ············else·{ |
1042 | ················this.mWifiMetrics.addMeteredStat((WifiConfiguration)o,·false); | 1040 | ················this.mWifiMetrics.addMeteredStat((WifiConfiguration)o,·false); |
... Open expanded diff ... |
Offset 516, 16 lines modified | Offset 516, 15 lines modified | ||
516 | ········final·WifiNetworkSuggestion·wns·=·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.wns; | 516 | ········final·WifiNetworkSuggestion·wns·=·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.wns; |
517 | ········final·String·s·=·"NetworkSuggestion"; | 517 | ········final·String·s·=·"NetworkSuggestion"; |
518 | ········XmlUtil.writeNextSectionStart(xmlSerializer,·s); | 518 | ········XmlUtil.writeNextSectionStart(xmlSerializer,·s); |
519 | ········final·String·s2·=·"WifiConfiguration"; | 519 | ········final·String·s2·=·"WifiConfiguration"; |
520 | ········XmlUtil.writeNextSectionStart(xmlSerializer,·s2); | 520 | ········XmlUtil.writeNextSectionStart(xmlSerializer,·s2); |
521 | ········XmlUtil$WifiConfigurationXmlUtil.writeToXmlForConfigStore(xmlSerializer,·wns.wifiConfiguration,·wifiConfigStoreEncryptionUtil); | 521 | ········XmlUtil$WifiConfigurationXmlUtil.writeToXmlForConfigStore(xmlSerializer,·wns.wifiConfiguration,·wifiConfigStoreEncryptionUtil); |
522 | ········XmlUtil.writeNextSectionEnd(xmlSerializer,·s2); | 522 | ········XmlUtil.writeNextSectionEnd(xmlSerializer,·s2); |
523 | ········f | 523 | ········if·(wns.wifiConfiguration.enterpriseConfig·!=·null·&&·wns.wifiConfiguration.enterpriseConfig.getEapMethod()·!=·-1)·{ |
524 | ········if·(enterpriseConfig·!=·null·&&·enterpriseConfig.getEapMethod()·!=·-1)·{ | ||
525 | ············final·String·s3·=·"WifiEnterpriseConfiguration"; | 524 | ············final·String·s3·=·"WifiEnterpriseConfiguration"; |
526 | ············XmlUtil.writeNextSectionStart(xmlSerializer,·s3); | 525 | ············XmlUtil.writeNextSectionStart(xmlSerializer,·s3); |
527 | ············XmlUtil$WifiEnterpriseConfigXmlUtil.writeToXml(xmlSerializer,·wns.wifiConfiguration.enterpriseConfig,·wifiConfigStoreEncryptionUtil); | 526 | ············XmlUtil$WifiEnterpriseConfigXmlUtil.writeToXml(xmlSerializer,·wns.wifiConfiguration.enterpriseConfig,·wifiConfigStoreEncryptionUtil); |
528 | ············XmlUtil.writeNextSectionEnd(xmlSerializer,·s3); | 527 | ············XmlUtil.writeNextSectionEnd(xmlSerializer,·s3); |
529 | ········} | 528 | ········} |
530 | ········if·(wns.passpointConfiguration·!=·null)·{ | 529 | ········if·(wns.passpointConfiguration·!=·null)·{ |
531 | ············final·String·s4·=·"PasspointConfiguration"; | 530 | ············final·String·s4·=·"PasspointConfiguration"; |
Offset 5, 15 lines modified | Offset 5, 14 lines modified | ||
5 | import·com.android.wifi.x.com.android.internal.util.State; | 5 | import·com.android.wifi.x.com.android.internal.util.State; |
6 | import·com.android.wifi.x.com.android.internal.util.StateMachine; | 6 | import·com.android.wifi.x.com.android.internal.util.StateMachine; |
7 | class·SoftApManager$SoftApStateMachine·extends·StateMachine | 7 | class·SoftApManager$SoftApStateMachine·extends·StateMachine |
8 | { | 8 | { |
9 | ····public·static·final·int·CMD_ASSOCIATED_STATIONS_CHANGED·=·4; | 9 | ····public·static·final·int·CMD_ASSOCIATED_STATIONS_CHANGED·=·4; |
10 | ····public·static·final·int·CMD_FAILURE·=·2; | 10 | ····public·static·final·int·CMD_FAILURE·=·2; |
11 | ····public·static·final·int·CMD_FORCE_DISCONNECT_PENDING_CLIENTS·=·12; | ||
12 | ····public·static·final·int·CMD_INTERFACE_DESTROYED·=·7; | 11 | ····public·static·final·int·CMD_INTERFACE_DESTROYED·=·7; |
13 | ····public·static·final·int·CMD_INTERFACE_DOWN·=·8; | 12 | ····public·static·final·int·CMD_INTERFACE_DOWN·=·8; |
14 | ····public·static·final·int·CMD_INTERFACE_STATUS_CHANGED·=·3; | 13 | ····public·static·final·int·CMD_INTERFACE_STATUS_CHANGED·=·3; |
15 | ····public·static·final·int·CMD_NO_ASSOCIATED_STATIONS_TIMEOUT·=·5; | 14 | ····public·static·final·int·CMD_NO_ASSOCIATED_STATIONS_TIMEOUT·=·5; |
16 | ····public·static·final·int·CMD_SOFT_AP_CHANNEL_SWITCHED·=·9; | 15 | ····public·static·final·int·CMD_SOFT_AP_CHANNEL_SWITCHED·=·9; |
17 | ····public·static·final·int·CMD_START·=·0; | 16 | ····public·static·final·int·CMD_START·=·0; |
18 | ····public·static·final·int·CMD_STOP·=·1; | 17 | ····public·static·final·int·CMD_STOP·=·1; |
Offset 12, 36 lines modified | Offset 12, 32 lines modified | ||
12 | import·com.android.server.wifi.util.ApConfigUtil; | 12 | import·com.android.server.wifi.util.ApConfigUtil; |
13 | import·android.net.wifi.SoftApConfiguration$Builder; | 13 | import·android.net.wifi.SoftApConfiguration$Builder; |
14 | import·android.net.MacAddress; | 14 | import·android.net.MacAddress; |
15 | import·java.util.Locale; | 15 | import·java.util.Locale; |
16 | import·android.text.TextUtils; | 16 | import·android.text.TextUtils; |
17 | import·com.android.wifi.x.com.android.internal.util.IState; | 17 | import·com.android.wifi.x.com.android.internal.util.IState; |
18 | import·java.util.Iterator; | 18 | import·java.util.Iterator; |
19 | import·android.os.Handler; | ||
20 | import·android.util.Log; | 19 | import·android.util.Log; |
21 | import·android.net.wifi.WifiClient; | 20 | import·android.net.wifi.WifiClient; |
22 | import·android.net.wifi.SoftApConfiguration; | 21 | import·android.net.wifi.SoftApConfiguration; |
23 | import·java.util.Collection; | 22 | import·java.util.Collection; |
24 | import·android.content.Context; | 23 | import·android.content.Context; |
25 | import·java.util.HashSet; | 24 | import·java.util.HashSet; |
26 | import·java.util.HashMap; | ||
27 | import·java.util.ArrayList; | 25 | import·java.util.ArrayList; |
28 | import·android.os.Looper; | 26 | import·android.os.Looper; |
29 | import·android.net.wifi.WifiManager$SoftApCallback; | 27 | import·android.net.wifi.WifiManager$SoftApCallback; |
30 | import·java.util.Map; | ||
31 | import·android.net.wifi.SoftApInfo; | 28 | import·android.net.wifi.SoftApInfo; |
32 | import·android.net.wifi.SoftApCapability; | 29 | import·android.net.wifi.SoftApCapability; |
33 | import·java.util.List; | 30 | import·java.util.List; |
34 | import·java.util.Set; | 31 | import·java.util.Set; |
35 | import·java.text.SimpleDateFormat; | 32 | import·java.text.SimpleDateFormat; |
36 | public·class·SoftApManager·implements·ActiveModeManager | 33 | public·class·SoftApManager·implements·ActiveModeManager |
37 | { | 34 | { |
38 | ····private·static·final·SimpleDateFormat·FORMATTER; | 35 | ····private·static·final·SimpleDateFormat·FORMATTER; |
39 | ····static·final·long·SOFT_AP_PENDING_DISCONNECTION_CHECK_DELAY_MS·=·1000L; | ||
40 | ····public·static·final·String·SOFT_AP_SEND_MESSAGE_TIMEOUT_TAG·=·"SoftApManager·Soft·AP·Send·Message·Timeout"; | 36 | ····public·static·final·String·SOFT_AP_SEND_MESSAGE_TIMEOUT_TAG·=·"SoftApManager·Soft·AP·Send·Message·Timeout"; |
41 | ····private·static·final·String·TAG·=·"SoftApManager"; | 37 | ····private·static·final·String·TAG·=·"SoftApManager"; |
42 | ····private·Set·mAllowedClientList; | 38 | ····private·Set·mAllowedClientList; |
43 | ····private·SoftApModeConfiguration·mApConfig; | 39 | ····private·SoftApModeConfiguration·mApConfig; |
44 | ····private·String·mApInterfaceName; | 40 | ····private·String·mApInterfaceName; |
45 | ····private·Set·mBlockedClientList; | 41 | ····private·Set·mBlockedClientList; |
46 | ····private·List·mConnectedClients; | 42 | ····private·List·mConnectedClients; |
Offset 52, 15 lines modified | Offset 48, 14 lines modified | ||
52 | ····private·long·mDefaultShutDownTimeoutMills; | 48 | ····private·long·mDefaultShutDownTimeoutMills; |
53 | ····private·boolean·mEverReportMetricsForMaxClient; | 49 | ····private·boolean·mEverReportMetricsForMaxClient; |
54 | ····private·final·FrameworkFacade·mFrameworkFacade; | 50 | ····private·final·FrameworkFacade·mFrameworkFacade; |
55 | ····private·boolean·mIfaceIsDestroyed; | 51 | ····private·boolean·mIfaceIsDestroyed; |
56 | ····private·boolean·mIfaceIsUp; | 52 | ····private·boolean·mIfaceIsUp; |
57 | ····private·boolean·mIsRandomizeBssid; | 53 | ····private·boolean·mIsRandomizeBssid; |
58 | ····private·final·ActiveModeManager$Listener·mModeListener; | 54 | ····private·final·ActiveModeManager$Listener·mModeListener; |
59 | ····Map·mPendingDisconnectClients; | ||
60 | ····private·int·mRole; | 55 | ····private·int·mRole; |
61 | ····private·final·SarManager·mSarManager; | 56 | ····private·final·SarManager·mSarManager; |
62 | ····private·final·WifiManager$SoftApCallback·mSoftApCallback; | 57 | ····private·final·WifiManager$SoftApCallback·mSoftApCallback; |
63 | ····private·final·WifiNative$SoftApListener·mSoftApListener; | 58 | ····private·final·WifiNative$SoftApListener·mSoftApListener; |
64 | ····SoftApNotifier·mSoftApNotifier; | 59 | ····SoftApNotifier·mSoftApNotifier; |
65 | ····private·String·mStartTimestamp; | 60 | ····private·String·mStartTimestamp; |
66 | ····private·final·SoftApManager$SoftApStateMachine·mStateMachine; | 61 | ····private·final·SoftApManager$SoftApStateMachine·mStateMachine; |
Offset 74, 15 lines modified | Offset 69, 14 lines modified | ||
74 | ····static·{ | 69 | ····static·{ |
75 | ········FORMATTER·=·new·SimpleDateFormat("MM-dd·HH:mm:ss.SSS"); | 70 | ········FORMATTER·=·new·SimpleDateFormat("MM-dd·HH:mm:ss.SSS"); |
76 | ····} | 71 | ····} |
77 | ···· | 72 | ···· |
78 | ····public·SoftApManager(final·WifiContext·mContext,·final·Looper·looper,·final·FrameworkFacade·mFrameworkFacade,·final·WifiNative·mWifiNative,·final·String·mCountryCode,·final·ActiveModeManager$Listener·mModeListener,·final·WifiManager$SoftApCallback·mSoftApCallback,·final·WifiApConfigStore·mWifiApConfigStore,·final·SoftApModeConfiguration·softApModeConfiguration,·final·WifiMetrics·mWifiMetrics,·final·SarManager·mSarManager,·final·BaseWifiDiagnostics·mWifiDiagnostics)·{ | 73 | ····public·SoftApManager(final·WifiContext·mContext,·final·Looper·looper,·final·FrameworkFacade·mFrameworkFacade,·final·WifiNative·mWifiNative,·final·String·mCountryCode,·final·ActiveModeManager$Listener·mModeListener,·final·WifiManager$SoftApCallback·mSoftApCallback,·final·WifiApConfigStore·mWifiApConfigStore,·final·SoftApModeConfiguration·softApModeConfiguration,·final·WifiMetrics·mWifiMetrics,·final·SarManager·mSarManager,·final·BaseWifiDiagnostics·mWifiDiagnostics)·{ |
79 | ········this.mCurrentSoftApInfo·=·new·SoftApInfo(); | 74 | ········this.mCurrentSoftApInfo·=·new·SoftApInfo(); |
80 | ········this.mConnectedClients·=·new·ArrayList(); | 75 | ········this.mConnectedClients·=·new·ArrayList(); |
81 | ········this.mPendingDisconnectClients·=·new·HashMap(); | ||
82 | ········boolean·mIsRandomizeBssid·=·false; | 76 | ········boolean·mIsRandomizeBssid·=·false; |
83 | ········this.mTimeoutEnabled·=·false; | 77 | ········this.mTimeoutEnabled·=·false; |
84 | ········final·int·n·=·-1; | 78 | ········final·int·n·=·-1; |
85 | ········this.mRole·=·n; | 79 | ········this.mRole·=·n; |
86 | ········this.mTargetRole·=·n; | 80 | ········this.mTargetRole·=·n; |
87 | ········this.mEverReportMetricsForMaxClient·=·false; | 81 | ········this.mEverReportMetricsForMaxClient·=·false; |
88 | ········this.mBlockedClientList·=·new·HashSet(); | 82 | ········this.mBlockedClientList·=·new·HashSet(); |
Offset 114, 28 lines modified | Offset 108, 15 lines modified | ||
114 | ········this.mWifiDiagnostics·=·mWifiDiagnostics; | 108 | ········this.mWifiDiagnostics·=·mWifiDiagnostics; |
115 | ········this.mStateMachine·=·new·SoftApManager$SoftApStateMachine(this,·looper); | 109 | ········this.mStateMachine·=·new·SoftApManager$SoftApStateMachine(this,·looper); |
116 | ········if·(softApConfiguration·!=·null)·{ | 110 | ········if·(softApConfiguration·!=·null)·{ |
117 | ············this.mBlockedClientList·=·new·HashSet(softApConfiguration.getBlockedClientList()); | 111 | ············this.mBlockedClientList·=·new·HashSet(softApConfiguration.getBlockedClientList()); |
118 | ············this.mAllowedClientList·=·new·HashSet(softApConfiguration.getAllowedClientList()); | 112 | ············this.mAllowedClientList·=·new·HashSet(softApConfiguration.getAllowedClientList()); |
119 | ············this.mTimeoutEnabled·=·softApConfiguration.isAutoShutdownEnabled(); | 113 | ············this.mTimeoutEnabled·=·softApConfiguration.isAutoShutdownEnabled(); |
120 | ········} | 114 | ········} |
121 | ········this.mDefaultShutDownTimeoutMills·=·this.mContext.getResources().getInteger(213103414 | 115 | ········this.mDefaultShutDownTimeoutMills·=·this.mContext.getResources().getInteger(2131034144); |
122 | ····} | ||
123 | ···· | ||
124 | ····private·void·addClientToPendingDisconnectionList(final·WifiClient·wifiClient,·int·n)·{ | ||
125 | ········final·StringBuilder·sb·=·new·StringBuilder(); | ||
126 | ········sb.append("Fail·to·disconnect·client:·"); | ||
127 | ········sb.append(wifiClient.getMacAddress()); | ||
128 | ········sb.append(",·add·it·into·pending·list"); | ||
129 | ········Log.d("SoftApManager",·sb.toString()); | ||
130 | ········this.mPendingDisconnectClients.put(wifiClient,·n); | ||
131 | ········final·Handler·handler·=·((StateMachine)this.mStateMachine).getHandler(); | ||
132 | ········n·=·12; | ||
133 | ········handler.removeMessages(n); | ||
134 | ········((StateMachine)this.mStateMachine).sendMessageDelayed(n,·1000L); | ||
135 | ····} | 116 | ····} |
136 | ···· | 117 | ···· |
137 | ····private·boolean·checkSoftApClient(final·SoftApConfiguration·softApConfiguration,·final·WifiClient·wifiClient)·{ | 118 | ····private·boolean·checkSoftApClient(final·SoftApConfiguration·softApConfiguration,·final·WifiClient·wifiClient)·{ |
138 | ········final·boolean·featuresSupported·=·this.mCurrentSoftApCapability.areFeaturesSupported((long)2); | 119 | ········final·boolean·featuresSupported·=·this.mCurrentSoftApCapability.areFeaturesSupported((long)2); |
139 | ········final·int·mEverReportMetricsForMaxClient·=·1; | 120 | ········final·int·mEverReportMetricsForMaxClient·=·1; |
140 | ········if·(!featuresSupported)·{ | 121 | ········if·(!featuresSupported)·{ |
141 | ············return·mEverReportMetricsForMaxClient·!=·0; | 122 | ············return·mEverReportMetricsForMaxClient·!=·0; |
Offset 144, 42 lines modified | Offset 125, 36 lines modified | ||
144 | ········final·String·s·=·"SoftApManager"; | 125 | ········final·String·s·=·"SoftApManager"; |
145 | ········if·(contains)·{ | 126 | ········if·(contains)·{ |
146 | ············final·StringBuilder·sb·=·new·StringBuilder(); | 127 | ············final·StringBuilder·sb·=·new·StringBuilder(); |
147 | ············sb.append("Force·disconnect·for·client:·"); | 128 | ············sb.append("Force·disconnect·for·client:·"); |
148 | ············sb.append(wifiClient); | 129 | ············sb.append(wifiClient); |
149 | ············sb.append("in·blocked·list"); | 130 | ············sb.append("in·blocked·list"); |
150 | ············Log.d(s,·sb.toString()); | 131 | ············Log.d(s,·sb.toString()); |
151 | ············ | 132 | ············this.mWifiNative.forceClientDisconnect(this.mApInterfaceName,·wifiClient.getMacAddress(),·0); |
152 | ················this.addClientToPendingDisconnectionList(wifiClient,·0); | ||
153 | ············} | ||
154 | ············return·false; | 133 | ············return·false; |
155 | ········} | 134 | ········} |
156 | ········if·(softApConfiguration.isClientControlByUserEnabled()·&&·!this.mAllowedClientList.contains(wifiClient.getMacAddress()))·{ | 135 | ········if·(softApConfiguration.isClientControlByUserEnabled()·&&·!this.mAllowedClientList.contains(wifiClient.getMacAddress()))·{ |
157 | ············this.mSoftApCallback.onBlockedClientConnecting(wifiClient,·0); | 136 | ············this.mSoftApCallback.onBlockedClientConnecting(wifiClient,·0); |
158 | ············final·StringBuilder·sb2·=·new·StringBuilder(); | 137 | ············final·StringBuilder·sb2·=·new·StringBuilder(); |
159 | ············sb2.append("Force·disconnect·for·unauthorized·client:·"); | 138 | ············sb2.append("Force·disconnect·for·unauthorized·client:·"); |
160 | ············sb2.append(wifiClient); | 139 | ············sb2.append(wifiClient); |
161 | ············Log.d(s,·sb2.toString()); | 140 | ············Log.d(s,·sb2.toString()); |
162 | ············ | 141 | ············this.mWifiNative.forceClientDisconnect(this.mApInterfaceName,·wifiClient.getMacAddress(),·0); |
163 | ················this.addClientToPendingDisconnectionList(wifiClient,·0); | ||
164 | ············} | ||
165 | ············return·false; | 142 | ············return·false; |
166 | ········} | 143 | ········} |
167 | ········int·n·=·this.mCurrentSoftApCapability.getMaxSupportedClients(); | 144 | ········int·n·=·this.mCurrentSoftApCapability.getMaxSupportedClients(); |
168 | ········if·(softApConfiguration.getMaxNumberOfClients()·>·0)·{ | 145 | ········if·(softApConfiguration.getMaxNumberOfClients()·>·0)·{ |
169 | ············n·=·Math.min(n,·softApConfiguration.getMaxNumberOfClients()); | 146 | ············n·=·Math.min(n,·softApConfiguration.getMaxNumberOfClients()); |
170 | ········} | 147 | ········} |
171 | ········if·(this.mConnectedClients.size()·>=·n)·{ | 148 | ········if·(this.mConnectedClients.size()·>=·n)·{ |
172 | ············final·StringBuilder·sb3·=·new·StringBuilder(); | 149 | ············final·StringBuilder·sb3·=·new·StringBuilder(); |
... Open expanded diff ... |
Offset 498, 16 lines modified | Offset 498, 16 lines modified | ||
498 | ············this.mLastMileLogger.dump(printWriter); | 498 | ············this.mLastMileLogger.dump(printWriter); |
499 | ············printWriter.println("--------------------------------------------------------------------"); | 499 | ············printWriter.println("--------------------------------------------------------------------"); |
500 | ········} | 500 | ········} |
501 | ····} | 501 | ····} |
502 | ···· | 502 | ···· |
503 | ····public·void·enableVerboseLogging(final·boolean·b)·{ | 503 | ····public·void·enableVerboseLogging(final·boolean·b)·{ |
504 | ········synchronized·(this)·{ | 504 | ········synchronized·(this)·{ |
505 | ············int·mMaxRingBufferSizeBytes·=·this.mContext.getResources().getInteger(213103417 | 505 | ············int·mMaxRingBufferSizeBytes·=·this.mContext.getResources().getInteger(2131034171)·*·1024; |
506 | ············final·int·mMaxRingBufferSizeBytes2·=·this.mContext.getResources().getInteger(213103417 | 506 | ············final·int·mMaxRingBufferSizeBytes2·=·this.mContext.getResources().getInteger(2131034172)·*·1024; |
507 | ············if·(b)·{ | 507 | ············if·(b)·{ |
508 | ················this.mLogLevel·=·2; | 508 | ················this.mLogLevel·=·2; |
509 | ················this.mMaxRingBufferSizeBytes·=·mMaxRingBufferSizeBytes2; | 509 | ················this.mMaxRingBufferSizeBytes·=·mMaxRingBufferSizeBytes2; |
510 | ············} | 510 | ············} |
511 | ············else·{ | 511 | ············else·{ |
512 | ················this.mLogLevel·=·1; | 512 | ················this.mLogLevel·=·1; |
513 | ················if·(this.enableVerboseLoggingForDogfood())·{ | 513 | ················if·(this.enableVerboseLoggingForDogfood())·{ |
Offset 650, 15 lines modified | Offset 650, 15 lines modified | ||
650 | ················this.stopLoggingRingBuffer(this.mPerPacketRingBuffer); | 650 | ················this.stopLoggingRingBuffer(this.mPerPacketRingBuffer); |
651 | ············} | 651 | ············} |
652 | ········} | 652 | ········} |
653 | ····} | 653 | ····} |
654 | ···· | 654 | ···· |
655 | ····public·void·takeBugReport(String·name,·String·s)·{ | 655 | ····public·void·takeBugReport(String·name,·String·s)·{ |
656 | ········if·(!this.mBuildProperties.isUserBuild())·{ | 656 | ········if·(!this.mBuildProperties.isUserBuild())·{ |
657 | ············if·(this.mContext.getResources().getBoolean(213083753 | 657 | ············if·(this.mContext.getResources().getBoolean(2130837538))·{ |
658 | ················final·long·wallClockMillis·=·this.mClock.getWallClockMillis(); | 658 | ················final·long·wallClockMillis·=·this.mClock.getWallClockMillis(); |
659 | ················if·(wallClockMillis·-·this.mLastBugReportTime·<·this.mWifiInjector.getDeviceConfigFacade().getBugReportMinWindowMs()·&&·this.mLastBugReportTime·>·0L)·{ | 659 | ················if·(wallClockMillis·-·this.mLastBugReportTime·<·this.mWifiInjector.getDeviceConfigFacade().getBugReportMinWindowMs()·&&·this.mLastBugReportTime·>·0L)·{ |
660 | ····················return; | 660 | ····················return; |
661 | ················} | 661 | ················} |
662 | ················this.mLastBugReportTime·=·wallClockMillis; | 662 | ················this.mLastBugReportTime·=·wallClockMillis; |
663 | ················final·BugreportManager·bugreportManager·=·(BugreportManager)this.mContext.getSystemService((Class)BugreportManager.class); | 663 | ················final·BugreportManager·bugreportManager·=·(BugreportManager)this.mContext.getSystemService((Class)BugreportManager.class); |
664 | ················final·BugreportParams·bugreportParams·=·new·BugreportParams(0); | 664 | ················final·BugreportParams·bugreportParams·=·new·BugreportParams(0); |
Offset 1, 10 lines modified | Offset 1, 11 lines modified | ||
1 | package·com.android.server.wifi; | 1 | package·com.android.server.wifi; |
2 | import·android.util.Pair; | ||
2 | import·java.io.PrintWriter; | 3 | import·java.io.PrintWriter; |
3 | import·java.io.FileDescriptor; | 4 | import·java.io.FileDescriptor; |
4 | import·android.net.wifi.INetworkRequestUserSelectionCallback; | 5 | import·android.net.wifi.INetworkRequestUserSelectionCallback; |
5 | import·android.net.NetworkSpecifier; | 6 | import·android.net.NetworkSpecifier; |
6 | import·com.android.server.wifi.util.ScanResultUtil; | 7 | import·com.android.server.wifi.util.ScanResultUtil; |
7 | import·android.content.Intent; | 8 | import·android.content.Intent; |
8 | import·android.net.wifi.WifiScanner$ScanListener; | 9 | import·android.net.wifi.WifiScanner$ScanListener; |
Offset 24, 15 lines modified | Offset 25, 14 lines modified | ||
24 | import·android.content.pm.PackageManager; | 25 | import·android.content.pm.PackageManager; |
25 | import·android.content.pm.PackageManager$NameNotFoundException; | 26 | import·android.content.pm.PackageManager$NameNotFoundException; |
26 | import·android.content.pm.ApplicationInfo; | 27 | import·android.content.pm.ApplicationInfo; |
27 | import·android.os.UserHandle; | 28 | import·android.os.UserHandle; |
28 | import·java.util.function.Function; | 29 | import·java.util.function.Function; |
29 | import·java.util.Comparator; | 30 | import·java.util.Comparator; |
30 | import·java.util.function.Predicate; | 31 | import·java.util.function.Predicate; |
31 | import·android.util.Pair; | ||
32 | import·android.net.wifi.IActionListener; | 32 | import·android.net.wifi.IActionListener; |
33 | import·android.os.IBinder; | 33 | import·android.os.IBinder; |
34 | import·android.os.Binder; | 34 | import·android.os.Binder; |
35 | import·android.os.RemoteException; | 35 | import·android.os.RemoteException; |
36 | import·android.net.wifi.INetworkRequestMatchCallback; | 36 | import·android.net.wifi.INetworkRequestMatchCallback; |
37 | import·android.app.AlarmManager$OnAlarmListener; | 37 | import·android.app.AlarmManager$OnAlarmListener; |
38 | import·java.util.Iterator; | 38 | import·java.util.Iterator; |
Offset 317, 20 lines modified | Offset 317, 15 lines modified | ||
317 | ················sb.append(configuredNetwork.networkId); | 317 | ················sb.append(configuredNetwork.networkId); |
318 | ················Log.v(s,·sb.toString()); | 318 | ················Log.v(s,·sb.toString()); |
319 | ············} | 319 | ············} |
320 | ········} | 320 | ········} |
321 | ····} | 321 | ····} |
322 | ···· | 322 | ···· |
323 | ····private·boolean·doesScanResultMatchWifiNetworkSpecifier(final·WifiNetworkSpecifier·wifiNetworkSpecifier,·final·ScanResult·scanResult)·{ | 323 | ····private·boolean·doesScanResultMatchWifiNetworkSpecifier(final·WifiNetworkSpecifier·wifiNetworkSpecifier,·final·ScanResult·scanResult)·{ |
324 | ········if·( | 324 | ········return·wifiNetworkSpecifier.ssidPatternMatcher.match(scanResult.SSID)·&&·MacAddress.fromString(scanResult.BSSID).matches((MacAddress)wifiNetworkSpecifier.bssidPatternMatcher.first,·(MacAddress)wifiNetworkSpecifier.bssidPatternMatcher.second)·&&·ScanResultMatchInfo.fromScanResult(scanResult).networkTypeEquals(ScanResultMatchInfo.fromWifiConfiguration(wifiNetworkSpecifier.wifiConfiguration),·false); |
325 | ············return·false; | ||
326 | ········} | ||
327 | ········final·MacAddress·fromString·=·MacAddress.fromString(scanResult.BSSID); | ||
328 | ········final·Pair·bssidPatternMatcher·=·wifiNetworkSpecifier.bssidPatternMatcher; | ||
329 | ········return·fromString.matches((MacAddress)bssidPatternMatcher.first,·(MacAddress)bssidPatternMatcher.second)·&&·ScanResultMatchInfo.fromScanResult(scanResult).networkTypeEquals(ScanResultMatchInfo.fromWifiConfiguration(wifiNetworkSpecifier.wifiConfiguration),·false); | ||
330 | ····} | 325 | ····} |
331 | ···· | 326 | ···· |
332 | ····private·String·findBestBssidFromActiveMatchedScanResultsForNetwork(final·ScanResultMatchInfo·scanResultMatchInfo)·{ | 327 | ····private·String·findBestBssidFromActiveMatchedScanResultsForNetwork(final·ScanResultMatchInfo·scanResultMatchInfo)·{ |
333 | ········if·(this.mActiveSpecificNetworkRequestSpecifier·!=·null)·{ | 328 | ········if·(this.mActiveSpecificNetworkRequestSpecifier·!=·null)·{ |
334 | ············final·Map·mActiveMatchedScanResults·=·this.mActiveMatchedScanResults; | 329 | ············final·Map·mActiveMatchedScanResults·=·this.mActiveMatchedScanResults; |
335 | ············if·(mActiveMatchedScanResults·!=·null)·{ | 330 | ············if·(mActiveMatchedScanResults·!=·null)·{ |
336 | ················final·ScanResult·scanResult·=·(ScanResult)mActiveMatchedScanResults.values().stream().filter((Predicate<?·super·ScanResult>)new·-$$Lambda$WifiNetworkFactory$kgmvViUSRQFBmgULiV_K6mdrFGI(scanResultMatchInfo)).max(Comparator.comparing((Function<?·super·ScanResult,·?·extends·Comparable>)-$$Lambda$WifiNetworkFactory$uQTzBkFoCEwN-ndjhXTPHmeDMro.INSTANCE)).orElse(null); | 331 | ················final·ScanResult·scanResult·=·(ScanResult)mActiveMatchedScanResults.values().stream().filter((Predicate<?·super·ScanResult>)new·-$$Lambda$WifiNetworkFactory$kgmvViUSRQFBmgULiV_K6mdrFGI(scanResultMatchInfo)).max(Comparator.comparing((Function<?·super·ScanResult,·?·extends·Comparable>)-$$Lambda$WifiNetworkFactory$uQTzBkFoCEwN-ndjhXTPHmeDMro.INSTANCE)).orElse(null); |
Offset 798, 17 lines modified | Offset 793, 16 lines modified | ||
798 | ········if·(this.mActiveSpecificNetworkRequestSpecifier·==·null)·{ | 793 | ········if·(this.mActiveSpecificNetworkRequestSpecifier·==·null)·{ |
799 | ············return·false; | 794 | ············return·false; |
800 | ········} | 795 | ········} |
801 | ········if·(!this.isActiveRequestForSingleAccessPoint())·{ | 796 | ········if·(!this.isActiveRequestForSingleAccessPoint())·{ |
802 | ············return·false; | 797 | ············return·false; |
803 | ········} | 798 | ········} |
804 | ········final·String·path·=·this.mActiveSpecificNetworkRequestSpecifier.ssidPatternMatcher.getPath(); | 799 | ········final·String·path·=·this.mActiveSpecificNetworkRequestSpecifier.ssidPatternMatcher.getPath(); |
805 | ········final· | 800 | ········final·MacAddress·macAddress·=·(MacAddress)this.mActiveSpecificNetworkRequestSpecifier.bssidPatternMatcher.first; |
806 | ········final· | 801 | ········final·boolean·accessPointApprovedForActiveRequest·=·this.isAccessPointApprovedForActiveRequest(path,·macAddress,·ScanResultMatchInfo.fromWifiConfiguration(this.mActiveSpecificNetworkRequestSpecifier.wifiConfiguration).networkType); |
807 | ········final·boolean·accessPointApprovedForActiveRequest·=·this.isAccessPointApprovedForActiveRequest(path,·macAddress,·ScanResultMatchInfo.fromWifiConfiguration(mActiveSpecificNetworkRequestSpecifier.wifiConfiguration).networkType); | ||
808 | ········final·String·s·=·"WifiNetworkFactory"; | 802 | ········final·String·s·=·"WifiNetworkFactory"; |
809 | ········if·(accessPointApprovedForActiveRequest·&&·!this.mWifiConfigManager.isNetworkTemporarilyDisabledByUser(ScanResultUtil.createQuotedSSID(path)))·{ | 803 | ········if·(accessPointApprovedForActiveRequest·&&·!this.mWifiConfigManager.isNetworkTemporarilyDisabledByUser(ScanResultUtil.createQuotedSSID(path)))·{ |
810 | ············final·StringBuilder·sb·=·new·StringBuilder(); | 804 | ············final·StringBuilder·sb·=·new·StringBuilder(); |
811 | ············sb.append("Approved·access·point·found·in·matching·scan·results.·Triggering·connect·"); | 805 | ············sb.append("Approved·access·point·found·in·matching·scan·results.·Triggering·connect·"); |
812 | ············sb.append(path); | 806 | ············sb.append(path); |
813 | ············sb.append("/"); | 807 | ············sb.append("/"); |
814 | ············sb.append(macAddress); | 808 | ············sb.append(macAddress); |
Offset 1, 11 lines modified | Offset 1, 10 lines modified | ||
1 | package·com.android.server.wifi; | 1 | package·com.android.server.wifi; |
2 | import·android.net.wifi.WifiNetworkSuggestion; | ||
3 | import·java.util.Set; | 2 | import·java.util.Set; |
4 | import·java.util.Iterator; | 3 | import·java.util.Iterator; |
5 | import·java.util.Map; | 4 | import·java.util.Map; |
6 | class·WifiNetworkSuggestionsManager$NetworkSuggestionDataSource·implements·NetworkSuggestionStoreData$DataSource | 5 | class·WifiNetworkSuggestionsManager$NetworkSuggestionDataSource·implements·NetworkSuggestionStoreData$DataSource |
7 | { | 6 | { |
8 | ····final·/*·synthetic·*/·WifiNetworkSuggestionsManager·this$0; | 7 | ····final·/*·synthetic·*/·WifiNetworkSuggestionsManager·this$0; |
Offset 20, 20 lines modified | Offset 19, 19 lines modified | ||
20 | ········for·(final·Map.Entry<String,·V>·entry·:·map.entrySet())·{ | 19 | ········for·(final·Map.Entry<String,·V>·entry·:·map.entrySet())·{ |
21 | ············final·String·s·=·(String)entry.getKey(); | 20 | ············final·String·s·=·(String)entry.getKey(); |
22 | ············final·Set·extNetworkSuggestions·=·((WifiNetworkSuggestionsManager$PerAppInfo)entry.getValue()).extNetworkSuggestions; | 21 | ············final·Set·extNetworkSuggestions·=·((WifiNetworkSuggestionsManager$PerAppInfo)entry.getValue()).extNetworkSuggestions; |
23 | ············if·(!extNetworkSuggestions.isEmpty())·{ | 22 | ············if·(!extNetworkSuggestions.isEmpty())·{ |
24 | ················WifiNetworkSuggestionsManager.access$600(this.this$0,·s,·((WifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion)extNetworkSuggestions.iterator().next()).perAppInfo.uid); | 23 | ················WifiNetworkSuggestionsManager.access$600(this.this$0,·s,·((WifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion)extNetworkSuggestions.iterator().next()).perAppInfo.uid); |
25 | ············} | 24 | ············} |
26 | ············for·(final·WifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion·:·extNetworkSuggestions)·{ | 25 | ············for·(final·WifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion·:·extNetworkSuggestions)·{ |
27 | ················ | 26 | ················if·(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.wns.passpointConfiguration·!=·null)·{ |
28 | ················if·(wns.passpointConfiguration·!=·null)·{ | ||
29 | ····················WifiNetworkSuggestionsManager.access$700(this.this$0,·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion); | 27 | ····················WifiNetworkSuggestionsManager.access$700(this.this$0,·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion); |
30 | ················} | 28 | ················} |
31 | ················else·{ | 29 | ················else·{ |
32 | ····················if·(wns.wifiConfiguration.isMostRecentlyConnected)·{ | 30 | ····················if·(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.wns.wifiConfiguration.isMostRecentlyConnected)·{ |
33 | ························WifiNetworkSuggestionsManager.access$400(this.this$0).addNetwork(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.createInternalWifiConfiguration()); | 31 | ························WifiNetworkSuggestionsManager.access$400(this.this$0).addNetwork(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.createInternalWifiConfiguration()); |
34 | ····················} | 32 | ····················} |
35 | ····················WifiNetworkSuggestionsManager.access$800(this.this$0,·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion); | 33 | ····················WifiNetworkSuggestionsManager.access$800(this.this$0,·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion); |
36 | ················} | 34 | ················} |
37 | ············} | 35 | ············} |
38 | ········} | 36 | ········} |
39 | ········WifiNetworkSuggestionsManager.access$902(this.this$0,·true); | 37 | ········WifiNetworkSuggestionsManager.access$902(this.this$0,·true); |
Offset 51, 18 lines modified | Offset 49, 17 lines modified | ||
51 | ········WifiNetworkSuggestionsManager.access$1200(this.this$0).clear(); | 49 | ········WifiNetworkSuggestionsManager.access$1200(this.this$0).clear(); |
52 | ····} | 50 | ····} |
53 | ···· | 51 | ···· |
54 | ····public·Map·toSerialize()·{ | 52 | ····public·Map·toSerialize()·{ |
55 | ········final·Iterator<Map.Entry<K,·WifiNetworkSuggestionsManager$PerAppInfo>>·iterator·=·WifiNetworkSuggestionsManager.access$300(this.this$0).entrySet().iterator(); | 53 | ········final·Iterator<Map.Entry<K,·WifiNetworkSuggestionsManager$PerAppInfo>>·iterator·=·WifiNetworkSuggestionsManager.access$300(this.this$0).entrySet().iterator(); |
56 | ········while·(iterator.hasNext())·{ | 54 | ········while·(iterator.hasNext())·{ |
57 | ············for·(final·WifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion·:·((WifiNetworkSuggestionsManager$PerAppInfo)((Map.Entry<K,·WifiNetworkSuggestionsManager$PerAppInfo>)iterator.next()).getValue()).extNetworkSuggestions)·{ | 55 | ············for·(final·WifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion·wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion·:·((WifiNetworkSuggestionsManager$PerAppInfo)((Map.Entry<K,·WifiNetworkSuggestionsManager$PerAppInfo>)iterator.next()).getValue()).extNetworkSuggestions)·{ |
58 | ················ | 56 | ················if·(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.wns.passpointConfiguration·!=·null)·{ |
59 | ················if·(wns.passpointConfiguration·!=·null)·{ | ||
60 | ····················continue; | 57 | ····················continue; |
61 | ················} | 58 | ················} |
62 | ················wns.wifiConfiguration.isMostRecentlyConnected·=·WifiNetworkSuggestionsManager.access$400(this.this$0).isMostRecentlyConnected(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.createInternalWifiConfiguration()); | 59 | ················wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.wns.wifiConfiguration.isMostRecentlyConnected·=·WifiNetworkSuggestionsManager.access$400(this.this$0).isMostRecentlyConnected(wifiNetworkSuggestionsManager$ExtendedWifiNetworkSuggestion.createInternalWifiConfiguration()); |
63 | ············} | 60 | ············} |
64 | ········} | 61 | ········} |
65 | ········WifiNetworkSuggestionsManager.access$502(this.this$0,·false); | 62 | ········WifiNetworkSuggestionsManager.access$502(this.this$0,·false); |
66 | ········return·WifiNetworkSuggestionsManager.access$300(this.this$0); | 63 | ········return·WifiNetworkSuggestionsManager.access$300(this.this$0); |
67 | ····} | 64 | ····} |
68 | } | 65 | } |
Offset 272, 21 lines modified | Offset 272, 21 lines modified | ||
272 | ····private·long·getSupportedFeaturesInternal()·{ | 272 | ····private·long·getSupportedFeaturesInternal()·{ |
273 | ········final·AsyncChannel·mClientModeImplChannel·=·this.mClientModeImplChannel; | 273 | ········final·AsyncChannel·mClientModeImplChannel·=·this.mClientModeImplChannel; |
274 | ········if·(mClientModeImplChannel·!=·null)·{ | 274 | ········if·(mClientModeImplChannel·!=·null)·{ |
275 | ············long·syncGetSupportedFeatures·=·this.mClientModeImpl.syncGetSupportedFeatures(mClientModeImplChannel); | 275 | ············long·syncGetSupportedFeatures·=·this.mClientModeImpl.syncGetSupportedFeatures(mClientModeImplChannel); |
276 | ············if·(!this.mContext.getPackageManager().hasSystemFeature("android.hardware.wifi.rtt"))·{ | 276 | ············if·(!this.mContext.getPackageManager().hasSystemFeature("android.hardware.wifi.rtt"))·{ |
277 | ················syncGetSupportedFeatures·&=·0xFFFFFFFFFFFFFE7FL; | 277 | ················syncGetSupportedFeatures·&=·0xFFFFFFFFFFFFFE7FL; |
278 | ············} | 278 | ············} |
279 | ············if·(!this.mContext.getResources().getBoolean(213083754 | 279 | ············if·(!this.mContext.getResources().getBoolean(2130837547))·{ |
280 | ················syncGetSupportedFeatures·&=·0xFFFFFFFEFFFFFFFFL; | 280 | ················syncGetSupportedFeatures·&=·0xFFFFFFFEFFFFFFFFL; |
281 | ············} | 281 | ············} |
282 | ············if·(this.mContext.getResources().getBoolean(213083753 | 282 | ············if·(this.mContext.getResources().getBoolean(2130837537))·{ |
283 | ················syncGetSupportedFeatures·|=·0x200000000L; | 283 | ················syncGetSupportedFeatures·|=·0x200000000L; |
284 | ············} | 284 | ············} |
285 | ············if·(this.mContext.getResources().getBoolean(213083753 | 285 | ············if·(this.mContext.getResources().getBoolean(2130837535))·{ |
286 | ················syncGetSupportedFeatures·|=·0x400000000L; | 286 | ················syncGetSupportedFeatures·|=·0x400000000L; |
287 | ············} | 287 | ············} |
288 | ············if·((boolean)this.mWifiThreadRunner.call((Supplier)new·-$$Lambda$WifiServiceImpl$YV2Ekgbs7txeaM2pzw_y7rO2rxc(this),·(Object)Boolean.FALSE))·{ | 288 | ············if·((boolean)this.mWifiThreadRunner.call((Supplier)new·-$$Lambda$WifiServiceImpl$YV2Ekgbs7txeaM2pzw_y7rO2rxc(this),·(Object)Boolean.FALSE))·{ |
289 | ················syncGetSupportedFeatures·|=·0x8000L; | 289 | ················syncGetSupportedFeatures·|=·0x8000L; |
290 | ············} | 290 | ············} |
291 | ············return·syncGetSupportedFeatures; | 291 | ············return·syncGetSupportedFeatures; |
292 | ········} | 292 | ········} |
Offset 513, 15 lines modified | Offset 513, 15 lines modified | ||
513 | ····} | 513 | ····} |
514 | ···· | 514 | ···· |
515 | ····private·boolean·startSoftApInternal(final·SoftApModeConfiguration·softApModeConfiguration)·{ | 515 | ····private·boolean·startSoftApInternal(final·SoftApModeConfiguration·softApModeConfiguration)·{ |
516 | ········final·int·callingUid·=·Binder.getCallingUid(); | 516 | ········final·int·callingUid·=·Binder.getCallingUid(); |
517 | ········final·boolean·settingsOrSuw·=·this.isSettingsOrSuw(Binder.getCallingPid(),·callingUid); | 517 | ········final·boolean·settingsOrSuw·=·this.isSettingsOrSuw(Binder.getCallingPid(),·callingUid); |
518 | ········this.mLog.trace("startSoftApInternal·uid=%·mode=%").c((long)callingUid).c((long)softApModeConfiguration.getTargetMode()).flush(); | 518 | ········this.mLog.trace("startSoftApInternal·uid=%·mode=%").c((long)callingUid).c((long)softApModeConfiguration.getTargetMode()).flush(); |
519 | ········final·SoftApConfiguration·softApConfiguration·=·softApModeConfiguration.getSoftApConfiguration(); | 519 | ········final·SoftApConfiguration·softApConfiguration·=·softApModeConfiguration.getSoftApConfiguration(); |
520 | ········if·(softApConfiguration·!=·null·&&·(!WifiApConfigStore.validateApWifiConfiguration(softApConfiguration,·settingsOrSuw | 520 | ········if·(softApConfiguration·!=·null·&&·(!WifiApConfigStore.validateApWifiConfiguration(softApConfiguration,·settingsOrSuw)·||·!this.validateSoftApBand(softApConfiguration.getBand())))·{ |
521 | ············Log.e("WifiService",·"Invalid·SoftApConfiguration"); | 521 | ············Log.e("WifiService",·"Invalid·SoftApConfiguration"); |
522 | ············return·false; | 522 | ············return·false; |
523 | ········} | 523 | ········} |
524 | ········this.mActiveModeWarden.startSoftAp(softApModeConfiguration); | 524 | ········this.mActiveModeWarden.startSoftAp(softApModeConfiguration); |
525 | ········return·true; | 525 | ········return·true; |
526 | ····} | 526 | ····} |
527 | ···· | 527 | ···· |
Offset 730, 15 lines modified | Offset 730, 15 lines modified | ||
730 | ········this.enforceNetworkSettingsPermission(); | 730 | ········this.enforceNetworkSettingsPermission(); |
731 | ········this.mLog.info("allowAutojoin=%·uid=%").c(b).c((long)Binder.getCallingUid()).flush(); | 731 | ········this.mLog.info("allowAutojoin=%·uid=%").c(b).c((long)Binder.getCallingUid()).flush(); |
732 | ········this.mWifiThreadRunner.post((Runnable)new·-$$Lambda$WifiServiceImpl$zP3SSqtsZK-zJkU3XvMv6WNhrMs(this,·n,·b)); | 732 | ········this.mWifiThreadRunner.post((Runnable)new·-$$Lambda$WifiServiceImpl$zP3SSqtsZK-zJkU3XvMv6WNhrMs(this,·n,·b)); |
733 | ····} | 733 | ····} |
734 | ···· | 734 | ···· |
735 | ····public·void·allowAutojoinGlobal(final·boolean·b)·{ | 735 | ····public·void·allowAutojoinGlobal(final·boolean·b)·{ |
736 | ········this.enforceNetworkSettingsPermission(); | 736 | ········this.enforceNetworkSettingsPermission(); |
737 | ········this.mLog.info("allowAutojoin | 737 | ········this.mLog.info("allowAutojoin=%·uid=%").c(b).c((long)Binder.getCallingUid()).flush(); |
738 | ········this.mWifiThreadRunner.post((Runnable)new·-$$Lambda$WifiServiceImpl$Bm0dB_Grybclx8PAiBvhzyRrmxE(this,·b)); | 738 | ········this.mWifiThreadRunner.post((Runnable)new·-$$Lambda$WifiServiceImpl$Bm0dB_Grybclx8PAiBvhzyRrmxE(this,·b)); |
739 | ····} | 739 | ····} |
740 | ···· | 740 | ···· |
741 | ····public·void·allowAutojoinPasspoint(final·String·s,·final·boolean·b)·{ | 741 | ····public·void·allowAutojoinPasspoint(final·String·s,·final·boolean·b)·{ |
742 | ········this.enforceNetworkSettingsPermission(); | 742 | ········this.enforceNetworkSettingsPermission(); |
743 | ········if·(s·!=·null)·{ | 743 | ········if·(s·!=·null)·{ |
744 | ············this.mLog.info("allowAutojoinPasspoint=%·uid=%").c(b).c((long)Binder.getCallingUid()).flush(); | 744 | ············this.mLog.info("allowAutojoinPasspoint=%·uid=%").c(b).c((long)Binder.getCallingUid()).flush(); |
Offset 1464, 20 lines modified | Offset 1464, 21 lines modified | ||
1464 | ····} | 1464 | ····} |
1465 | ···· | 1465 | ···· |
1466 | ····public·int·getMockableCallingUid()·{ | 1466 | ····public·int·getMockableCallingUid()·{ |
1467 | ········return·IWifiManager$Stub.getCallingUid(); | 1467 | ········return·IWifiManager$Stub.getCallingUid(); |
1468 | ····} | 1468 | ····} |
1469 | ···· | 1469 | ···· |
1470 | ····public·List·getNetworkSuggestions(final·String·s)·{ | 1470 | ····public·List·getNetworkSuggestions(final·String·s)·{ |
1471 | ········ | 1471 | ········final·int·callingUid·=·Binder.getCallingUid(); |
1472 | ········this.mAppOps.checkPackage(callingUid,·s); | ||
1472 | ········this.enforceAccessPermission(); | 1473 | ········this.enforceAccessPermission(); |
1473 | ········if·(this.mVerboseLoggingEnabled)·{ | 1474 | ········if·(this.mVerboseLoggingEnabled)·{ |
1474 | ············this.mLog.info("getNetworkSuggestionList·uid=%").c((long)Binder.getCallingUid()).flush(); | 1475 | ············this.mLog.info("getNetworkSuggestionList·uid=%").c((long)Binder.getCallingUid()).flush(); |
1475 | ········} | 1476 | ········} |
1476 | ········return·(List)this.mWifiThreadRunner.call((Supplier)new·-$$Lambda$WifiServiceImpl$ | 1477 | ········return·(List)this.mWifiThreadRunner.call((Supplier)new·-$$Lambda$WifiServiceImpl$nd20ljo_XFKM5CZPUsUAGNROuUs(this,·s,·callingUid),·(Object)Collections.emptyList()); |
1477 | ····} | 1478 | ····} |
1478 | ···· | 1479 | ···· |
1479 | ····public·List·getPasspointConfigurations(final·String·s)·{ | 1480 | ····public·List·getPasspointConfigurations(final·String·s)·{ |
1480 | ········final·int·callingUid·=·Binder.getCallingUid(); | 1481 | ········final·int·callingUid·=·Binder.getCallingUid(); |
1481 | ········final·boolean·b·=·this.mWifiPermissionsUtil.checkNetworkSettingsPermission(callingUid)·||·this.mWifiPermissionsUtil.checkNetworkSetupWizardPermission(callingUid); | 1482 | ········final·boolean·b·=·this.mWifiPermissionsUtil.checkNetworkSettingsPermission(callingUid)·||·this.mWifiPermissionsUtil.checkNetworkSetupWizardPermission(callingUid); |
1482 | ········if·(this.mVerboseLoggingEnabled)·{ | 1483 | ········if·(this.mVerboseLoggingEnabled)·{ |
1483 | ············this.mLog.info("getPasspointConfigurations·uid=%").c((long)Binder.getCallingUid()).flush(); | 1484 | ············this.mLog.info("getPasspointConfigurations·uid=%").c((long)Binder.getCallingUid()).flush(); |
Offset 1575, 22 lines modified | Offset 1576, 16 lines modified | ||
1575 | ············return·list; | 1576 | ············return·list; |
1576 | ········} | 1577 | ········} |
1577 | ········catch·(SecurityException·ex2)·{} | 1578 | ········catch·(SecurityException·ex2)·{} |
1578 | ········Binder.restoreCallingIdentity(clearCallingIdentity); | 1579 | ········Binder.restoreCallingIdentity(clearCallingIdentity); |
1579 | ····} | 1580 | ····} |
1580 | ···· | 1581 | ···· |
1581 | ····public·SoftApConfiguration·getSoftApConfiguration()·{ | 1582 | ····public·SoftApConfiguration·getSoftApConfiguration()·{ |
1583 | ········this.enforceNetworkSettingsPermission(); | ||
1582 | ········final·int·callingUid·=·Binder.getCallingUid(); | 1584 | ········final·int·callingUid·=·Binder.getCallingUid(); |
1583 | ········if·(!this.mWifiPermissionsUtil.checkConfigOverridePermission(callingUid)·&&·!this.mWifiPermissionsUtil.checkNetworkSettingsPermission(callingUid))·{ | ||
1584 | ············final·StringBuilder·sb·=·new·StringBuilder(); | ||
1585 | ············sb.append("App·not·allowed·to·read·or·update·stored·WiFi·Ap·config·(uid·=·"); | ||
1586 | ············sb.append(callingUid); | ||
1587 | ············sb.append(")"); | ||
1588 | ············throw·new·SecurityException(sb.toString()); | ||
1589 | ········} | ||
1590 | ········if·(this.mVerboseLoggingEnabled)·{ | 1585 | ········if·(this.mVerboseLoggingEnabled)·{ |
1591 | ············this.mLog.info("getSoftApConfiguration·uid=%").c((long)callingUid).flush(); | 1586 | ············this.mLog.info("getSoftApConfiguration·uid=%").c((long)callingUid).flush(); |
1592 | ········} | 1587 | ········} |
1593 | ········final·WifiThreadRunner·mWifiThreadRunner·=·this.mWifiThreadRunner; | 1588 | ········final·WifiThreadRunner·mWifiThreadRunner·=·this.mWifiThreadRunner; |
1594 | ········final·WifiApConfigStore·mWifiApConfigStore·=·this.mWifiApConfigStore; | 1589 | ········final·WifiApConfigStore·mWifiApConfigStore·=·this.mWifiApConfigStore; |
1595 | ········Objects.requireNonNull(mWifiApConfigStore); | 1590 | ········Objects.requireNonNull(mWifiApConfigStore); |
1596 | ········return·(SoftApConfiguration)mWifiThreadRunner.call((Supplier)new·-$$Lambda$VT9e2V3o0MYZG8ZEONk9kV8oR9o(mWifiApConfigStore),·(Object)new·SoftApConfiguration$Builder().build()); | 1591 | ········return·(SoftApConfiguration)mWifiThreadRunner.call((Supplier)new·-$$Lambda$VT9e2V3o0MYZG8ZEONk9kV8oR9o(mWifiApConfigStore),·(Object)new·SoftApConfiguration$Builder().build()); |
Offset 1865, 15 lines modified | Offset 1860, 15 lines modified | ||
1865 | ········if·(suggestionConnectionStatusListener·!=·null)·{ | 1860 | ········if·(suggestionConnectionStatusListener·!=·null)·{ |
1866 | ············final·int·callingUid·=·Binder.getCallingUid(); | 1861 | ············final·int·callingUid·=·Binder.getCallingUid(); |
1867 | ············this.enforceAccessPermission(); | 1862 | ············this.enforceAccessPermission(); |
1868 | ············this.enforceLocationPermission(s,·s2,·callingUid); | 1863 | ············this.enforceLocationPermission(s,·s2,·callingUid); |
1869 | ············if·(this.mVerboseLoggingEnabled)·{ | 1864 | ············if·(this.mVerboseLoggingEnabled)·{ |
1870 | ················this.mLog.info("registerSuggestionConnectionStatusListener·uid=%").c((long)callingUid).flush(); | 1865 | ················this.mLog.info("registerSuggestionConnectionStatusListener·uid=%").c((long)callingUid).flush(); |
1871 | ············} | 1866 | ············} |
1872 | ············this.mWifiThreadRunner.post((Runnable)new·-$$Lambda$WifiServiceImpl$ | 1867 | ············this.mWifiThreadRunner.post((Runnable)new·-$$Lambda$WifiServiceImpl$QEbQWjtkwU2ZCBwW2g7n2lupBkw(this,·binder,·suggestionConnectionStatusListener,·n,·s,·callingUid)); |
1873 | ············return; | 1868 | ············return; |
1874 | ········} | 1869 | ········} |
1875 | ········throw·new·IllegalArgumentException("listener·must·not·be·null"); | 1870 | ········throw·new·IllegalArgumentException("listener·must·not·be·null"); |
1876 | ····} | 1871 | ····} |
1877 | ···· | 1872 | ···· |
1878 | ····public·void·registerTrafficStateCallback(final·IBinder·binder,·final·ITrafficStateCallback·trafficStateCallback,·final·int·n)·{ | 1873 | ····public·void·registerTrafficStateCallback(final·IBinder·binder,·final·ITrafficStateCallback·trafficStateCallback,·final·int·n)·{ |
1879 | ········if·(binder·==·null)·{ | 1874 | ········if·(binder·==·null)·{ |
Offset 2072, 28 lines modified | Offset 2067, 22 lines modified | ||
2072 | ····public·void·setScanThrottleEnabled(final·boolean·b)·{ | 2067 | ····public·void·setScanThrottleEnabled(final·boolean·b)·{ |
2073 | ········this.enforceNetworkSettingsPermission(); | 2068 | ········this.enforceNetworkSettingsPermission(); |
2074 | ········this.mLog.info("setScanThrottleEnabled·uid=%·verbose=%").c((long)Binder.getCallingUid()).c(b).flush(); | 2069 | ········this.mLog.info("setScanThrottleEnabled·uid=%·verbose=%").c((long)Binder.getCallingUid()).c(b).flush(); |
2075 | ········this.mWifiThreadRunner.post((Runnable)new·-$$Lambda$WifiServiceImpl$kyNmlLzCsRj-Pv0gTPbIGNBVNbY(this,·b)); | 2070 | ········this.mWifiThreadRunner.post((Runnable)new·-$$Lambda$WifiServiceImpl$kyNmlLzCsRj-Pv0gTPbIGNBVNbY(this,·b)); |
2076 | ····} | 2071 | ····} |
2077 | ···· | 2072 | ···· |
2078 | ····public·boolean·setSoftApConfiguration(final·SoftApConfiguration·softApConfiguration,·final·String·s)·{ | 2073 | ····public·boolean·setSoftApConfiguration(final·SoftApConfiguration·softApConfiguration,·final·String·s)·{ |
2074 | ········this.enforceNetworkSettingsPermission(); | ||
2079 | ········final·int·callingUid·=·Binder.getCallingUid(); | 2075 | ········final·int·callingUid·=·Binder.getCallingUid(); |
2080 | ········final·boolean·checkNetworkSettingsPermission·=·this.mWifiPermissionsUtil.checkNetworkSettingsPermission(callingUid); | 2076 | ········final·boolean·checkNetworkSettingsPermission·=·this.mWifiPermissionsUtil.checkNetworkSettingsPermission(callingUid); |
2081 | ········if·(!this.mWifiPermissionsUtil.checkConfigOverridePermission(callingUid)·&&·!checkNetworkSettingsPermission)·{ | ||
... Open expanded diff ... |
Offset 129, 21 lines modified | Offset 129, 15 lines modified | ||
129 | ················sb3.append(wifiAwareNetworkSpecifier); | 129 | ················sb3.append(wifiAwareNetworkSpecifier); |
130 | ················sb3.append("·no·interface·available"); | 130 | ················sb3.append("·no·interface·available"); |
131 | ················Log.w(s2,·sb3.toString()); | 131 | ················Log.w(s2,·sb3.toString()); |
132 | ················WifiAwareDataPathStateManager.access$200(this.this$0).remove(wifiAwareNetworkSpecifier); | 132 | ················WifiAwareDataPathStateManager.access$200(this.this$0).remove(wifiAwareNetworkSpecifier); |
133 | ················this.letAppKnowThatRequestsAreUnavailable(wifiAwareDataPathStateManager$AwareNetworkRequestInformation); | 133 | ················this.letAppKnowThatRequestsAreUnavailable(wifiAwareDataPathStateManager$AwareNetworkRequestInformation); |
134 | ················return; | 134 | ················return; |
135 | ············} | 135 | ············} |
136 | ············fina | 136 | ············WifiAwareDataPathStateManager.access$000(this.this$0).initiateDataPathSetup(wifiAwareNetworkSpecifier,·wifiAwareDataPathStateManager$AwareNetworkRequestInformation.peerInstanceId,·0,·WifiAwareDataPathStateManager.access$800(this.this$0,·wifiAwareDataPathStateManager$AwareNetworkRequestInformation),·wifiAwareDataPathStateManager$AwareNetworkRequestInformation.peerDiscoveryMac,·wifiAwareDataPathStateManager$AwareNetworkRequestInformation.interfaceName,·wifiAwareDataPathStateManager$AwareNetworkRequestInformation.networkSpecifier.pmk,·wifiAwareDataPathStateManager$AwareNetworkRequestInformation.networkSpecifier.passphrase,·wifiAwareDataPathStateManager$AwareNetworkRequestInformation.networkSpecifier.isOutOfBand(),·(byte[])null); |
137 | ············final·int·peerInstanceId·=·wifiAwareDataPathStateManager$AwareNetworkRequestInformation.peerInstanceId; | ||
138 | ············final·int·access$602·=·WifiAwareDataPathStateManager.access$800(this.this$0,·wifiAwareDataPathStateManager$AwareNetworkRequestInformation); | ||
139 | ············final·byte[]·peerDiscoveryMac·=·wifiAwareDataPathStateManager$AwareNetworkRequestInformation.peerDiscoveryMac; | ||
140 | ············final·String·interfaceName·=·wifiAwareDataPathStateManager$AwareNetworkRequestInformation.interfaceName; | ||
141 | ············final·WifiAwareNetworkSpecifier·networkSpecifier2·=·wifiAwareDataPathStateManager$AwareNetworkRequestInformation.networkSpecifier; | ||
142 | ············access$601.initiateDataPathSetup(wifiAwareNetworkSpecifier,·peerInstanceId,·0,·access$602,·peerDiscoveryMac,·interfaceName,·networkSpecifier2.pmk,·networkSpecifier2.passphrase,·networkSpecifier2.isOutOfBand(),·(byte[])null); | ||
143 | ············wifiAwareDataPathStateManager$AwareNetworkRequestInformation.state·=·103; | 137 | ············wifiAwareDataPathStateManager$AwareNetworkRequestInformation.state·=·103; |
144 | ············wifiAwareDataPathStateManager$AwareNetworkRequestInformation.startTimestamp·=·WifiAwareDataPathStateManager.access$900(this.this$0).getElapsedSinceBootMillis(); | 138 | ············wifiAwareDataPathStateManager$AwareNetworkRequestInformation.startTimestamp·=·WifiAwareDataPathStateManager.access$900(this.this$0).getElapsedSinceBootMillis(); |
145 | ········} | 139 | ········} |
146 | ········else·{ | 140 | ········else·{ |
147 | ············wifiAwareDataPathStateManager$AwareNetworkRequestInformation.state·=·104; | 141 | ············wifiAwareDataPathStateManager$AwareNetworkRequestInformation.state·=·104; |
148 | ········} | 142 | ········} |
149 | ····} | 143 | ····} |
Offset 1257, 38 lines modified | Offset 1257, 39 lines modified | ||
1257 | ············Log.e(s,·"publish:·null·interface"); | 1257 | ············Log.e(s,·"publish:·null·interface"); |
1258 | ············return·false; | 1258 | ············return·false; |
1259 | ········} | 1259 | ········} |
1260 | ········final·NanPublishRequest·nanPublishRequest·=·new·NanPublishRequest(); | 1260 | ········final·NanPublishRequest·nanPublishRequest·=·new·NanPublishRequest(); |
1261 | ········final·NanDiscoveryCommonConfig·baseConfigs·=·nanPublishRequest.baseConfigs; | 1261 | ········final·NanDiscoveryCommonConfig·baseConfigs·=·nanPublishRequest.baseConfigs; |
1262 | ········baseConfigs.sessionId·=·sessionId; | 1262 | ········baseConfigs.sessionId·=·sessionId; |
1263 | ········baseConfigs.ttlSec·=·(short)publishConfig.mTtlSec; | 1263 | ········baseConfigs.ttlSec·=·(short)publishConfig.mTtlSec; |
1264 | ········final·boolean·b·=·true; | ||
1265 | ········baseConfigs.discoveryWindowPeriod·=·(short)(b·?·1·:·0); | ||
1266 | ········baseConfigs.discoveryCount·=·0; | ||
1267 | ········this.convertNativeByteArrayToArrayList(publishConfig.mServiceName,·baseConfigs.serviceName); | ||
1268 | ········final·NanDiscoveryCommonConfig·baseConfigs2·=·nanPublishRequest.baseConfigs; | 1264 | ········final·NanDiscoveryCommonConfig·baseConfigs2·=·nanPublishRequest.baseConfigs; |
1269 | ········ | 1265 | ········final·boolean·b·=·true; |
1270 | ········ | 1266 | ········baseConfigs2.discoveryWindowPeriod·=·(short)(b·?·1·:·0); |
1267 | ········baseConfigs2.discoveryCount·=·0; | ||
1268 | ········this.convertNativeByteArrayToArrayList(publishConfig.mServiceName,·nanPublishRequest.baseConfigs.serviceName); | ||
1269 | ········nanPublishRequest.baseConfigs.discoveryMatchIndicator·=·2; | ||
1270 | ········this.convertNativeByteArrayToArrayList(publishConfig.mServiceSpecificInfo,·nanPublishRequest.baseConfigs.serviceSpecificInfo); | ||
1271 | ········final·byte[]·mMatchFilter·=·publishConfig.mMatchFilter; | 1271 | ········final·byte[]·mMatchFilter·=·publishConfig.mMatchFilter; |
1272 | ········ArrayList·list; | 1272 | ········ArrayList·list; |
1273 | ········if·(publishConfig.mPublishType·==·0)·{ | 1273 | ········if·(publishConfig.mPublishType·==·0)·{ |
1274 | ············list·=·nanPublishRequest.baseConfigs.txMatchFilter; | 1274 | ············list·=·nanPublishRequest.baseConfigs.txMatchFilter; |
1275 | ········} | 1275 | ········} |
1276 | ········else·{ | 1276 | ········else·{ |
1277 | ············list·=·nanPublishRequest.baseConfigs.rxMatchFilter; | 1277 | ············list·=·nanPublishRequest.baseConfigs.rxMatchFilter; |
1278 | ········} | 1278 | ········} |
1279 | ········this.convertNativeByteArrayToArrayList(mMatchFilter,·list); | 1279 | ········this.convertNativeByteArrayToArrayList(mMatchFilter,·list); |
1280 | ········final·NanDiscoveryCommonConfig·baseConfigs3·=·nanPublishRequest.baseConfigs; | 1280 | ········final·NanDiscoveryCommonConfig·baseConfigs3·=·nanPublishRequest.baseConfigs; |
1281 | ········baseConfigs3.useRssiThreshold·=·false; | 1281 | ········baseConfigs3.useRssiThreshold·=·false; |
1282 | ········baseConfigs3.disableDiscoveryTerminationIndication·=·(publishConfig.mEnableTerminateNotification·^·b); | 1282 | ········baseConfigs3.disableDiscoveryTerminationIndication·=·(publishConfig.mEnableTerminateNotification·^·b); |
1283 | ········ | 1283 | ········final·NanDiscoveryCommonConfig·baseConfigs4·=·nanPublishRequest.baseConfigs; |
1284 | ········baseConfigs | 1284 | ········baseConfigs4.disableMatchExpirationIndication·=·b; |
1285 | ········baseConfigs4.disableFollowupReceivedIndication·=·false; | ||
1285 | ········nanPublishRequest.autoAcceptDataPathRequests·=·false; | 1286 | ········nanPublishRequest.autoAcceptDataPathRequests·=·false; |
1286 | ········baseConfigs | 1287 | ········baseConfigs4.rangingRequired·=·publishConfig.mEnableRanging; |
1287 | ········baseConfigs | 1288 | ········nanPublishRequest.baseConfigs.securityConfig.securityType·=·0; |
1288 | ········nanPublishRequest.publishType·=·publishConfig.mPublishType; | 1289 | ········nanPublishRequest.publishType·=·publishConfig.mPublishType; |
1289 | ········nanPublishRequest.txType·=·0; | 1290 | ········nanPublishRequest.txType·=·0; |
1290 | ········final·IWifiNanIface·wifiNanIface2·=·wifiNanIface; | 1291 | ········final·IWifiNanIface·wifiNanIface2·=·wifiNanIface; |
1291 | ········try·{ | 1292 | ········try·{ |
1292 | ············final·WifiStatus·startPublishRequest·=·wifiNanIface2.startPublishRequest(n,·nanPublishRequest); | 1293 | ············final·WifiStatus·startPublishRequest·=·wifiNanIface2.startPublishRequest(n,·nanPublishRequest); |
1293 | ············try·{ | 1294 | ············try·{ |
1294 | ················if·(startPublishRequest.code·==·0)·{ | 1295 | ················if·(startPublishRequest.code·==·0)·{ |
Offset 1580, 42 lines modified | Offset 1581, 42 lines modified | ||
1580 | ············Log.e(s,·"subscribe:·null·interface"); | 1581 | ············Log.e(s,·"subscribe:·null·interface"); |
1581 | ············return·false; | 1582 | ············return·false; |
1582 | ········} | 1583 | ········} |
1583 | ········final·NanSubscribeRequest·nanSubscribeRequest·=·new·NanSubscribeRequest(); | 1584 | ········final·NanSubscribeRequest·nanSubscribeRequest·=·new·NanSubscribeRequest(); |
1584 | ········final·NanDiscoveryCommonConfig·baseConfigs·=·nanSubscribeRequest.baseConfigs; | 1585 | ········final·NanDiscoveryCommonConfig·baseConfigs·=·nanSubscribeRequest.baseConfigs; |
1585 | ········baseConfigs.sessionId·=·sessionId; | 1586 | ········baseConfigs.sessionId·=·sessionId; |
1586 | ········baseConfigs.ttlSec·=·(short)subscribeConfig.mTtlSec; | 1587 | ········baseConfigs.ttlSec·=·(short)subscribeConfig.mTtlSec; |
1587 | ········final·boolean·b·=·true; | ||
1588 | ········baseConfigs.discoveryWindowPeriod·=·(short)(b·?·1·:·0); | ||
1589 | ········baseConfigs.discoveryCount·=·0; | ||
1590 | ········this.convertNativeByteArrayToArrayList(subscribeConfig.mServiceName,·baseConfigs.serviceName); | ||
1591 | ········final·NanDiscoveryCommonConfig·baseConfigs2·=·nanSubscribeRequest.baseConfigs; | 1588 | ········final·NanDiscoveryCommonConfig·baseConfigs2·=·nanSubscribeRequest.baseConfigs; |
1592 | ········ | 1589 | ········final·boolean·b·=·true; |
1593 | ········ | 1590 | ········baseConfigs2.discoveryWindowPeriod·=·(short)(b·?·1·:·0); |
1591 | ········baseConfigs2.discoveryCount·=·0; | ||
1592 | ········this.convertNativeByteArrayToArrayList(subscribeConfig.mServiceName,·nanSubscribeRequest.baseConfigs.serviceName); | ||
1593 | ········nanSubscribeRequest.baseConfigs.discoveryMatchIndicator·=·0; | ||
1594 | ········this.convertNativeByteArrayToArrayList(subscribeConfig.mServiceSpecificInfo,·nanSubscribeRequest.baseConfigs.serviceSpecificInfo); | ||
1594 | ········final·byte[]·mMatchFilter·=·subscribeConfig.mMatchFilter; | 1595 | ········final·byte[]·mMatchFilter·=·subscribeConfig.mMatchFilter; |
1595 | ········ArrayList·list; | 1596 | ········ArrayList·list; |
1596 | ········if·(subscribeConfig.mSubscribeType·==·(b·?·1·:·0))·{ | 1597 | ········if·(subscribeConfig.mSubscribeType·==·(b·?·1·:·0))·{ |
1597 | ············list·=·nanSubscribeRequest.baseConfigs.txMatchFilter; | 1598 | ············list·=·nanSubscribeRequest.baseConfigs.txMatchFilter; |
1598 | ········} | 1599 | ········} |
1599 | ········else·{ | 1600 | ········else·{ |
1600 | ············list·=·nanSubscribeRequest.baseConfigs.rxMatchFilter; | 1601 | ············list·=·nanSubscribeRequest.baseConfigs.rxMatchFilter; |
1601 | ········} | 1602 | ········} |
1602 | ········this.convertNativeByteArrayToArrayList(mMatchFilter,·list); | 1603 | ········this.convertNativeByteArrayToArrayList(mMatchFilter,·list); |
1603 | ········final·NanDiscoveryCommonConfig·baseConfigs3·=·nanSubscribeRequest.baseConfigs; | 1604 | ········final·NanDiscoveryCommonConfig·baseConfigs3·=·nanSubscribeRequest.baseConfigs; |
1604 | ········baseConfigs3.useRssiThreshold·=·false; | 1605 | ········baseConfigs3.useRssiThreshold·=·false; |
1605 | ········baseConfigs3.disableDiscoveryTerminationIndication·=·(subscribeConfig.mEnableTerminateNotification·^·b); | 1606 | ········baseConfigs3.disableDiscoveryTerminationIndication·=·(subscribeConfig.mEnableTerminateNotification·^·b); |
1606 | ········baseConfigs3.disableMatchExpirationIndication·=·b; | ||
1607 | ········baseConfigs3.disableFollowupReceivedIndication·=·false; | ||
1608 | ········baseConfigs3.rangingRequired·=·((subscribeConfig.mMinDistanceMmSet·||·subscribeConfig.mMaxDistanceMmSet)·&&·b); | ||
1609 | ········final·NanDiscoveryCommonConfig·baseConfigs4·=·nanSubscribeRequest.baseConfigs; | 1607 | ········final·NanDiscoveryCommonConfig·baseConfigs4·=·nanSubscribeRequest.baseConfigs; |
1610 | ········baseConfigs4. | 1608 | ········baseConfigs4.disableMatchExpirationIndication·=·b; |
1609 | ········baseConfigs4.disableFollowupReceivedIndication·=·false; | ||
1610 | ········baseConfigs4.rangingRequired·=·((subscribeConfig.mMinDistanceMmSet·||·subscribeConfig.mMaxDistanceMmSet)·&&·b); | ||
1611 | ········nanSubscribeRequest.baseConfigs.configRangingIndications·=·0; | ||
1611 | ········final·boolean·mMinDistanceMmSet·=·subscribeConfig.mMinDistanceMmSet; | 1612 | ········final·boolean·mMinDistanceMmSet·=·subscribeConfig.mMinDistanceMmSet; |
1612 | ········final·int·n2·=·32767; | 1613 | ········final·int·n2·=·32767; |
1613 | ········if·(mMinDistanceMmSet)·{ | 1614 | ········if·(mMinDistanceMmSet)·{ |
1614 | ············baseConfigs | 1615 | ············nanSubscribeRequest.baseConfigs.distanceEgressCm·=·(short)Math.min(subscribeConfig.mMinDistanceMm·/·10,·n2); |
1615 | ············final·NanDiscoveryCommonConfig·baseConfigs5·=·nanSubscribeRequest.baseConfigs; | 1616 | ············final·NanDiscoveryCommonConfig·baseConfigs5·=·nanSubscribeRequest.baseConfigs; |
1616 | ············baseConfigs5.configRangingIndications·|=·0x4; | 1617 | ············baseConfigs5.configRangingIndications·|=·0x4; |
1617 | ········} | 1618 | ········} |
1618 | ········if·(subscribeConfig.mMaxDistanceMmSet)·{ | 1619 | ········if·(subscribeConfig.mMaxDistanceMmSet)·{ |
1619 | ············nanSubscribeRequest.baseConfigs.distanceIngressCm·=·(short)Math.min(subscribeConfig.mMaxDistanceMm·/·10,·n2); | 1620 | ············nanSubscribeRequest.baseConfigs.distanceIngressCm·=·(short)Math.min(subscribeConfig.mMaxDistanceMm·/·10,·n2); |
1620 | ············final·NanDiscoveryCommonConfig·baseConfigs6·=·nanSubscribeRequest.baseConfigs; | 1621 | ············final·NanDiscoveryCommonConfig·baseConfigs6·=·nanSubscribeRequest.baseConfigs; |
1621 | ············baseConfigs6.configRangingIndications·|=·0x2; | 1622 | ············baseConfigs6.configRangingIndications·|=·0x2; |
Offset 870, 17 lines modified | Offset 870, 16 lines modified | ||
870 | ········} | 870 | ········} |
871 | ········if·(!groupOwner·&&·fetchCurrentDeviceDetails.isDeviceLimit())·{ | 871 | ········if·(!groupOwner·&&·fetchCurrentDeviceDetails.isDeviceLimit())·{ |
872 | ············this.loge("target·device·reaches·the·device·limit."); | 872 | ············this.loge("target·device·reaches·the·device·limit."); |
873 | ············return·false; | 873 | ············return·false; |
874 | ········} | 874 | ········} |
875 | ········if·(!groupOwner·&&·fetchCurrentDeviceDetails.isInvitationCapable())·{ | 875 | ········if·(!groupOwner·&&·fetchCurrentDeviceDetails.isInvitationCapable())·{ |
876 | ············int·netId·=·-2; | 876 | ············int·netId·=·-2; |
877 | ············ | 877 | ············if·(wifiP2pConfig.netId·>=·0)·{ |
878 | ············if·(net | 878 | ················if·(wifiP2pConfig.deviceAddress.equals(this.mGroups.getOwnerAddr(wifiP2pConfig.netId)))·{ |
879 | ················if·(wifiP2pConfig.deviceAddress.equals(this.mGroups.getOwnerAddr(netId2)))·{ | ||
880 | ····················netId·=·wifiP2pConfig.netId; | 879 | ····················netId·=·wifiP2pConfig.netId; |
881 | ················} | 880 | ················} |
882 | ············} | 881 | ············} |
883 | ············else·{ | 882 | ············else·{ |
884 | ················netId·=·this.mGroups.getNetworkId(fetchCurrentDeviceDetails.deviceAddress); | 883 | ················netId·=·this.mGroups.getNetworkId(fetchCurrentDeviceDetails.deviceAddress); |
885 | ············} | 884 | ············} |
886 | ············if·(netId·<·0)·{ | 885 | ············if·(netId·<·0)·{ |
Offset 7, 15 lines modified | Offset 7, 14 lines modified | ||
7 | import·com.android.wifi.x.com.google.protobuf.nano.InternalNano; | 7 | import·com.android.wifi.x.com.google.protobuf.nano.InternalNano; |
8 | import·com.android.wifi.x.com.google.protobuf.nano.MessageNano; | 8 | import·com.android.wifi.x.com.google.protobuf.nano.MessageNano; |
9 | public·final·class·WifiMetricsProto$ConnectionDurationStats·extends·MessageNano | 9 | public·final·class·WifiMetricsProto$ConnectionDurationStats·extends·MessageNano |
10 | { | 10 | { |
11 | ····private·static·volatile·WifiMetricsProto$ConnectionDurationStats[]·_emptyArray; | 11 | ····private·static·volatile·WifiMetricsProto$ConnectionDurationStats[]·_emptyArray; |
12 | ····public·int·totalTimeCellularDataOffMs; | 12 | ····public·int·totalTimeCellularDataOffMs; |
13 | ····public·int·totalTimeInsufficientThroughputDefaultWifiMs; | ||
14 | ····public·int·totalTimeInsufficientThroughputMs; | 13 | ····public·int·totalTimeInsufficientThroughputMs; |
15 | ····public·int·totalTimeSufficientThroughputMs; | 14 | ····public·int·totalTimeSufficientThroughputMs; |
16 | ···· | 15 | ···· |
17 | ····public·WifiMetricsProto$ConnectionDurationStats()·{ | 16 | ····public·WifiMetricsProto$ConnectionDurationStats()·{ |
18 | ········this.clear(); | 17 | ········this.clear(); |
19 | ····} | 18 | ····} |
20 | ···· | 19 | ···· |
Offset 38, 15 lines modified | Offset 37, 14 lines modified | ||
38 | ········return·(WifiMetricsProto$ConnectionDurationStats)MessageNano.mergeFrom((MessageNano)new·WifiMetricsProto$ConnectionDurationStats(),·array); | 37 | ········return·(WifiMetricsProto$ConnectionDurationStats)MessageNano.mergeFrom((MessageNano)new·WifiMetricsProto$ConnectionDurationStats(),·array); |
39 | ····} | 38 | ····} |
40 | ···· | 39 | ···· |
41 | ····public·WifiMetricsProto$ConnectionDurationStats·clear()·{ | 40 | ····public·WifiMetricsProto$ConnectionDurationStats·clear()·{ |
42 | ········this.totalTimeSufficientThroughputMs·=·0; | 41 | ········this.totalTimeSufficientThroughputMs·=·0; |
43 | ········this.totalTimeInsufficientThroughputMs·=·0; | 42 | ········this.totalTimeInsufficientThroughputMs·=·0; |
44 | ········this.totalTimeCellularDataOffMs·=·0; | 43 | ········this.totalTimeCellularDataOffMs·=·0; |
45 | ········this.totalTimeInsufficientThroughputDefaultWifiMs·=·0; | ||
46 | ········super.cachedSize·=·-1; | 44 | ········super.cachedSize·=·-1; |
47 | ········return·this; | 45 | ········return·this; |
48 | ····} | 46 | ····} |
49 | ···· | 47 | ···· |
50 | ····protected·int·computeSerializedSize()·{ | 48 | ····protected·int·computeSerializedSize()·{ |
51 | ········int·computeSerializedSize·=·super.computeSerializedSize(); | 49 | ········int·computeSerializedSize·=·super.computeSerializedSize(); |
52 | ········final·int·totalTimeSufficientThroughputMs·=·this.totalTimeSufficientThroughputMs; | 50 | ········final·int·totalTimeSufficientThroughputMs·=·this.totalTimeSufficientThroughputMs; |
Offset 57, 39 lines modified | Offset 55, 30 lines modified | ||
57 | ········if·(totalTimeInsufficientThroughputMs·!=·0)·{ | 55 | ········if·(totalTimeInsufficientThroughputMs·!=·0)·{ |
58 | ············computeSerializedSize·+=·CodedOutputByteBufferNano.computeInt32Size(2,·totalTimeInsufficientThroughputMs); | 56 | ············computeSerializedSize·+=·CodedOutputByteBufferNano.computeInt32Size(2,·totalTimeInsufficientThroughputMs); |
59 | ········} | 57 | ········} |
60 | ········final·int·totalTimeCellularDataOffMs·=·this.totalTimeCellularDataOffMs; | 58 | ········final·int·totalTimeCellularDataOffMs·=·this.totalTimeCellularDataOffMs; |
61 | ········if·(totalTimeCellularDataOffMs·!=·0)·{ | 59 | ········if·(totalTimeCellularDataOffMs·!=·0)·{ |
62 | ············computeSerializedSize·+=·CodedOutputByteBufferNano.computeInt32Size(3,·totalTimeCellularDataOffMs); | 60 | ············computeSerializedSize·+=·CodedOutputByteBufferNano.computeInt32Size(3,·totalTimeCellularDataOffMs); |
63 | ········} | 61 | ········} |
64 | ········final·int·totalTimeInsufficientThroughputDefaultWifiMs·=·this.totalTimeInsufficientThroughputDefaultWifiMs; | ||
65 | ········if·(totalTimeInsufficientThroughputDefaultWifiMs·!=·0)·{ | ||
66 | ············computeSerializedSize·+=·CodedOutputByteBufferNano.computeInt32Size(4,·totalTimeInsufficientThroughputDefaultWifiMs); | ||
67 | ········} | ||
68 | ········return·computeSerializedSize; | 62 | ········return·computeSerializedSize; |
69 | ····} | 63 | ····} |
70 | ···· | 64 | ···· |
71 | ····public·WifiMetricsProto$ConnectionDurationStats·mergeFrom(final·CodedInputByteBufferNano·codedInputByteBufferNano)·{ | 65 | ····public·WifiMetricsProto$ConnectionDurationStats·mergeFrom(final·CodedInputByteBufferNano·codedInputByteBufferNano)·{ |
72 | ········while·(true)·{ | 66 | ········while·(true)·{ |
73 | ············final·int·tag·=·codedInputByteBufferNano.readTag(); | 67 | ············final·int·tag·=·codedInputByteBufferNano.readTag(); |
74 | ············if·(tag·==·0)·{ | 68 | ············if·(tag·==·0)·{ |
75 | ················return·this; | 69 | ················return·this; |
76 | ············} | 70 | ············} |
77 | ············if·(tag·!=·8)·{ | 71 | ············if·(tag·!=·8)·{ |
78 | ················if·(tag·!=·16)·{ | 72 | ················if·(tag·!=·16)·{ |
79 | ····················if·(tag·!=·24)·{ | 73 | ····················if·(tag·!=·24)·{ |
80 | ························if·(ta | 74 | ························if·(!WireFormatNano.parseUnknownField(codedInputByteBufferNano,·tag))·{ |
81 | ···························· | 75 | ····························return·this; |
82 | ································return·this; | ||
83 | ····························} | ||
84 | ····························continue; | ||
85 | ························} | ||
86 | ························else·{ | ||
87 | ····························this.totalTimeInsufficientThroughputDefaultWifiMs·=·codedInputByteBufferNano.readInt32(); | ||
88 | ························} | 76 | ························} |
77 | ························continue; | ||
89 | ····················} | 78 | ····················} |
90 | ····················else·{ | 79 | ····················else·{ |
91 | ························this.totalTimeCellularDataOffMs·=·codedInputByteBufferNano.readInt32(); | 80 | ························this.totalTimeCellularDataOffMs·=·codedInputByteBufferNano.readInt32(); |
92 | ····················} | 81 | ····················} |
93 | ················} | 82 | ················} |
94 | ················else·{ | 83 | ················else·{ |
95 | ····················this.totalTimeInsufficientThroughputMs·=·codedInputByteBufferNano.readInt32(); | 84 | ····················this.totalTimeInsufficientThroughputMs·=·codedInputByteBufferNano.readInt32(); |
Offset 110, 14 lines modified | Offset 99, 10 lines modified | ||
110 | ········if·(totalTimeInsufficientThroughputMs·!=·0)·{ | 99 | ········if·(totalTimeInsufficientThroughputMs·!=·0)·{ |
111 | ············codedOutputByteBufferNano.writeInt32(2,·totalTimeInsufficientThroughputMs); | 100 | ············codedOutputByteBufferNano.writeInt32(2,·totalTimeInsufficientThroughputMs); |
112 | ········} | 101 | ········} |
113 | ········final·int·totalTimeCellularDataOffMs·=·this.totalTimeCellularDataOffMs; | 102 | ········final·int·totalTimeCellularDataOffMs·=·this.totalTimeCellularDataOffMs; |
114 | ········if·(totalTimeCellularDataOffMs·!=·0)·{ | 103 | ········if·(totalTimeCellularDataOffMs·!=·0)·{ |
115 | ············codedOutputByteBufferNano.writeInt32(3,·totalTimeCellularDataOffMs); | 104 | ············codedOutputByteBufferNano.writeInt32(3,·totalTimeCellularDataOffMs); |
116 | ········} | 105 | ········} |
117 | ········final·int·totalTimeInsufficientThroughputDefaultWifiMs·=·this.totalTimeInsufficientThroughputDefaultWifiMs; | ||
118 | ········if·(totalTimeInsufficientThroughputDefaultWifiMs·!=·0)·{ | ||
119 | ············codedOutputByteBufferNano.writeInt32(4,·totalTimeInsufficientThroughputDefaultWifiMs); | ||
120 | ········} | ||
121 | ········super.writeTo(codedOutputByteBufferNano); | 106 | ········super.writeTo(codedOutputByteBufferNano); |
122 | ····} | 107 | ····} |
123 | } | 108 | } |
Offset 135, 17 lines modified | Offset 135, 16 lines modified | ||
135 | ···· | 135 | ···· |
136 | ····private·void·reportFullScanResult(final·ScanResult·scanResult,·final·int·n)·{ | 136 | ····private·void·reportFullScanResult(final·ScanResult·scanResult,·final·int·n)·{ |
137 | ········for·(final·WifiScanningServiceImpl$RequestInfo·wifiScanningServiceImpl$RequestInfo·:·this.mActiveBackgroundScans)·{ | 137 | ········for·(final·WifiScanningServiceImpl$RequestInfo·wifiScanningServiceImpl$RequestInfo·:·this.mActiveBackgroundScans)·{ |
138 | ············final·WifiScanningServiceImpl$ClientInfo·clientInfo·=·wifiScanningServiceImpl$RequestInfo.clientInfo; | 138 | ············final·WifiScanningServiceImpl$ClientInfo·clientInfo·=·wifiScanningServiceImpl$RequestInfo.clientInfo; |
139 | ············final·int·handlerId·=·wifiScanningServiceImpl$RequestInfo.handlerId; | 139 | ············final·int·handlerId·=·wifiScanningServiceImpl$RequestInfo.handlerId; |
140 | ············if·(WifiScanningServiceImpl.access$3600(this.this$0).shouldReportFullScanResultForSettings(scanResult,·n,·(WifiScanner$ScanSettings)wifiScanningServiceImpl$RequestInfo.settings))·{ | 140 | ············if·(WifiScanningServiceImpl.access$3600(this.this$0).shouldReportFullScanResultForSettings(scanResult,·n,·(WifiScanner$ScanSettings)wifiScanningServiceImpl$RequestInfo.settings))·{ |
141 | ················final·ScanResult·scanResult2·=·new·ScanResult(scanResult); | 141 | ················final·ScanResult·scanResult2·=·new·ScanResult(scanResult); |
142 | ················ | 142 | ················if·(scanResult.informationElements·!=·null)·{ |
143 | ················ | 143 | ····················scanResult2.informationElements·=·scanResult.informationElements.clone(); |
144 | ····················scanResult2.informationElements·=·informationElements.clone(); | ||
145 | ················} | 144 | ················} |
146 | ················else·{ | 145 | ················else·{ |
147 | ····················scanResult2.informationElements·=·null; | 146 | ····················scanResult2.informationElements·=·null; |
148 | ················} | 147 | ················} |
149 | ················clientInfo.reportEvent(159764,·0,·handlerId,·(Object)scanResult2); | 148 | ················clientInfo.reportEvent(159764,·0,·handlerId,·(Object)scanResult2); |
150 | ············} | 149 | ············} |
151 | ········} | 150 | ········} |
Offset 1, 15 lines modified | Offset 1, 14 lines modified | ||
1 | package·com.android.server.wifi.scanner; | 1 | package·com.android.server.wifi.scanner; |
2 | import·java.util.ArrayList; | 2 | import·java.util.ArrayList; |
3 | import·com.android.wifi.x.com.android.internal.util.IState; | 3 | import·com.android.wifi.x.com.android.internal.util.IState; |
4 | import·android.net.wifi.WifiScanner$OperationResult; | 4 | import·android.net.wifi.WifiScanner$OperationResult; |
5 | import·android.net.wifi.WifiScanner$ParcelableScanResults; | 5 | import·android.net.wifi.WifiScanner$ParcelableScanResults; |
6 | import·android.net.wifi.ScanResult$InformationElement; | ||
7 | import·java.util.Iterator; | 6 | import·java.util.Iterator; |
8 | import·android.net.wifi.WifiScanner$PnoSettings$PnoNetwork; | 7 | import·android.net.wifi.WifiScanner$PnoSettings$PnoNetwork; |
9 | import·com.android.server.wifi.WifiNative$PnoNetwork; | 8 | import·com.android.server.wifi.WifiNative$PnoNetwork; |
10 | import·com.android.server.wifi.WifiNative$PnoSettings; | 9 | import·com.android.server.wifi.WifiNative$PnoSettings; |
11 | import·android.util.Pair; | 10 | import·android.util.Pair; |
12 | import·com.android.server.wifi.ClientModeImpl; | 11 | import·com.android.server.wifi.ClientModeImpl; |
13 | import·android.os.Messenger; | 12 | import·android.os.Messenger; |
Offset 119, 16 lines modified | Offset 118, 16 lines modified | ||
119 | ············return·(WifiScanner$ScanSettings)((Pair)iterator.next()).second; | 118 | ············return·(WifiScanner$ScanSettings)((Pair)iterator.next()).second; |
120 | ········} | 119 | ········} |
121 | ········return·null; | 120 | ········return·null; |
122 | ····} | 121 | ····} |
123 | ···· | 122 | ···· |
124 | ····private·boolean·isSingleScanNeeded(final·ScanResult[]·array)·{ | 123 | ····private·boolean·isSingleScanNeeded(final·ScanResult[]·array)·{ |
125 | ········for·(int·length·=·array.length,·i·=·0;·i·<·length;·++i)·{ | 124 | ········for·(int·length·=·array.length,·i·=·0;·i·<·length;·++i)·{ |
126 | ············final·ScanResult | 125 | ············final·ScanResult·scanResult·=·array[i]; |
127 | ············if·(informationElements·!=·null·&&·informationElements.length·>·0)·{ | 126 | ············if·(scanResult.informationElements·!=·null·&&·scanResult.informationElements.length·>·0)·{ |
128 | ················return·false; | 127 | ················return·false; |
129 | ············} | 128 | ············} |
130 | ········} | 129 | ········} |
131 | ········return·true; | 130 | ········return·true; |
132 | ····} | 131 | ····} |
133 | ···· | 132 | ···· |
134 | ····private·void·removeHwPnoScanRequest(final·WifiScanningServiceImpl$ClientInfo·wifiScanningServiceImpl$ClientInfo,·final·int·n)·{ | 133 | ····private·void·removeHwPnoScanRequest(final·WifiScanningServiceImpl$ClientInfo·wifiScanningServiceImpl$ClientInfo,·final·int·n)·{ |
Offset 113, 15 lines modified | Offset 113, 15 lines modified | ||
113 | ········} | 113 | ········} |
114 | ········finally·{ | 114 | ········finally·{ |
115 | ········} | 115 | ········} |
116 | ········//·monitorexit(mSettingsLock) | 116 | ········//·monitorexit(mSettingsLock) |
117 | ····} | 117 | ····} |
118 | ···· | 118 | ···· |
119 | ····private·boolean·isHwPnoScanRequired(final·boolean·b)·{ | 119 | ····private·boolean·isHwPnoScanRequired(final·boolean·b)·{ |
120 | ········return·!b·&&·this.mContext.getResources().getBoolean(213083753 | 120 | ········return·!b·&&·this.mContext.getResources().getBoolean(2130837536); |
121 | ····} | 121 | ····} |
122 | ···· | 122 | ···· |
123 | ····private·void·pollLatestScanData()·{ | 123 | ····private·void·pollLatestScanData()·{ |
124 | ········synchronized·(this.mSettingsLock)·{ | 124 | ········synchronized·(this.mSettingsLock)·{ |
125 | ············if·(this.mLastScanSettings·==·null)·{ | 125 | ············if·(this.mLastScanSettings·==·null)·{ |
126 | ················return; | 126 | ················return; |
127 | ············} | 127 | ············} |
Offset 1, 13 lines modified | Offset 1, 13 lines modified | ||
1 | package·com.android.server.wifi; | 1 | package·com.android.server.wifi; |
2 | import·android.net.NetworkAgent; | 2 | import·android.net.NetworkAgent; |
3 | import·com.android.wifi.x.com.android.internal.util.StateMachine; | ||
4 | import·android.net.wifi.WifiInfo; | 3 | import·android.net.wifi.WifiInfo; |
4 | import·com.android.wifi.x.com.android.internal.util.StateMachine; | ||
5 | import·android.net.wifi.ScanResult; | 5 | import·android.net.wifi.ScanResult; |
6 | import·android.net.wifi.WifiEnterpriseConfig; | 6 | import·android.net.wifi.WifiEnterpriseConfig; |
7 | import·android.net.wifi.WifiConfiguration; | 7 | import·android.net.wifi.WifiConfiguration; |
8 | import·android.util.Pair; | 8 | import·android.util.Pair; |
9 | import·android.os.WorkSource; | 9 | import·android.os.WorkSource; |
10 | import·android.os.Bundle; | 10 | import·android.os.Bundle; |
11 | import·android.net.wifi.hotspot2.IProvisioningCallback; | 11 | import·android.net.wifi.hotspot2.IProvisioningCallback; |
Offset 41, 15 lines modified | Offset 41, 15 lines modified | ||
41 | ········final·int·wifiEnabled·=·1; | 41 | ········final·int·wifiEnabled·=·1; |
42 | ········ClientModeImpl.access$3502(this$0,·wifiEnabled); | 42 | ········ClientModeImpl.access$3502(this$0,·wifiEnabled); |
43 | ········ClientModeImpl.access$3600(this.this$0); | 43 | ········ClientModeImpl.access$3600(this.this$0); |
44 | ········if·(!ClientModeImpl.access$600(this.this$0).removeAllNetworks(ClientModeImpl.access$2400(this.this$0)))·{ | 44 | ········if·(!ClientModeImpl.access$600(this.this$0).removeAllNetworks(ClientModeImpl.access$2400(this.this$0)))·{ |
45 | ············this.this$0.loge("Failed·to·remove·networks·on·entering·connect·mode"); | 45 | ············this.this$0.loge("Failed·to·remove·networks·on·entering·connect·mode"); |
46 | ········} | 46 | ········} |
47 | ········ClientModeImpl.access$800(this.this$0).reset(); | 47 | ········ClientModeImpl.access$800(this.this$0).reset(); |
48 | ········ | 48 | ········ClientModeImpl.access$800(this.this$0).setSupplicantState(SupplicantState.DISCONNECTED); |
49 | ········ClientModeImpl.access$3700(this.this$0).getWakeupController().reset(); | 49 | ········ClientModeImpl.access$3700(this.this$0).getWakeupController().reset(); |
50 | ········ClientModeImpl.access$3800(this.this$0,·NetworkInfo$DetailedState.DISCONNECTED); | 50 | ········ClientModeImpl.access$3800(this.this$0,·NetworkInfo$DetailedState.DISCONNECTED); |
51 | ········ClientModeImpl.access$1400(this.this$0).setWifiEnabled((boolean)(wifiEnabled·!=·0)); | 51 | ········ClientModeImpl.access$1400(this.this$0).setWifiEnabled((boolean)(wifiEnabled·!=·0)); |
52 | ········ClientModeImpl.access$3900(this.this$0).setWifiState((boolean)(wifiEnabled·!=·0)); | 52 | ········ClientModeImpl.access$3900(this.this$0).setWifiState((boolean)(wifiEnabled·!=·0)); |
53 | ········ClientModeImpl.access$300(this.this$0).setWifiState(2); | 53 | ········ClientModeImpl.access$300(this.this$0).setWifiState(2); |
54 | ········ClientModeImpl.access$300(this.this$0).logStaEvent(18); | 54 | ········ClientModeImpl.access$300(this.this$0).logStaEvent(18); |
55 | ········ClientModeImpl.access$4000(this.this$0).noteSupplicantStateChanged(ClientModeImpl.access$800(this.this$0)); | 55 | ········ClientModeImpl.access$4000(this.this$0).noteSupplicantStateChanged(ClientModeImpl.access$800(this.this$0)); |
Offset 64, 15 lines modified | Offset 64, 15 lines modified | ||
64 | ········ClientModeImpl.access$300(this.this$0).setWifiState(1); | 64 | ········ClientModeImpl.access$300(this.this$0).setWifiState(1); |
65 | ········ClientModeImpl.access$300(this.this$0).logStaEvent(19); | 65 | ········ClientModeImpl.access$300(this.this$0).logStaEvent(19); |
66 | ········ClientModeImpl.access$4000(this.this$0).noteWifiDisabled(ClientModeImpl.access$800(this.this$0)); | 66 | ········ClientModeImpl.access$4000(this.this$0).noteWifiDisabled(ClientModeImpl.access$800(this.this$0)); |
67 | ········if·(!ClientModeImpl.access$600(this.this$0).removeAllNetworks(ClientModeImpl.access$2400(this.this$0)))·{ | 67 | ········if·(!ClientModeImpl.access$600(this.this$0).removeAllNetworks(ClientModeImpl.access$2400(this.this$0)))·{ |
68 | ············this.this$0.loge("Failed·to·remove·networks·on·exiting·connect·mode"); | 68 | ············this.this$0.loge("Failed·to·remove·networks·on·exiting·connect·mode"); |
69 | ········} | 69 | ········} |
70 | ········ClientModeImpl.access$800(this.this$0).reset(); | 70 | ········ClientModeImpl.access$800(this.this$0).reset(); |
71 | ········ | 71 | ········ClientModeImpl.access$800(this.this$0).setSupplicantState(SupplicantState.DISCONNECTED); |
72 | ········ClientModeImpl.access$4000(this.this$0).noteSupplicantStateChanged(ClientModeImpl.access$800(this.this$0)); | 72 | ········ClientModeImpl.access$4000(this.this$0).noteSupplicantStateChanged(ClientModeImpl.access$800(this.this$0)); |
73 | ········ClientModeImpl.access$4100(this.this$0).setWifiEnabled(false); | 73 | ········ClientModeImpl.access$4100(this.this$0).setWifiEnabled(false); |
74 | ········ClientModeImpl.access$4200(this.this$0).reset(); | 74 | ········ClientModeImpl.access$4200(this.this$0).reset(); |
75 | ········ClientModeImpl.access$4300(this.this$0); | 75 | ········ClientModeImpl.access$4300(this.this$0); |
76 | ····} | 76 | ····} |
77 | ···· | 77 | ···· |
78 | ····public·boolean·processMessage(final·Message·message)·{ | 78 | ····public·boolean·processMessage(final·Message·message)·{ |
Offset 80, 23 lines modified | Offset 80, 23 lines modified | ||
80 | ········final·int·n·=·-1; | 80 | ········final·int·n·=·-1; |
81 | ········final·String·s·=·"any"; | 81 | ········final·String·s·=·"any"; |
82 | ········final·int·n2·=·15; | 82 | ········final·int·n2·=·15; |
83 | ········int·n3·=·4; | 83 | ········int·n3·=·4; |
84 | ········int·n4·=·5; | 84 | ········int·n4·=·5; |
85 | ········final·String·s2·=·"WifiClientModeImpl"; | 85 | ········final·String·s2·=·"WifiClientModeImpl"; |
86 | ········int·n5·=·2; | 86 | ········int·n5·=·2; |
87 | ········int·access$8 | 87 | ········int·access$8300·=·0; |
88 | ········final·int·n6·=·1; | 88 | ········final·int·n6·=·1; |
89 | ········Label_53 | 89 | ········Label_5313:·{ |
90 | ············switch·(what)·{ | 90 | ············switch·(what)·{ |
91 | ················default:·{ | 91 | ················default:·{ |
92 | ····················break·Label_53 | 92 | ····················break·Label_5313; |
93 | ················} | 93 | ················} |
94 | ················case·147527:·{ | 94 | ················case·147527:·{ |
95 | ····················ClientModeImpl.access$8 | 95 | ····················ClientModeImpl.access$8200(this.this$0,·(MboOceController$BtmFrameData)message.obj); |
96 | ····················break; | 96 | ····················break; |
97 | ················} | 97 | ················} |
98 | ················case·147517:·{ | 98 | ················case·147517:·{ |
99 | ····················ClientModeImpl.access$6000(this.this$0).receivedWnmFrame((WnmData)message.obj); | 99 | ····················ClientModeImpl.access$6000(this.this$0).receivedWnmFrame((WnmData)message.obj); |
100 | ····················break; | 100 | ····················break; |
101 | ················} | 101 | ················} |
102 | ················case·147509:·{ | 102 | ················case·147509:·{ |
Offset 116, 62 lines modified | Offset 116, 62 lines modified | ||
116 | ····················if·(s3·!=·null)·{ | 116 | ····················if·(s3·!=·null)·{ |
117 | ························final·ScanDetailCache·scanDetailCacheForNetwork·=·ClientModeImpl.access$4700(this.this$0).getScanDetailCacheForNetwork(ClientModeImpl.access$400(this.this$0)); | 117 | ························final·ScanDetailCache·scanDetailCacheForNetwork·=·ClientModeImpl.access$4700(this.this$0).getScanDetailCacheForNetwork(ClientModeImpl.access$400(this.this$0)); |
118 | ························if·(scanDetailCacheForNetwork·!=·null)·{ | 118 | ························if·(scanDetailCacheForNetwork·!=·null)·{ |
119 | ····························ClientModeImpl.access$300(this.this$0).setConnectionScanDetail(scanDetailCacheForNetwork.getScanDetail(s3)); | 119 | ····························ClientModeImpl.access$300(this.this$0).setConnectionScanDetail(scanDetailCacheForNetwork.getScanDetail(s3)); |
120 | ························} | 120 | ························} |
121 | ························ClientModeImpl.access$5402(this.this$0,·s3); | 121 | ························ClientModeImpl.access$5402(this.this$0,·s3); |
122 | ····················} | 122 | ····················} |
123 | ····················break·Label_53 | 123 | ····················break·Label_5313; |
124 | ················} | 124 | ················} |
125 | ················case·147500:·{ | 125 | ················case·147500:·{ |
126 | ····················ClientModeImpl.access$6000(this.this$0).notifyANQPDone((AnqpEvent)message.obj); | 126 | ····················ClientModeImpl.access$6000(this.this$0).notifyANQPDone((AnqpEvent)message.obj); |
127 | ····················break; | 127 | ····················break; |
128 | ················} | 128 | ················} |
129 | ················case·147499:·{ | 129 | ················case·147499:·{ |
130 | ····················ClientModeImpl.access$4400(this.this$0); | 130 | ····················ClientModeImpl.access$4400(this.this$0); |
131 | ····················ClientModeImpl.access$3300(this.this$0).captureBugReportData(n6); | 131 | ····················ClientModeImpl.access$3300(this.this$0).captureBugReportData(n6); |
132 | ····················ClientModeImpl.access$4502(this.this$0,·false); | 132 | ····················ClientModeImpl.access$4502(this.this$0,·false); |
133 | ····················String·access$8 | 133 | ····················String·access$8301·=·(String)message.obj; |
134 | ····················int·n7; | 134 | ····················int·n7; |
135 | ····················if·(message.arg1·>·0)·{ | 135 | ····················if·(message.arg1·>·0)·{ |
136 | ························n7·=·n6; | 136 | ························n7·=·n6; |
137 | ····················} | 137 | ····················} |
138 | ····················else·{ | 138 | ····················else·{ |
139 | ························n7·=·0; | 139 | ························n7·=·0; |
140 | ····················} | 140 | ····················} |
141 | ····················final·int·arg2·=·message.arg2; | 141 | ····················final·int·arg2·=·message.arg2; |
142 | ····················final·StringBuilder·sb·=·new·StringBuilder(); | 142 | ····················final·StringBuilder·sb·=·new·StringBuilder(); |
143 | ····················sb.append("Association·Rejection·event:·bssid="); | 143 | ····················sb.append("Association·Rejection·event:·bssid="); |
144 | ····················sb.append(access$8 | 144 | ····················sb.append(access$8301); |
145 | ····················sb.append("·reason·code="); | 145 | ····················sb.append("·reason·code="); |
146 | ····················sb.append(arg2); | 146 | ····················sb.append(arg2); |
147 | ····················sb.append("·timedOut="); | 147 | ····················sb.append("·timedOut="); |
148 | ····················sb.append(Boolean.toString((boolean)(n7·!=·0))); | 148 | ····················sb.append(Boolean.toString((boolean)(n7·!=·0))); |
149 | ····················Log.d(s2,·sb.toString()); | 149 | ····················Log.d(s2,·sb.toString()); |
150 | ····················if·(access$8 | 150 | ····················if·(access$8301·!=·null·&&·!TextUtils.isEmpty((CharSequence)access$8301))·{ |
151 | ························if·(ClientModeImpl.access$4600(this.this$0)·==·s)·{ | 151 | ························if·(ClientModeImpl.access$4600(this.this$0)·==·s)·{ |
152 | ····························ClientModeImpl.access$4602(this.this$0,·access$8 | 152 | ····························ClientModeImpl.access$4602(this.this$0,·access$8301); |
153 | ························} | 153 | ························} |
154 | ····················} | 154 | ····················} |
155 | ····················else·{ | 155 | ····················else·{ |
156 | ························access$8 | 156 | ························access$8301·=·ClientModeImpl.access$4600(this.this$0); |
157 | ····················} | 157 | ····················} |
158 | ····················ClientModeImpl.access$4700(this.this$0).updateNetworkSelectionStatus(ClientModeImpl.access$400(this.this$0),·n6); | 158 | ····················ClientModeImpl.access$4700(this.this$0).updateNetworkSelectionStatus(ClientModeImpl.access$400(this.this$0),·n6); |
159 | ····················ClientModeImpl.access$4700(this.this$0).setRecentFailureAssociationStatus(ClientModeImpl.access$400(this.this$0),·arg2); | 159 | ····················ClientModeImpl.access$4700(this.this$0).setRecentFailureAssociationStatus(ClientModeImpl.access$400(this.this$0),·arg2); |
160 | ····················final·int·n8·=·17; | 160 | ····················final·int·n8·=·17; |
161 | ····················if·(arg2·!=·n8)·{ | 161 | ····················if·(arg2·!=·n8)·{ |
162 | ························n4·=·0; | 162 | ························n4·=·0; |
163 | ····················} | 163 | ····················} |
164 | ····················final·ClientModeImpl·this$0·=·this.this$0; | 164 | ····················final·ClientModeImpl·this$0·=·this.this$0; |
165 | ····················if·(n7·!=·0)·{ | 165 | ····················if·(n7·!=·0)·{ |
166 | ························n5·=·11; | 166 | ························n5·=·11; |
167 | ····················} | 167 | ····················} |
168 | ····················ClientModeImpl.access$4800(this$0,·n5,·n6,·n4); | 168 | ····················ClientModeImpl.access$4800(this$0,·n5,·n6,·n4); |
169 | ····················if·(arg2·!=·n8)·{ | 169 | ····················if·(arg2·!=·n8)·{ |
170 | ························ClientModeImpl.access$3700(this.this$0).getWifiLastResortWatchdog().noteConnectionFailureAndTriggerIfNeeded(ClientModeImpl.access$4900(this.this$0),·access$8 | 170 | ························ClientModeImpl.access$3700(this.this$0).getWifiLastResortWatchdog().noteConnectionFailureAndTriggerIfNeeded(ClientModeImpl.access$4900(this.this$0),·access$8301,·n6); |
171 | ····················} | 171 | ····················} |
... Open expanded diff ... |
Offset 20, 72 lines modified | Offset 20, 72 lines modified | ||
20 | ····} | 20 | ····} |
21 | ···· | 21 | ···· |
22 | ····public·void·enter()·{ | 22 | ····public·void·enter()·{ |
23 | ········if·(ClientModeImpl.access$900(this.this$0))·{ | 23 | ········if·(ClientModeImpl.access$900(this.this$0))·{ |
24 | ············final·ClientModeImpl·this$0·=·this.this$0; | 24 | ············final·ClientModeImpl·this$0·=·this.this$0; |
25 | ············final·StringBuilder·sb·=·new·StringBuilder(); | 25 | ············final·StringBuilder·sb·=·new·StringBuilder(); |
26 | ············sb.append("Enter·ConnectedState··mScreenOn="); | 26 | ············sb.append("Enter·ConnectedState··mScreenOn="); |
27 | ············sb.append(ClientModeImpl.access$11 | 27 | ············sb.append(ClientModeImpl.access$11400(this.this$0)); |
28 | ············this$0.log(sb.toString()); | 28 | ············this$0.log(sb.toString()); |
29 | ········} | 29 | ········} |
30 | ········final·ClientModeImpl·this$2·=·this.this$0; | 30 | ········final·ClientModeImpl·this$2·=·this.this$0; |
31 | ········final·int·n·=·1; | 31 | ········final·int·n·=·1; |
32 | ········ClientModeImpl.access$4800(this$2,·n,·n,·0); | 32 | ········ClientModeImpl.access$4800(this$2,·n,·n,·0); |
33 | ········ClientModeImpl.access$1400(this.this$0).handleConnectionStateChanged(n); | 33 | ········ClientModeImpl.access$1400(this.this$0).handleConnectionStateChanged(n); |
34 | ········this.this$0.registerConnected(); | 34 | ········this.this$0.registerConnected(); |
35 | ········final·ClientModeImpl·this$3·=·this.this$0; | 35 | ········final·ClientModeImpl·this$3·=·this.this$0; |
36 | ········final·long·n2·=·0L; | 36 | ········final·long·n2·=·0L; |
37 | ········ClientModeImpl.access$6102(this$3,·n2); | 37 | ········ClientModeImpl.access$6102(this$3,·n2); |
38 | ········ClientModeImpl.access$5802(this.this$0,·(WifiConfiguration)null); | 38 | ········ClientModeImpl.access$5802(this.this$0,·(WifiConfiguration)null); |
39 | ········ClientModeImpl.access$1700(this.this$0).reset(); | 39 | ········ClientModeImpl.access$1700(this.this$0).reset(); |
40 | ········final·ClientModeImpl·this$4·=·this.this$0; | 40 | ········final·ClientModeImpl·this$4·=·this.this$0; |
41 | ········final·int·n3·=·-1; | 41 | ········final·int·n3·=·-1; |
42 | ········ClientModeImpl.access$1 | 42 | ········ClientModeImpl.access$10802(this$4,·n3); |
43 | ········ClientModeImpl.access$6602(this.this$0,·false); | 43 | ········ClientModeImpl.access$6602(this.this$0,·false); |
44 | ········ClientModeImpl.access$11 | 44 | ········ClientModeImpl.access$11702(this.this$0,·n2); |
45 | ········ClientModeImpl.access$402(this.this$0,·n3); | 45 | ········ClientModeImpl.access$402(this.this$0,·n3); |
46 | ········ClientModeImpl.access$3700(this.this$0).getWifiLastResortWatchdog().connectedStateTransition((boolean)(n·!=·0)); | 46 | ········ClientModeImpl.access$3700(this.this$0).getWifiLastResortWatchdog().connectedStateTransition((boolean)(n·!=·0)); |
47 | ········ClientModeImpl.access$9 | 47 | ········ClientModeImpl.access$9100(this.this$0).updateState(3); |
48 | ········ClientModeImpl.access$3700(this.this$0).getWifiLockManager().updateWifiClientConnected((boolean)(n·!=·0)); | 48 | ········ClientModeImpl.access$3700(this.this$0).getWifiLockManager().updateWifiClientConnected((boolean)(n·!=·0)); |
49 | ········ClientModeImpl.access$1700(this.this$0).startConnectedNetworkScorer(((NetworkAgent)ClientModeImpl.access$3200(this.this$0)).getNetwork().getNetId()); | 49 | ········ClientModeImpl.access$1700(this.this$0).startConnectedNetworkScorer(((NetworkAgent)ClientModeImpl.access$3200(this.this$0)).getNetwork().getNetId()); |
50 | ········this.this$0.updateLinkLayerStatsRssiAndScoreReport(); | 50 | ········this.this$0.updateLinkLayerStatsRssiAndScoreReport(); |
51 | ····} | 51 | ····} |
52 | ···· | 52 | ···· |
53 | ····public·void·exit()·{ | 53 | ····public·void·exit()·{ |
54 | ········this.this$0.logd("ClientModeImpl:·Leaving·Connected·state"); | 54 | ········this.this$0.logd("ClientModeImpl:·Leaving·Connected·state"); |
55 | ········ClientModeImpl.access$1400(this.this$0).handleConnectionStateChanged(3); | 55 | ········ClientModeImpl.access$1400(this.this$0).handleConnectionStateChanged(3); |
56 | ········ClientModeImpl.access$11 | 56 | ········ClientModeImpl.access$11702(this.this$0,·0L); |
57 | ········ClientModeImpl.access$3700(this.this$0).getWifiLastResortWatchdog().connectedStateTransition(false); | 57 | ········ClientModeImpl.access$3700(this.this$0).getWifiLastResortWatchdog().connectedStateTransition(false); |
58 | ····} | 58 | ····} |
59 | ···· | 59 | ···· |
60 | ····public·boolean·processMessage(final·Message·message)·{ | 60 | ····public·boolean·processMessage(final·Message·message)·{ |
61 | ········final·int·what·=·message.what; | 61 | ········final·int·what·=·message.what; |
62 | ········final·int·n·=·5; | 62 | ········final·int·n·=·5; |
63 | ········final·int·n2·=·131324; | 63 | ········final·int·n2·=·131324; |
64 | ········final·int·n3·=·3; | 64 | ········final·int·n3·=·3; |
65 | ········final·int·n4·=·6; | 65 | ········final·int·n4·=·6; |
66 | ········final·long·n5·=·0L; | 66 | ········final·long·n5·=·0L; |
67 | ········byte·b·=·0; | 67 | ········byte·b·=·0; |
68 | ········final·byte·b2·=·1; | 68 | ········final·byte·b2·=·1; |
69 | ········Label_17 | 69 | ········Label_1746:·{ |
70 | ············switch·(what)·{ | 70 | ············switch·(what)·{ |
71 | ················default:·{ | 71 | ················default:·{ |
72 | ····················break·Label_17 | 72 | ····················break·Label_1746; |
73 | ················} | 73 | ················} |
74 | ················case·147501:·{ | 74 | ················case·147501:·{ |
75 | ····················final·ClientModeImpl·this$0·=·this.this$0; | 75 | ····················final·ClientModeImpl·this$0·=·this.this$0; |
76 | ····················ClientModeImpl.access$11 | 76 | ····················ClientModeImpl.access$11702(this$0,·ClientModeImpl.access$6200(this$0).getWallClockMillis()); |
77 | ····················break·Label_17 | 77 | ····················break·Label_1746; |
78 | ················} | 78 | ················} |
79 | ················case·147460:·{ | 79 | ················case·147460:·{ |
80 | ····················ClientModeImpl.access$4800(this.this$0,·n4,·(int)b2,·0); | 80 | ····················ClientModeImpl.access$4800(this.this$0,·n4,·(int)b2,·0); |
81 | ····················if·(ClientModeImpl.access$11 | 81 | ····················if·(ClientModeImpl.access$11700(this.this$0)·!=·n5)·{ |
82 | ························ClientModeImpl.access$6200(this.this$0).getWallClockMillis(); | 82 | ························ClientModeImpl.access$6200(this.this$0).getWallClockMillis(); |
83 | ························ClientModeImpl.access$11 | 83 | ························ClientModeImpl.access$11700(this.this$0); |
84 | ························ClientModeImpl.access$11 | 84 | ························ClientModeImpl.access$11702(this.this$0,·n5); |
85 | ····················} | 85 | ····················} |
86 | ····················if·(ClientModeImpl.unexpectedDisconnectedReason(message.arg2))·{ | 86 | ····················if·(ClientModeImpl.unexpectedDisconnectedReason(message.arg2))·{ |
87 | ························ClientModeImpl.access$3300(this.this$0).captureBugReportData(n); | 87 | ························ClientModeImpl.access$3300(this.this$0).captureBugReportData(n); |
88 | ····················} | 88 | ····················} |
89 | ····················if·(message.arg1·==·b2)·{ | 89 | ····················if·(message.arg1·==·b2)·{ |
90 | ························b·=·b2; | 90 | ························b·=·b2; |
91 | ····················} | 91 | ····················} |
Offset 117, 100 lines modified | Offset 117, 98 lines modified | ||
117 | ························this$2.log(sb.toString()); | 117 | ························this$2.log(sb.toString()); |
118 | ························break; | 118 | ························break; |
119 | ····················} | 119 | ····················} |
120 | ····················break; | 120 | ····················break; |
121 | ················} | 121 | ················} |
122 | ················case·131335:·{ | 122 | ················case·131335:·{ |
123 | ····················final·ClientModeImpl·this$3·=·this.this$0; | 123 | ····················final·ClientModeImpl·this$3·=·this.this$0; |
124 | ····················ClientModeImpl.access$2500(this$3,·message,·what,·(Object)ClientModeImpl.access$11 | 124 | ····················ClientModeImpl.access$2500(this$3,·message,·what,·(Object)ClientModeImpl.access$11600(this$3)); |
125 | ····················break; | 125 | ····················break; |
126 | ················} | 126 | ················} |
127 | ················case·131225:·{ | 127 | ················case·131225:·{ |
128 | ····················if·(message.arg1·!=·0)·{ | 128 | ····················if·(message.arg1·!=·0)·{ |
129 | ························b·=·b2; | 129 | ························b·=·b2; |
130 | ····················} | 130 | ····················} |
131 | ····················ClientModeImpl.access$4700(this.this$0).setNetworkNoInternetAccessExpected(ClientModeImpl.access$500(this.this$0),·(boolean)(b·!=·0)); | 131 | ····················ClientModeImpl.access$4700(this.this$0).setNetworkNoInternetAccessExpected(ClientModeImpl.access$500(this.this$0),·(boolean)(b·!=·0)); |
132 | ····················break; | 132 | ····················break; |
133 | ················} | 133 | ················} |
134 | ················case·131220:·{ | 134 | ················case·131220:·{ |
135 | ····················if·(message.arg1·!=·b2)·{ | 135 | ····················if·(message.arg1·!=·b2)·{ |
136 | ························break; | 136 | ························break; |
137 | ····················} | 137 | ····················} |
138 | ····················ClientModeImpl.access$1 | 138 | ····················ClientModeImpl.access$11900(this.this$0,·n2); |
139 | ····················ClientModeImpl.access$3300(this.this$0).reportConnectionEvent(b2); | 139 | ····················ClientModeImpl.access$3300(this.this$0).reportConnectionEvent(b2); |
140 | ····················ClientModeImpl.access$4000(this.this$0).noteValidationSuccess(ClientModeImpl.access$800(this.this$0)); | 140 | ····················ClientModeImpl.access$4000(this.this$0).noteValidationSuccess(ClientModeImpl.access$800(this.this$0)); |
141 | ····················ClientModeImpl.access$700(this.this$0).handleNetworkValidationSuccess(ClientModeImpl.access$5400(this.this$0),·((WifiInfo)ClientModeImpl.access$800(this.this$0)).getSSID()); | 141 | ····················ClientModeImpl.access$700(this.this$0).handleNetworkValidationSuccess(ClientModeImpl.access$5400(this.this$0),·((WifiInfo)ClientModeImpl.access$800(this.this$0)).getSSID()); |
142 | ····················final·WifiConfiguration·currentWifiConfiguration2·=·this.this$0.getCurrentWifiConfiguration(); | 142 | ····················final·WifiConfiguration·currentWifiConfiguration2·=·this.this$0.getCurrentWifiConfiguration(); |
143 | ····················if·(currentWifiConfiguration2·!=·null)·{ | 143 | ····················if·(currentWifiConfiguration2·!=·null)·{ |
144 | ························ClientModeImpl.access$4700(this.this$0).updateNetworkSelectionStatus(currentWifiConfiguration2.networkId,·0); | 144 | ························ClientModeImpl.access$4700(this.this$0).updateNetworkSelectionStatus(currentWifiConfiguration2.networkId,·0); |
145 | ························ClientModeImpl.access$4700(this.this$0).setNetworkValidatedInternetAccess(currentWifiConfiguration2.networkId,·(boolean)(b2·!=·0)); | 145 | ························ClientModeImpl.access$4700(this.this$0).setNetworkValidatedInternetAccess(currentWifiConfiguration2.networkId,·(boolean)(b2·!=·0)); |
146 | ························break; | 146 | ························break; |
147 | ····················} | 147 | ····················} |
148 | ····················break; | 148 | ····················break; |
149 | ················} | 149 | ················} |
150 | ················case·131217:·{ | 150 | ················case·131217:·{ |
151 | ····················ClientModeImpl.access$11 | 151 | ····················ClientModeImpl.access$11702(this.this$0,·n5); |
152 | ····················final·int·arg1·=·message.arg1; | 152 | ····················final·int·arg1·=·message.arg1; |
153 | ····················final·ScanResult·scanResult·=·(ScanResult)message.obj; | 153 | ····················final·ScanResult·scanResult·=·(ScanResult)message.obj; |
154 | ····················String·bssid; | 154 | ····················String·bssid; |
155 | ····················if·(scanResult·!=·null)·{ | 155 | ····················if·(scanResult·!=·null)·{ |
156 | ························bssid·=·scanResult.BSSID; | 156 | ························bssid·=·scanResult.BSSID; |
157 | ····················} | 157 | ····················} |
158 | ····················else·{ | 158 | ····················else·{ |
159 | ························bssid·=·"any"; | 159 | ························bssid·=·"any"; |
160 | ····················} | 160 | ····················} |
161 | ····················final·WifiConfiguration·configuredNetworkWithoutMasking·=·ClientModeImpl.access$4700(this.this$0).getConfiguredNetworkWithoutMasking(arg1); | 161 | ····················final·WifiConfiguration·configuredNetworkWithoutMasking·=·ClientModeImpl.access$4700(this.this$0).getConfiguredNetworkWithoutMasking(arg1); |
162 | ····················if·(configuredNetworkWithoutMasking·==·null)·{ | 162 | ····················if·(configuredNetworkWithoutMasking·==·null)·{ |
163 | ························this.this$0.loge("CMD_START_ROAM·and·no·config,·bail·out..."); | 163 | ························this.this$0.loge("CMD_START_ROAM·and·no·config,·bail·out..."); |
164 | ························break; | 164 | ························break; |
165 | ····················} | 165 | ····················} |
166 | ···················· | 166 | ····················ClientModeImpl.access$4000(this.this$0).noteConnectionAttempt(ClientModeImpl.access$800(this.this$0),·ClientModeImpl.access$4700(this.this$0).findScanRssi(arg1,·ClientModeImpl.access$4100(this.this$0).getScanRssiValidTimeMs()),·configuredNetworkWithoutMasking.SSID); |
167 | ····················ClientModeImpl.access$ | 167 | ····················ClientModeImpl.access$12000(this.this$0,·configuredNetworkWithoutMasking,·bssid); |
168 | ····················ClientModeImpl.access$4000(this.this$0).noteConnectionAttempt(ClientModeImpl.access$800(this.this$0),·ClientModeImpl.access$6700(this.this$0),·configuredNetworkWithoutMasking.SSID); | ||
169 | ····················ClientModeImpl.access$12200(this.this$0,·configuredNetworkWithoutMasking,·bssid); | ||
170 | ····················ClientModeImpl.access$402(this.this$0,·arg1); | 168 | ····················ClientModeImpl.access$402(this.this$0,·arg1); |
... Open expanded diff ... |
Offset 23, 15 lines modified | Offset 23, 15 lines modified | ||
23 | ············ClientModeImpl.access$1200(this.this$0,·143373); | 23 | ············ClientModeImpl.access$1200(this.this$0,·143373); |
24 | ············return; | 24 | ············return; |
25 | ········} | 25 | ········} |
26 | ········if·(ClientModeImpl.access$900(this.this$0))·{ | 26 | ········if·(ClientModeImpl.access$900(this.this$0))·{ |
27 | ············final·ClientModeImpl·this$0·=·this.this$0; | 27 | ············final·ClientModeImpl·this$0·=·this.this$0; |
28 | ············final·StringBuilder·sb·=·new·StringBuilder(); | 28 | ············final·StringBuilder·sb·=·new·StringBuilder(); |
29 | ············sb.append("·Enter·DisconnectedState·screenOn="); | 29 | ············sb.append("·Enter·DisconnectedState·screenOn="); |
30 | ············sb.append(ClientModeImpl.access$11 | 30 | ············sb.append(ClientModeImpl.access$11400(this.this$0)); |
31 | ············this$0.logd(sb.toString()); | 31 | ············this$0.logd(sb.toString()); |
32 | ········} | 32 | ········} |
33 | ········ClientModeImpl.access$6602(this.this$0,·false); | 33 | ········ClientModeImpl.access$6602(this.this$0,·false); |
34 | ········ClientModeImpl.access$1400(this.this$0).handleConnectionStateChanged(2); | 34 | ········ClientModeImpl.access$1400(this.this$0).handleConnectionStateChanged(2); |
35 | ····} | 35 | ····} |
36 | ···· | 36 | ···· |
37 | ····public·void·exit()·{ | 37 | ····public·void·exit()·{ |
Offset 58, 27 lines modified | Offset 58, 27 lines modified | ||
58 | ························sb.append(stateChangeResult.state); | 58 | ························sb.append(stateChangeResult.state); |
59 | ························sb.append("·->·state=·"); | 59 | ························sb.append("·->·state=·"); |
60 | ························sb.append(WifiInfo.getDetailedStateOf(stateChangeResult.state)); | 60 | ························sb.append(WifiInfo.getDetailedStateOf(stateChangeResult.state)); |
61 | ························this$0.logd(sb.toString()); | 61 | ························this$0.logd(sb.toString()); |
62 | ····················} | 62 | ····················} |
63 | ····················if·(SupplicantState.isConnecting(stateChangeResult.state))·{ | 63 | ····················if·(SupplicantState.isConnecting(stateChangeResult.state))·{ |
64 | ························final·WifiConfiguration·configuredNetwork·=·ClientModeImpl.access$4700(this.this$0).getConfiguredNetwork(stateChangeResult.networkId); | 64 | ························final·WifiConfiguration·configuredNetwork·=·ClientModeImpl.access$4700(this.this$0).getConfiguredNetwork(stateChangeResult.networkId); |
65 | ························ | 65 | ························ClientModeImpl.access$800(this.this$0).setFQDN((String)null); |
66 | ························ | 66 | ························ClientModeImpl.access$800(this.this$0).setPasspointUniqueId((String)null); |
67 | ························ | 67 | ························ClientModeImpl.access$800(this.this$0).setOsuAp(false); |
68 | ························ | 68 | ························ClientModeImpl.access$800(this.this$0).setProviderFriendlyName((String)null); |
69 | ························if·(configuredNetwork·!=·null·&&·(configuredNetwork.isPasspoint()·||·configuredNetwork.osu))·{ | 69 | ························if·(configuredNetwork·!=·null·&&·(configuredNetwork.isPasspoint()·||·configuredNetwork.osu))·{ |
70 | ····························if·(configuredNetwork.isPasspoint())·{ | 70 | ····························if·(configuredNetwork.isPasspoint())·{ |
71 | ································ | 71 | ································ClientModeImpl.access$800(this.this$0).setFQDN(configuredNetwork.FQDN); |
72 | ································ | 72 | ································ClientModeImpl.access$800(this.this$0).setPasspointUniqueId(configuredNetwork.getPasspointUniqueId()); |
73 | ····························} | 73 | ····························} |
74 | ····························else·{ | 74 | ····························else·{ |
75 | ································ | 75 | ································ClientModeImpl.access$800(this.this$0).setOsuAp(osuAp); |
76 | ····························} | 76 | ····························} |
77 | ···························· | 77 | ····························ClientModeImpl.access$800(this.this$0).setProviderFriendlyName(configuredNetwork.providerFriendlyName); |
78 | ························} | 78 | ························} |
79 | ····················} | 79 | ····················} |
80 | ····················ClientModeImpl.access$3800(this.this$0,·WifiInfo.getDetailedStateOf(stateChangeResult.state)); | 80 | ····················ClientModeImpl.access$3800(this.this$0,·WifiInfo.getDetailedStateOf(stateChangeResult.state)); |
81 | ····················break·Label_0715; | 81 | ····················break·Label_0715; |
82 | ················} | 82 | ················} |
83 | ················case·147460:·{ | 83 | ················case·147460:·{ |
84 | ····················ClientModeImpl.access$4400(this.this$0); | 84 | ····················ClientModeImpl.access$4400(this.this$0); |
Offset 90, 15 lines modified | Offset 90, 15 lines modified | ||
90 | ························} | 90 | ························} |
91 | ························else·{ | 91 | ························else·{ |
92 | ····························access$4600·=·(String)obj; | 92 | ····························access$4600·=·(String)obj; |
93 | ························} | 93 | ························} |
94 | ························ClientModeImpl.access$3700(this.this$0).getWifiLastResortWatchdog().noteConnectionFailureAndTriggerIfNeeded(ClientModeImpl.access$4900(this.this$0),·access$4600,·n); | 94 | ························ClientModeImpl.access$3700(this.this$0).getWifiLastResortWatchdog().noteConnectionFailureAndTriggerIfNeeded(ClientModeImpl.access$4900(this.this$0),·access$4600,·n); |
95 | ····················} | 95 | ····················} |
96 | ····················final·ClientModeImpl·this$2·=·this.this$0; | 96 | ····················final·ClientModeImpl·this$2·=·this.this$0; |
97 | ····················this$2.clearNetworkCachedDataIfNeeded(ClientModeImpl.access$7 | 97 | ····················this$2.clearNetworkCachedDataIfNeeded(ClientModeImpl.access$7700(this$2),·message.arg2); |
98 | ····················ClientModeImpl.access$402(this.this$0,·-1); | 98 | ····················ClientModeImpl.access$402(this.this$0,·-1); |
99 | ····················ClientModeImpl.access$800(this.this$0).reset(); | 99 | ····················ClientModeImpl.access$800(this.this$0).reset(); |
100 | ····················break; | 100 | ····················break; |
101 | ················} | 101 | ················} |
102 | ················case·143371:·{ | 102 | ················case·143371:·{ |
103 | ····················ClientModeImpl.access$2600(this.this$0).set(((NetworkInfo)message.obj).isConnected()); | 103 | ····················ClientModeImpl.access$2600(this.this$0).set(((NetworkInfo)message.obj).isConnected()); |
104 | ····················break; | 104 | ····················break; |
Offset 15, 15 lines modified | Offset 15, 15 lines modified | ||
15 | ····} | 15 | ····} |
16 | ···· | 16 | ···· |
17 | ····public·void·enter()·{ | 17 | ····public·void·enter()·{ |
18 | ········if·(ClientModeImpl.access$900(this.this$0))·{ | 18 | ········if·(ClientModeImpl.access$900(this.this$0))·{ |
19 | ············final·ClientModeImpl·this$0·=·this.this$0; | 19 | ············final·ClientModeImpl·this$0·=·this.this$0; |
20 | ············final·StringBuilder·sb·=·new·StringBuilder(); | 20 | ············final·StringBuilder·sb·=·new·StringBuilder(); |
21 | ············sb.append("·Enter·DisconnectingState·State·screenOn="); | 21 | ············sb.append("·Enter·DisconnectingState·State·screenOn="); |
22 | ············sb.append(ClientModeImpl.access$11 | 22 | ············sb.append(ClientModeImpl.access$11400(this.this$0)); |
23 | ············this$0.logd(sb.toString()); | 23 | ············this$0.logd(sb.toString()); |
24 | ········} | 24 | ········} |
25 | ········final·ClientModeImpl·this$2·=·this.this$0; | 25 | ········final·ClientModeImpl·this$2·=·this.this$0; |
26 | ········++this$2.mDisconnectingWatchdogCount; | 26 | ········++this$2.mDisconnectingWatchdogCount; |
27 | ········final·StringBuilder·sb2·=·new·StringBuilder(); | 27 | ········final·StringBuilder·sb2·=·new·StringBuilder(); |
28 | ········sb2.append("Start·Disconnecting·Watchdog·"); | 28 | ········sb2.append("Start·Disconnecting·Watchdog·"); |
29 | ········sb2.append(this.this$0.mDisconnectingWatchdogCount); | 29 | ········sb2.append(this.this$0.mDisconnectingWatchdogCount); |
Offset 7, 15 lines modified | Offset 7, 14 lines modified | ||
7 | import·android.net.wifi.ScanResult; | 7 | import·android.net.wifi.ScanResult; |
8 | import·android.net.wifi.WifiInfo; | 8 | import·android.net.wifi.WifiInfo; |
9 | import·android.net.KeepalivePacketData; | 9 | import·android.net.KeepalivePacketData; |
10 | import·com.android.wifi.x.android.net.DhcpResultsParcelable; | 10 | import·com.android.wifi.x.android.net.DhcpResultsParcelable; |
11 | import·com.android.wifi.x.android.net.TcpKeepalivePacketData; | 11 | import·com.android.wifi.x.android.net.TcpKeepalivePacketData; |
12 | import·android.net.NattKeepalivePacketData; | 12 | import·android.net.NattKeepalivePacketData; |
13 | import·com.android.wifi.x.com.android.internal.util.IState; | 13 | import·com.android.wifi.x.com.android.internal.util.IState; |
14 | import·java.util.Objects; | ||
15 | import·android.os.Message; | 14 | import·android.os.Message; |
16 | import·android.net.NetworkCapabilities; | 15 | import·android.net.NetworkCapabilities; |
17 | import·android.net.NetworkAgentConfig; | 16 | import·android.net.NetworkAgentConfig; |
18 | import·android.net.wifi.WifiConfiguration; | 17 | import·android.net.wifi.WifiConfiguration; |
19 | import·android.net.NetworkAgent; | 18 | import·android.net.NetworkAgent; |
20 | import·android.util.Log; | 19 | import·android.util.Log; |
21 | import·android.net.NetworkAgentConfig$Builder; | 20 | import·android.net.NetworkAgentConfig$Builder; |
Offset 30, 25 lines modified | Offset 29, 25 lines modified | ||
30 | ····ClientModeImpl$L2ConnectedState(final·ClientModeImpl·this$0)·{ | 29 | ····ClientModeImpl$L2ConnectedState(final·ClientModeImpl·this$0)·{ |
31 | ········this.this$0·=·this$0; | 30 | ········this.this$0·=·this$0; |
32 | ········this.mRssiEventHandler·=·new·ClientModeImpl$L2ConnectedState$RssiEventHandler(this); | 31 | ········this.mRssiEventHandler·=·new·ClientModeImpl$L2ConnectedState$RssiEventHandler(this); |
33 | ····} | 32 | ····} |
34 | ···· | 33 | ···· |
35 | ····private·WifiLinkLayerStats·updateLinkLayerStatsRssiAndScoreReportInternal()·{ | 34 | ····private·WifiLinkLayerStats·updateLinkLayerStatsRssiAndScoreReportInternal()·{ |
36 | ········final·WifiLinkLayerStats·wifiLinkLayerStats·=·this.this$0.getWifiLinkLayerStats(); | 35 | ········final·WifiLinkLayerStats·wifiLinkLayerStats·=·this.this$0.getWifiLinkLayerStats(); |
37 | ········ClientModeImpl.access$1 | 36 | ········ClientModeImpl.access$10900(this.this$0); |
38 | ········ClientModeImpl.access$1700(this.this$0).calculateAndReportScore(); | 37 | ········ClientModeImpl.access$1700(this.this$0).calculateAndReportScore(); |
39 | ········return·wifiLinkLayerStats; | 38 | ········return·wifiLinkLayerStats; |
40 | ····} | 39 | ····} |
41 | ···· | 40 | ···· |
42 | ····public·void·enter()·{ | 41 | ····public·void·enter()·{ |
43 | ········ClientModeImpl.access$8 | 42 | ········ClientModeImpl.access$8508(this.this$0); |
44 | ········if·(ClientModeImpl.access$1500(this.this$0))·{ | 43 | ········if·(ClientModeImpl.access$1500(this.this$0))·{ |
45 | ············ClientModeImpl.access$8 | 44 | ············ClientModeImpl.access$8600(this.this$0).resetOnNewConnection(); |
46 | ············final·ClientModeImpl·this$0·=·this.this$0; | 45 | ············final·ClientModeImpl·this$0·=·this.this$0; |
47 | ············((StateMachine)this$0).sendMessage(131155,·ClientModeImpl.access$8 | 46 | ············((StateMachine)this$0).sendMessage(131155,·ClientModeImpl.access$8500(this$0),·0); |
48 | ········} | 47 | ········} |
49 | ········ClientModeImpl.access$3800(this.this$0,·NetworkInfo$DetailedState.CONNECTING); | 48 | ········ClientModeImpl.access$3800(this.this$0,·NetworkInfo$DetailedState.CONNECTING); |
50 | ········final·WifiConfiguration·currentWifiConfiguration·=·this.this$0.getCurrentWifiConfiguration(); | 49 | ········final·WifiConfiguration·currentWifiConfiguration·=·this.this$0.getCurrentWifiConfiguration(); |
51 | ········boolean·checkNetworkSettingsPermission; | 50 | ········boolean·checkNetworkSettingsPermission; |
52 | ········if·(this.this$0.shouldEvaluateWhetherToSendExplicitlySelected(currentWifiConfiguration))·{ | 51 | ········if·(this.this$0.shouldEvaluateWhetherToSendExplicitlySelected(currentWifiConfiguration))·{ |
53 | ············checkNetworkSettingsPermission·=·ClientModeImpl.access$6500(this.this$0).checkNetworkSettingsPermission(currentWifiConfiguration.lastConnectUid); | 52 | ············checkNetworkSettingsPermission·=·ClientModeImpl.access$6500(this.this$0).checkNetworkSettingsPermission(currentWifiConfiguration.lastConnectUid); |
54 | ············if·(ClientModeImpl.access$900(this.this$0))·{ | 53 | ············if·(ClientModeImpl.access$900(this.this$0))·{ |
Offset 77, 28 lines modified | Offset 76, 28 lines modified | ||
77 | ········int·n·=·1; | 76 | ········int·n·=·1; |
78 | ········final·NetworkAgentConfig$Builder·setExplicitlySelected·=·networkAgentConfig$Builder.setLegacyType(n).setLegacyTypeName("WIFI").setExplicitlySelected(checkNetworkSettingsPermission); | 77 | ········final·NetworkAgentConfig$Builder·setExplicitlySelected·=·networkAgentConfig$Builder.setLegacyType(n).setLegacyTypeName("WIFI").setExplicitlySelected(checkNetworkSettingsPermission); |
79 | ········if·(!checkNetworkSettingsPermission·||·!currentWifiConfiguration.noInternetAccessExpected)·{ | 78 | ········if·(!checkNetworkSettingsPermission·||·!currentWifiConfiguration.noInternetAccessExpected)·{ |
80 | ············n·=·0; | 79 | ············n·=·0; |
81 | ········} | 80 | ········} |
82 | ········final·NetworkAgentConfig·build·=·setExplicitlySelected.setUnvalidatedConnectivityAcceptable((boolean)(n·!=·0)).setPartialConnectivityAcceptable(currentWifiConfiguration.noInternetAccessExpected).build(); | 81 | ········final·NetworkAgentConfig·build·=·setExplicitlySelected.setUnvalidatedConnectivityAcceptable((boolean)(n·!=·0)).setPartialConnectivityAcceptable(currentWifiConfiguration.noInternetAccessExpected).build(); |
83 | ········final·ClientModeImpl·this$4·=·this.this$0; | 82 | ········final·ClientModeImpl·this$4·=·this.this$0; |
84 | ········final·NetworkCapabilities·access$8 | 83 | ········final·NetworkCapabilities·access$8700·=·ClientModeImpl.access$8700(this$4,·this$4.getCurrentWifiConfiguration()); |
85 | ········if·(ClientModeImpl.access$3200(this.this$0)·!=·null)·{ | 84 | ········if·(ClientModeImpl.access$3200(this.this$0)·!=·null)·{ |
86 | ············final·StringBuilder·sb3·=·new·StringBuilder(); | 85 | ············final·StringBuilder·sb3·=·new·StringBuilder(); |
87 | ············sb3.append("mNetworkAgent·is·not·null:·"); | 86 | ············sb3.append("mNetworkAgent·is·not·null:·"); |
88 | ············sb3.append(ClientModeImpl.access$3200(this.this$0)); | 87 | ············sb3.append(ClientModeImpl.access$3200(this.this$0)); |
89 | ············Log.wtf("WifiClientModeImpl",·sb3.toString()); | 88 | ············Log.wtf("WifiClientModeImpl",·sb3.toString()); |
90 | ············((NetworkAgent)ClientModeImpl.access$3200(this.this$0)).unregister(); | 89 | ············((NetworkAgent)ClientModeImpl.access$3200(this.this$0)).unregister(); |
91 | ········} | 90 | ········} |
92 | ········final·ClientModeImpl·this$5·=·this.this$0; | 91 | ········final·ClientModeImpl·this$5·=·this.this$0; |
93 | ········final·ClientModeImpl·this$6·=·this.this$0; | 92 | ········final·ClientModeImpl·this$6·=·this.this$0; |
94 | ········ClientModeImpl.access$3202(this$5,·new·ClientModeImpl$WifiNetworkAgent(this$6,·ClientModeImpl.access$8 | 93 | ········ClientModeImpl.access$3202(this$5,·new·ClientModeImpl$WifiNetworkAgent(this$6,·ClientModeImpl.access$8800(this$6),·((StateMachine)this.this$0).getHandler().getLooper(),·"WifiNetworkAgent",·access$8700,·ClientModeImpl.access$8900(this.this$0),·60,·build,·((NetworkFactory)ClientModeImpl.access$3900(this.this$0)).getProvider())); |
95 | ········ClientModeImpl.access$1700(this.this$0).setNetworkAgent((NetworkAgent)ClientModeImpl.access$3200(this.this$0)); | 94 | ········ClientModeImpl.access$1700(this.this$0).setNetworkAgent((NetworkAgent)ClientModeImpl.access$3200(this.this$0)); |
96 | ········this.this$0.clearTargetBssid("L2ConnectedState"); | 95 | ········this.this$0.clearTargetBssid("L2ConnectedState"); |
97 | ········ClientModeImpl.access$9 | 96 | ········ClientModeImpl.access$9000(this.this$0).setReadyForChange(false); |
98 | ········ClientModeImpl.access$300(this.this$0).setWifiState(3); | 97 | ········ClientModeImpl.access$300(this.this$0).setWifiState(3); |
99 | ········ClientModeImpl.access$4000(this.this$0).noteNetworkAgentCreated(ClientModeImpl.access$800(this.this$0),·((NetworkAgent)ClientModeImpl.access$3200(this.this$0)).getNetwork().getNetId()); | 98 | ········ClientModeImpl.access$4000(this.this$0).noteNetworkAgentCreated(ClientModeImpl.access$800(this.this$0),·((NetworkAgent)ClientModeImpl.access$3200(this.this$0)).getNetwork().getNetId()); |
100 | ········ClientModeImpl.access$700(this.this$0).handleBssidConnectionSuccess(ClientModeImpl.access$5400(this.this$0),·((WifiInfo)ClientModeImpl.access$800(this.this$0)).getSSID()); | 99 | ········ClientModeImpl.access$700(this.this$0).handleBssidConnectionSuccess(ClientModeImpl.access$5400(this.this$0),·((WifiInfo)ClientModeImpl.access$800(this.this$0)).getSSID()); |
101 | ····} | 100 | ····} |
102 | ···· | 101 | ···· |
103 | ····public·void·exit()·{ | 102 | ····public·void·exit()·{ |
104 | ········if·(ClientModeImpl.access$900(this.this$0))·{ | 103 | ········if·(ClientModeImpl.access$900(this.this$0))·{ |
Offset 108, 81 lines modified | Offset 107, 79 lines modified | ||
108 | ············sb2.append(Integer.toString(ClientModeImpl.access$500(this.this$0))); | 107 | ············sb2.append(Integer.toString(ClientModeImpl.access$500(this.this$0))); |
109 | ············sb.append(sb2.toString()); | 108 | ············sb.append(sb2.toString()); |
110 | ············if·(ClientModeImpl.access$5400(this.this$0)·!=·null)·{ | 109 | ············if·(ClientModeImpl.access$5400(this.this$0)·!=·null)·{ |
111 | ················sb.append("·"); | 110 | ················sb.append("·"); |
112 | ················sb.append(ClientModeImpl.access$5400(this.this$0)); | 111 | ················sb.append(ClientModeImpl.access$5400(this.this$0)); |
113 | ············} | 112 | ············} |
114 | ········} | 113 | ········} |
115 | ········ClientModeImpl.access$9 | 114 | ········ClientModeImpl.access$9000(this.this$0).setReadyForChange(true); |
116 | ········final·WifiMetrics·access$300·=·ClientModeImpl.access$300(this.this$0); | 115 | ········final·WifiMetrics·access$300·=·ClientModeImpl.access$300(this.this$0); |
117 | ········final·int·wifiState·=·2; | 116 | ········final·int·wifiState·=·2; |
118 | ········access$300.setWifiState(wifiState); | 117 | ········access$300.setWifiState(wifiState); |
119 | ········ClientModeImpl.access$9 | 118 | ········ClientModeImpl.access$9100(this.this$0).updateState(wifiState); |
120 | ········ClientModeImpl.access$3700(this.this$0).getWifiLockManager().updateWifiClientConnected(false); | 119 | ········ClientModeImpl.access$3700(this.this$0).getWifiLockManager().updateWifiClientConnected(false); |
121 | ····} | 120 | ····} |
122 | ···· | 121 | ···· |
123 | ····public·boolean·processMessage(final·Message·message)·{ | 122 | ····public·boolean·processMessage(final·Message·message)·{ |
124 | ········final·int·what·=·message.what; | 123 | ········final·int·what·=·message.what; |
125 | ········final·int·n·=·131155; | 124 | ········final·int·n·=·131155; |
126 | ········final·int·n2·=·3; | 125 | ········final·int·n2·=·3; |
127 | ········final·int·n3·=·6; | 126 | ········final·int·n3·=·6; |
128 | ········final·int·n4·=·5; | 127 | ········final·int·n4·=·5; |
129 | ········final·int·n5·=·15; | 128 | ········final·int·n5·=·15; |
130 | ········final·int·n6·=·2; | 129 | ········final·int·n6·=·2; |
131 | ········final·int·n7·=·-1; | 130 | ········final·int·n7·=·-1; |
132 | ········boolean·b·=·false; | 131 | ········boolean·b·=·false; |
133 | ········final·int·n8·=·1; | 132 | ········final·int·n8·=·1; |
134 | ········Label_26 | 133 | ········Label_2627:·{ |
135 | ············switch·(what)·{ | 134 | ············switch·(what)·{ |
136 | ················default:·{ | 135 | ················default:·{ |
137 | ····················break·Label_26 | 136 | ····················break·Label_2627; |
138 | ················} | 137 | ················} |
139 | ················case·147501:·{ | 138 | ················case·147501:·{ |
140 | ····················final·Object·obj·=·message.obj; | 139 | ····················final·Object·obj·=·message.obj; |
141 | ····················if·(obj·==·null)·{ | 140 | ····················if·(obj·==·null)·{ |
142 | ························ClientModeImpl.access$11 | 141 | ························ClientModeImpl.access$11000(this.this$0,·"Associated·command·w/o·BSSID"); |
143 | ························break; | 142 | ························break; |
144 | ····················} | 143 | ····················} |
145 | ····················ClientModeImpl.access$5402(this.this$0,·(String)obj); | 144 | ····················ClientModeImpl.access$5402(this.this$0,·(String)obj); |
146 | ····················if·(ClientModeImpl.access$5400(this.this$0)· | 145 | ····················if·(ClientModeImpl.access$5400(this.this$0)·==·null·||·(((WifiInfo)ClientModeImpl.access$800(this.this$0)).getBSSID()·!=·null·&&·ClientModeImpl.access$5400(this.this$0).equals(((WifiInfo)ClientModeImpl.access$800(this.this$0)).getBSSID())))·{ |
147 | ························ | 146 | ························break; |
148 | ···················· | 147 | ····················} |
149 | ···················· | 148 | ····················ClientModeImpl.access$800(this.this$0).setBSSID(ClientModeImpl.access$5400(this.this$0)); |
150 | ···················· | 149 | ····················final·WifiConfiguration·currentWifiConfiguration·=·this.this$0.getCurrentWifiConfiguration(); |
151 | ···················· | 150 | ····················if·(currentWifiConfiguration·==·null)·{ |
152 | ························ | 151 | ························break; |
153 | ···················· | 152 | ····················} |
154 | ····················· | 153 | ····················final·ScanDetailCache·scanDetailCacheForNetwork·=·ClientModeImpl.access$4700(this.this$0).getScanDetailCacheForNetwork(currentWifiConfiguration.networkId); |
155 | ····················· | 154 | ····················if·(scanDetailCacheForNetwork·==·null)·{ |
156 | ························ | 155 | ························break; |
157 | ···················· | 156 | ····················} |
158 | ························ClientModeImpl.access$ | 157 | ····················final·ScanResult·scanResult·=·scanDetailCacheForNetwork.getScanResult(ClientModeImpl.access$5400(this.this$0)); |
158 | ····················if·(scanResult·!=·null)·{ | ||
159 | ························ClientModeImpl.access$800(this.this$0).setFrequency(scanResult.frequency); | ||
159 | ························break; | 160 | ························break; |
160 | ····················} | 161 | ····················} |
161 | ····················break; | 162 | ····················break; |
... Open expanded diff ... |
Offset 12, 21 lines modified | Offset 12, 21 lines modified | ||
12 | ···· | 12 | ···· |
13 | ····ClientModeImpl$ObtainingIpState(final·ClientModeImpl·this$0)·{ | 13 | ····ClientModeImpl$ObtainingIpState(final·ClientModeImpl·this$0)·{ |
14 | ········this.this$0·=·this$0; | 14 | ········this.this$0·=·this$0; |
15 | ····} | 15 | ····} |
16 | ···· | 16 | ···· |
17 | ····public·void·enter()·{ | 17 | ····public·void·enter()·{ |
18 | ········final·WifiConfiguration·currentWifiConfiguration·=·this.this$0.getCurrentWifiConfiguration(); | 18 | ········final·WifiConfiguration·currentWifiConfiguration·=·this.this$0.getCurrentWifiConfiguration(); |
19 | ········if·(ClientModeImpl.access$ | 19 | ········if·(ClientModeImpl.access$6900(this.this$0)·&&·ClientModeImpl.access$200(this.this$0)·!=·null)·{ |
20 | ············ClientModeImpl.access$200(this.this$0).notifyPreconnectionComplete(ClientModeImpl.access$6300(this.this$0)); | 20 | ············ClientModeImpl.access$200(this.this$0).notifyPreconnectionComplete(ClientModeImpl.access$6300(this.this$0)); |
21 | ············ClientModeImpl.access$ | 21 | ············ClientModeImpl.access$6902(this.this$0,·false); |
22 | ············ClientModeImpl.access$6302(this.this$0,·false); | 22 | ············ClientModeImpl.access$6302(this.this$0,·false); |
23 | ········} | 23 | ········} |
24 | ········else·{ | 24 | ········else·{ |
25 | ············ClientModeImpl.access$6 | 25 | ············ClientModeImpl.access$6800(this.this$0,·currentWifiConfiguration,·false); |
26 | ········} | 26 | ········} |
27 | ········this.this$0.getWifiLinkLayerStats(); | 27 | ········this.this$0.getWifiLinkLayerStats(); |
28 | ····} | 28 | ····} |
29 | ···· | 29 | ···· |
30 | ····public·boolean·processMessage(final·Message·message)·{ | 30 | ····public·boolean·processMessage(final·Message·message)·{ |
31 | ········final·int·what·=·message.what; | 31 | ········final·int·what·=·message.what; |
32 | ········final·int·n·=·131149; | 32 | ········final·int·n·=·131149; |
Offset 18, 15 lines modified | Offset 18, 15 lines modified | ||
18 | ····} | 18 | ····} |
19 | ···· | 19 | ···· |
20 | ····public·void·enter()·{ | 20 | ····public·void·enter()·{ |
21 | ········if·(ClientModeImpl.access$900(this.this$0))·{ | 21 | ········if·(ClientModeImpl.access$900(this.this$0))·{ |
22 | ············final·ClientModeImpl·this$0·=·this.this$0; | 22 | ············final·ClientModeImpl·this$0·=·this.this$0; |
23 | ············final·StringBuilder·sb·=·new·StringBuilder(); | 23 | ············final·StringBuilder·sb·=·new·StringBuilder(); |
24 | ············sb.append("RoamingState·Enter·mScreenOn="); | 24 | ············sb.append("RoamingState·Enter·mScreenOn="); |
25 | ············sb.append(ClientModeImpl.access$11 | 25 | ············sb.append(ClientModeImpl.access$11400(this.this$0)); |
26 | ············this$0.log(sb.toString()); | 26 | ············this$0.log(sb.toString()); |
27 | ········} | 27 | ········} |
28 | ········final·ClientModeImpl·this$2·=·this.this$0; | 28 | ········final·ClientModeImpl·this$2·=·this.this$0; |
29 | ········++this$2.mRoamWatchdogCount; | 29 | ········++this$2.mRoamWatchdogCount; |
30 | ········final·StringBuilder·sb2·=·new·StringBuilder(); | 30 | ········final·StringBuilder·sb2·=·new·StringBuilder(); |
31 | ········sb2.append("Start·Roam·Watchdog·"); | 31 | ········sb2.append("Start·Roam·Watchdog·"); |
32 | ········sb2.append(this.this$0.mRoamWatchdogCount); | 32 | ········sb2.append(this.this$0.mRoamWatchdogCount); |
Offset 40, 18 lines modified | Offset 40, 18 lines modified | ||
40 | ········this.this$0.logd("ClientModeImpl:·Leaving·Roaming·state"); | 40 | ········this.this$0.logd("ClientModeImpl:·Leaving·Roaming·state"); |
41 | ····} | 41 | ····} |
42 | ···· | 42 | ···· |
43 | ····public·boolean·processMessage(final·Message·message)·{ | 43 | ····public·boolean·processMessage(final·Message·message)·{ |
44 | ········final·int·what·=·message.what; | 44 | ········final·int·what·=·message.what; |
45 | ········int·n·=·0; | 45 | ········int·n·=·0; |
46 | ········final·int·mAssociated·=·1; | 46 | ········final·int·mAssociated·=·1; |
47 | ········Label_ | 47 | ········Label_0997:·{ |
48 | ············switch·(what)·{ | 48 | ············switch·(what)·{ |
49 | ················default:·{ | 49 | ················default:·{ |
50 | ····················break·Label_ | 50 | ····················break·Label_0997; |
51 | ················} | 51 | ················} |
52 | ················case·147462:·{ | 52 | ················case·147462:·{ |
53 | ····················final·StateChangeResult·stateChangeResult·=·(StateChangeResult)message.obj; | 53 | ····················final·StateChangeResult·stateChangeResult·=·(StateChangeResult)message.obj; |
54 | ····················final·SupplicantState·state·=·stateChangeResult.state; | 54 | ····················final·SupplicantState·state·=·stateChangeResult.state; |
55 | ····················if·(state·==·SupplicantState.DISCONNECTED·||·state·==·SupplicantState.INACTIVE·||·state·==·SupplicantState.INTERFACE_DISABLED)·{ | 55 | ····················if·(state·==·SupplicantState.DISCONNECTED·||·state·==·SupplicantState.INACTIVE·||·state·==·SupplicantState.INTERFACE_DISABLED)·{ |
56 | ························if·(ClientModeImpl.access$900(this.this$0))·{ | 56 | ························if·(ClientModeImpl.access$900(this.this$0))·{ |
57 | ····························final·ClientModeImpl·this$0·=·this.this$0; | 57 | ····························final·ClientModeImpl·this$0·=·this.this$0; |
Offset 91, 15 lines modified | Offset 91, 15 lines modified | ||
91 | ····················final·StringBuilder·sb2·=·new·StringBuilder(); | 91 | ····················final·StringBuilder·sb2·=·new·StringBuilder(); |
92 | ····················sb2.append("NETWORK_DISCONNECTION_EVENT·in·roaming·state·BSSID="); | 92 | ····················sb2.append("NETWORK_DISCONNECTION_EVENT·in·roaming·state·BSSID="); |
93 | ····················sb2.append(s); | 93 | ····················sb2.append(s); |
94 | ····················sb2.append("·target="); | 94 | ····················sb2.append("·target="); |
95 | ····················sb2.append(access$4600); | 95 | ····················sb2.append(access$4600); |
96 | ····················this$3.log(sb2.toString()); | 96 | ····················this$3.log(sb2.toString()); |
97 | ····················final·ClientModeImpl·this$4·=·this.this$0; | 97 | ····················final·ClientModeImpl·this$4·=·this.this$0; |
98 | ····················this$4.clearNetworkCachedDataIfNeeded(ClientModeImpl.access$7 | 98 | ····················this$4.clearNetworkCachedDataIfNeeded(ClientModeImpl.access$7700(this$4),·message.arg2); |
99 | ····················if·(s·!=·null·&&·s.equals(ClientModeImpl.access$4600(this.this$0)))·{ | 99 | ····················if·(s·!=·null·&&·s.equals(ClientModeImpl.access$4600(this.this$0)))·{ |
100 | ························ClientModeImpl.access$5600(this.this$0); | 100 | ························ClientModeImpl.access$5600(this.this$0); |
101 | ························final·ClientModeImpl·this$5·=·this.this$0; | 101 | ························final·ClientModeImpl·this$5·=·this.this$0; |
102 | ························((StateMachine)this$5).transitionTo((IState)ClientModeImpl.access$5700(this$5)); | 102 | ························((StateMachine)this$5).transitionTo((IState)ClientModeImpl.access$5700(this$5)); |
103 | ························break; | 103 | ························break; |
104 | ····················} | 104 | ····················} |
105 | ····················break; | 105 | ····················break; |
Offset 107, 53 lines modified | Offset 107, 52 lines modified | ||
107 | ················case·147459:·{ | 107 | ················case·147459:·{ |
108 | ····················if·(this.mAssociated)·{ | 108 | ····················if·(this.mAssociated)·{ |
109 | ························if·(ClientModeImpl.access$900(this.this$0))·{ | 109 | ························if·(ClientModeImpl.access$900(this.this$0))·{ |
110 | ····························this.this$0.log("roaming·and·Network·connection·established"); | 110 | ····························this.this$0.log("roaming·and·Network·connection·established"); |
111 | ························} | 111 | ························} |
112 | ························ClientModeImpl.access$502(this.this$0,·message.arg1); | 112 | ························ClientModeImpl.access$502(this.this$0,·message.arg1); |
113 | ························ClientModeImpl.access$5402(this.this$0,·(String)message.obj); | 113 | ························ClientModeImpl.access$5402(this.this$0,·(String)message.obj); |
114 | ························ | 114 | ························ClientModeImpl.access$800(this.this$0).setBSSID(ClientModeImpl.access$5400(this.this$0)); |
115 | ························ | 115 | ························ClientModeImpl.access$800(this.this$0).setNetworkId(ClientModeImpl.access$500(this.this$0)); |
116 | ························ClientModeImpl.access$9400(this.this$0); | ||
117 | ························ClientModeImpl.access$700(this.this$0).handleBssidConnectionSuccess(ClientModeImpl.access$5400(this.this$0),·((WifiInfo)ClientModeImpl.access$800(this.this$0)).getSSID()); | 116 | ························ClientModeImpl.access$700(this.this$0).handleBssidConnectionSuccess(ClientModeImpl.access$5400(this.this$0),·((WifiInfo)ClientModeImpl.access$800(this.this$0)).getSSID()); |
118 | ························ClientModeImpl.access$4800(this.this$0,·mAssociated,·mAssociated,·0); | 117 | ························ClientModeImpl.access$4800(this.this$0,·mAssociated,·mAssociated,·0); |
119 | ························this.this$0.clearTargetBssid("RoamingCompleted"); | 118 | ························this.this$0.clearTargetBssid("RoamingCompleted"); |
120 | ························final·ClientModeImpl·this$6·=·this.this$0; | 119 | ························final·ClientModeImpl·this$6·=·this.this$0; |
121 | ························((StateMachine)this$6).transitionTo((IState)ClientModeImpl.access$9 | 120 | ························((StateMachine)this$6).transitionTo((IState)ClientModeImpl.access$9700(this$6)); |
122 | ························break; | 121 | ························break; |
123 | ····················} | 122 | ····················} |
124 | ····················ClientModeImpl.access$3102(this.this$0,·-5); | 123 | ····················ClientModeImpl.access$3102(this.this$0,·-5); |
125 | ····················break; | 124 | ····················break; |
126 | ················} | 125 | ················} |
127 | ················case·131335:·{ | 126 | ················case·131335:·{ |
128 | ····················final·ClientModeImpl·this$7·=·this.this$0; | 127 | ····················final·ClientModeImpl·this$7·=·this.this$0; |
129 | ····················ClientModeImpl.access$2500(this$7,·message,·what,·(Object)ClientModeImpl.access$11 | 128 | ····················ClientModeImpl.access$2500(this$7,·message,·what,·(Object)ClientModeImpl.access$11600(this$7)); |
130 | ····················break; | 129 | ····················break; |
131 | ················} | 130 | ················} |
132 | ················case·131216:·{ | 131 | ················case·131216:·{ |
133 | ····················if·(ClientModeImpl.access$900(this.this$0))·{ | 132 | ····················if·(ClientModeImpl.access$900(this.this$0))·{ |
134 | ························this.this$0.log("Roaming·and·CS·doesn't·want·the·network·->·ignore"); | 133 | ························this.this$0.log("Roaming·and·CS·doesn't·want·the·network·->·ignore"); |
135 | ························break; | 134 | ························break; |
136 | ····················} | 135 | ····················} |
137 | ····················break; | 136 | ····················break; |
138 | ················} | 137 | ················} |
139 | ················case·131211:·{ | 138 | ················case·131211:·{ |
140 | ····················if·(this.this$0.getCurrentWifiConfiguration()·!=·null)·{ | 139 | ····················if·(this.this$0.getCurrentWifiConfiguration()·!=·null)·{ |
141 | ························ClientModeImpl.access$3300(this.this$0).captureBugReportData(3); | 140 | ························ClientModeImpl.access$3300(this.this$0).captureBugReportData(3); |
142 | ····················} | 141 | ····················} |
143 | ····················break·Label_ | 142 | ····················break·Label_0997; |
144 | ················} | 143 | ················} |
145 | ················case·131166:·{ | 144 | ················case·131166:·{ |
146 | ····················final·ClientModeImpl·this$8·=·this.this$0; | 145 | ····················final·ClientModeImpl·this$8·=·this.this$0; |
147 | ····················if·(this$8.mRoamWatchdogCount·==·message.arg1)·{ | 146 | ····················if·(this$8.mRoamWatchdogCount·==·message.arg1)·{ |
148 | ························if·(ClientModeImpl.access$900(this$8))·{ | 147 | ························if·(ClientModeImpl.access$900(this$8))·{ |
149 | ····························this.this$0.log("roaming·watchdog!·->·disconnect"); | 148 | ····························this.this$0.log("roaming·watchdog!·->·disconnect"); |
150 | ························} | 149 | ························} |
151 | ························ClientModeImpl.access$300(this.this$0).endConnectionEvent(9,·mAssociated,·0); | 150 | ························ClientModeImpl.access$300(this.this$0).endConnectionEvent(9,·mAssociated,·0); |
152 | ························ClientModeImpl.access$11 | 151 | ························ClientModeImpl.access$11508(this.this$0); |
153 | ························ClientModeImpl.access$5600(this.this$0); | 152 | ························ClientModeImpl.access$5600(this.this$0); |
154 | ························ClientModeImpl.access$300(this.this$0).logStaEvent(15,·4); | 153 | ························ClientModeImpl.access$300(this.this$0).logStaEvent(15,·4); |
155 | ························ClientModeImpl.access$600(this.this$0).disconnect(ClientModeImpl.access$2400(this.this$0)); | 154 | ························ClientModeImpl.access$600(this.this$0).disconnect(ClientModeImpl.access$2400(this.this$0)); |
156 | ························final·ClientModeImpl·this$9·=·this.this$0; | 155 | ························final·ClientModeImpl·this$9·=·this.this$0; |
157 | ························((StateMachine)this$9).transitionTo((IState)ClientModeImpl.access$5700(this$9)); | 156 | ························((StateMachine)this$9).transitionTo((IState)ClientModeImpl.access$5700(this$9)); |
158 | ························break; | 157 | ························break; |
159 | ····················} | 158 | ····················} |
Offset 4, 26 lines modified | Offset 4, 25 lines modified | ||
4 | import·com.android.wifi.x.com.android.internal.util.StateMachine; | 4 | import·com.android.wifi.x.com.android.internal.util.StateMachine; |
5 | import·android.net.wifi.nl80211.NativeWifiClient; | 5 | import·android.net.wifi.nl80211.NativeWifiClient; |
6 | import·com.android.wifi.x.com.android.internal.util.IState; | 6 | import·com.android.wifi.x.com.android.internal.util.IState; |
7 | import·android.net.wifi.SoftApCapability; | 7 | import·android.net.wifi.SoftApCapability; |
8 | import·java.util.Set; | 8 | import·java.util.Set; |
9 | import·java.util.Collection; | 9 | import·java.util.Collection; |
10 | import·java.util.HashSet; | 10 | import·java.util.HashSet; |
11 | import·android.net.MacAddress; | ||
11 | import·android.net.wifi.SoftApConfiguration$Builder; | 12 | import·android.net.wifi.SoftApConfiguration$Builder; |
12 | import·android.net.wifi.SoftApConfiguration; | 13 | import·android.net.wifi.SoftApConfiguration; |
13 | import·java.util.function.BiConsumer; | ||
14 | import·android.os.Message; | 14 | import·android.os.Message; |
15 | import·android.content.Context; | 15 | import·android.content.Context; |
16 | import·com.android.server.wifi.util.ApConfigUtil; | 16 | import·com.android.server.wifi.util.ApConfigUtil; |
17 | import·android.net.wifi.ScanResult; | 17 | import·android.net.wifi.ScanResult; |
18 | import·android.net.MacAddress; | ||
19 | import·java.util.Iterator; | 18 | import·java.util.Iterator; |
19 | import·android.net.wifi.WifiClient; | ||
20 | import·java.util.ArrayList; | 20 | import·java.util.ArrayList; |
21 | import·android.os.SystemClock; | 21 | import·android.os.SystemClock; |
22 | import·android.net.wifi.WifiClient; | ||
23 | import·android.util.Log; | 22 | import·android.util.Log; |
24 | import·com.android.wifi.x.com.android.internal.util.WakeupMessage; | 23 | import·com.android.wifi.x.com.android.internal.util.WakeupMessage; |
25 | import·com.android.wifi.x.com.android.internal.util.State; | 24 | import·com.android.wifi.x.com.android.internal.util.State; |
26 | class·SoftApManager$SoftApStateMachine$StartedState·extends·State | 25 | class·SoftApManager$SoftApStateMachine$StartedState·extends·State |
27 | { | 26 | { |
28 | ····private·WakeupMessage·mSoftApTimeoutMessage; | 27 | ····private·WakeupMessage·mSoftApTimeoutMessage; |
Offset 44, 16 lines modified | Offset 43, 16 lines modified | ||
44 | ········} | 43 | ········} |
45 | ········SoftApManager.access$402(this.this$1.this$0,·b); | 44 | ········SoftApManager.access$402(this.this$1.this$0,·b); |
46 | ········if·(b)·{ | 45 | ········if·(b)·{ |
47 | ············Log.d("SoftApManager",·"SoftAp·is·ready·for·use"); | 46 | ············Log.d("SoftApManager",·"SoftAp·is·ready·for·use"); |
48 | ············SoftApManager.access$800(this.this$1.this$0,·13,·12,·0); | 47 | ············SoftApManager.access$800(this.this$1.this$0,·13,·12,·0); |
49 | ············SoftApManager.access$1000(this.this$1.this$0).onStarted(); | 48 | ············SoftApManager.access$1000(this.this$1.this$0).onStarted(); |
50 | ············SoftApManager.access$900(this.this$1.this$0).incrementSoftApStartResult(true,·0); | 49 | ············SoftApManager.access$900(this.this$1.this$0).incrementSoftApStartResult(true,·0); |
51 | ············if·(SoftApManager.access$2 | 50 | ············if·(SoftApManager.access$2200(this.this$1.this$0)·!=·null)·{ |
52 | ················SoftApManager.access$2 | 51 | ················SoftApManager.access$2200(this.this$1.this$0).onConnectedClientsChanged(SoftApManager.access$1900(this.this$1.this$0)); |
53 | ············} | 52 | ············} |
54 | ········} | 53 | ········} |
55 | ········else·{ | 54 | ········else·{ |
56 | ············((StateMachine)this.this$1).sendMessage(8); | 55 | ············((StateMachine)this.this$1).sendMessage(8); |
57 | ········} | 56 | ········} |
58 | ········SoftApManager.access$900(this.this$1.this$0).addSoftApUpChangedEvent(b,·SoftApManager.access$1400(this.this$1.this$0).getTargetMode(),·SoftApManager.access$2000(this.this$1.this$0)); | 57 | ········SoftApManager.access$900(this.this$1.this$0).addSoftApUpChangedEvent(b,·SoftApManager.access$1400(this.this$1.this$0).getTargetMode(),·SoftApManager.access$2000(this.this$1.this$0)); |
59 | ········if·(b)·{ | 58 | ········if·(b)·{ |
Offset 81, 24 lines modified | Offset 80, 24 lines modified | ||
81 | ····private·void·setSoftApChannel(final·int·frequency,·int·frequency2)·{ | 80 | ····private·void·setSoftApChannel(final·int·frequency,·int·frequency2)·{ |
82 | ········final·StringBuilder·sb·=·new·StringBuilder(); | 81 | ········final·StringBuilder·sb·=·new·StringBuilder(); |
83 | ········sb.append("Channel·switched.·Frequency:·"); | 82 | ········sb.append("Channel·switched.·Frequency:·"); |
84 | ········sb.append(frequency); | 83 | ········sb.append(frequency); |
85 | ········sb.append("·Bandwidth:·"); | 84 | ········sb.append("·Bandwidth:·"); |
86 | ········sb.append(frequency2); | 85 | ········sb.append(frequency2); |
87 | ········Log.d("SoftApManager",·sb.toString()); | 86 | ········Log.d("SoftApManager",·sb.toString()); |
88 | ········if·(frequency·==·SoftApManager.access$2 | 87 | ········if·(frequency·==·SoftApManager.access$2300(this.this$1.this$0).getFrequency()·&&·frequency2·==·SoftApManager.access$2300(this.this$1.this$0).getBandwidth())·{ |
89 | ············return; | 88 | ············return; |
90 | ········} | 89 | ········} |
91 | ········SoftApManager.access$2 | 90 | ········SoftApManager.access$2300(this.this$1.this$0).setFrequency(frequency); |
92 | ········SoftApManager.access$2 | 91 | ········SoftApManager.access$2300(this.this$1.this$0).setBandwidth(frequency2); |
93 | ········SoftApManager.access$2 | 92 | ········SoftApManager.access$2200(this.this$1.this$0).onInfoChanged(SoftApManager.access$2300(this.this$1.this$0)); |
94 | ········if·(frequency·>·0·&&·frequency2·!=·0)·{ | 93 | ········if·(frequency·>·0·&&·frequency2·!=·0)·{ |
95 | ············final·WifiMetrics·access$900·=·SoftApManager.access$900(this.this$1.this$0); | 94 | ············final·WifiMetrics·access$900·=·SoftApManager.access$900(this.this$1.this$0); |
96 | ············frequency2·=·SoftApManager.access$2 | 95 | ············frequency2·=·SoftApManager.access$2300(this.this$1.this$0).getFrequency(); |
97 | ············access$900.addSoftApChannelSwitchedEvent(frequency2,·SoftApManager.access$2 | 96 | ············access$900.addSoftApChannelSwitchedEvent(frequency2,·SoftApManager.access$2300(this.this$1.this$0).getBandwidth(),·SoftApManager.access$1400(this.this$1.this$0).getTargetMode()); |
98 | ············this.updateUserBandPreferenceViolationMetricsIfNeeded(); | 97 | ············this.updateUserBandPreferenceViolationMetricsIfNeeded(); |
99 | ········} | 98 | ········} |
100 | ····} | 99 | ····} |
101 | ···· | 100 | ···· |
102 | ····private·void·updateClientConnection()·{ | 101 | ····private·void·updateClientConnection()·{ |
103 | ········if·(!SoftApManager.access$1500(this.this$1.this$0).areFeaturesSupported((long)2))·{ | 102 | ········if·(!SoftApManager.access$1500(this.this$1.this$0).areFeaturesSupported((long)2))·{ |
104 | ············return; | 103 | ············return; |
Offset 123, 187 lines modified | Offset 122, 160 lines modified | ||
123 | ················list.add(wifiClient); | 122 | ················list.add(wifiClient); |
124 | ············} | 123 | ············} |
125 | ············else·{ | 124 | ············else·{ |
126 | ················final·StringBuilder·sb·=·new·StringBuilder(); | 125 | ················final·StringBuilder·sb·=·new·StringBuilder(); |
127 | ················sb.append("Force·disconnect·for·not·allowed·client:·"); | 126 | ················sb.append("Force·disconnect·for·not·allowed·client:·"); |
128 | ················sb.append(wifiClient); | 127 | ················sb.append(wifiClient); |
129 | ················Log.d(s,·sb.toString()); | 128 | ················Log.d(s,·sb.toString()); |
130 | ················ | 129 | ················SoftApManager.access$700(this.this$1.this$0).forceClientDisconnect(SoftApManager.access$300(this.this$1.this$0),·wifiClient.getMacAddress(),·0); |
131 | ····················SoftApManager.access$2100(this.this$1.this$0,·wifiClient,·0); | ||
132 | ················} | ||
133 | ················--n2; | 130 | ················--n2; |
134 | ············} | 131 | ············} |
135 | ········} | 132 | ········} |
136 | ········if·(n2·>·0)·{ | 133 | ········if·(n2·>·0)·{ |
137 | ············final·Iterator<Object>·iterator2·=·list.iterator(); | 134 | ············final·Iterator<Object>·iterator2·=·list.iterator(); |
138 | ············while·(iterator2.hasNext())·{ | 135 | ············while·(iterator2.hasNext())·{ |
139 | ················if·(n2·==·0)·{ | 136 | ················if·(n2·==·0)·{ |
140 | ····················break; | 137 | ····················break; |
141 | ················} | 138 | ················} |
142 | ················final·WifiClient·wifiClient2·=·(WifiClient)iterator2.next(); | 139 | ················final·WifiClient·wifiClient2·=·(WifiClient)iterator2.next(); |
143 | ················final·StringBuilder·sb2·=·new·StringBuilder(); | 140 | ················final·StringBuilder·sb2·=·new·StringBuilder(); |
144 | ················sb2.append("Force·disconnect·for·client·due·to·no·more·room:·"); | 141 | ················sb2.append("Force·disconnect·for·client·due·to·no·more·room:·"); |
145 | ················sb2.append(wifiClient2); | 142 | ················sb2.append(wifiClient2); |
146 | ················Log.d(s,·sb2.toString()); | 143 | ················Log.d(s,·sb2.toString()); |
147 | ················f | 144 | ················SoftApManager.access$700(this.this$1.this$0).forceClientDisconnect(SoftApManager.access$300(this.this$1.this$0),·wifiClient2.getMacAddress(),·1); |
148 | ················final·String·access$701·=·SoftApManager.access$300(this.this$1.this$0); | ||
149 | ················final·MacAddress·macAddress·=·wifiClient2.getMacAddress(); | ||
150 | ················final·int·n3·=·1; | ||
151 | ················if·(!access$700.forceClientDisconnect(access$701,·macAddress,·n3))·{ | ||
152 | ····················SoftApManager.access$2100(this.this$1.this$0,·wifiClient2,·n3); | ||
153 | ················} | ||
154 | ················--n2; | 145 | ················--n2; |
155 | ············} | 146 | ············} |
156 | ········} | 147 | ········} |
157 | ····} | 148 | ····} |
158 | ···· | 149 | ···· |
159 | ····private·void·updateConnectedClients(final·WifiClient·wifiClient,·final·boolean·b)·{ | 150 | ····private·void·updateConnectedClients(final·WifiClient·wifiClient,·final·boolean·b)·{ |
160 | ········if·(wifiClient·==·null)·{ | 151 | ········if·(wifiClient·==·null)·{ |
161 | ············return; | 152 | ············return; |
162 | ········} | 153 | ········} |
163 | ········final· | 154 | ········final·int·index·=·SoftApManager.access$1900(this.this$1.this$0).indexOf(wifiClient); |
155 | ········final·boolean·b2·=·index·!=·-1; | ||
164 | ········final·String·s·=·"SoftApManager"; | 156 | ········final·String·s·=·"SoftApManager"; |
165 | ········if·( | 157 | ········if·(b2·==·b)·{ |
166 | ············final·StringBuilder·sb·=·new·StringBuilder(); | 158 | ············final·StringBuilder·sb·=·new·StringBuilder(); |
167 | ············sb.append(" | 159 | ············sb.append("Drop·client·connection·event,·client·"); |
168 | ············sb.append(wifiClient | 160 | ············sb.append(wifiClient); |
169 | ············sb.append(" | 161 | ············sb.append("isConnected:·"); |
170 | ············ | 162 | ············sb.append(b); |
171 | ········ | 163 | ············sb.append("·,·duplicate·event·or·client·is·blocked"); |
172 | ········ | 164 | ············Log.e(s,·sb.toString()); |
173 | ········if·(index·!=·-1·==·b)·{ | ||
174 | ············final·StringBuilder·sb2·=·new·StringBuilder(); | ||
175 | ············sb2.append("Drop·client·connection·event,·client·"); | ||
176 | ············sb2.append(wifiClient); | ||
177 | ············sb2.append("isConnected:·"); | ||
... Open expanded diff ... |
Offset 16, 15 lines modified | Offset 16, 15 lines modified | ||
16 | ····final·/*·synthetic·*/·WifiP2pServiceImpl$P2pStateMachine·this$1; | 16 | ····final·/*·synthetic·*/·WifiP2pServiceImpl$P2pStateMachine·this$1; |
17 | ···· | 17 | ···· |
18 | ····WifiP2pServiceImpl$P2pStateMachine$P2pDisabledState(final·WifiP2pServiceImpl$P2pStateMachine·this$1)·{ | 18 | ····WifiP2pServiceImpl$P2pStateMachine$P2pDisabledState(final·WifiP2pServiceImpl$P2pStateMachine·this$1)·{ |
19 | ········this.this$1·=·this$1; | 19 | ········this.this$1·=·this$1; |
20 | ····} | 20 | ····} |
21 | ···· | 21 | ···· |
22 | ····private·void·setupInterfaceFeatures(String·s)·{ | 22 | ····private·void·setupInterfaceFeatures(String·s)·{ |
23 | ········if·(WifiP2pServiceImpl.access$1100(this.this$1.this$0).getResources().getBoolean(213083754 | 23 | ········if·(WifiP2pServiceImpl.access$1100(this.this$1.this$0).getResources().getBoolean(2130837547))·{ |
24 | ············s·=·"WifiP2pService"; | 24 | ············s·=·"WifiP2pService"; |
25 | ············Log.i(s,·"Supported·feature:·P2P·MAC·randomization"); | 25 | ············Log.i(s,·"Supported·feature:·P2P·MAC·randomization"); |
26 | ············WifiP2pServiceImpl$P2pStateMachine.access$600(this.this$1).setMacRandomization(true); | 26 | ············WifiP2pServiceImpl$P2pStateMachine.access$600(this.this$1).setMacRandomization(true); |
27 | ········} | 27 | ········} |
28 | ········else·{ | 28 | ········else·{ |
29 | ············WifiP2pServiceImpl$P2pStateMachine.access$600(this.this$1).setMacRandomization(false); | 29 | ············WifiP2pServiceImpl$P2pStateMachine.access$600(this.this$1).setMacRandomization(false); |
30 | ········} | 30 | ········} |
Offset 6, 18 lines modified | Offset 6, 18 lines modified | ||
6 | ····final·/*·synthetic·*/·IpMemoryStore·this$0; | 6 | ····final·/*·synthetic·*/·IpMemoryStore·this$0; |
7 | ···· | 7 | ···· |
8 | ····IpMemoryStore$1(final·IpMemoryStore·this$0)·{ | 8 | ····IpMemoryStore$1(final·IpMemoryStore·this$0)·{ |
9 | ········this.this$0·=·this$0; | 9 | ········this.this$0·=·this$0; |
10 | ····} | 10 | ····} |
11 | ···· | 11 | ···· |
12 | ····public·String·getInterfaceHash()·{ | 12 | ····public·String·getInterfaceHash()·{ |
13 | ········return·" | 13 | ········return·"31826566143ef882d67fac9f24566f73df4907b4"; |
14 | ····} | 14 | ····} |
15 | ···· | 15 | ···· |
16 | ····public·int·getInterfaceVersion()·{ | 16 | ····public·int·getInterfaceVersion()·{ |
17 | ········return· | 17 | ········return·7; |
18 | ····} | 18 | ····} |
19 | ···· | 19 | ···· |
20 | ····public·void·onIpMemoryStoreFetched(final·IIpMemoryStore·ipMemoryStore)·{ | 20 | ····public·void·onIpMemoryStoreFetched(final·IIpMemoryStore·ipMemoryStore)·{ |
21 | ········IpMemoryStore.access$000(this.this$0).complete(ipMemoryStore); | 21 | ········IpMemoryStore.access$000(this.this$0).complete(ipMemoryStore); |
22 | ····} | 22 | ····} |
23 | } | 23 | } |
Offset 10, 19 lines modified | Offset 10, 19 lines modified | ||
10 | ····protected·final·IpClientCallbacks·mCb; | 10 | ····protected·final·IpClientCallbacks·mCb; |
11 | ···· | 11 | ···· |
12 | ····public·IpClientUtil$IpClientCallbacksProxy(final·IpClientCallbacks·mCb)·{ | 12 | ····public·IpClientUtil$IpClientCallbacksProxy(final·IpClientCallbacks·mCb)·{ |
13 | ········this.mCb·=·mCb; | 13 | ········this.mCb·=·mCb; |
14 | ····} | 14 | ····} |
15 | ···· | 15 | ···· |
16 | ····public·String·getInterfaceHash()·{ | 16 | ····public·String·getInterfaceHash()·{ |
17 | ········return·" | 17 | ········return·"02cd6fd07d5c04eca0c35a350f7b0be576242883"; |
18 | ····} | 18 | ····} |
19 | ···· | 19 | ···· |
20 | ····public·int·getInterfaceVersion()·{ | 20 | ····public·int·getInterfaceVersion()·{ |
21 | ········return· | 21 | ········return·7; |
22 | ····} | 22 | ····} |
23 | ···· | 23 | ···· |
24 | ····public·void·installPacketFilter(final·byte[]·array)·{ | 24 | ····public·void·installPacketFilter(final·byte[]·array)·{ |
25 | ········this.mCb.installPacketFilter(array); | 25 | ········this.mCb.installPacketFilter(array); |
26 | ····} | 26 | ····} |
27 | ···· | 27 | ···· |
28 | ····public·void·onIpClientCreated(final·IIpClient·ipClient)·{ | 28 | ····public·void·onIpClientCreated(final·IIpClient·ipClient)·{ |
Offset 6, 19 lines modified | Offset 6, 19 lines modified | ||
6 | ····final·/*·synthetic·*/·OnBlobRetrievedListener·val$listener; | 6 | ····final·/*·synthetic·*/·OnBlobRetrievedListener·val$listener; |
7 | ···· | 7 | ···· |
8 | ····OnBlobRetrievedListener$1(final·OnBlobRetrievedListener·val$listener)·{ | 8 | ····OnBlobRetrievedListener$1(final·OnBlobRetrievedListener·val$listener)·{ |
9 | ········this.val$listener·=·val$listener; | 9 | ········this.val$listener·=·val$listener; |
10 | ····} | 10 | ····} |
11 | ···· | 11 | ···· |
12 | ····public·String·getInterfaceHash()·{ | 12 | ····public·String·getInterfaceHash()·{ |
13 | ········return·" | 13 | ········return·"31826566143ef882d67fac9f24566f73df4907b4"; |
14 | ····} | 14 | ····} |
15 | ···· | 15 | ···· |
16 | ····public·int·getInterfaceVersion()·{ | 16 | ····public·int·getInterfaceVersion()·{ |
17 | ········return· | 17 | ········return·7; |
18 | ····} | 18 | ····} |
19 | ···· | 19 | ···· |
20 | ····public·void·onBlobRetrieved(final·StatusParcelable·statusParcelable,·final·String·s,·final·String·s2,·final·Blob·blob)·{ | 20 | ····public·void·onBlobRetrieved(final·StatusParcelable·statusParcelable,·final·String·s,·final·String·s2,·final·Blob·blob)·{ |
21 | ········final·OnBlobRetrievedListener·val$listener·=·this.val$listener; | 21 | ········final·OnBlobRetrievedListener·val$listener·=·this.val$listener; |
22 | ········if·(val$listener·!=·null)·{ | 22 | ········if·(val$listener·!=·null)·{ |
23 | ············val$listener.onBlobRetrieved(new·Status(statusParcelable),·s,·s2,·blob); | 23 | ············val$listener.onBlobRetrieved(new·Status(statusParcelable),·s,·s2,·blob); |
24 | ········} | 24 | ········} |
Offset 6, 19 lines modified | Offset 6, 19 lines modified | ||
6 | ····final·/*·synthetic·*/·OnDeleteStatusListener·val$listener; | 6 | ····final·/*·synthetic·*/·OnDeleteStatusListener·val$listener; |
7 | ···· | 7 | ···· |
8 | ····OnDeleteStatusListener$1(final·OnDeleteStatusListener·val$listener)·{ | 8 | ····OnDeleteStatusListener$1(final·OnDeleteStatusListener·val$listener)·{ |
9 | ········this.val$listener·=·val$listener; | 9 | ········this.val$listener·=·val$listener; |
10 | ····} | 10 | ····} |
11 | ···· | 11 | ···· |
12 | ····public·String·getInterfaceHash()·{ | 12 | ····public·String·getInterfaceHash()·{ |
13 | ········return·" | 13 | ········return·"31826566143ef882d67fac9f24566f73df4907b4"; |
14 | ····} | 14 | ····} |
15 | ···· | 15 | ···· |
16 | ····public·int·getInterfaceVersion()·{ | 16 | ····public·int·getInterfaceVersion()·{ |
17 | ········return· | 17 | ········return·7; |
18 | ····} | 18 | ····} |
19 | ···· | 19 | ···· |
20 | ····public·void·onComplete(final·StatusParcelable·statusParcelable,·final·int·n)·{ | 20 | ····public·void·onComplete(final·StatusParcelable·statusParcelable,·final·int·n)·{ |
21 | ········final·OnDeleteStatusListener·val$listener·=·this.val$listener; | 21 | ········final·OnDeleteStatusListener·val$listener·=·this.val$listener; |
22 | ········if·(val$listener·!=·null)·{ | 22 | ········if·(val$listener·!=·null)·{ |
23 | ············val$listener.onComplete(new·Status(statusParcelable),·n); | 23 | ············val$listener.onComplete(new·Status(statusParcelable),·n); |
24 | ········} | 24 | ········} |
Offset 6, 19 lines modified | Offset 6, 19 lines modified | ||
6 | ····final·/*·synthetic·*/·OnStatusListener·val$listener; | 6 | ····final·/*·synthetic·*/·OnStatusListener·val$listener; |
7 | ···· | 7 | ···· |
8 | ····OnStatusListener$1(final·OnStatusListener·val$listener)·{ | 8 | ····OnStatusListener$1(final·OnStatusListener·val$listener)·{ |
9 | ········this.val$listener·=·val$listener; | 9 | ········this.val$listener·=·val$listener; |
10 | ····} | 10 | ····} |
11 | ···· | 11 | ···· |
12 | ····public·String·getInterfaceHash()·{ | 12 | ····public·String·getInterfaceHash()·{ |
13 | ········return·" | 13 | ········return·"31826566143ef882d67fac9f24566f73df4907b4"; |
14 | ····} | 14 | ····} |
15 | ···· | 15 | ···· |
16 | ····public·int·getInterfaceVersion()·{ | 16 | ····public·int·getInterfaceVersion()·{ |
17 | ········return· | 17 | ········return·7; |
18 | ····} | 18 | ····} |
19 | ···· | 19 | ···· |
20 | ····public·void·onComplete(final·StatusParcelable·statusParcelable)·{ | 20 | ····public·void·onComplete(final·StatusParcelable·statusParcelable)·{ |
21 | ········final·OnStatusListener·val$listener·=·this.val$listener; | 21 | ········final·OnStatusListener·val$listener·=·this.val$listener; |
22 | ········if·(val$listener·!=·null)·{ | 22 | ········if·(val$listener·!=·null)·{ |
23 | ············val$listener.onComplete(new·Status(statusParcelable)); | 23 | ············val$listener.onComplete(new·Status(statusParcelable)); |
24 | ········} | 24 | ········} |
Offset 1, 12 lines modified | Offset 1, 12 lines modified | ||
1 | package·com.android.server.wifi; | 1 | package·com.android.server.wifi; |
2 | import·android.net.wifi.ISuggestionConnectionStatusListener; | 2 | import·android.net.wifi.ISuggestionConnectionStatusListener; |
3 | import·android.os.IBinder; | 3 | import·android.os.IBinder; |
4 | public·final·class·-$$Lambda$WifiServiceImpl$ | 4 | public·final·class·-$$Lambda$WifiServiceImpl$QEbQWjtkwU2ZCBwW2g7n2lupBkw·implements·Runnable |
5 | { | 5 | { |
6 | ····public·final·void·run()·{ | 6 | ····public·final·void·run()·{ |
7 | ········this.f$0.lambda$registerSuggestionConnectionStatusListener$69$WifiServiceImpl(this.f$1,·this.f$2,·this.f$3,·this.f$4); | 7 | ········this.f$0.lambda$registerSuggestionConnectionStatusListener$69$WifiServiceImpl(this.f$1,·this.f$2,·this.f$3,·this.f$4,·this.f$5); |
8 | ····} | 8 | ····} |
9 | } | 9 | } |
Offset 1, 9 lines modified | Offset 1, 11 lines modified | ||
1 | package·com.android.server.wifi; | 1 | package·com.android.server.wifi; |
2 | 2 | import·java.util.function.Supplier; | |
3 | public·final·class·-$$Lambda$WifiServiceImpl$nd20ljo_XFKM5CZPUsUAGNROuUs·implements·Supplier | ||
3 | { | 4 | { |
4 | ····public·final· | 5 | ····public·final·Object·get()·{ |
5 | ········this.f$0.lambda$ | 6 | ········return·this.f$0.lambda$getNetworkSuggestions$59$WifiServiceImpl(this.f$1,·this.f$2); |
6 | ····} | 7 | ····} |
7 | } | 8 | } |
Offset 1, 8 lines modified | Offset 1, 8 lines modified | ||
1 | ··Size:·337 | 1 | ··Size:·3372326···» Blocks:·6592·······IO·Block:·4096···regular·file |
2 | Links:·1 | 2 | Links:·1 |
3 | Access:·(0644/-rw-r--r--)··Uid:·(·1001/·····dev)···Gid:·(·1001/·····dev) | 3 | Access:·(0644/-rw-r--r--)··Uid:·(·1001/·····dev)···Gid:·(·1001/·····dev) |
4 | Modify:·1970-01-01·00:00:00.000000000·+0000 | 4 | Modify:·1970-01-01·00:00:00.000000000·+0000 |
Offset 1, 2 lines modified | Offset 1, 2 lines modified | ||
1 | ServiceWifiResources | 1 | ServiceWifiResources |
2 | ServiceWifiResources | 2 | ServiceWifiResources/ServiceWifiResources.apk |
Offset 1, 1 lines modified | Offset 1, 1 lines modified | ||
1 | ServiceWifiResources | 1 | ServiceWifiResources.apk |
Offset 1, 13 lines modified | Offset 1, 11 lines modified | ||
1 | Zip·file·size:·6 | 1 | Zip·file·size:·619169·bytes,·number·of·entries:·9 |
2 | -rw----·····1.0·fat··· | 2 | -rw----·····1.0·fat···599764·bx·stor·09-Jan-01·00:00·resources.arsc |
3 | -rw----····· | 3 | -rw----·····2.0·fat·····2404·bl·defN·09-Jan-01·00:00·AndroidManifest.xml |
4 | -rw----·····2.0·fat·····2716·bl·defN·09-Jan-01·00:00·AndroidManifest.xml | ||
5 | -rw----·····2.0·fat·····1916·bl·defN·09-Jan-01·00:00·res/drawable/ic_wifi_settings.xml | 4 | -rw----·····2.0·fat·····1916·bl·defN·09-Jan-01·00:00·res/drawable/ic_wifi_settings.xml |
6 | -rw----·····2.0·fat·····1324·bl·defN·09-Jan-01·00:00·res/drawable/stat_notify_wifi_in_range.xml | 5 | -rw----·····2.0·fat·····1324·bl·defN·09-Jan-01·00:00·res/drawable/stat_notify_wifi_in_range.xml |
7 | -rw----·····2.0·fat·····1192·bl·defN·09-Jan-01·00:00·res/layout/wifi_p2p_dialog.xml | 6 | -rw----·····2.0·fat·····1192·bl·defN·09-Jan-01·00:00·res/layout/wifi_p2p_dialog.xml |
8 | -rw----·····2.0·fat······580·bl·defN·09-Jan-01·00:00·res/layout/wifi_p2p_dialog_row.xml | 7 | -rw----·····2.0·fat······580·bl·defN·09-Jan-01·00:00·res/layout/wifi_p2p_dialog_row.xml |
9 | -rw----·····2.0·fat······ | 8 | -rw----·····2.0·fat······764·bl·defN·09-Jan-01·00:00·META-INF/CERT.SF |
10 | -rw----·····2.0·fat····· | 9 | -rw----·····2.0·fat·····2385·bl·defN·09-Jan-01·00:00·META-INF/CERT.RSA |
11 | -rw----·····2.0·fat····· | 10 | -rw----·····2.0·fat······629·bl·defN·09-Jan-01·00:00·META-INF/MANIFEST.MF |
12 | 11 | 9·files,·610958·bytes·uncompressed,·605730·bytes·compressed:··0.9% | |
13 | 11·files,·618005·bytes·uncompressed,·612532·bytes·compressed:··0.9% |
Offset 1, 13 lines modified | Offset 1, 12 lines modified | ||
1 | <?xml·version="1.0"·encoding="utf-8"?> | 1 | <?xml·version="1.0"·encoding="utf-8"?> |
2 | <manifest·android:compileSdkVersion="30"·android:compileSdkVersionCodename="11"·android:versionCode="1"·android:versionName="R-initial"·coreApp="true"·package="com. | 2 | <manifest·android:compileSdkVersion="30"·android:compileSdkVersionCodename="11"·android:versionCode="1"·android:versionName="R-initial"·coreApp="true"·package="com.android.wifi.resources"·platformBuildVersionCode="30"·platformBuildVersionName="11"·xmlns:android="http://schemas.android.com/apk/res/android"> |
3 | ··<uses-sdk·android:minSdkVersion="30"·android:targetSdkVersion="30"/> | 3 | ··<uses-sdk·android:minSdkVersion="30"·android:targetSdkVersion="30"/> |
4 | ··<protected-broadcast·android:name="com.android.server.wifi.action.CarrierNetwork.USER_CLICKED"/> | 4 | ··<protected-broadcast·android:name="com.android.server.wifi.action.CarrierNetwork.USER_CLICKED"/> |
5 | ··<application·android:defaultToDeviceProtectedStorage="true"·android:directBootAware="true"·android:extractNativeLibs="false"·android:hasCode="false"·android:label="@string/wifiResourcesAppLabel"·android:usesCleartextTraffic="true"> | 5 | ··<application·android:defaultToDeviceProtectedStorage="true"·android:directBootAware="true"·android:extractNativeLibs="false"·android:hasCode="false"·android:label="@string/wifiResourcesAppLabel"·android:usesCleartextTraffic="true"> |
6 | ····<activity·android:enabled="true"·android:exported="true"·android:name="android.app.Activity"> | 6 | ····<activity·android:enabled="true"·android:exported="true"·android:name="android.app.Activity"> |
7 | ······<intent-filter> | 7 | ······<intent-filter> |
8 | ········<action·android:name="com.android.server.wifi.intent.action.SERVICE_WIFI_RESOURCES_APK"/> | 8 | ········<action·android:name="com.android.server.wifi.intent.action.SERVICE_WIFI_RESOURCES_APK"/> |
9 | ······</intent-filter> | 9 | ······</intent-filter> |
10 | ····</activity> | 10 | ····</activity> |
11 | ····<meta-data·android:name="android.content.pm.LOGGING_PARENT"·android:value="com.google.android.modulemetadata"/> | ||
12 | ··</application> | 11 | ··</application> |
13 | </manifest> | 12 | </manifest> |
Offset 1, 21 lines modified | Offset 1, 19 lines modified | ||
1 | !!brut.androlib.meta.MetaInfo | 1 | !!brut.androlib.meta.MetaInfo |
2 | compressionType:·false | 2 | compressionType:·false |
3 | doNotCompress: | 3 | doNotCompress: |
4 | -·arsc | 4 | -·arsc |
5 | -·assets/NOTICE.html.gz | ||
6 | isFrameworkApk:·false | 5 | isFrameworkApk:·false |
7 | packageInfo:·null | 6 | packageInfo:·null |
8 | sdkInfo: | 7 | sdkInfo: |
9 | ··minSdkVersion:·'30' | 8 | ··minSdkVersion:·'30' |
10 | ··targetSdkVersion:·'30' | 9 | ··targetSdkVersion:·'30' |
11 | sharedLibrary:·false | 10 | sharedLibrary:·false |
12 | sparseResources:·false | 11 | sparseResources:·false |
13 | unknownFiles: | 12 | unknownFiles:·{} |
14 | ··stamp-cert-sha256:·'8' | ||
15 | usesFramework: | 13 | usesFramework: |
16 | ··ids: | 14 | ··ids: |
17 | ··-·1 | 15 | ··-·1 |
18 | ··tag:·null | 16 | ··tag:·null |
19 | version:·2.3.4-dirty | 17 | version:·2.3.4-dirty |
20 | versionInfo: | 18 | versionInfo: |
21 | ··versionCode:·'1' | 19 | ··versionCode:·'1' |
Offset 1, 10 lines modified | Offset 1, 10 lines modified | ||
00000000:·0200·0c00· | 00000000:·0200·0c00·d426·0900·0100·0000·0100·1c00··.....&.......... | ||
00000010:· | 00000010:·9cd1·0500·1a14·0000·0000·0000·0001·0000··................ | ||
00000020:·8 | 00000020:·8450·0000·0000·0000·0000·0000·0300·0000··.P.............. | ||
00000030:·2600·0000·2d00·0000·3d00·0000·6c00·0000··&...-...=...l... | 00000030:·2600·0000·2d00·0000·3d00·0000·6c00·0000··&...-...=...l... | ||
00000040:·7800·0000·8700·0000·c500·0000·d100·0000··x............... | 00000040:·7800·0000·8700·0000·c500·0000·d100·0000··x............... | ||
00000050:·ea00·0000·d901·0000·0902·0000·2d02·0000··............-... | 00000050:·ea00·0000·d901·0000·0902·0000·2d02·0000··............-... | ||
00000060:·5a02·0000·7b02·0000·a002·0000·c602·0000··Z...{........... | 00000060:·5a02·0000·7b02·0000·a002·0000·c602·0000··Z...{........... | ||
00000070:·ee02·0000·1603·0000·3e03·0000·6603·0000··........>...f... | 00000070:·ee02·0000·1603·0000·3e03·0000·6603·0000··........>...f... | ||
00000080:·8e03·0000·b603·0000·de03·0000·e803·0000··................ | 00000080:·8e03·0000·b603·0000·de03·0000·e803·0000··................ | ||
00000090:·fb03·0000·7404·0000·9704·0000·a204·0000··....t........... | 00000090:·fb03·0000·7404·0000·9704·0000·a204·0000··....t........... | ||
Offset 39, 37361 lines modified | Offset 39, 37361 lines modified | ||
00000260:·5119·0000·6019·0000·6819·0000·7519·0000··Q...`...h...u... | 00000260:·5119·0000·6019·0000·6819·0000·7519·0000··Q...`...h...u... | ||
00000270:·8d19·0000·d819·0000·0f1a·0000·461a·0000··............F... | 00000270:·8d19·0000·d819·0000·0f1a·0000·461a·0000··............F... | ||
00000280:·6c1a·0000·961a·0000·b71a·0000·d81a·0000··l............... | 00000280:·6c1a·0000·961a·0000·b71a·0000·d81a·0000··l............... | ||
00000290:·fa1a·0000·6c1b·0000·801b·0000·8b1b·0000··....l........... | 00000290:·fa1a·0000·6c1b·0000·801b·0000·8b1b·0000··....l........... | ||
000002a0:·cd1b·0000·f31b·0000·071c·0000·1a1c·0000··................ | 000002a0:·cd1b·0000·f31b·0000·071c·0000·1a1c·0000··................ | ||
000002b0:·361c·0000·4f1c·0000·a31c·0000·b91c·0000··6...O........... | 000002b0:·361c·0000·4f1c·0000·a31c·0000·b91c·0000··6...O........... | ||
000002c0:·101d·0000·211d·0000·4b1d·0000·551d·0000··....!...K...U... | 000002c0:·101d·0000·211d·0000·4b1d·0000·551d·0000··....!...K...U... | ||
000002d0:·8 | 000002d0:·8f1d·0000·c91d·0000·031e·0000·3d1e·0000··............=... | ||
000002e0:· | 000002e0:·771e·0000·b11e·0000·eb1e·0000·031f·0000··w............... | ||
000002f0:· | 000002f0:·3b1f·0000·7c1f·0000·a91f·0000·d61f·0000··;...|........... | ||
00000300:· | 00000300:·2321·0000·9e21·0000·6523·0000·b723·0000··#!...!..e#...#.. | ||
00000310:· | 00000310:·e523·0000·0e24·0000·3724·0000·6b24·0000··.#...$..7$..k$.. | ||
00000320:· | 00000320:·ad24·0000·ce24·0000·0b25·0000·4a25·0000··.$...$...%..J%.. | ||
00000330:· | 00000330:·6a25·0000·ff26·0000·2127·0000·4327·0000··j%...&..!'..C'.. | ||
00000340:· | 00000340:·6527·0000·8727·0000·a927·0000·cb27·0000··e'...'...'...'.. | ||
00000350:· | 00000350:·ed27·0000·5f28·0000·8628·0000·a728·0000··.'.._(...(...(.. | ||
00000360:· | 00000360:·d428·0000·0529·0000·3529·0000·5c29·0000··.(...)..5)..\).. | ||
00000370:· | 00000370:·8529·0000·b529·0000·f329·0000·2e2a·0000··.)...)...)...*.. | ||
00000380:· | 00000380:·cb2a·0000·ec2a·0000·342b·0000·6a2b·0000··.*...*..4+..j+.. | ||
00000390:· | 00000390:·762b·0000·c82b·0000·ea2b·0000·442c·0000··v+...+...+..D,.. | ||
000003a0:· | 000003a0:·9b2c·0000·c82c·0000·ef2c·0000·192d·0000··.,...,...,...-.. | ||
000003b0:· | 000003b0:·342d·0000·672d·0000·9a2d·0000·0a2e·0000··4-..g-...-...... | ||
000003c0:· | 000003c0:·4a2e·0000·652e·0000·772e·0000·862e·0000··J...e...w....... | ||
000003d0:· | 000003d0:·b12e·0000·d22e·0000·db2e·0000·ed2e·0000··................ | ||
000003e0:· | 000003e0:·0830·0000·1d30·0000·3e30·0000·5f30·0000··.0...0..>0.._0.. | ||
000003f0:· | 000003f0:·7130·0000·bf30·0000·c830·0000·da30·0000··q0...0...0...0.. | ||
00000400:· | 00000400:·1331·0000·5331·0000·a431·0000·f531·0000··.1..S1...1...1.. | ||
00000410:· | 00000410:·4632·0000·9732·0000·e832·0000·3933·0000··F2...2...2..93.. | ||
00000420:· | 00000420:·8a33·0000·e033·0000·5e34·0000·2935·0000··.3...3..^4..)5.. | ||
00000430:·6 | 00000430:·6f35·0000·b735·0000·0e36·0000·4d36·0000··o5...5...6..M6.. | ||
00000440:· | 00000440:·b236·0000·2c37·0000·4a37·0000·7837·0000··.6..,7..J7..x7.. | ||
00000450:·9 | 00000450:·9e37·0000·bd37·0000·2c38·0000·6e38·0000··.7...7..,8..n8.. | ||
00000460:· | 00000460:·c638·0000·3939·0000·5d39·0000·983b·0000··.8..99..]9...;.. | ||
00000470:· | 00000470:·363c·0000·653f·0000·a03f·0000·e93f·0000··6<..e?...?...?.. | ||
00000480:· | 00000480:·0140·0000·1841·0000·8541·0000·1442·0000··.@...A...A...B.. | ||
00000490:· | 00000490:·7b42·0000·9442·0000·a942·0000·e342·0000··{B...B...B...B.. | ||
000004a0:· | 000004a0:·2943·0000·aa43·0000·de43·0000·f843·0000··)C...C...C...C.. | ||
000004b0:· | 000004b0:·9144·0000·ce44·0000·6b45·0000·8345·0000··.D...D..kE...E.. | ||
000004c0:· | 000004c0:·ca45·0000·ff45·0000·3c46·0000·7946·0000··.E...E..<F..yF.. | ||
000004d0:· | 000004d0:·a446·0000·c646·0000·8747·0000·db47·0000··.F...F...G...G.. | ||
000004e0:· | 000004e0:·1148·0000·8348·0000·b548·0000·0b49·0000··.H...H...H...I.. | ||
000004f0:· | 000004f0:·4a49·0000·8949·0000·c849·0000·074a·0000··JI...I...I...J.. | ||
00000500:· | 00000500:·464a·0000·854a·0000·c44a·0000·174b·0000··FJ...J...J...K.. | ||
00000510:· | 00000510:·664b·0000·074c·0000·294c·0000·3d4c·0000··fK...L..)L..=L.. | ||
00000520:· | 00000520:·454d·0000·6d4d·0000·044e·0000·344e·0000··EM..mM...N..4N.. | ||
00000530:· | 00000530:·d450·0000·f050·0000·1351·0000·6251·0000··.P...P...Q..bQ.. | ||
00000540:· | 00000540:·aa51·0000·f551·0000·4252·0000·9d52·0000··.Q...Q..BR...R.. | ||
00000550:·1 | 00000550:·1e53·0000·8953·0000·3a54·0000·0056·0000··.S...S..:T...V.. | ||
00000560:· | 00000560:·0c56·0000·1f56·0000·9556·0000·b756·0000··.V...V...V...V.. | ||
00000570:·d | 00000570:·df56·0000·0e57·0000·4357·0000·7a57·0000··.V...W..CW..zW.. | ||
00000580:· | 00000580:·cc57·0000·5658·0000·6658·0000·2259·0000··.W..VX..fX.."Y.. | ||
00000590:·5 | 00000590:·5f59·0000·7859·0000·be59·0000·0f5a·0000··_Y..xY...Y...Z.. | ||
000005a0:· | 000005a0:·7d5a·0000·eb5a·0000·4a5b·0000·c05b·0000··}Z...Z..J[...[.. | ||
000005b0:· | 000005b0:·1a5c·0000·475c·0000·545c·0000·735c·0000··.\..G\..T\..s\.. | ||
000005c0:· | 000005c0:·985c·0000·f55c·0000·285d·0000·bf5d·0000··.\...\..(]...].. | ||
000005d0:· | 000005d0:·e15d·0000·005e·0000·395e·0000·865e·0000··.]...^..9^...^.. | ||
000005e0:· | 000005e0:·d15e·0000·1c5f·0000·675f·0000·b25f·0000··.^..._..g_..._.. | ||
000005f0:· | 000005f0:·fd5f·0000·4860·0000·9360·0000·f160·0000··._..H`...`...`.. | ||
00000600:· | 00000600:·3a61·0000·1f62·0000·b062·0000·4763·0000··:a...b...b..Gc.. | ||
00000610:· | 00000610:·0564·0000·4364·0000·6564·0000·7a64·0000··.d..Cd..ed..zd.. | ||
00000620:· | 00000620:·1465·0000·3f65·0000·8265·0000·8e65·0000··.e..?e...e...e.. | ||
00000630:· | 00000630:·ac65·0000·c067·0000·1a6b·0000·556b·0000··.e...g...k..Uk.. | ||
00000640:· | 00000640:·8c6b·0000·d26b·0000·4e6c·0000·6c6c·0000··.k...k..Nl..ll.. | ||
00000650:· | 00000650:·886c·0000·946c·0000·936d·0000·256e·0000··.l...l...m..%n.. | ||
00000660:· | 00000660:·696e·0000·056f·0000·956f·0000·f56f·0000··in...o...o...o.. | ||
00000670:· | 00000670:·4070·0000·b270·0000·ea70·0000·0271·0000··@p...p...p...q.. | ||
00000680:· | 00000680:·3671·0000·8871·0000·c271·0000·2772·0000··6q...q...q..'r.. | ||
00000690:· | 00000690:·d572·0000·e572·0000·4f73·0000·6873·0000··.r...r..Os..hs.. | ||
000006a0:· | 000006a0:·a673·0000·c173·0000·1574·0000·5174·0000··.s...s...t..Qt.. | ||
000006b0:· | 000006b0:·ab74·0000·f174·0000·6675·0000·d175·0000··.t...t..fu...u.. | ||
000006c0:· | 000006c0:·3076·0000·7c76·0000·a276·0000·c876·0000··0v..|v...v...v.. | ||
000006d0:·e | 000006d0:·ee76·0000·1477·0000·3a77·0000·6077·0000··.v...w..:w..`w.. | ||
000006e0:· | 000006e0:·8677·0000·ac77·0000·e977·0000·f977·0000··.w...w...w...w.. | ||
000006f0:· | 000006f0:·2a78·0000·3378·0000·8578·0000·b578·0000··*x..3x...x...x.. | ||
00000700:·b | 00000700:·be78·0000·d478·0000·eb78·0000·1e79·0000··.x...x...x...y.. | ||
00000710:· | 00000710:·2b7a·0000·337a·0000·da7a·0000·eb7a·0000··+z..3z...z...z.. | ||
00000720:· | 00000720:·017b·0000·347b·0000·6c7b·0000·887b·0000··.{..4{..l{...{.. | ||
00000730:· | 00000730:·a07b·0000·c97b·0000·e37b·0000·fe7b·0000··.{...{...{...{.. | ||
00000740:· | 00000740:·0a7c·0000·317c·0000·4f7c·0000·6b7c·0000··.|..1|..O|..k|.. | ||
00000750:· | 00000750:·937c·0000·9e7c·0000·b97c·0000·cb7c·0000··.|...|...|...|.. | ||
00000760:·d | 00000760:·de7c·0000·1e7d·0000·3d7d·0000·597d·0000··.|...}..=}..Y}.. | ||
00000770:· | 00000770:·9c7d·0000·a57d·0000·e67d·0000·097e·0000··.}...}...}...~.. | ||
00000780:· | 00000780:·297e·0000·517e·0000·6e7e·0000·8c7e·0000··)~..Q~..n~...~.. | ||
00000790:· | 00000790:·b97e·0000·ce7e·0000·e97e·0000·0c7f·0000··.~...~...~...... | ||
000007a0:· | 000007a0:·2b7f·0000·6d7f·0000·ac7f·0000·eb7f·0000··+...m........... | ||
000007b0:· | 000007b0:·2a80·0000·6980·0000·a880·0000·e780·0000··*...i........... | ||
000007c0:· | 000007c0:·2681·0000·3381·0000·4e81·0000·8281·0000··&...3...N....... | ||
000007d0:· | 000007d0:·b681·0000·d481·0000·dc81·0000·ef81·0000··................ | ||
000007e0:· | 000007e0:·4382·0000·9682·0000·6e83·0000·8383·0000··C.......n....... | ||
000007f0:· | 000007f0:·e183·0000·0e84·0000·5084·0000·4186·0000··........P...A... | ||
00000800:· | 00000800:·6d86·0000·9786·0000·b586·0000·eb86·0000··m............... | ||
00000810:· | 00000810:·5b87·0000·ec88·0000·f888·0000·5a89·0000··[...........Z... | ||
00000820:·c | 00000820:·ce89·0000·2a8a·0000·488a·0000·918a·0000··....*...H....... | ||
00000830:· | 00000830:·d58a·0000·f68a·0000·0b8b·0000·428b·0000··............B... | ||
00000840:· | 00000840:·aa8b·0000·b18b·0000·f38b·0000·0c8c·0000··................ | ||
00000850:· | 00000850:·498c·0000·7a8c·0000·ab8c·0000·0a8d·0000··I...z........... | ||
00000860:· | 00000860:·1d8d·0000·ac8d·0000·fe8d·0000·0f8e·0000··................ | ||
00000870:·2 | 00000870:·2f8e·0000·548e·0000·6a8e·0000·948e·0000··/...T...j....... | ||
00000880:· | 00000880:·1b8f·0000·4b8f·0000·5f8f·0000·848f·0000··....K..._....... | ||
00000890:·a | 00000890:·ae8f·0000·d98f·0000·0490·0000·2f90·0000··............/... | ||
000008a0:· | 000008a0:·5a90·0000·8590·0000·b090·0000·db90·0000··Z............... | ||
000008b0:· | 000008b0:·e690·0000·f490·0000·0591·0000·0b91·0000··................ | ||
000008c0:· | 000008c0:·7491·0000·a991·0000·cb91·0000·0e92·0000··t............... | ||
000008d0:· | 000008d0:·6792·0000·a292·0000·ad92·0000·c292·0000··g............... | ||
000008e0:· | 000008e0:·ea92·0000·3993·0000·4f93·0000·8593·0000··....9...O....... | ||
000008f0:· | 000008f0:·9893·0000·b293·0000·f293·0000·3f94·0000··............?... | ||
00000900:· | 00000900:·5894·0000·6d94·0000·8a94·0000·9794·0000··X...m........... | ||
00000910:· | 00000910:·b194·0000·c794·0000·d894·0000·ec94·0000··................ | ||
00000920:·f | 00000920:·fe94·0000·1895·0000·1d95·0000·3695·0000··............6... | ||
00000930:· | 00000930:·8895·0000·ad95·0000·b995·0000·d395·0000··................ | ||
00000940:· | 00000940:·f795·0000·1d96·0000·3496·0000·8a96·0000··........4....... | ||
00000950:· | 00000950:·9196·0000·b296·0000·cf96·0000·e696·0000··................ | ||
00000960:· | 00000960:·0897·0000·3a97·0000·d298·0000·b499·0000··....:........... | ||
00000970:· | 00000970:·f799·0000·029a·0000·4f9a·0000·b69a·0000··........O....... | ||
00000980:· | 00000980:·1d9b·0000·849b·0000·eb9b·0000·529c·0000··............R... | ||
00000990:· | 00000990:·b99c·0000·209d·0000·589d·0000·bb9d·0000··....·...X....... | ||
... Open expanded diff (truncated) ... |
Offset 1, 26 lines modified | Offset 1, 20 lines modified | ||
1 | Manifest-Version:·1.0\xd | 1 | Manifest-Version:·1.0\xd |
2 | \xd | 2 | \xd |
3 | Name:·AndroidManifest.xml\xd | 3 | Name:·AndroidManifest.xml\xd |
4 | SHA-256-Digest:· | 4 | SHA-256-Digest:·pw9yWkt1a6kMkYgE+BDYYGDO++YyAjgssaP3gxzY4K4=\xd |
5 | \xd | ||
6 | Name:·assets/NOTICE.html.gz\xd | ||
7 | SHA-256-Digest:·0i3S0W4xKxP+Q46KrA2xJ6XghP/JN4CJ5pjS1Gvh2aI=\xd | ||
8 | \xd | 5 | \xd |
9 | Name:·res/drawable/ic_wifi_settings.xml\xd | 6 | Name:·res/drawable/ic_wifi_settings.xml\xd |
10 | SHA-256-Digest:·szc1/CI/9jDmLHWOf52BcpNb9Sdx+5jQRf2ajp8ZnV0=\xd | 7 | SHA-256-Digest:·szc1/CI/9jDmLHWOf52BcpNb9Sdx+5jQRf2ajp8ZnV0=\xd |
11 | \xd | 8 | \xd |
12 | Name:·res/drawable/stat_notify_wifi_in_range.xml\xd | 9 | Name:·res/drawable/stat_notify_wifi_in_range.xml\xd |
13 | SHA-256-Digest:·wD/zI6SBSG2AqnyqIHd07kSRhv/evCykVugfNy7esW0=\xd | 10 | SHA-256-Digest:·wD/zI6SBSG2AqnyqIHd07kSRhv/evCykVugfNy7esW0=\xd |
14 | \xd | 11 | \xd |
15 | Name:·res/layout/wifi_p2p_dialog.xml\xd | 12 | Name:·res/layout/wifi_p2p_dialog.xml\xd |
16 | SHA-256-Digest:·oQJ0raJ1KQT/QZwv5rw7jyS/HuVRrICsoJbTcTy4Zuw=\xd | 13 | SHA-256-Digest:·oQJ0raJ1KQT/QZwv5rw7jyS/HuVRrICsoJbTcTy4Zuw=\xd |
17 | \xd | 14 | \xd |
18 | Name:·res/layout/wifi_p2p_dialog_row.xml\xd | 15 | Name:·res/layout/wifi_p2p_dialog_row.xml\xd |
19 | SHA-256-Digest:·yl7Cu4ksYCXf27CtQmDP6zoX4bluPpAo6W9aKm5QAjA=\xd | 16 | SHA-256-Digest:·yl7Cu4ksYCXf27CtQmDP6zoX4bluPpAo6W9aKm5QAjA=\xd |
20 | \xd | 17 | \xd |
21 | Name:·resources.arsc\xd | 18 | Name:·resources.arsc\xd |
22 | SHA-256-Digest:· | 19 | SHA-256-Digest:·pTR3kY1rOc+9WMKaPIGd0MTCu2YY1gF3qM1FmY/f6E0=\xd |
23 | \xd | ||
24 | Name:·stamp-cert-sha256\xd | ||
25 | SHA-256-Digest:·HZwqAqk4Fv9ceuZPmq0Cwj3kncUUYg2xp61iTSqDZ5w=\xd | ||
26 | \xd | 20 | \xd |
Offset 1, 29 lines modified | Offset 1, 23 lines modified | ||
1 | Signature-Version:·1.0\xd | 1 | Signature-Version:·1.0\xd |
2 | Created-By:·1.0·(Android·SignApk)\xd | 2 | Created-By:·1.0·(Android·SignApk)\xd |
3 | SHA-256-Digest-Manifest:· | 3 | SHA-256-Digest-Manifest:·LGsiQMBDzdCkI8S0MlhaCsN4BH9EIObtqZdZ4b3WB4w=\xd |
4 | X-Android-APK-Signed:·2,·3\xd | 4 | X-Android-APK-Signed:·2,·3\xd |
5 | \xd | 5 | \xd |
6 | Name:·AndroidManifest.xml\xd | 6 | Name:·AndroidManifest.xml\xd |
7 | SHA-256-Digest:· | 7 | SHA-256-Digest:·oSU/LDmmmbPbU+jIl43A4KwNlzl18N3m/ES6nfkDjKE=\xd |
8 | \xd | ||
9 | Name:·assets/NOTICE.html.gz\xd | ||
10 | SHA-256-Digest:·ABWXDAOt8P2NvxptvzPmPDvYIgVaTPQtZwuK7Haz9BQ=\xd | ||
11 | \xd | 8 | \xd |
12 | Name:·res/drawable/ic_wifi_settings.xml\xd | 9 | Name:·res/drawable/ic_wifi_settings.xml\xd |
13 | SHA-256-Digest:·fhgyEEGAy5a2LIec4H0IXmn5i/5YwIFNStysuEhkreM=\xd | 10 | SHA-256-Digest:·fhgyEEGAy5a2LIec4H0IXmn5i/5YwIFNStysuEhkreM=\xd |
14 | \xd | 11 | \xd |
15 | Name:·res/drawable/stat_notify_wifi_in_range.xml\xd | 12 | Name:·res/drawable/stat_notify_wifi_in_range.xml\xd |
16 | SHA-256-Digest:·7pUN1z3QO7N3Zg39m87MSmhxpQSQTOSM00jEAT4r4n8=\xd | 13 | SHA-256-Digest:·7pUN1z3QO7N3Zg39m87MSmhxpQSQTOSM00jEAT4r4n8=\xd |
17 | \xd | 14 | \xd |
18 | Name:·res/layout/wifi_p2p_dialog.xml\xd | 15 | Name:·res/layout/wifi_p2p_dialog.xml\xd |
19 | SHA-256-Digest:·A/xFc4Wwvhs7aL55TjxTO1rVA1aYmLs7OuWCaY3ND6o=\xd | 16 | SHA-256-Digest:·A/xFc4Wwvhs7aL55TjxTO1rVA1aYmLs7OuWCaY3ND6o=\xd |
20 | \xd | 17 | \xd |
21 | Name:·res/layout/wifi_p2p_dialog_row.xml\xd | 18 | Name:·res/layout/wifi_p2p_dialog_row.xml\xd |
22 | SHA-256-Digest:·5u+C2n7WffhNrYbQjuEz5rxcnM5EAWmFeAEaYsAAO8c=\xd | 19 | SHA-256-Digest:·5u+C2n7WffhNrYbQjuEz5rxcnM5EAWmFeAEaYsAAO8c=\xd |
23 | \xd | 20 | \xd |
24 | Name:·resources.arsc\xd | 21 | Name:·resources.arsc\xd |
25 | SHA-256-Digest:· | 22 | SHA-256-Digest:·S/PdZIZpaOUGUhpXte/9TMNUGU6l7Fe6rWM+LAPrUzA=\xd |
26 | \xd | ||
27 | Name:·stamp-cert-sha256\xd | ||
28 | SHA-256-Digest:·L0p4Bm/NGffFWX26fUKi8jlq3aKsfwyEBtSavY6F0c0=\xd | ||
29 | \xd | 23 | \xd |
Offset 1, 10 lines modified | Offset 1, 10 lines modified | ||
1 | <?xml·version="1.0"·encoding="utf-8"?> | 1 | <?xml·version="1.0"·encoding="utf-8"?> |
2 | <resources> | 2 | <resources> |
3 | ··<string·name="wifi_eap_error_message_code_32760">%1$s·:·Не·можете·да·се·повежете·на·Verizon·Wi | 3 | ··<string·name="wifi_eap_error_message_code_32760">%1$s·:·Не·можете·да·се·повежете·на·Verizon·WiFi·Access·ван·области·коју·Verizon·покрива.</string> |
4 | ··<string·name="wifi_eap_error_message_code_32761">%1$s·:·Нисте·претплаћени·на·Verizon·Wi | 4 | ··<string·name="wifi_eap_error_message_code_32761">%1$s·:·Нисте·претплаћени·на·Verizon·WiFi·Access.·Позовите·нас·на·800·922·0204.</string> |
5 | ··<string·name="wifi_eap_error_message_code_32762">%1$s·:·Дошло·је·до·проблема·у·вези·са·Verizon·Wi | 5 | ··<string·name="wifi_eap_error_message_code_32762">%1$s·:·Дошло·је·до·проблема·у·вези·са·Verizon·WiFi·Access·налогом.·Позовите·нас·на·800·922·0204.</string> |
6 | ··<string·name="wifi_eap_error_message_code_32763">%1$s·:·Већ·сте·повезани·на·Verizon·Wi | 6 | ··<string·name="wifi_eap_error_message_code_32763">%1$s·:·Већ·сте·повезани·на·Verizon·WiFi·Access.</string> |
7 | ··<string·name="wifi_eap_error_message_code_32764">%1$s·:·Постоји·проблем·при·повезивању·на·Verizon·Wi | 7 | ··<string·name="wifi_eap_error_message_code_32764">%1$s·:·Постоји·проблем·при·повезивању·на·Verizon·WiFi·Access.·Позовите·нас·на·800·922·0204.</string> |
8 | ··<string·name="wifi_eap_error_message_code_32765">%1$s·:·Дошло·је·до·проблема·у·вези·са·Verizon·Wi | 8 | ··<string·name="wifi_eap_error_message_code_32765">%1$s·:·Дошло·је·до·проблема·у·вези·са·Verizon·WiFi·Access·налогом.·Позовите·нас·на·800·922·0204.</string> |
9 | ··<string·name="wifi_eap_error_message_code_32766">%1$s·:·Verizon·Wi | 9 | ··<string·name="wifi_eap_error_message_code_32766">%1$s·:·Verizon·WiFi·Access·није·доступан·са·ваше·локације.·Пробајте·поново·касније·или·пробајте·са·неке·друге·локације.</string> |
10 | </resources> | 10 | </resources> |
Offset 3, 25 lines modified | Offset 3, 25 lines modified | ||
3 | ··<string·name="accept">Прихвати</string> | 3 | ··<string·name="accept">Прихвати</string> |
4 | ··<string·name="decline">Одбиј</string> | 4 | ··<string·name="decline">Одбиј</string> |
5 | ··<string·name="dlg_ok">Потврди</string> | 5 | ··<string·name="dlg_ok">Потврди</string> |
6 | ··<string·name="notification_channel_network_alerts">Обавештења·у·вези·са·мрежом</string> | 6 | ··<string·name="notification_channel_network_alerts">Обавештења·у·вези·са·мрежом</string> |
7 | ··<string·name="notification_channel_network_available">Мрежа·је·доступна</string> | 7 | ··<string·name="notification_channel_network_available">Мрежа·је·доступна</string> |
8 | ··<string·name="notification_channel_network_status">Статус·мреже</string> | 8 | ··<string·name="notification_channel_network_status">Статус·мреже</string> |
9 | ··<string·name="ok">Потврди</string> | 9 | ··<string·name="ok">Потврди</string> |
10 | ··<string·name="wifiResourcesAppLabel">Системски·Wi | 10 | ··<string·name="wifiResourcesAppLabel">Системски·WiFi·ресурси</string> |
11 | ··<string·name="wifi_available_action_all_networks">Све·мреже</string> | 11 | ··<string·name="wifi_available_action_all_networks">Све·мреже</string> |
12 | ··<string·name="wifi_available_action_connect">Повежи</string> | 12 | ··<string·name="wifi_available_action_connect">Повежи</string> |
13 | ··<string·name="wifi_available_content_failed_to_connect">Додирните·да·бисте·видели·све·мреже</string> | 13 | ··<string·name="wifi_available_content_failed_to_connect">Додирните·да·бисте·видели·све·мреже</string> |
14 | ··<string·name="wifi_available_title">Повежите·се·са·отвореном·Wi‑Fi·мрежом</string> | 14 | ··<string·name="wifi_available_title">Повежите·се·са·отвореном·Wi‑Fi·мрежом</string> |
15 | ··<string·name="wifi_available_title_connected">Повезали·сте·се·са·Wi‑Fi·мрежом</string> | 15 | ··<string·name="wifi_available_title_connected">Повезали·сте·се·са·Wi‑Fi·мрежом</string> |
16 | ··<string·name="wifi_available_title_connecting">Повезује·се·са·Wi | 16 | ··<string·name="wifi_available_title_connecting">Повезује·се·са·WiFi·мрежом...</string> |
17 | ··<string·name="wifi_available_title_failed_to_connect">Повезивање·са·Wi‑Fi·мрежом·није·успело</string> | 17 | ··<string·name="wifi_available_title_failed_to_connect">Повезивање·са·Wi‑Fi·мрежом·није·успело</string> |
18 | ··<string·name="wifi_cannot_connect_with_randomized_mac_message">Додирните·да·бисте·променили·подешавања·приватности·и·пробали·поново</string> | 18 | ··<string·name="wifi_cannot_connect_with_randomized_mac_message">Додирните·да·бисте·променили·подешавања·приватности·и·пробали·поново</string> |
19 | ··<string·name="wifi_cannot_connect_with_randomized_mac_title">Повезивање·на·мрежу·%1$s·није·успело</string> | 19 | ··<string·name="wifi_cannot_connect_with_randomized_mac_title">Повезивање·на·мрежу·%1$s·није·успело</string> |
20 | ··<string·name="wifi_connect_alert_message">Апликација·%1$s·жели·да·се·повеже·на·Wi | 20 | ··<string·name="wifi_connect_alert_message">Апликација·%1$s·жели·да·се·повеже·на·WiFi·мрежу·%2$s</string> |
21 | ··<string·name="wifi_connect_alert_title">Желите·ли·да·дозволите·повезивање?</string> | 21 | ··<string·name="wifi_connect_alert_title">Желите·ли·да·дозволите·повезивање?</string> |
22 | ··<string·name="wifi_connect_default_application">Апликација</string> | 22 | ··<string·name="wifi_connect_default_application">Апликација</string> |
23 | ··<string·name="wifi_disable_mac_randomization_dialog_confirm_text">Промени·подешавање</string> | 23 | ··<string·name="wifi_disable_mac_randomization_dialog_confirm_text">Промени·подешавање</string> |
24 | ··<string·name="wifi_disable_mac_randomization_dialog_failure">Промена·подешавања·приватности·није·успела</string> | 24 | ··<string·name="wifi_disable_mac_randomization_dialog_failure">Промена·подешавања·приватности·није·успела</string> |
25 | ··<string·name="wifi_disable_mac_randomization_dialog_message">"%1$s·треба·да·се·повеже·помоћу·MAC·адресе·уређаја,·јединственог·идентификатора.·Подешавање·приватности·за·ову·мрежу·тренутно·користи·насумични·идентификатор.· | 25 | ··<string·name="wifi_disable_mac_randomization_dialog_message">"%1$s·треба·да·се·повеже·помоћу·MAC·адресе·уређаја,·јединственог·идентификатора.·Подешавање·приватности·за·ову·мрежу·тренутно·користи·насумични·идентификатор.· |
26 | Ова·измена·може·да·омогући·уређајима·у·близини·да·прате·локацију·уређаја."</string> | 26 | Ова·измена·може·да·омогући·уређајима·у·близини·да·прате·локацију·уређаја."</string> |
Offset 32, 37 lines modified | Offset 32, 37 lines modified | ||
32 | ··<string·name="wifi_eap_error_message_code_32761">%1$s:·EAP·грешка·при·потврди·идентитета·32761</string> | 32 | ··<string·name="wifi_eap_error_message_code_32761">%1$s:·EAP·грешка·при·потврди·идентитета·32761</string> |
33 | ··<string·name="wifi_eap_error_message_code_32762">%1$s:·EAP·грешка·при·потврди·идентитета·32762</string> | 33 | ··<string·name="wifi_eap_error_message_code_32762">%1$s:·EAP·грешка·при·потврди·идентитета·32762</string> |
34 | ··<string·name="wifi_eap_error_message_code_32763">%1$s:·EAP·грешка·при·потврди·идентитета·32763</string> | 34 | ··<string·name="wifi_eap_error_message_code_32763">%1$s:·EAP·грешка·при·потврди·идентитета·32763</string> |
35 | ··<string·name="wifi_eap_error_message_code_32764">%1$s:·EAP·грешка·при·потврди·идентитета·32764</string> | 35 | ··<string·name="wifi_eap_error_message_code_32764">%1$s:·EAP·грешка·при·потврди·идентитета·32764</string> |
36 | ··<string·name="wifi_eap_error_message_code_32765">%1$s:·EAP·грешка·при·потврди·идентитета·32765</string> | 36 | ··<string·name="wifi_eap_error_message_code_32765">%1$s:·EAP·грешка·при·потврди·идентитета·32765</string> |
37 | ··<string·name="wifi_eap_error_message_code_32766">%1$s:·EAP·грешка·при·потврди·идентитета·32766</string> | 37 | ··<string·name="wifi_eap_error_message_code_32766">%1$s:·EAP·грешка·при·потврди·идентитета·32766</string> |
38 | ··<string·name="wifi_p2p_enter_pin_message">Унесите·потребни·PIN:</string> | 38 | ··<string·name="wifi_p2p_enter_pin_message">Унесите·потребни·PIN:</string> |
39 | ··<string·name="wifi_p2p_frequency_conflict_message">Телефон·ће·привремено·прекинути·везу·са·Wi | 39 | ··<string·name="wifi_p2p_frequency_conflict_message">Телефон·ће·привремено·прекинути·везу·са·WiFi-ем·док·је·повезан·са·уређајем·%1$s</string> |
40 | ··<string·name="wifi_p2p_from_message">Од:</string> | 40 | ··<string·name="wifi_p2p_from_message">Од:</string> |
41 | ··<string·name="wifi_p2p_invitation_sent_title">Позивница·је·послата</string> | 41 | ··<string·name="wifi_p2p_invitation_sent_title">Позивница·је·послата</string> |
42 | ··<string·name="wifi_p2p_invitation_to_connect_title">Позивница·за·повезивање</string> | 42 | ··<string·name="wifi_p2p_invitation_to_connect_title">Позивница·за·повезивање</string> |
43 | ··<string·name="wifi_p2p_show_pin_message">PIN:</string> | 43 | ··<string·name="wifi_p2p_show_pin_message">PIN:</string> |
44 | ··<string·name="wifi_p2p_to_message">Коме:</string> | 44 | ··<string·name="wifi_p2p_to_message">Коме:</string> |
45 | ··<string·name="wifi_sim_required_message">Да·бисте·се·повезали·на·мрежу·%1$s,· | 45 | ··<string·name="wifi_sim_required_message">Да·бисте·се·повезали·на·мрежу·%1$s,·ставите·%2$s·SIM·картицу</string> |
46 | ··<string·name="wifi_sim_required_title">Wi | 46 | ··<string·name="wifi_sim_required_title">WiFi·веза·је·прекинута</string> |
47 | ··<string·name="wifi_softap_auto_shutdown_timeout_expired_summary">Ниједан·уређај·није·повезан.·Додирните·да·бисте·изменили.</string> | 47 | ··<string·name="wifi_softap_auto_shutdown_timeout_expired_summary">Ниједан·уређај·није·повезан.·Додирните·да·бисте·изменили.</string> |
48 | ··<string·name="wifi_softap_auto_shutdown_timeout_expired_title">Хотспот·је·искључен</string> | 48 | ··<string·name="wifi_softap_auto_shutdown_timeout_expired_title">Хотспот·је·искључен</string> |
49 | ··<string·name="wifi_suggestion_action_allow_app">Дозволи</string> | 49 | ··<string·name="wifi_suggestion_action_allow_app">Дозволи</string> |
50 | ··<string·name="wifi_suggestion_action_allow_imsi_privacy_exemption_carrier">Повежи</string> | 50 | ··<string·name="wifi_suggestion_action_allow_imsi_privacy_exemption_carrier">Повежи</string> |
51 | ··<string·name="wifi_suggestion_action_allow_imsi_privacy_exemption_confirmation">Повежи</string> | 51 | ··<string·name="wifi_suggestion_action_allow_imsi_privacy_exemption_confirmation">Повежи</string> |
52 | ··<string·name="wifi_suggestion_action_disallow_app">Не,·хвала</string> | 52 | ··<string·name="wifi_suggestion_action_disallow_app">Не,·хвала</string> |
53 | ··<string·name="wifi_suggestion_action_disallow_imsi_privacy_exemption_carrier">Не·повезуј</string> | 53 | ··<string·name="wifi_suggestion_action_disallow_imsi_privacy_exemption_carrier">Не·повезуј</string> |
54 | ··<string·name="wifi_suggestion_action_disallow_imsi_privacy_exemption_confirmation">Не·повезуј</string> | 54 | ··<string·name="wifi_suggestion_action_disallow_imsi_privacy_exemption_confirmation">Не·повезуј</string> |
55 | ··<string·name="wifi_suggestion_content">Мреже·које·предлаже·%s.·Уређај·ће·се·можда·повезати·аутоматски.</string> | 55 | ··<string·name="wifi_suggestion_content">Мреже·које·предлаже·%s.·Уређај·ће·се·можда·повезати·аутоматски.</string> |
56 | ··<string·name="wifi_suggestion_imsi_privacy_content">Ове·мреже·добијају·ИД·SIM·картице·који·може·да·се·користи·за·праћење·локације·уређаја</string> | 56 | ··<string·name="wifi_suggestion_imsi_privacy_content">Ове·мреже·добијају·ИД·SIM·картице·који·може·да·се·користи·за·праћење·локације·уређаја</string> |
57 | ··<string·name="wifi_suggestion_imsi_privacy_exemption_confirmation_content">Ако·се·повежете,·Wi‑Fi·мреже·оператера·%s·могу·да·приступају·јединственом·ИД-у·повезаном·са·SIM·картицом·или·да·га·деле.·То·може·да·омогући·праћење·локације·уређаја.</string> | 57 | ··<string·name="wifi_suggestion_imsi_privacy_exemption_confirmation_content">Ако·се·повежете,·Wi‑Fi·мреже·оператера·%s·могу·да·приступају·јединственом·ИД-у·повезаном·са·SIM·картицом·или·да·га·деле.·То·може·да·омогући·праћење·локације·уређаја.</string> |
58 | ··<string·name="wifi_suggestion_imsi_privacy_exemption_confirmation_title">Желите·ли·да·потврдите·повезивање?</string> | 58 | ··<string·name="wifi_suggestion_imsi_privacy_exemption_confirmation_title">Желите·ли·да·потврдите·повезивање?</string> |
59 | ··<string·name="wifi_suggestion_imsi_privacy_title">Желите·да·се·повежете·на·Wi | 59 | ··<string·name="wifi_suggestion_imsi_privacy_title">Желите·да·се·повежете·на·WiFi·мрежу·%s?</string> |
60 | ··<string·name="wifi_suggestion_title">Желите·да·дозволите·предложене·Wi‑Fi·мреже?</string> | 60 | ··<string·name="wifi_suggestion_title">Желите·да·дозволите·предложене·Wi‑Fi·мреже?</string> |
61 | ··<string·name="wifi_wakeup_enabled_content">У·близини·сте·сачуване·мреже:·%1$s</string> | 61 | ··<string·name="wifi_wakeup_enabled_content">У·близини·сте·сачуване·мреже:·%1$s</string> |
62 | ··<string·name="wifi_wakeup_enabled_title">Wi‑Fi·је·аутоматски·укључен</string> | 62 | ··<string·name="wifi_wakeup_enabled_title">Wi‑Fi·је·аутоматски·укључен</string> |
63 | ··<string·name="wifi_wakeup_onboarding_action_disable">Не·укључуј·поново</string> | 63 | ··<string·name="wifi_wakeup_onboarding_action_disable">Не·укључуј·поново</string> |
64 | ··<string·name="wifi_wakeup_onboarding_subtext">Када·сте·у·близини·сачуване·мреже·високог·квалитета</string> | 64 | ··<string·name="wifi_wakeup_onboarding_subtext">Када·сте·у·близини·сачуване·мреже·високог·квалитета</string> |
65 | ··<string·name="wifi_wakeup_onboarding_title">Wi‑Fi·ће·се·аутоматски·укључити</string> | 65 | ··<string·name="wifi_wakeup_onboarding_title">Wi‑Fi·ће·се·аутоматски·укључити</string> |
66 | ··<string·name="wifi_watchdog_network_disabled">Није·могуће·повезати·са·Wi | 66 | ··<string·name="wifi_watchdog_network_disabled">Није·могуће·повезати·са·WiFi·мрежом</string> |
67 | ··<string·name="wifi_watchdog_network_disabled_detailed">"·има·лошу·интернет·везу."</string> | 67 | ··<string·name="wifi_watchdog_network_disabled_detailed">"·има·лошу·интернет·везу."</string> |
68 | </resources> | 68 | </resources> |
Offset 10, 15 lines modified | Offset 10, 15 lines modified | ||
10 | ··<string·name="wifiResourcesAppLabel">Системски·ресусрси·на·Wi-Fi</string> | 10 | ··<string·name="wifiResourcesAppLabel">Системски·ресусрси·на·Wi-Fi</string> |
11 | ··<string·name="wifi_available_action_all_networks">Сите·мрежи</string> | 11 | ··<string·name="wifi_available_action_all_networks">Сите·мрежи</string> |
12 | ··<string·name="wifi_available_action_connect">Поврзете·се</string> | 12 | ··<string·name="wifi_available_action_connect">Поврзете·се</string> |
13 | ··<string·name="wifi_available_content_failed_to_connect">Допрете·за·да·ги·видите·сите·мрежи</string> | 13 | ··<string·name="wifi_available_content_failed_to_connect">Допрете·за·да·ги·видите·сите·мрежи</string> |
14 | ··<string·name="wifi_available_title">Поврзете·се·на·отворена·Wi‑Fi-мрежа</string> | 14 | ··<string·name="wifi_available_title">Поврзете·се·на·отворена·Wi‑Fi-мрежа</string> |
15 | ··<string·name="wifi_available_title_connected">Се·поврзавте·на·Wi‑Fi-мрежа</string> | 15 | ··<string·name="wifi_available_title_connected">Се·поврзавте·на·Wi‑Fi-мрежа</string> |
16 | ··<string·name="wifi_available_title_connecting">Поврзување·со·Wi-Fi·мрежа</string> | 16 | ··<string·name="wifi_available_title_connecting">Поврзување·со·Wi-Fi·мрежа</string> |
17 | ··<string·name="wifi_available_title_failed_to_connect">Не·може | 17 | ··<string·name="wifi_available_title_failed_to_connect">Не·може·да·се·поврзе·на·Wi‑Fi-мрежа</string> |
18 | ··<string·name="wifi_cannot_connect_with_randomized_mac_message">Допрете·за·да·ги·промените·поставките·за·приватност·и·обидете·се·повторно</string> | 18 | ··<string·name="wifi_cannot_connect_with_randomized_mac_message">Допрете·за·да·ги·промените·поставките·за·приватност·и·обидете·се·повторно</string> |
19 | ··<string·name="wifi_cannot_connect_with_randomized_mac_title">Не·може·да·се·поврзе·на·„%1$s“</string> | 19 | ··<string·name="wifi_cannot_connect_with_randomized_mac_title">Не·може·да·се·поврзе·на·„%1$s“</string> |
20 | ··<string·name="wifi_connect_alert_message">Апликацијата·%1$s·сака·да·се·поврзе·со·Wifi-мрежата·%2$s</string> | 20 | ··<string·name="wifi_connect_alert_message">Апликацијата·%1$s·сака·да·се·поврзе·со·Wifi-мрежата·%2$s</string> |
21 | ··<string·name="wifi_connect_alert_title">Дозволете·поврзување?</string> | 21 | ··<string·name="wifi_connect_alert_title">Дозволете·поврзување?</string> |
22 | ··<string·name="wifi_connect_default_application">Апликација</string> | 22 | ··<string·name="wifi_connect_default_application">Апликација</string> |
23 | ··<string·name="wifi_disable_mac_randomization_dialog_confirm_text">Променете·ги·поставките</string> | 23 | ··<string·name="wifi_disable_mac_randomization_dialog_confirm_text">Променете·ги·поставките</string> |
24 | ··<string·name="wifi_disable_mac_randomization_dialog_failure">Не·може·да·се·променат·поставките·за·приватност</string> | 24 | ··<string·name="wifi_disable_mac_randomization_dialog_failure">Не·може·да·се·променат·поставките·за·приватност</string> |
Offset 59, 10 lines modified | Offset 59, 10 lines modified | ||
59 | ··<string·name="wifi_suggestion_imsi_privacy_title">Да·се·поврзе·на·Wi-Fi·на·%s?</string> | 59 | ··<string·name="wifi_suggestion_imsi_privacy_title">Да·се·поврзе·на·Wi-Fi·на·%s?</string> |
60 | ··<string·name="wifi_suggestion_title">Да·се·дозволат·предложените·Wi‑Fi·мрежи?</string> | 60 | ··<string·name="wifi_suggestion_title">Да·се·дозволат·предложените·Wi‑Fi·мрежи?</string> |
61 | ··<string·name="wifi_wakeup_enabled_content">Близу·сте·до·зачувана·мрежа:·%1$s</string> | 61 | ··<string·name="wifi_wakeup_enabled_content">Близу·сте·до·зачувана·мрежа:·%1$s</string> |
62 | ··<string·name="wifi_wakeup_enabled_title">Wi‑Fi·се·вклучи·автоматски</string> | 62 | ··<string·name="wifi_wakeup_enabled_title">Wi‑Fi·се·вклучи·автоматски</string> |
63 | ··<string·name="wifi_wakeup_onboarding_action_disable">Не·вклучувај·повторно</string> | 63 | ··<string·name="wifi_wakeup_onboarding_action_disable">Не·вклучувај·повторно</string> |
64 | ··<string·name="wifi_wakeup_onboarding_subtext">Кога·сте·во·близина·на·зачувана·мрежа·со·висок·квалитет</string> | 64 | ··<string·name="wifi_wakeup_onboarding_subtext">Кога·сте·во·близина·на·зачувана·мрежа·со·висок·квалитет</string> |
65 | ··<string·name="wifi_wakeup_onboarding_title">Wi‑Fi·ќе·се·вклучи·автоматски</string> | 65 | ··<string·name="wifi_wakeup_onboarding_title">Wi‑Fi·ќе·се·вклучи·автоматски</string> |
66 | ··<string·name="wifi_watchdog_network_disabled">Не·може | 66 | ··<string·name="wifi_watchdog_network_disabled">Не·може·да·се·поврзе·на·Wi-Fi</string> |
67 | ··<string·name="wifi_watchdog_network_disabled_detailed">"·има·слаба·интернет-врска."</string> | 67 | ··<string·name="wifi_watchdog_network_disabled_detailed">"·има·слаба·интернет-врска."</string> |
68 | </resources> | 68 | </resources> |
Offset 4, 29 lines modified | Offset 4, 26 lines modified | ||
4 | ··<integer·name="config_wifiBssidBlocklistMonitorAbnormalDisconnectThreshold">3</integer> | 4 | ··<integer·name="config_wifiBssidBlocklistMonitorAbnormalDisconnectThreshold">3</integer> |
5 | ··<integer·name="config_wifiBssidBlocklistMonitorApUnableToHandleNewStaThreshold">1</integer> | 5 | ··<integer·name="config_wifiBssidBlocklistMonitorApUnableToHandleNewStaThreshold">1</integer> |
6 | ··<integer·name="config_wifiBssidBlocklistMonitorAssociationRejectionThreshold">3</integer> | 6 | ··<integer·name="config_wifiBssidBlocklistMonitorAssociationRejectionThreshold">3</integer> |
7 | ··<integer·name="config_wifiBssidBlocklistMonitorAssociationTimeoutThreshold">3</integer> | 7 | ··<integer·name="config_wifiBssidBlocklistMonitorAssociationTimeoutThreshold">3</integer> |
8 | ··<integer·name="config_wifiBssidBlocklistMonitorAuthenticationFailureThreshold">3</integer> | 8 | ··<integer·name="config_wifiBssidBlocklistMonitorAuthenticationFailureThreshold">3</integer> |
9 | ··<integer·name="config_wifiBssidBlocklistMonitorBaseBlockDurationMs">300000</integer> | 9 | ··<integer·name="config_wifiBssidBlocklistMonitorBaseBlockDurationMs">300000</integer> |
10 | ··<integer·name="config_wifiBssidBlocklistMonitorConnectedScoreBaseBlockDurationMs">30000</integer> | 10 | ··<integer·name="config_wifiBssidBlocklistMonitorConnectedScoreBaseBlockDurationMs">30000</integer> |
11 | ··<integer·name="config_wifiBssidBlocklistMonitorDhcpFailureThreshold"> | 11 | ··<integer·name="config_wifiBssidBlocklistMonitorDhcpFailureThreshold">3</integer> |
12 | ··<integer·name="config_wifiBssidBlocklistMonitorEapFailureThreshold">1</integer> | 12 | ··<integer·name="config_wifiBssidBlocklistMonitorEapFailureThreshold">1</integer> |
13 | ··<integer·name="config_wifiBssidBlocklistMonitorFailureStreakCap">7</integer> | 13 | ··<integer·name="config_wifiBssidBlocklistMonitorFailureStreakCap">7</integer> |
14 | ··<integer·name="config_wifiBssidBlocklistMonitorNetworkValidationFailureThreshold">1</integer> | 14 | ··<integer·name="config_wifiBssidBlocklistMonitorNetworkValidationFailureThreshold">1</integer> |
15 | ··<integer·name="config_wifiBssidBlocklistMonitorWrongPasswordThreshold">1</integer> | 15 | ··<integer·name="config_wifiBssidBlocklistMonitorWrongPasswordThreshold">1</integer> |
16 | ··<integer·name="config_wifiChannelUtilizationOverride2g">80</integer> | 16 | ··<integer·name="config_wifiChannelUtilizationOverride2g">80</integer> |
17 | ··<integer·name="config_wifiChannelUtilizationOverride5g">15</integer> | 17 | ··<integer·name="config_wifiChannelUtilizationOverride5g">15</integer> |
18 | ··<integer·name="config_wifiChannelUtilizationOverride6g">10</integer> | 18 | ··<integer·name="config_wifiChannelUtilizationOverride6g">10</integer> |
19 | ··<integer·name="config_wifiConnectedHighRssiScanMinimumWindowSizeSec">600</integer> | 19 | ··<integer·name="config_wifiConnectedHighRssiScanMinimumWindowSizeSec">600</integer> |
20 | ··<integer·name="config_wifiDataStallMinTxBad">1</integer> | 20 | ··<integer·name="config_wifiDataStallMinTxBad">1</integer> |
21 | ··<integer·name="config_wifiDataStallMinTxSuccessWithoutRx">50</integer> | 21 | ··<integer·name="config_wifiDataStallMinTxSuccessWithoutRx">50</integer> |
22 | ··<integer·name="config_wifiDelayDisconnectOnImsLostMs">0</integer> | 22 | ··<integer·name="config_wifiDelayDisconnectOnImsLostMs">0</integer> |
23 | ··<integer·name="config_wifiDisableReasonAssociationRejectionThreshold">5</integer> | ||
24 | ··<integer·name="config_wifiDisableReasonAuthenticationFailureThreshold">5</integer> | ||
25 | ··<integer·name="config_wifiDisableReasonDhcpFailureThreshold">2</integer> | ||
26 | ··<integer·name="config_wifiFrameworkCurrentNetworkBonusMin">20</integer> | 23 | ··<integer·name="config_wifiFrameworkCurrentNetworkBonusMin">20</integer> |
27 | ··<integer·name="config_wifiFrameworkCurrentNetworkBonusPercent">20</integer> | 24 | ··<integer·name="config_wifiFrameworkCurrentNetworkBonusPercent">20</integer> |
28 | ··<integer·name="config_wifiFrameworkLastSelectionMinutes">480</integer> | 25 | ··<integer·name="config_wifiFrameworkLastSelectionMinutes">480</integer> |
29 | ··<integer·name="config_wifiFrameworkMaxNumSpatialStreamDeviceOverrideValue">2</integer> | 26 | ··<integer·name="config_wifiFrameworkMaxNumSpatialStreamDeviceOverrideValue">2</integer> |
30 | ··<integer·name="config_wifiFrameworkMinPacketPerSecondActiveTraffic">16</integer> | 27 | ··<integer·name="config_wifiFrameworkMinPacketPerSecondActiveTraffic">16</integer> |
31 | ··<integer·name="config_wifiFrameworkMinPacketPerSecondHighTraffic">100</integer> | 28 | ··<integer·name="config_wifiFrameworkMinPacketPerSecondHighTraffic">100</integer> |
32 | ··<integer·name="config_wifiFrameworkSavedNetworkBonus">500</integer> | 29 | ··<integer·name="config_wifiFrameworkSavedNetworkBonus">500</integer> |
Offset 21, 15 lines modified | Offset 21, 14 lines modified | ||
21 | ··<bool·name="config_wifiSoftap6ghzSupported">false</bool> | 21 | ··<bool·name="config_wifiSoftap6ghzSupported">false</bool> |
22 | ··<bool·name="config_wifiSoftapAcsIncludeDfs">false</bool> | 22 | ··<bool·name="config_wifiSoftapAcsIncludeDfs">false</bool> |
23 | ··<bool·name="config_wifiSoftapHeMuBeamformerSupported">false</bool> | 23 | ··<bool·name="config_wifiSoftapHeMuBeamformerSupported">false</bool> |
24 | ··<bool·name="config_wifiSoftapHeSuBeamformeeSupported">false</bool> | 24 | ··<bool·name="config_wifiSoftapHeSuBeamformeeSupported">false</bool> |
25 | ··<bool·name="config_wifiSoftapHeSuBeamformerSupported">false</bool> | 25 | ··<bool·name="config_wifiSoftapHeSuBeamformerSupported">false</bool> |
26 | ··<bool·name="config_wifiSoftapHeTwtSupported">false</bool> | 26 | ··<bool·name="config_wifiSoftapHeTwtSupported">false</bool> |
27 | ··<bool·name="config_wifiSoftapIeee80211axSupported">false</bool> | 27 | ··<bool·name="config_wifiSoftapIeee80211axSupported">false</bool> |
28 | ··<bool·name="config_wifiSoftapPassphraseAsciiEncodableCheck">true</bool> | ||
29 | ··<bool·name="config_wifiSoftapResetAutoShutdownTimerConfig">true</bool> | 28 | ··<bool·name="config_wifiSoftapResetAutoShutdownTimerConfig">true</bool> |
30 | ··<bool·name="config_wifiSoftapResetChannelConfig">true</bool> | 29 | ··<bool·name="config_wifiSoftapResetChannelConfig">true</bool> |
31 | ··<bool·name="config_wifiSoftapResetHiddenConfig">true</bool> | 30 | ··<bool·name="config_wifiSoftapResetHiddenConfig">true</bool> |
32 | ··<bool·name="config_wifiSoftapResetMaxClientSettingConfig">true</bool> | 31 | ··<bool·name="config_wifiSoftapResetMaxClientSettingConfig">true</bool> |
33 | ··<bool·name="config_wifiSoftapResetUserControlConfig">true</bool> | 32 | ··<bool·name="config_wifiSoftapResetUserControlConfig">true</bool> |
34 | ··<bool·name="config_wifiSuspendOptimizationsEnabled">true</bool> | 33 | ··<bool·name="config_wifiSuspendOptimizationsEnabled">true</bool> |
35 | ··<bool·name="config_wifi_ap_mac_randomization_supported">true</bool> | 34 | ··<bool·name="config_wifi_ap_mac_randomization_supported">true</bool> |
Offset 28, 40 lines modified | Offset 28, 39 lines modified | ||
28 | ··<public·id="0x7f020012"·name="config_wifiSoftap6ghzSupported"·type="bool"/> | 28 | ··<public·id="0x7f020012"·name="config_wifiSoftap6ghzSupported"·type="bool"/> |
29 | ··<public·id="0x7f020013"·name="config_wifiSoftapAcsIncludeDfs"·type="bool"/> | 29 | ··<public·id="0x7f020013"·name="config_wifiSoftapAcsIncludeDfs"·type="bool"/> |
30 | ··<public·id="0x7f020014"·name="config_wifiSoftapHeMuBeamformerSupported"·type="bool"/> | 30 | ··<public·id="0x7f020014"·name="config_wifiSoftapHeMuBeamformerSupported"·type="bool"/> |
31 | ··<public·id="0x7f020015"·name="config_wifiSoftapHeSuBeamformeeSupported"·type="bool"/> | 31 | ··<public·id="0x7f020015"·name="config_wifiSoftapHeSuBeamformeeSupported"·type="bool"/> |
32 | ··<public·id="0x7f020016"·name="config_wifiSoftapHeSuBeamformerSupported"·type="bool"/> | 32 | ··<public·id="0x7f020016"·name="config_wifiSoftapHeSuBeamformerSupported"·type="bool"/> |
33 | ··<public·id="0x7f020017"·name="config_wifiSoftapHeTwtSupported"·type="bool"/> | 33 | ··<public·id="0x7f020017"·name="config_wifiSoftapHeTwtSupported"·type="bool"/> |
34 | ··<public·id="0x7f020018"·name="config_wifiSoftapIeee80211axSupported"·type="bool"/> | 34 | ··<public·id="0x7f020018"·name="config_wifiSoftapIeee80211axSupported"·type="bool"/> |
35 | ··<public·id="0x7f020019"·name="config_wifiSoftap | 35 | ··<public·id="0x7f020019"·name="config_wifiSoftapResetAutoShutdownTimerConfig"·type="bool"/> |
36 | ··<public·id="0x7f02001a"·name="config_wifiSoftapReset | 36 | ··<public·id="0x7f02001a"·name="config_wifiSoftapResetChannelConfig"·type="bool"/> |
37 | ··<public·id="0x7f02001b"·name="config_wifiSoftapReset | 37 | ··<public·id="0x7f02001b"·name="config_wifiSoftapResetHiddenConfig"·type="bool"/> |
38 | ··<public·id="0x7f02001c"·name="config_wifiSoftapReset | 38 | ··<public·id="0x7f02001c"·name="config_wifiSoftapResetMaxClientSettingConfig"·type="bool"/> |
39 | ··<public·id="0x7f02001d"·name="config_wifiSoftapReset | 39 | ··<public·id="0x7f02001d"·name="config_wifiSoftapResetUserControlConfig"·type="bool"/> |
40 | ··<public·id="0x7f02001e"·name="config_wifiS | 40 | ··<public·id="0x7f02001e"·name="config_wifiSuspendOptimizationsEnabled"·type="bool"/> |
41 | ··<public·id="0x7f02001f"·name="config_wifi | 41 | ··<public·id="0x7f02001f"·name="config_wifi_ap_mac_randomization_supported"·type="bool"/> |
42 | ··<public·id="0x7f020020"·name="config_wifi_ | 42 | ··<public·id="0x7f020020"·name="config_wifi_background_scan_support"·type="bool"/> |
43 | ··<public·id="0x7f020021"·name="config_wifi_ | 43 | ··<public·id="0x7f020021"·name="config_wifi_connected_mac_randomization_supported"·type="bool"/> |
44 | ··<public·id="0x7f020022"·name="config_wifi_ | 44 | ··<public·id="0x7f020022"·name="config_wifi_diagnostics_bugreport_enabled"·type="bool"/> |
45 | ··<public·id="0x7f020023"·name="config_wifi_ | 45 | ··<public·id="0x7f020023"·name="config_wifi_fast_bss_transition_enabled"·type="bool"/> |
46 | ··<public·id="0x7f020024"·name="config_wifi_fa | 46 | ··<public·id="0x7f020024"·name="config_wifi_framework_enable_associated_network_selection"·type="bool"/> |
47 | ··<public·id="0x7f020025"·name="config_wifi_framework_enable_ | 47 | ··<public·id="0x7f020025"·name="config_wifi_framework_enable_sar_tx_power_limit"·type="bool"/> |
48 | ··<public·id="0x7f020026"·name="config_wifi_framework_enable_sar_tx_power_limit"·type="bool"/> | 48 | ··<public·id="0x7f020026"·name="config_wifi_framework_enable_soft_ap_sar_tx_power_limit"·type="bool"/> |
49 | ··<public·id="0x7f020027"·name="config_wifi_framework_e | 49 | ··<public·id="0x7f020027"·name="config_wifi_framework_use_single_radio_chain_scan_results_network_selection"·type="bool"/> |
50 | ··<public·id="0x7f020028"·name="config_wifi_ | 50 | ··<public·id="0x7f020028"·name="config_wifi_link_probing_supported"·type="bool"/> |
51 | ··<public·id="0x7f020029"·name="config_wifi_l | 51 | ··<public·id="0x7f020029"·name="config_wifi_local_only_hotspot_5ghz"·type="bool"/> |
52 | ··<public·id="0x7f02002a"·name="config_wifi_l | 52 | ··<public·id="0x7f02002a"·name="config_wifi_only_link_same_credential_configurations"·type="bool"/> |
53 | ··<public·id="0x7f02002b"·name="config_wifi_ | 53 | ··<public·id="0x7f02002b"·name="config_wifi_p2p_mac_randomization_supported"·type="bool"/> |
54 | ··<public·id="0x7f02002c"·name="config_wifi_ | 54 | ··<public·id="0x7f02002c"·name="config_wifi_revert_country_code_on_cellular_loss"·type="bool"/> |
55 | ··<public·id="0x7f02002d"·name="config_wifi_ | 55 | ··<public·id="0x7f02002d"·name="config_wifi_softap_acs_supported"·type="bool"/> |
56 | ··<public·id="0x7f02002e"·name="config_wifi_softap_ac | 56 | ··<public·id="0x7f02002e"·name="config_wifi_softap_ieee80211ac_supported"·type="bool"/> |
57 | ··<public·id="0x7f02002f"·name="config_wifi_softap_ | 57 | ··<public·id="0x7f02002f"·name="config_wifi_softap_sae_supported"·type="bool"/> |
58 | ··<public·id="0x7f020030"·name="config_wifi_ | 58 | ··<public·id="0x7f020030"·name="config_wifi_turn_off_during_emergency_call"·type="bool"/> |
59 | ··<public·id="0x7f020031"·name="config_wifi_ | 59 | ··<public·id="0x7f020031"·name="config_wifi_watchdog_enabled"·type="bool"/> |
60 | ··<public·id="0x7f020032"·name="config_wifi_watchdog_enabled"·type="bool"/> | ||
61 | ··<public·id="0x7f030000"·name="ic_wifi_settings"·type="drawable"/> | 60 | ··<public·id="0x7f030000"·name="ic_wifi_settings"·type="drawable"/> |
62 | ··<public·id="0x7f030001"·name="stat_notify_wifi_in_range"·type="drawable"/> | 61 | ··<public·id="0x7f030001"·name="stat_notify_wifi_in_range"·type="drawable"/> |
63 | ··<public·id="0x7f040000"·name="enter_pin_section"·type="id"/> | 62 | ··<public·id="0x7f040000"·name="enter_pin_section"·type="id"/> |
64 | ··<public·id="0x7f040001"·name="info"·type="id"/> | 63 | ··<public·id="0x7f040001"·name="info"·type="id"/> |
65 | ··<public·id="0x7f040002"·name="name"·type="id"/> | 64 | ··<public·id="0x7f040002"·name="name"·type="id"/> |
66 | ··<public·id="0x7f040003"·name="value"·type="id"/> | 65 | ··<public·id="0x7f040003"·name="value"·type="id"/> |
67 | ··<public·id="0x7f040004"·name="wifi_p2p_wps_pin"·type="id"/> | 66 | ··<public·id="0x7f040004"·name="wifi_p2p_wps_pin"·type="id"/> |
Offset 81, 58 lines modified | Offset 80, 55 lines modified | ||
81 | ··<public·id="0x7f05000d"·name="config_wifiChannelUtilizationOverride2g"·type="integer"/> | 80 | ··<public·id="0x7f05000d"·name="config_wifiChannelUtilizationOverride2g"·type="integer"/> |
82 | ··<public·id="0x7f05000e"·name="config_wifiChannelUtilizationOverride5g"·type="integer"/> | 81 | ··<public·id="0x7f05000e"·name="config_wifiChannelUtilizationOverride5g"·type="integer"/> |
83 | ··<public·id="0x7f05000f"·name="config_wifiChannelUtilizationOverride6g"·type="integer"/> | 82 | ··<public·id="0x7f05000f"·name="config_wifiChannelUtilizationOverride6g"·type="integer"/> |
84 | ··<public·id="0x7f050010"·name="config_wifiConnectedHighRssiScanMinimumWindowSizeSec"·type="integer"/> | 83 | ··<public·id="0x7f050010"·name="config_wifiConnectedHighRssiScanMinimumWindowSizeSec"·type="integer"/> |
85 | ··<public·id="0x7f050011"·name="config_wifiDataStallMinTxBad"·type="integer"/> | 84 | ··<public·id="0x7f050011"·name="config_wifiDataStallMinTxBad"·type="integer"/> |
86 | ··<public·id="0x7f050012"·name="config_wifiDataStallMinTxSuccessWithoutRx"·type="integer"/> | 85 | ··<public·id="0x7f050012"·name="config_wifiDataStallMinTxSuccessWithoutRx"·type="integer"/> |
87 | ··<public·id="0x7f050013"·name="config_wifiDelayDisconnectOnImsLostMs"·type="integer"/> | 86 | ··<public·id="0x7f050013"·name="config_wifiDelayDisconnectOnImsLostMs"·type="integer"/> |
88 | ··<public·id="0x7f050014"·name="config_wifi | 87 | ··<public·id="0x7f050014"·name="config_wifiFrameworkCurrentNetworkBonusMin"·type="integer"/> |
89 | ··<public·id="0x7f050015"·name="config_wifi | 88 | ··<public·id="0x7f050015"·name="config_wifiFrameworkCurrentNetworkBonusPercent"·type="integer"/> |
90 | ··<public·id="0x7f050016"·name="config_wifi | 89 | ··<public·id="0x7f050016"·name="config_wifiFrameworkLastSelectionMinutes"·type="integer"/> |
91 | ··<public·id="0x7f050017"·name="config_wifiFramework | 90 | ··<public·id="0x7f050017"·name="config_wifiFrameworkMaxNumSpatialStreamDeviceOverrideValue"·type="integer"/> |
92 | ··<public·id="0x7f050018"·name="config_wifiFramework | 91 | ··<public·id="0x7f050018"·name="config_wifiFrameworkMinPacketPerSecondActiveTraffic"·type="integer"/> |
93 | ··<public·id="0x7f050019"·name="config_wifiFramework | 92 | ··<public·id="0x7f050019"·name="config_wifiFrameworkMinPacketPerSecondHighTraffic"·type="integer"/> |
94 | ··<public·id="0x7f05001a"·name="config_wifiFramework | 93 | ··<public·id="0x7f05001a"·name="config_wifiFrameworkSavedNetworkBonus"·type="integer"/> |
95 | ··<public·id="0x7f05001b"·name="config_wifiFramework | 94 | ··<public·id="0x7f05001b"·name="config_wifiFrameworkScoreBadRssiThreshold6ghz"·type="integer"/> |
96 | ··<public·id="0x7f05001c"·name="config_wifiFramework | 95 | ··<public·id="0x7f05001c"·name="config_wifiFrameworkScoreEntryRssiThreshold6ghz"·type="integer"/> |
97 | ··<public·id="0x7f05001d"·name="config_wifiFrameworkS | 96 | ··<public·id="0x7f05001d"·name="config_wifiFrameworkScoreGoodRssiThreshold6ghz"·type="integer"/> |
98 | ··<public·id="0x7f05001e"·name="config_wifiFrameworkScore | 97 | ··<public·id="0x7f05001e"·name="config_wifiFrameworkScoreLowRssiThreshold6ghz"·type="integer"/> |
99 | ··<public·id="0x7f05001f"·name="config_wifiFrameworkSc | 98 | ··<public·id="0x7f05001f"·name="config_wifiFrameworkSecureNetworkBonus"·type="integer"/> |
100 | ··<public·id="0x7f050020"·name="config_wifiFrameworkS | 99 | ··<public·id="0x7f050020"·name="config_wifiFrameworkSoftApShutDownTimeoutMilliseconds"·type="integer"/> |
101 | ··<public·id="0x7f050021"·name="config_wifiFramework | 100 | ··<public·id="0x7f050021"·name="config_wifiFrameworkThroughputBonusDenominator"·type="integer"/> |
102 | ··<public·id="0x7f050022"·name="config_wifiFramework | 101 | ··<public·id="0x7f050022"·name="config_wifiFrameworkThroughputBonusLimit"·type="integer"/> |
103 | ··<public·id="0x7f050023"·name="config_wifiFramework | 102 | ··<public·id="0x7f050023"·name="config_wifiFrameworkThroughputBonusNumerator"·type="integer"/> |
104 | ··<public·id="0x7f050024"·name="config_wifiFramework | 103 | ··<public·id="0x7f050024"·name="config_wifiFrameworkUnmeteredNetworkBonus"·type="integer"/> |
105 | ··<public·id="0x7f050025"·name="config_wifi | 104 | ··<public·id="0x7f050025"·name="config_wifiHardwareSoftapMaxClientCount"·type="integer"/> |
106 | ··<public·id="0x7f050026"·name="config_wifi | 105 | ··<public·id="0x7f050026"·name="config_wifiHighMovementNetworkSelectionOptimizationRssiDelta"·type="integer"/> |
107 | ··<public·id="0x7f050027"·name="config_wifi | 106 | ··<public·id="0x7f050027"·name="config_wifiHighMovementNetworkSelectionOptimizationScanDelayMs"·type="integer"/> |
108 | ··<public·id="0x7f050028"·name="config_wifi | 107 | ··<public·id="0x7f050028"·name="config_wifiInitialPartialScanChannelCacheAgeMins"·type="integer"/> |
109 | ··<public·id="0x7f050029"·name="config_wifi | 108 | ··<public·id="0x7f050029"·name="config_wifiInitialPartialScanChannelMaxCount"·type="integer"/> |
110 | ··<public·id="0x7f05002a"·name="config_wifi | 109 | ··<public·id="0x7f05002a"·name="config_wifiMaxNativeFailureSelfRecoveryPerHour"·type="integer"/> |
111 | ··<public·id="0x7f05002b"·name="config_wifi | 110 | ··<public·id="0x7f05002b"·name="config_wifiMaxPnoSsidCount"·type="integer"/> |
112 | ··<public·id="0x7f05002c"·name="config_wifi | 111 | ··<public·id="0x7f05002c"·name="config_wifiMovingPnoScanIntervalMillis"·type="integer"/> |
113 | ··<public·id="0x7f05002d"·name="config_wifi | 112 | ··<public·id="0x7f05002d"·name="config_wifiPollRssiIntervalMilliseconds"·type="integer"/> |
114 | ··<public·id="0x7f05002e"·name="config_wifi | 113 | ··<public·id="0x7f05002e"·name="config_wifiRttBackgroundExecGapMs"·type="integer"/> |
115 | ··<public·id="0x7f05002f"·name="config_wifi | 114 | ··<public·id="0x7f05002f"·name="config_wifiStationaryPnoScanIntervalMillis"·type="integer"/> |
116 | ··<public·id="0x7f050030"·name="config_wifi | 115 | ··<public·id="0x7f050030"·name="config_wifiSufficientDurationAfterUserSelectionMilliseconds"·type="integer"/> |
117 | ··<public·id="0x7f050031"·name="config_wifi | 116 | ··<public·id="0x7f050031"·name="config_wifi_framework_associated_partial_scan_max_num_active_channels"·type="integer"/> |
118 | ··<public·id="0x7f050032"·name="config_wifi | 117 | ··<public·id="0x7f050032"·name="config_wifi_framework_recovery_timeout_delay"·type="integer"/> |
119 | ··<public·id="0x7f050033"·name="config_wifi | 118 | ··<public·id="0x7f050033"·name="config_wifi_framework_wifi_score_bad_rssi_threshold_24GHz"·type="integer"/> |
120 | ··<public·id="0x7f050034"·name="config_wifi_framework_ | 119 | ··<public·id="0x7f050034"·name="config_wifi_framework_wifi_score_bad_rssi_threshold_5GHz"·type="integer"/> |
121 | ··<public·id="0x7f050035"·name="config_wifi_framework_ | 120 | ··<public·id="0x7f050035"·name="config_wifi_framework_wifi_score_entry_rssi_threshold_24GHz"·type="integer"/> |
122 | ··<public·id="0x7f050036"·name="config_wifi_framework_wifi_score_ | 121 | ··<public·id="0x7f050036"·name="config_wifi_framework_wifi_score_entry_rssi_threshold_5GHz"·type="integer"/> |
123 | ··<public·id="0x7f050037"·name="config_wifi_framework_wifi_score_ | 122 | ··<public·id="0x7f050037"·name="config_wifi_framework_wifi_score_good_rssi_threshold_24GHz"·type="integer"/> |
124 | ··<public·id="0x7f050038"·name="config_wifi_framework_wifi_score_ | 123 | ··<public·id="0x7f050038"·name="config_wifi_framework_wifi_score_good_rssi_threshold_5GHz"·type="integer"/> |
125 | ··<public·id="0x7f050039"·name="config_wifi_framework_wifi_score_ | 124 | ··<public·id="0x7f050039"·name="config_wifi_framework_wifi_score_low_rssi_threshold_24GHz"·type="integer"/> |
126 | ··<public·id="0x7f05003a"·name="config_wifi_framework_wifi_score_ | 125 | ··<public·id="0x7f05003a"·name="config_wifi_framework_wifi_score_low_rssi_threshold_5GHz"·type="integer"/> |
127 | ··<public·id="0x7f05003b"·name="config_wifi_ | 126 | ··<public·id="0x7f05003b"·name="config_wifi_logger_ring_buffer_default_size_limit_kb"·type="integer"/> |
128 | ··<public·id="0x7f05003c"·name="config_wifi_ | 127 | ··<public·id="0x7f05003c"·name="config_wifi_logger_ring_buffer_verbose_size_limit_kb"·type="integer"/> |
129 | ··<public·id="0x7f05003d"·name="config_wifi_framework_wifi_score_low_rssi_threshold_5GHz"·type="integer"/> | ||
130 | ··<public·id="0x7f05003e"·name="config_wifi_logger_ring_buffer_default_size_limit_kb"·type="integer"/> | ||
131 | ··<public·id="0x7f05003f"·name="config_wifi_logger_ring_buffer_verbose_size_limit_kb"·type="integer"/> | ||
132 | ··<public·id="0x7f060000"·name="wifi_p2p_dialog"·type="layout"/> | 128 | ··<public·id="0x7f060000"·name="wifi_p2p_dialog"·type="layout"/> |
133 | ··<public·id="0x7f060001"·name="wifi_p2p_dialog_row"·type="layout"/> | 129 | ··<public·id="0x7f060001"·name="wifi_p2p_dialog_row"·type="layout"/> |
134 | ··<public·id="0x7f070000"·name="accept"·type="string"/> | 130 | ··<public·id="0x7f070000"·name="accept"·type="string"/> |
135 | ··<public·id="0x7f070001"·name="config_wifiSoftap2gChannelList"·type="string"/> | 131 | ··<public·id="0x7f070001"·name="config_wifiSoftap2gChannelList"·type="string"/> |
136 | ··<public·id="0x7f070002"·name="config_wifiSoftap5gChannelList"·type="string"/> | 132 | ··<public·id="0x7f070002"·name="config_wifiSoftap5gChannelList"·type="string"/> |
137 | ··<public·id="0x7f070003"·name="config_wifiSoftap6gChannelList"·type="string"/> | 133 | ··<public·id="0x7f070003"·name="config_wifiSoftap6gChannelList"·type="string"/> |
138 | ··<public·id="0x7f070004"·name="config_wifi_p2p_device_type"·type="string"/> | 134 | ··<public·id="0x7f070004"·name="config_wifi_p2p_device_type"·type="string"/> |
Offset 1, 12 lines modified | Offset 1, 12 lines modified | ||
1 | <?xml·version="1.0"·encoding="utf-8"?> | 1 | <?xml·version="1.0"·encoding="utf-8"?> |
2 | <resources> | 2 | <resources> |
3 | ··<string·name="accept">Ընդունել</string> | 3 | ··<string·name="accept">Ընդունել</string> |
4 | ··<string·name="decline">Մերժել</string> | 4 | ··<string·name="decline">Մերժել</string> |
5 | ··<string·name="dlg_ok"> | 5 | ··<string·name="dlg_ok">Եղավ</string> |
6 | ··<string·name="notification_channel_network_alerts">Ցանցային·զգուշացումներ</string> | 6 | ··<string·name="notification_channel_network_alerts">Ցանցային·զգուշացումներ</string> |
7 | ··<string·name="notification_channel_network_available">Ցանցը·հասանելի·է</string> | 7 | ··<string·name="notification_channel_network_available">Ցանցը·հասանելի·է</string> |
8 | ··<string·name="notification_channel_network_status">Ցանցի·կարգավիճակ</string> | 8 | ··<string·name="notification_channel_network_status">Ցանցի·կարգավիճակ</string> |
9 | ··<string·name="ok">Լավ</string> | 9 | ··<string·name="ok">Լավ</string> |
10 | ··<string·name="wifiResourcesAppLabel">Համակարգի·Wi-Fi·ռեսուրսներ</string> | 10 | ··<string·name="wifiResourcesAppLabel">Համակարգի·Wi-Fi·ռեսուրսներ</string> |
11 | ··<string·name="wifi_available_action_all_networks">Բոլոր·ցանցերը</string> | 11 | ··<string·name="wifi_available_action_all_networks">Բոլոր·ցանցերը</string> |
12 | ··<string·name="wifi_available_action_connect">Միանալ</string> | 12 | ··<string·name="wifi_available_action_connect">Միանալ</string> |
Offset 36, 15 lines modified | Offset 36, 15 lines modified | ||
36 | ··<string·name="wifi_eap_error_message_code_32765">%1$s·:·EAP·նույնականացման·սխալ·32765</string> | 36 | ··<string·name="wifi_eap_error_message_code_32765">%1$s·:·EAP·նույնականացման·սխալ·32765</string> |
37 | ··<string·name="wifi_eap_error_message_code_32766">%1$s·:·EAP·նույնականացման·սխալ·32766</string> | 37 | ··<string·name="wifi_eap_error_message_code_32766">%1$s·:·EAP·նույնականացման·սխալ·32766</string> |
38 | ··<string·name="wifi_p2p_enter_pin_message">Մուտքագրեք·պահանջվող·PIN-ը:</string> | 38 | ··<string·name="wifi_p2p_enter_pin_message">Մուտքագրեք·պահանջվող·PIN-ը:</string> |
39 | ··<string·name="wifi_p2p_frequency_conflict_message">Հեռախոսը·ժամանակավորապես·կանջատվի·Wi-Fi-ից,·քանի·դեռ·այն·միացված·է·%1$s-ին</string> | 39 | ··<string·name="wifi_p2p_frequency_conflict_message">Հեռախոսը·ժամանակավորապես·կանջատվի·Wi-Fi-ից,·քանի·դեռ·այն·միացված·է·%1$s-ին</string> |
40 | ··<string·name="wifi_p2p_from_message">Ուղարկող`</string> | 40 | ··<string·name="wifi_p2p_from_message">Ուղարկող`</string> |
41 | ··<string·name="wifi_p2p_invitation_sent_title">Հրավերն·ուղարկված·է</string> | 41 | ··<string·name="wifi_p2p_invitation_sent_title">Հրավերն·ուղարկված·է</string> |
42 | ··<string·name="wifi_p2p_invitation_to_connect_title">Միացման·հրավեր</string> | 42 | ··<string·name="wifi_p2p_invitation_to_connect_title">Միացման·հրավեր</string> |
43 | ··<string·name="wifi_p2p_show_pin_message">PIN-ը | 43 | ··<string·name="wifi_p2p_show_pin_message">PIN-ը՝</string> |
44 | ··<string·name="wifi_p2p_to_message">Ում`</string> | 44 | ··<string·name="wifi_p2p_to_message">Ում`</string> |
45 | ··<string·name="wifi_sim_required_message">%1$s·ցանցին·միանալու·համար·տեղադրեք·%2$s·օպերատորի·SIM·քարտը</string> | 45 | ··<string·name="wifi_sim_required_message">%1$s·ցանցին·միանալու·համար·տեղադրեք·%2$s·օպերատորի·SIM·քարտը</string> |
46 | ··<string·name="wifi_sim_required_title">Wi-Fi-ն·անջատված·է</string> | 46 | ··<string·name="wifi_sim_required_title">Wi-Fi-ն·անջատված·է</string> |
47 | ··<string·name="wifi_softap_auto_shutdown_timeout_expired_summary">Կապված·սարքեր·չկան։·Հպեք՝·փոփոխելու·համար։</string> | 47 | ··<string·name="wifi_softap_auto_shutdown_timeout_expired_summary">Կապված·սարքեր·չկան։·Հպեք՝·փոփոխելու·համար։</string> |
48 | ··<string·name="wifi_softap_auto_shutdown_timeout_expired_title">Թեժ·կետն·անջատված·է</string> | 48 | ··<string·name="wifi_softap_auto_shutdown_timeout_expired_title">Թեժ·կետն·անջատված·է</string> |
49 | ··<string·name="wifi_suggestion_action_allow_app">Թույլատրել</string> | 49 | ··<string·name="wifi_suggestion_action_allow_app">Թույլատրել</string> |
50 | ··<string·name="wifi_suggestion_action_allow_imsi_privacy_exemption_carrier">Միանալ</string> | 50 | ··<string·name="wifi_suggestion_action_allow_imsi_privacy_exemption_carrier">Միանալ</string> |
Offset 1, 10 lines modified | Offset 1, 10 lines modified | ||
1 | <?xml·version="1.0"·encoding="utf-8"?> | 1 | <?xml·version="1.0"·encoding="utf-8"?> |
2 | <resources> | 2 | <resources> |
3 | ··<string·name="wifi_eap_error_message_code_32760">%1$s·:·Ne·možete·da·se·povežete·na·Verizon·Wi | 3 | ··<string·name="wifi_eap_error_message_code_32760">%1$s·:·Ne·možete·da·se·povežete·na·Verizon·WiFi·Access·van·oblasti·koju·Verizon·pokriva.</string> |
4 | ··<string·name="wifi_eap_error_message_code_32761">%1$s·:·Niste·pretplaćeni·na·Verizon·Wi | 4 | ··<string·name="wifi_eap_error_message_code_32761">%1$s·:·Niste·pretplaćeni·na·Verizon·WiFi·Access.·Pozovite·nas·na·800·922·0204.</string> |
5 | ··<string·name="wifi_eap_error_message_code_32762">%1$s·:·Došlo·je·do·problema·u·vezi·sa·Verizon·Wi | 5 | ··<string·name="wifi_eap_error_message_code_32762">%1$s·:·Došlo·je·do·problema·u·vezi·sa·Verizon·WiFi·Access·nalogom.·Pozovite·nas·na·800·922·0204.</string> |
6 | ··<string·name="wifi_eap_error_message_code_32763">%1$s·:·Već·ste·povezani·na·Verizon·Wi | 6 | ··<string·name="wifi_eap_error_message_code_32763">%1$s·:·Već·ste·povezani·na·Verizon·WiFi·Access.</string> |
7 | ··<string·name="wifi_eap_error_message_code_32764">%1$s·:·Postoji·problem·pri·povezivanju·na·Verizon·Wi | 7 | ··<string·name="wifi_eap_error_message_code_32764">%1$s·:·Postoji·problem·pri·povezivanju·na·Verizon·WiFi·Access.·Pozovite·nas·na·800·922·0204.</string> |
8 | ··<string·name="wifi_eap_error_message_code_32765">%1$s·:·Došlo·je·do·problema·u·vezi·sa·Verizon·Wi | 8 | ··<string·name="wifi_eap_error_message_code_32765">%1$s·:·Došlo·je·do·problema·u·vezi·sa·Verizon·WiFi·Access·nalogom.·Pozovite·nas·na·800·922·0204.</string> |
9 | ··<string·name="wifi_eap_error_message_code_32766">%1$s·:·Verizon·Wi | 9 | ··<string·name="wifi_eap_error_message_code_32766">%1$s·:·Verizon·WiFi·Access·nije·dostupan·sa·vaše·lokacije.·Probajte·ponovo·kasnije·ili·probajte·sa·neke·druge·lokacije.</string> |
10 | </resources> | 10 | </resources> |
Offset 24, 21 lines modified | Offset 24, 21 lines modified | ||
24 | ··<string·name="wifi_disable_mac_randomization_dialog_failure">تنظیم·حریمخصوصی·تغییر·نکرد</string> | 24 | ··<string·name="wifi_disable_mac_randomization_dialog_failure">تنظیم·حریمخصوصی·تغییر·نکرد</string> |
25 | ··<string·name="wifi_disable_mac_randomization_dialog_message">"برای·اتصال،·%1$s·باید·از·نشانی·MAC·دستگاهتان·که·شناسهای·منحصربهفرد·است·استفاده·کند.·درحالحاضر،·تنظیم·حریمخصوصی·شما·برای·این·شبکه·از·شناسه·تصادفی·استفاده·میکند.· | 25 | ··<string·name="wifi_disable_mac_randomization_dialog_message">"برای·اتصال،·%1$s·باید·از·نشانی·MAC·دستگاهتان·که·شناسهای·منحصربهفرد·است·استفاده·کند.·درحالحاضر،·تنظیم·حریمخصوصی·شما·برای·این·شبکه·از·شناسه·تصادفی·استفاده·میکند.· |
26 | این·تغییر·ممکن·است·به·دستگاههای·اطراف·امکان·دهد·مکان·دستگاهتان·را·ردیابی·کنند."</string> | 26 | این·تغییر·ممکن·است·به·دستگاههای·اطراف·امکان·دهد·مکان·دستگاهتان·را·ردیابی·کنند."</string> |
27 | ··<string·name="wifi_disable_mac_randomization_dialog_network_not_found">شبکهای·پیدا·نشد</string> | 27 | ··<string·name="wifi_disable_mac_randomization_dialog_network_not_found">شبکهای·پیدا·نشد</string> |
28 | ··<string·name="wifi_disable_mac_randomization_dialog_success">تنظیم·بهروزرسانی·شد.·دوباره·متصل·شوید.</string> | 28 | ··<string·name="wifi_disable_mac_randomization_dialog_success">تنظیم·بهروزرسانی·شد.·دوباره·متصل·شوید.</string> |
29 | ··<string·name="wifi_disable_mac_randomization_dialog_title">تنظیم·حریمخصوصی·تغییر·کند؟</string> | 29 | ··<string·name="wifi_disable_mac_randomization_dialog_title">تنظیم·حریمخصوصی·تغییر·کند؟</string> |
30 | ··<string·name="wifi_eap_error_message_code_32760">%1$s·:·خطای·۳۲۷۶۰·ا | 30 | ··<string·name="wifi_eap_error_message_code_32760">%1$s·:·خطای·۳۲۷۶۰·اصالتسنجی·EAP</string> |
31 | ··<string·name="wifi_eap_error_message_code_32761">%1$s·:·خطای·۳۲۷۶۱·ا | 31 | ··<string·name="wifi_eap_error_message_code_32761">%1$s·:·خطای·۳۲۷۶۱·اصالتسنجی·EAP</string> |
32 | ··<string·name="wifi_eap_error_message_code_32762">%1$s·:·خطای·۳۲۷۶۲·ا | 32 | ··<string·name="wifi_eap_error_message_code_32762">%1$s·:·خطای·۳۲۷۶۲·اصالتسنجی·EAP</string> |
33 | ··<string·name="wifi_eap_error_message_code_32763">%1$s·:·خطای·۳۲۷۶۳·ا | 33 | ··<string·name="wifi_eap_error_message_code_32763">%1$s·:·خطای·۳۲۷۶۳·اصالتسنجی·EAP</string> |
34 | ··<string·name="wifi_eap_error_message_code_32764">%1$s·:·خطای·۳۲۷۶۴·ا | 34 | ··<string·name="wifi_eap_error_message_code_32764">%1$s·:·خطای·۳۲۷۶۴·اصالتسنجی·EAP</string> |
35 | ··<string·name="wifi_eap_error_message_code_32765">%1$s·:·خطای·۳۲۷۶۵·ا | 35 | ··<string·name="wifi_eap_error_message_code_32765">%1$s·:·خطای·۳۲۷۶۵·اصالتسنجی·EAP</string> |
36 | ··<string·name="wifi_eap_error_message_code_32766">%1$s·:·خطای·۳۲۷۶۶·ا | 36 | ··<string·name="wifi_eap_error_message_code_32766">%1$s·:·خطای·۳۲۷۶۶·اصالتسنجی·EAP</string> |
37 | ··<string·name="wifi_p2p_enter_pin_message">پین·لازم·را·تایپ·کنید:</string> | 37 | ··<string·name="wifi_p2p_enter_pin_message">پین·لازم·را·تایپ·کنید:</string> |
38 | ··<string·name="wifi_p2p_frequency_conflict_message">این·گوشی·بهطور·موقت·از·Wi-Fi·قطع·خواهد·شد،·در·حالی·که·به·%1$s·وصل·است</string> | 38 | ··<string·name="wifi_p2p_frequency_conflict_message">این·گوشی·بهطور·موقت·از·Wi-Fi·قطع·خواهد·شد،·در·حالی·که·به·%1$s·وصل·است</string> |
39 | ··<string·name="wifi_p2p_from_message">از:</string> | 39 | ··<string·name="wifi_p2p_from_message">از:</string> |
40 | ··<string·name="wifi_p2p_invitation_sent_title">دعوتنامه·ارسال·شد</string> | 40 | ··<string·name="wifi_p2p_invitation_sent_title">دعوتنامه·ارسال·شد</string> |
41 | ··<string·name="wifi_p2p_invitation_to_connect_title">دعوتنامه·برای·اتصال</string> | 41 | ··<string·name="wifi_p2p_invitation_to_connect_title">دعوتنامه·برای·اتصال</string> |
42 | ··<string·name="wifi_p2p_show_pin_message">پین:</string> | 42 | ··<string·name="wifi_p2p_show_pin_message">پین:</string> |
43 | ··<string·name="wifi_p2p_to_message">به:</string> | 43 | ··<string·name="wifi_p2p_to_message">به:</string> |
Offset 1, 10 lines modified | Offset 1, 10 lines modified | ||
1 | <?xml·version="1.0"·encoding="utf-8"?> | 1 | <?xml·version="1.0"·encoding="utf-8"?> |
2 | <resources> | 2 | <resources> |
3 | ··<string·name="wifi_eap_error_message_code_32760">%1$s·:·Ne·možete·da·se·povežete·na·Verizon·Wi | 3 | ··<string·name="wifi_eap_error_message_code_32760">%1$s·:·Ne·možete·da·se·povežete·na·Verizon·WiFi·Access·van·oblasti·koju·Verizon·pokriva.</string> |
4 | ··<string·name="wifi_eap_error_message_code_32761">%1$s·:·Niste·pretplaćeni·na·Verizon·Wi | 4 | ··<string·name="wifi_eap_error_message_code_32761">%1$s·:·Niste·pretplaćeni·na·Verizon·WiFi·Access.·Pozovite·nas·na·800·922·0204.</string> |
5 | ··<string·name="wifi_eap_error_message_code_32762">%1$s·:·Došlo·je·do·problema·u·vezi·sa·Verizon·Wi | 5 | ··<string·name="wifi_eap_error_message_code_32762">%1$s·:·Došlo·je·do·problema·u·vezi·sa·Verizon·WiFi·Access·nalogom.·Pozovite·nas·na·800·922·0204.</string> |
6 | ··<string·name="wifi_eap_error_message_code_32763">%1$s·:·Već·ste·povezani·na·Verizon·Wi | 6 | ··<string·name="wifi_eap_error_message_code_32763">%1$s·:·Već·ste·povezani·na·Verizon·WiFi·Access.</string> |
7 | ··<string·name="wifi_eap_error_message_code_32764">%1$s·:·Postoji·problem·pri·povezivanju·na·Verizon·Wi | 7 | ··<string·name="wifi_eap_error_message_code_32764">%1$s·:·Postoji·problem·pri·povezivanju·na·Verizon·WiFi·Access.·Pozovite·nas·na·800·922·0204.</string> |
8 | ··<string·name="wifi_eap_error_message_code_32765">%1$s·:·Došlo·je·do·problema·u·vezi·sa·Verizon·Wi | 8 | ··<string·name="wifi_eap_error_message_code_32765">%1$s·:·Došlo·je·do·problema·u·vezi·sa·Verizon·WiFi·Access·nalogom.·Pozovite·nas·na·800·922·0204.</string> |
9 | ··<string·name="wifi_eap_error_message_code_32766">%1$s·:·Verizon·Wi | 9 | ··<string·name="wifi_eap_error_message_code_32766">%1$s·:·Verizon·WiFi·Access·nije·dostupan·sa·vaše·lokacije.·Probajte·ponovo·kasnije·ili·probajte·sa·neke·druge·lokacije.</string> |
10 | </resources> | 10 | </resources> |
Offset 1, 10 lines modified | Offset 1, 10 lines modified | ||
1 | <?xml·version="1.0"·encoding="utf-8"?> | 1 | <?xml·version="1.0"·encoding="utf-8"?> |
2 | <resources> | 2 | <resources> |
3 | ··<string·name="wifi_eap_error_message_code_32760">%1$s·:·Не·можете·да·се·повежете·на·Verizon·Wi | 3 | ··<string·name="wifi_eap_error_message_code_32760">%1$s·:·Не·можете·да·се·повежете·на·Verizon·WiFi·Access·ван·области·коју·Verizon·покрива.</string> |
4 | ··<string·name="wifi_eap_error_message_code_32761">%1$s·:·Нисте·претплаћени·на·Verizon·Wi | 4 | ··<string·name="wifi_eap_error_message_code_32761">%1$s·:·Нисте·претплаћени·на·Verizon·WiFi·Access.·Позовите·нас·на·800·922·0204.</string> |
5 | ··<string·name="wifi_eap_error_message_code_32762">%1$s·:·Дошло·је·до·проблема·у·вези·са·Verizon·Wi | 5 | ··<string·name="wifi_eap_error_message_code_32762">%1$s·:·Дошло·је·до·проблема·у·вези·са·Verizon·WiFi·Access·налогом.·Позовите·нас·на·800·922·0204.</string> |
6 | ··<string·name="wifi_eap_error_message_code_32763">%1$s·:·Већ·сте·повезани·на·Verizon·Wi | 6 | ··<string·name="wifi_eap_error_message_code_32763">%1$s·:·Већ·сте·повезани·на·Verizon·WiFi·Access.</string> |
7 | ··<string·name="wifi_eap_error_message_code_32764">%1$s·:·Постоји·проблем·при·повезивању·на·Verizon·Wi | 7 | ··<string·name="wifi_eap_error_message_code_32764">%1$s·:·Постоји·проблем·при·повезивању·на·Verizon·WiFi·Access.·Позовите·нас·на·800·922·0204.</string> |
8 | ··<string·name="wifi_eap_error_message_code_32765">%1$s·:·Дошло·је·до·проблема·у·вези·са·Verizon·Wi | 8 | ··<string·name="wifi_eap_error_message_code_32765">%1$s·:·Дошло·је·до·проблема·у·вези·са·Verizon·WiFi·Access·налогом.·Позовите·нас·на·800·922·0204.</string> |
9 | ··<string·name="wifi_eap_error_message_code_32766">%1$s·:·Verizon·Wi | 9 | ··<string·name="wifi_eap_error_message_code_32766">%1$s·:·Verizon·WiFi·Access·није·доступан·са·ваше·локације.·Пробајте·поново·касније·или·пробајте·са·неке·друге·локације.</string> |
10 | </resources> | 10 | </resources> |
Offset 41, 15 lines modified | Offset 41, 15 lines modified | ||
41 | ··<string·name="wifi_p2p_invitation_sent_title">ההזמנה·נשלחה</string> | 41 | ··<string·name="wifi_p2p_invitation_sent_title">ההזמנה·נשלחה</string> |
42 | ··<string·name="wifi_p2p_invitation_to_connect_title">הזמנה·להתחבר</string> | 42 | ··<string·name="wifi_p2p_invitation_to_connect_title">הזמנה·להתחבר</string> |
43 | ··<string·name="wifi_p2p_show_pin_message">קוד·גישה:</string> | 43 | ··<string·name="wifi_p2p_show_pin_message">קוד·גישה:</string> |
44 | ··<string·name="wifi_p2p_to_message">אל:</string> | 44 | ··<string·name="wifi_p2p_to_message">אל:</string> |
45 | ··<string·name="wifi_sim_required_message">יש·להכניס·SIM·של·%2$s·כדי·להתחבר·אל·%1$s</string> | 45 | ··<string·name="wifi_sim_required_message">יש·להכניס·SIM·של·%2$s·כדי·להתחבר·אל·%1$s</string> |
46 | ··<string·name="wifi_sim_required_title">Wi-Fi·מנותק</string> | 46 | ··<string·name="wifi_sim_required_title">Wi-Fi·מנותק</string> |
47 | ··<string·name="wifi_softap_auto_shutdown_timeout_expired_summary">אין·מכשירים·מחוברים.·יש·להקיש·כדי·לשנות.</string> | 47 | ··<string·name="wifi_softap_auto_shutdown_timeout_expired_summary">אין·מכשירים·מחוברים.·יש·להקיש·כדי·לשנות.</string> |
48 | ··<string·name="wifi_softap_auto_shutdown_timeout_expired_title">נקוד | 48 | ··<string·name="wifi_softap_auto_shutdown_timeout_expired_title">נקודת·האינטרנט·(hotspot)·נכבתה</string> |
49 | ··<string·name="wifi_suggestion_action_allow_app">אישור</string> | 49 | ··<string·name="wifi_suggestion_action_allow_app">אישור</string> |
50 | ··<string·name="wifi_suggestion_action_allow_imsi_privacy_exemption_carrier">חיבור</string> | 50 | ··<string·name="wifi_suggestion_action_allow_imsi_privacy_exemption_carrier">חיבור</string> |
51 | ··<string·name="wifi_suggestion_action_allow_imsi_privacy_exemption_confirmation">התחברות</string> | 51 | ··<string·name="wifi_suggestion_action_allow_imsi_privacy_exemption_confirmation">התחברות</string> |
52 | ··<string·name="wifi_suggestion_action_disallow_app">לא·תודה</string> | 52 | ··<string·name="wifi_suggestion_action_disallow_app">לא·תודה</string> |
53 | ··<string·name="wifi_suggestion_action_disallow_imsi_privacy_exemption_carrier">אין·להתחבר</string> | 53 | ··<string·name="wifi_suggestion_action_disallow_imsi_privacy_exemption_carrier">אין·להתחבר</string> |
54 | ··<string·name="wifi_suggestion_action_disallow_imsi_privacy_exemption_confirmation">אין·להתחבר</string> | 54 | ··<string·name="wifi_suggestion_action_disallow_imsi_privacy_exemption_confirmation">אין·להתחבר</string> |
55 | ··<string·name="wifi_suggestion_content">הצעות·לרשתות·%s.·ייתכן·שחיבור·המכשיר·ייעשה·באופן·אוטומטי.</string> | 55 | ··<string·name="wifi_suggestion_content">הצעות·לרשתות·%s.·ייתכן·שחיבור·המכשיר·ייעשה·באופן·אוטומטי.</string> |
Offset 3, 25 lines modified | Offset 3, 25 lines modified | ||
3 | ··<string·name="accept">Prihvati</string> | 3 | ··<string·name="accept">Prihvati</string> |
4 | ··<string·name="decline">Odbij</string> | 4 | ··<string·name="decline">Odbij</string> |
5 | ··<string·name="dlg_ok">Potvrdi</string> | 5 | ··<string·name="dlg_ok">Potvrdi</string> |
6 | ··<string·name="notification_channel_network_alerts">Obaveštenja·u·vezi·sa·mrežom</string> | 6 | ··<string·name="notification_channel_network_alerts">Obaveštenja·u·vezi·sa·mrežom</string> |
7 | ··<string·name="notification_channel_network_available">Mreža·je·dostupna</string> | 7 | ··<string·name="notification_channel_network_available">Mreža·je·dostupna</string> |
8 | ··<string·name="notification_channel_network_status">Status·mreže</string> | 8 | ··<string·name="notification_channel_network_status">Status·mreže</string> |
9 | ··<string·name="ok">Potvrdi</string> | 9 | ··<string·name="ok">Potvrdi</string> |
10 | ··<string·name="wifiResourcesAppLabel">Sistemski·Wi | 10 | ··<string·name="wifiResourcesAppLabel">Sistemski·WiFi·resursi</string> |
11 | ··<string·name="wifi_available_action_all_networks">Sve·mreže</string> | 11 | ··<string·name="wifi_available_action_all_networks">Sve·mreže</string> |
12 | ··<string·name="wifi_available_action_connect">Poveži</string> | 12 | ··<string·name="wifi_available_action_connect">Poveži</string> |
13 | ··<string·name="wifi_available_content_failed_to_connect">Dodirnite·da·biste·videli·sve·mreže</string> | 13 | ··<string·name="wifi_available_content_failed_to_connect">Dodirnite·da·biste·videli·sve·mreže</string> |
14 | ··<string·name="wifi_available_title">Povežite·se·sa·otvorenom·Wi‑Fi·mrežom</string> | 14 | ··<string·name="wifi_available_title">Povežite·se·sa·otvorenom·Wi‑Fi·mrežom</string> |
15 | ··<string·name="wifi_available_title_connected">Povezali·ste·se·sa·Wi‑Fi·mrežom</string> | 15 | ··<string·name="wifi_available_title_connected">Povezali·ste·se·sa·Wi‑Fi·mrežom</string> |
16 | ··<string·name="wifi_available_title_connecting">Povezuje·se·sa·Wi | 16 | ··<string·name="wifi_available_title_connecting">Povezuje·se·sa·WiFi·mrežom...</string> |
17 | ··<string·name="wifi_available_title_failed_to_connect">Povezivanje·sa·Wi‑Fi·mrežom·nije·uspelo</string> | 17 | ··<string·name="wifi_available_title_failed_to_connect">Povezivanje·sa·Wi‑Fi·mrežom·nije·uspelo</string> |
18 | ··<string·name="wifi_cannot_connect_with_randomized_mac_message">Dodirnite·da·biste·promenili·podešavanja·privatnosti·i·probali·ponovo</string> | 18 | ··<string·name="wifi_cannot_connect_with_randomized_mac_message">Dodirnite·da·biste·promenili·podešavanja·privatnosti·i·probali·ponovo</string> |
19 | ··<string·name="wifi_cannot_connect_with_randomized_mac_title">Povezivanje·na·mrežu·%1$s·nije·uspelo</string> | 19 | ··<string·name="wifi_cannot_connect_with_randomized_mac_title">Povezivanje·na·mrežu·%1$s·nije·uspelo</string> |
20 | ··<string·name="wifi_connect_alert_message">Aplikacija·%1$s·želi·da·se·poveže·na·Wi | 20 | ··<string·name="wifi_connect_alert_message">Aplikacija·%1$s·želi·da·se·poveže·na·WiFi·mrežu·%2$s</string> |
21 | ··<string·name="wifi_connect_alert_title">Želite·li·da·dozvolite·povezivanje?</string> | 21 | ··<string·name="wifi_connect_alert_title">Želite·li·da·dozvolite·povezivanje?</string> |
22 | ··<string·name="wifi_connect_default_application">Aplikacija</string> | 22 | ··<string·name="wifi_connect_default_application">Aplikacija</string> |
23 | ··<string·name="wifi_disable_mac_randomization_dialog_confirm_text">Promeni·podešavanje</string> | 23 | ··<string·name="wifi_disable_mac_randomization_dialog_confirm_text">Promeni·podešavanje</string> |
24 | ··<string·name="wifi_disable_mac_randomization_dialog_failure">Promena·podešavanja·privatnosti·nije·uspela</string> | 24 | ··<string·name="wifi_disable_mac_randomization_dialog_failure">Promena·podešavanja·privatnosti·nije·uspela</string> |
25 | ··<string·name="wifi_disable_mac_randomization_dialog_message">"%1$s·treba·da·se·poveže·pomoću·MAC·adrese·uređaja,·jedinstvenog·identifikatora.·Podešavanje·privatnosti·za·ovu·mrežu·trenutno·koristi·nasumični·identifikator.· | 25 | ··<string·name="wifi_disable_mac_randomization_dialog_message">"%1$s·treba·da·se·poveže·pomoću·MAC·adrese·uređaja,·jedinstvenog·identifikatora.·Podešavanje·privatnosti·za·ovu·mrežu·trenutno·koristi·nasumični·identifikator.· |
26 | Ova·izmena·može·da·omogući·uređajima·u·blizini·da·prate·lokaciju·uređaja."</string> | 26 | Ova·izmena·može·da·omogući·uređajima·u·blizini·da·prate·lokaciju·uređaja."</string> |
Offset 32, 37 lines modified | Offset 32, 37 lines modified | ||
32 | ··<string·name="wifi_eap_error_message_code_32761">%1$s:·EAP·greška·pri·potvrdi·identiteta·32761</string> | 32 | ··<string·name="wifi_eap_error_message_code_32761">%1$s:·EAP·greška·pri·potvrdi·identiteta·32761</string> |
33 | ··<string·name="wifi_eap_error_message_code_32762">%1$s:·EAP·greška·pri·potvrdi·identiteta·32762</string> | 33 | ··<string·name="wifi_eap_error_message_code_32762">%1$s:·EAP·greška·pri·potvrdi·identiteta·32762</string> |
34 | ··<string·name="wifi_eap_error_message_code_32763">%1$s:·EAP·greška·pri·potvrdi·identiteta·32763</string> | 34 | ··<string·name="wifi_eap_error_message_code_32763">%1$s:·EAP·greška·pri·potvrdi·identiteta·32763</string> |
35 | ··<string·name="wifi_eap_error_message_code_32764">%1$s:·EAP·greška·pri·potvrdi·identiteta·32764</string> | 35 | ··<string·name="wifi_eap_error_message_code_32764">%1$s:·EAP·greška·pri·potvrdi·identiteta·32764</string> |
36 | ··<string·name="wifi_eap_error_message_code_32765">%1$s:·EAP·greška·pri·potvrdi·identiteta·32765</string> | 36 | ··<string·name="wifi_eap_error_message_code_32765">%1$s:·EAP·greška·pri·potvrdi·identiteta·32765</string> |
37 | ··<string·name="wifi_eap_error_message_code_32766">%1$s:·EAP·greška·pri·potvrdi·identiteta·32766</string> | 37 | ··<string·name="wifi_eap_error_message_code_32766">%1$s:·EAP·greška·pri·potvrdi·identiteta·32766</string> |
38 | ··<string·name="wifi_p2p_enter_pin_message">Unesite·potrebni·PIN:</string> | 38 | ··<string·name="wifi_p2p_enter_pin_message">Unesite·potrebni·PIN:</string> |
39 | ··<string·name="wifi_p2p_frequency_conflict_message">Telefon·će·privremeno·prekinuti·vezu·sa·Wi | 39 | ··<string·name="wifi_p2p_frequency_conflict_message">Telefon·će·privremeno·prekinuti·vezu·sa·WiFi-em·dok·je·povezan·sa·uređajem·%1$s</string> |
40 | ··<string·name="wifi_p2p_from_message">Od:</string> | 40 | ··<string·name="wifi_p2p_from_message">Od:</string> |
41 | ··<string·name="wifi_p2p_invitation_sent_title">Pozivnica·je·poslata</string> | 41 | ··<string·name="wifi_p2p_invitation_sent_title">Pozivnica·je·poslata</string> |
42 | ··<string·name="wifi_p2p_invitation_to_connect_title">Pozivnica·za·povezivanje</string> | 42 | ··<string·name="wifi_p2p_invitation_to_connect_title">Pozivnica·za·povezivanje</string> |
43 | ··<string·name="wifi_p2p_show_pin_message">PIN:</string> | 43 | ··<string·name="wifi_p2p_show_pin_message">PIN:</string> |
44 | ··<string·name="wifi_p2p_to_message">Kome:</string> | 44 | ··<string·name="wifi_p2p_to_message">Kome:</string> |
45 | ··<string·name="wifi_sim_required_message">Da·biste·se·povezali·na·mrežu·%1$s,· | 45 | ··<string·name="wifi_sim_required_message">Da·biste·se·povezali·na·mrežu·%1$s,·stavite·%2$s·SIM·karticu</string> |
46 | ··<string·name="wifi_sim_required_title">Wi | 46 | ··<string·name="wifi_sim_required_title">WiFi·veza·je·prekinuta</string> |
47 | ··<string·name="wifi_softap_auto_shutdown_timeout_expired_summary">Nijedan·uređaj·nije·povezan.·Dodirnite·da·biste·izmenili.</string> | 47 | ··<string·name="wifi_softap_auto_shutdown_timeout_expired_summary">Nijedan·uređaj·nije·povezan.·Dodirnite·da·biste·izmenili.</string> |
48 | ··<string·name="wifi_softap_auto_shutdown_timeout_expired_title">Hotspot·je·isključen</string> | 48 | ··<string·name="wifi_softap_auto_shutdown_timeout_expired_title">Hotspot·je·isključen</string> |
49 | ··<string·name="wifi_suggestion_action_allow_app">Dozvoli</string> | 49 | ··<string·name="wifi_suggestion_action_allow_app">Dozvoli</string> |
50 | ··<string·name="wifi_suggestion_action_allow_imsi_privacy_exemption_carrier">Poveži</string> | 50 | ··<string·name="wifi_suggestion_action_allow_imsi_privacy_exemption_carrier">Poveži</string> |
51 | ··<string·name="wifi_suggestion_action_allow_imsi_privacy_exemption_confirmation">Poveži</string> | 51 | ··<string·name="wifi_suggestion_action_allow_imsi_privacy_exemption_confirmation">Poveži</string> |
52 | ··<string·name="wifi_suggestion_action_disallow_app">Ne,·hvala</string> | 52 | ··<string·name="wifi_suggestion_action_disallow_app">Ne,·hvala</string> |
53 | ··<string·name="wifi_suggestion_action_disallow_imsi_privacy_exemption_carrier">Ne·povezuj</string> | 53 | ··<string·name="wifi_suggestion_action_disallow_imsi_privacy_exemption_carrier">Ne·povezuj</string> |
54 | ··<string·name="wifi_suggestion_action_disallow_imsi_privacy_exemption_confirmation">Ne·povezuj</string> | 54 | ··<string·name="wifi_suggestion_action_disallow_imsi_privacy_exemption_confirmation">Ne·povezuj</string> |
55 | ··<string·name="wifi_suggestion_content">Mreže·koje·predlaže·%s.·Uređaj·će·se·možda·povezati·automatski.</string> | 55 | ··<string·name="wifi_suggestion_content">Mreže·koje·predlaže·%s.·Uređaj·će·se·možda·povezati·automatski.</string> |
56 | ··<string·name="wifi_suggestion_imsi_privacy_content">Ove·mreže·dobijaju·ID·SIM·kartice·koji·može·da·se·koristi·za·praćenje·lokacije·uređaja</string> | 56 | ··<string·name="wifi_suggestion_imsi_privacy_content">Ove·mreže·dobijaju·ID·SIM·kartice·koji·može·da·se·koristi·za·praćenje·lokacije·uređaja</string> |
57 | ··<string·name="wifi_suggestion_imsi_privacy_exemption_confirmation_content">Ako·se·povežete,·Wi‑Fi·mreže·operatera·%s·mogu·da·pristupaju·jedinstvenom·ID-u·povezanom·sa·SIM·karticom·ili·da·ga·dele.·To·može·da·omogući·praćenje·lokacije·uređaja.</string> | 57 | ··<string·name="wifi_suggestion_imsi_privacy_exemption_confirmation_content">Ako·se·povežete,·Wi‑Fi·mreže·operatera·%s·mogu·da·pristupaju·jedinstvenom·ID-u·povezanom·sa·SIM·karticom·ili·da·ga·dele.·To·može·da·omogući·praćenje·lokacije·uređaja.</string> |
58 | ··<string·name="wifi_suggestion_imsi_privacy_exemption_confirmation_title">Želite·li·da·potvrdite·povezivanje?</string> | 58 | ··<string·name="wifi_suggestion_imsi_privacy_exemption_confirmation_title">Želite·li·da·potvrdite·povezivanje?</string> |
59 | ··<string·name="wifi_suggestion_imsi_privacy_title">Želite·da·se·povežete·na·Wi | 59 | ··<string·name="wifi_suggestion_imsi_privacy_title">Želite·da·se·povežete·na·WiFi·mrežu·%s?</string> |
60 | ··<string·name="wifi_suggestion_title">Želite·da·dozvolite·predložene·Wi‑Fi·mreže?</string> | 60 | ··<string·name="wifi_suggestion_title">Želite·da·dozvolite·predložene·Wi‑Fi·mreže?</string> |
61 | ··<string·name="wifi_wakeup_enabled_content">U·blizini·ste·sačuvane·mreže:·%1$s</string> | 61 | ··<string·name="wifi_wakeup_enabled_content">U·blizini·ste·sačuvane·mreže:·%1$s</string> |
62 | ··<string·name="wifi_wakeup_enabled_title">Wi‑Fi·je·automatski·uključen</string> | 62 | ··<string·name="wifi_wakeup_enabled_title">Wi‑Fi·je·automatski·uključen</string> |
63 | ··<string·name="wifi_wakeup_onboarding_action_disable">Ne·uključuj·ponovo</string> | 63 | ··<string·name="wifi_wakeup_onboarding_action_disable">Ne·uključuj·ponovo</string> |
64 | ··<string·name="wifi_wakeup_onboarding_subtext">Kada·ste·u·blizini·sačuvane·mreže·visokog·kvaliteta</string> | 64 | ··<string·name="wifi_wakeup_onboarding_subtext">Kada·ste·u·blizini·sačuvane·mreže·visokog·kvaliteta</string> |
65 | ··<string·name="wifi_wakeup_onboarding_title">Wi‑Fi·će·se·automatski·uključiti</string> | 65 | ··<string·name="wifi_wakeup_onboarding_title">Wi‑Fi·će·se·automatski·uključiti</string> |
66 | ··<string·name="wifi_watchdog_network_disabled">Nije·moguće·povezati·sa·Wi | 66 | ··<string·name="wifi_watchdog_network_disabled">Nije·moguće·povezati·sa·WiFi·mrežom</string> |
67 | ··<string·name="wifi_watchdog_network_disabled_detailed">"·ima·lošu·internet·vezu."</string> | 67 | ··<string·name="wifi_watchdog_network_disabled_detailed">"·ima·lošu·internet·vezu."</string> |
68 | </resources> | 68 | </resources> |
Offset 55, 14 lines modified | Offset 55, 14 lines modified | ||
55 | ··<string·name="wifi_suggestion_content">%s·સૂચવેલા·નેટવર્ક.·ડિવાઇસ·ઑટોમૅટિક·રીતે·કનેક્ટ·થાય·તેમ·બની·શકે·છે.</string> | 55 | ··<string·name="wifi_suggestion_content">%s·સૂચવેલા·નેટવર્ક.·ડિવાઇસ·ઑટોમૅટિક·રીતે·કનેક્ટ·થાય·તેમ·બની·શકે·છે.</string> |
56 | ··<string·name="wifi_suggestion_imsi_privacy_content">આ·બધા·નેટવર્કને·સિમ·ID·મળે·છે·કે·જેનો·ઉપયોગ·ડિવાઇસના·સ્થાનને·ટ્રૅક·કરવા·માટે·થઈ·શકે·છે</string> | 56 | ··<string·name="wifi_suggestion_imsi_privacy_content">આ·બધા·નેટવર્કને·સિમ·ID·મળે·છે·કે·જેનો·ઉપયોગ·ડિવાઇસના·સ્થાનને·ટ્રૅક·કરવા·માટે·થઈ·શકે·છે</string> |
57 | ··<string·name="wifi_suggestion_imsi_privacy_exemption_confirmation_content">જો·તમે·કનેક્ટ·કરો·છો,·તો·%s·વાઇ-ફાઇ·નેટવર્ક,·તમારા·SIM·સાથે·સંકળાયેલા·અજોડ·IDને·ઍક્સેસ·અથવા·શેર·કરી·શકે·છે.·આમ·કરવાથી·તમારા·ડિવાઇસનું·સ્થાન·ટ્રૅક·કરવાની·મંજૂરી·આપવામાં·આવી·શકે·છે.</string> | 57 | ··<string·name="wifi_suggestion_imsi_privacy_exemption_confirmation_content">જો·તમે·કનેક્ટ·કરો·છો,·તો·%s·વાઇ-ફાઇ·નેટવર્ક,·તમારા·SIM·સાથે·સંકળાયેલા·અજોડ·IDને·ઍક્સેસ·અથવા·શેર·કરી·શકે·છે.·આમ·કરવાથી·તમારા·ડિવાઇસનું·સ્થાન·ટ્રૅક·કરવાની·મંજૂરી·આપવામાં·આવી·શકે·છે.</string> |
58 | ··<string·name="wifi_suggestion_imsi_privacy_exemption_confirmation_title">કનેક્શનને·કન્ફર્મ·કરીએ?</string> | 58 | ··<string·name="wifi_suggestion_imsi_privacy_exemption_confirmation_title">કનેક્શનને·કન્ફર્મ·કરીએ?</string> |
59 | ··<string·name="wifi_suggestion_imsi_privacy_title">%s·વાઇ-ફાઇ·સાથે·કનેક્ટ·કરીએ?</string> | 59 | ··<string·name="wifi_suggestion_imsi_privacy_title">%s·વાઇ-ફાઇ·સાથે·કનેક્ટ·કરીએ?</string> |
60 | ··<string·name="wifi_suggestion_title">સૂચવેલા·વાઇ-ફાઇ·નેટવર્કને·મંજૂરી·આપીએ?</string> | 60 | ··<string·name="wifi_suggestion_title">સૂચવેલા·વાઇ-ફાઇ·નેટવર્કને·મંજૂરી·આપીએ?</string> |
61 | ··<string·name="wifi_wakeup_enabled_content">તમે·એક·સાચવેલ·નેટવર્કની·નજીકમાં·છો:·%1$s</string> | 61 | ··<string·name="wifi_wakeup_enabled_content">તમે·એક·સાચવેલ·નેટવર્કની·નજીકમાં·છો:·%1$s</string> |
62 | ··<string·name="wifi_wakeup_enabled_title">વાઇ-ફાઇ· | 62 | ··<string·name="wifi_wakeup_enabled_title">વાઇ-ફાઇ·ઑટોમૅટિક·રીતે·ચાલુ·થયું</string> |
63 | ··<string·name="wifi_wakeup_onboarding_action_disable">પાછું·ચાલુ·કરશો·નહીં</string> | 63 | ··<string·name="wifi_wakeup_onboarding_action_disable">પાછું·ચાલુ·કરશો·નહીં</string> |
64 | ··<string·name="wifi_wakeup_onboarding_subtext">જ્યારે·તમે·એક·ઉચ્ચ·ક્વૉલિટીવાળા·સાચવેલ·નેટવર્કની·નજીક·હોવ</string> | 64 | ··<string·name="wifi_wakeup_onboarding_subtext">જ્યારે·તમે·એક·ઉચ્ચ·ક્વૉલિટીવાળા·સાચવેલ·નેટવર્કની·નજીક·હોવ</string> |
65 | ··<string·name="wifi_wakeup_onboarding_title">વાઇ-ફાઇ· | 65 | ··<string·name="wifi_wakeup_onboarding_title">વાઇ-ફાઇ·ઑટોમૅટિક·રીતે·ચાલુ·થઈ·જશે</string> |
66 | ··<string·name="wifi_watchdog_network_disabled">વાઇ-ફાઇ·સાથે·કનેક્ટ·કરી·શકાયું·નથી</string> | 66 | ··<string·name="wifi_watchdog_network_disabled">વાઇ-ફાઇ·સાથે·કનેક્ટ·કરી·શકાયું·નથી</string> |
67 | ··<string·name="wifi_watchdog_network_disabled_detailed">"·આમનું·ઇન્ટરનેટ·કનેક્શન·નબળું·છે."</string> | 67 | ··<string·name="wifi_watchdog_network_disabled_detailed">"·આમનું·ઇન્ટરનેટ·કનેક્શન·નબળું·છે."</string> |
68 | </resources> | 68 | </resources> |
Offset 1, 8 lines modified | Offset 1, 8 lines modified | ||
1 | ··Size:·6 | 1 | ··Size:·619169····» Blocks:·1216·······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 |