| | | | |
| Offset 18, 59 lines modified | Offset 18, 58 lines modified |
| | |
| 18 | public·class·ProvisioningConfiguration | 18 | public·class·ProvisioningConfiguration |
| 19 | { | 19 | { |
| 20 | ····private·static·final·int·DEFAULT_TIMEOUT_MS·=·18000; | 20 | ····private·static·final·int·DEFAULT_TIMEOUT_MS·=·18000; |
| 21 | ····public·static·final·int·IPV6_ADDR_GEN_MODE_EUI64·=·0; | 21 | ····public·static·final·int·IPV6_ADDR_GEN_MODE_EUI64·=·0; |
| 22 | ····public·static·final·int·IPV6_ADDR_GEN_MODE_STABLE_PRIVACY·=·2; | 22 | ····public·static·final·int·IPV6_ADDR_GEN_MODE_STABLE_PRIVACY·=·2; |
| 23 | ····private·static·final·String·TAG·=·"ProvisioningConfiguration"; | 23 | ····private·static·final·String·TAG·=·"ProvisioningConfiguration"; |
| 24 | ····public·static·final·int·VERSION_ADDED_PROVISIONING_ENUM·=·12; | |
| 25 | ····public·ApfCapabilities·mApfCapabilities; | 24 | ····public·ApfCapabilities·mApfCapabilities; |
| 26 | ····public·List·mDhcpOptions; | 25 | ····public·List·mDhcpOptions; |
| 27 | ····public·String·mDisplayName; | 26 | ····public·String·mDisplayName; |
| | 27 | ····public·boolean·mEnableIPv4; |
| | 28 | ····public·boolean·mEnableIPv6; |
| 28 | ····public·boolean·mEnablePreconnection; | 29 | ····public·boolean·mEnablePreconnection; |
| 29 | ····public·int·mIPv4ProvisioningMode; | |
| 30 | ····public·int·mIPv6AddrGenMode; | 30 | ····public·int·mIPv6AddrGenMode; |
| 31 | ····public·int·mIPv6ProvisioningMode; | |
| 32 | ····public·InitialConfiguration·mInitialConfig; | 31 | ····public·InitialConfiguration·mInitialConfig; |
| 33 | ····public·Layer2Information·mLayer2Info; | 32 | ····public·Layer2Information·mLayer2Info; |
| 34 | ····public·Network·mNetwork; | 33 | ····public·Network·mNetwork; |
| 35 | ····public·int·mProvisioningTimeoutMs; | 34 | ····public·int·mProvisioningTimeoutMs; |
| 36 | ····public·int·mRequestedPreDhcpActionMs; | 35 | ····public·int·mRequestedPreDhcpActionMs; |
| 37 | ····public·ProvisioningConfiguration$ScanResultInfo·mScanResultInfo; | 36 | ····public·ProvisioningConfiguration$ScanResultInfo·mScanResultInfo; |
| 38 | ····public·StaticIpConfiguration·mStaticIpConfig; | 37 | ····public·StaticIpConfiguration·mStaticIpConfig; |
| 39 | ····public·boolean·mUsingIpReachabilityMonitor; | 38 | ····public·boolean·mUsingIpReachabilityMonitor; |
| 40 | ····public·boolean·mUsingMultinetworkPolicyTracker; | 39 | ····public·boolean·mUsingMultinetworkPolicyTracker; |
| 41 | ···· | 40 | ···· |
| 42 | ····public·ProvisioningConfiguration()·{ | 41 | ····public·ProvisioningConfiguration()·{ |
| | 42 | ········final·boolean·b·=·true; |
| | 43 | ········this.mEnableIPv4·=·b; |
| | 44 | ········this.mEnableIPv6·=·b; |
| 43 | ········this.mEnablePreconnection·=·false; | 45 | ········this.mEnablePreconnection·=·false; |
| 44 | ········final·boolean·miPv6ProvisioningMode·=·true; | |
| 45 | ········this.mUsingMultinetworkPolicyTracker·=·miPv6ProvisioningMode; | 46 | ········this.mUsingMultinetworkPolicyTracker·=·b; |
| 46 | ········this.mUsingIpReachabilityMonitor·=·miPv6ProvisioningMode; | 47 | ········this.mUsingIpReachabilityMonitor·=·b; |
| 47 | ········this.mProvisioningTimeoutMs·=·18000; | 48 | ········this.mProvisioningTimeoutMs·=·18000; |
| 48 | ········final·int·n·=·2; | |
| 49 | ········this.mIPv6AddrGenMode·=·n; | 49 | ········this.mIPv6AddrGenMode·=·2; |
| 50 | ········this.mNetwork·=·null; | 50 | ········this.mNetwork·=·null; |
| 51 | ········this.mDisplayName·=·null; | 51 | ········this.mDisplayName·=·null; |
| 52 | ········this.mIPv4ProvisioningMode·=·n; | |
| 53 | ········this.mIPv6ProvisioningMode·=·(miPv6ProvisioningMode·?·1·:·0); | |
| 54 | ····} | 52 | ····} |
| 55 | ···· | 53 | ···· |
| 56 | ····public·ProvisioningConfiguration(final·ProvisioningConfiguration·provisioningConfiguration)·{ | 54 | ····public·ProvisioningConfiguration(final·ProvisioningConfiguration·provisioningConfiguration)·{ |
| | 55 | ········final·boolean·b·=·true; |
| | 56 | ········this.mEnableIPv4·=·b; |
| | 57 | ········this.mEnableIPv6·=·b; |
| 57 | ········this.mEnablePreconnection·=·false; | 58 | ········this.mEnablePreconnection·=·false; |
| 58 | ········final·boolean·miPv6ProvisioningMode·=·true; | |
| 59 | ········this.mUsingMultinetworkPolicyTracker·=·miPv6ProvisioningMode; | 59 | ········this.mUsingMultinetworkPolicyTracker·=·b; |
| 60 | ········this.mUsingIpReachabilityMonitor·=·miPv6ProvisioningMode; | 60 | ········this.mUsingIpReachabilityMonitor·=·b; |
| 61 | ········this.mProvisioningTimeoutMs·=·18000; | 61 | ········this.mProvisioningTimeoutMs·=·18000; |
| 62 | ········final·int·n·=·2; | |
| 63 | ········this.mIPv6AddrGenMode·=·n; | 62 | ········this.mIPv6AddrGenMode·=·2; |
| 64 | ········StaticIpConfiguration·mStaticIpConfig·=·null; | 63 | ········StaticIpConfiguration·mStaticIpConfig·=·null; |
| 65 | ········this.mNetwork·=·null; | 64 | ········this.mNetwork·=·null; |
| 66 | ········this.mDisplayName·=·null; | 65 | ········this.mDisplayName·=·null; |
| 67 | ········this.mIPv4ProvisioningMode·=·n; | |
| 68 | ········this.mIPv6ProvisioningMode·=·(miPv6ProvisioningMode·?·1·:·0); | 66 | ········this.mEnableIPv4·=·provisioningConfiguration.mEnableIPv4; |
| | 67 | ········this.mEnableIPv6·=·provisioningConfiguration.mEnableIPv6; |
| 69 | ········this.mEnablePreconnection·=·provisioningConfiguration.mEnablePreconnection; | 68 | ········this.mEnablePreconnection·=·provisioningConfiguration.mEnablePreconnection; |
| 70 | ········this.mUsingMultinetworkPolicyTracker·=·provisioningConfiguration.mUsingMultinetworkPolicyTracker; | 69 | ········this.mUsingMultinetworkPolicyTracker·=·provisioningConfiguration.mUsingMultinetworkPolicyTracker; |
| 71 | ········this.mUsingIpReachabilityMonitor·=·provisioningConfiguration.mUsingIpReachabilityMonitor; | 70 | ········this.mUsingIpReachabilityMonitor·=·provisioningConfiguration.mUsingIpReachabilityMonitor; |
| 72 | ········this.mRequestedPreDhcpActionMs·=·provisioningConfiguration.mRequestedPreDhcpActionMs; | 71 | ········this.mRequestedPreDhcpActionMs·=·provisioningConfiguration.mRequestedPreDhcpActionMs; |
| 73 | ········this.mInitialConfig·=·InitialConfiguration.copy(provisioningConfiguration.mInitialConfig); | 72 | ········this.mInitialConfig·=·InitialConfiguration.copy(provisioningConfiguration.mInitialConfig); |
| 74 | ········if·(provisioningConfiguration.mStaticIpConfig·!=·null)·{ | 73 | ········if·(provisioningConfiguration.mStaticIpConfig·!=·null)·{ |
| 75 | ············mStaticIpConfig·=·new·StaticIpConfiguration(provisioningConfiguration.mStaticIpConfig); | 74 | ············mStaticIpConfig·=·new·StaticIpConfiguration(provisioningConfiguration.mStaticIpConfig); |
| Offset 80, 16 lines modified | Offset 79, 14 lines modified |
| 80 | ········this.mProvisioningTimeoutMs·=·provisioningConfiguration.mProvisioningTimeoutMs; | 79 | ········this.mProvisioningTimeoutMs·=·provisioningConfiguration.mProvisioningTimeoutMs; |
| 81 | ········this.mIPv6AddrGenMode·=·provisioningConfiguration.mIPv6AddrGenMode; | 80 | ········this.mIPv6AddrGenMode·=·provisioningConfiguration.mIPv6AddrGenMode; |
| 82 | ········this.mNetwork·=·provisioningConfiguration.mNetwork; | 81 | ········this.mNetwork·=·provisioningConfiguration.mNetwork; |
| 83 | ········this.mDisplayName·=·provisioningConfiguration.mDisplayName; | 82 | ········this.mDisplayName·=·provisioningConfiguration.mDisplayName; |
| 84 | ········this.mScanResultInfo·=·provisioningConfiguration.mScanResultInfo; | 83 | ········this.mScanResultInfo·=·provisioningConfiguration.mScanResultInfo; |
| 85 | ········this.mLayer2Info·=·provisioningConfiguration.mLayer2Info; | 84 | ········this.mLayer2Info·=·provisioningConfiguration.mLayer2Info; |
| 86 | ········this.mDhcpOptions·=·provisioningConfiguration.mDhcpOptions; | 85 | ········this.mDhcpOptions·=·provisioningConfiguration.mDhcpOptions; |
| 87 | ········this.mIPv4ProvisioningMode·=·provisioningConfiguration.mIPv4ProvisioningMode; | |
| 88 | ········this.mIPv6ProvisioningMode·=·provisioningConfiguration.mIPv6ProvisioningMode; | |
| 89 | ····} | 86 | ····} |
| 90 | ···· | 87 | ···· |
| 91 | ····private·static·boolean·dhcpOptionEquals(final·DhcpOption·dhcpOption,·final·DhcpOption·dhcpOption2)·{ | 88 | ····private·static·boolean·dhcpOptionEquals(final·DhcpOption·dhcpOption,·final·DhcpOption·dhcpOption2)·{ |
| 92 | ········boolean·b·=·true; | 89 | ········boolean·b·=·true; |
| 93 | ········if·(dhcpOption·==·dhcpOption2)·{ | 90 | ········if·(dhcpOption·==·dhcpOption2)·{ |
| 94 | ············return·b; | 91 | ············return·b; |
| 95 | ········} | 92 | ········} |
| Offset 117, 20 lines modified | Offset 114, 22 lines modified |
| 117 | ············if·(!dhcpOptionEquals(list.get(i),·list2.get(i)))·{ | 114 | ············if·(!dhcpOptionEquals(list.get(i),·list2.get(i)))·{ |
| 118 | ················return·false; | 115 | ················return·false; |
| 119 | ············} | 116 | ············} |
| 120 | ········} | 117 | ········} |
| 121 | ········return·b; | 118 | ········return·b; |
| 122 | ····} | 119 | ····} |
| 123 | ···· | 120 | ···· |
| 124 | ····public·static·ProvisioningConfiguration·fromStableParcelable(final·ProvisioningConfigurationParcelable·provisioningConfigurationParcelable,·final·int·n)·{ | 121 | ····public·static·ProvisioningConfiguration·fromStableParcelable(final·ProvisioningConfigurationParcelable·provisioningConfigurationParcelable)·{ |
| 125 | ········List·mDhcpOptions·=·null; | 122 | ········List·mDhcpOptions·=·null; |
| 126 | ········if·(provisioningConfigurationParcelable·==·null)·{ | 123 | ········if·(provisioningConfigurationParcelable·==·null)·{ |
| 127 | ············return·null; | 124 | ············return·null; |
| 128 | ········} | 125 | ········} |
| 129 | ········final·ProvisioningConfiguration·provisioningConfiguration·=·new·ProvisioningConfiguration(); | 126 | ········final·ProvisioningConfiguration·provisioningConfiguration·=·new·ProvisioningConfiguration(); |
| | 127 | ········provisioningConfiguration.mEnableIPv4·=·provisioningConfigurationParcelable.enableIPv4; |
| | 128 | ········provisioningConfiguration.mEnableIPv6·=·provisioningConfigurationParcelable.enableIPv6; |
| 130 | ········provisioningConfiguration.mEnablePreconnection·=·provisioningConfigurationParcelable.enablePreconnection; | 129 | ········provisioningConfiguration.mEnablePreconnection·=·provisioningConfigurationParcelable.enablePreconnection; |
| 131 | ········provisioningConfiguration.mUsingMultinetworkPolicyTracker·=·provisioningConfigurationParcelable.usingMultinetworkPolicyTracker; | 130 | ········provisioningConfiguration.mUsingMultinetworkPolicyTracker·=·provisioningConfigurationParcelable.usingMultinetworkPolicyTracker; |
| 132 | ········provisioningConfiguration.mUsingIpReachabilityMonitor·=·provisioningConfigurationParcelable.usingIpReachabilityMonitor; | 131 | ········provisioningConfiguration.mUsingIpReachabilityMonitor·=·provisioningConfigurationParcelable.usingIpReachabilityMonitor; |
| 133 | ········provisioningConfiguration.mRequestedPreDhcpActionMs·=·provisioningConfigurationParcelable.requestedPreDhcpActionMs; | 132 | ········provisioningConfiguration.mRequestedPreDhcpActionMs·=·provisioningConfigurationParcelable.requestedPreDhcpActionMs; |
| 134 | ········provisioningConfiguration.mInitialConfig·=·InitialConfiguration.fromStableParcelable(provisioningConfigurationParcelable.initialConfig); | 133 | ········provisioningConfiguration.mInitialConfig·=·InitialConfiguration.fromStableParcelable(provisioningConfigurationParcelable.initialConfig); |
| 135 | ········StaticIpConfiguration·mStaticIpConfig; | 134 | ········StaticIpConfiguration·mStaticIpConfig; |
| 136 | ········if·(provisioningConfigurationParcelable.staticIpConfig·==·null)·{ | 135 | ········if·(provisioningConfigurationParcelable.staticIpConfig·==·null)·{ |
| Offset 147, 95 lines modified | Offset 146, 39 lines modified |
| 147 | ········provisioningConfiguration.mDisplayName·=·provisioningConfigurationParcelable.displayName; | 146 | ········provisioningConfiguration.mDisplayName·=·provisioningConfigurationParcelable.displayName; |
| 148 | ········provisioningConfiguration.mScanResultInfo·=·ProvisioningConfiguration$ScanResultInfo.fromStableParcelable(provisioningConfigurationParcelable.scanResultInfo); | 147 | ········provisioningConfiguration.mScanResultInfo·=·ProvisioningConfiguration$ScanResultInfo.fromStableParcelable(provisioningConfigurationParcelable.scanResultInfo); |
| 149 | ········provisioningConfiguration.mLayer2Info·=·Layer2Information.fromStableParcelable(provisioningConfigurationParcelable.layer2Info); | 148 | ········provisioningConfiguration.mLayer2Info·=·Layer2Information.fromStableParcelable(provisioningConfigurationParcelable.layer2Info); |
| 150 | ········if·(provisioningConfigurationParcelable.options·!=·null)·{ | 149 | ········if·(provisioningConfigurationParcelable.options·!=·null)·{ |
| 151 | ············mDhcpOptions·=·new·ArrayList(provisioningConfigurationParcelable.options); | 150 | ············mDhcpOptions·=·new·ArrayList(provisioningConfigurationParcelable.options); |
| 152 | ········} | 151 | ········} |
| 153 | ········provisioningConfiguration.mDhcpOptions·=·mDhcpOptions; | 152 | ········provisioningConfiguration.mDhcpOptions·=·mDhcpOptions; |
| 154 | ········if·(n·<·12)·{ | |
| 155 | ············int·miPv4ProvisioningMode; | |
| 156 | ············if·(provisioningConfigurationParcelable.enableIPv4)·{ | |
| 157 | ················miPv4ProvisioningMode·=·2; | |
| 158 | ············} | |
| 159 | ············else·{ | |
| 160 | ················miPv4ProvisioningMode·=·0; | |
| 161 | ············} | |
| 162 | ············provisioningConfiguration.mIPv4ProvisioningMode·=·miPv4ProvisioningMode; | |
| 163 | ············provisioningConfiguration.mIPv6ProvisioningMode·=·(provisioningConfigurationParcelable.enableIPv6·?·1·:·0); | |
| 164 | ········} | |
| 165 | ········else·{ | |
| 166 | ············provisioningConfiguration.mIPv4ProvisioningMode·=·provisioningConfigurationParcelable.ipv4ProvisioningMode; | |
| 167 | ············provisioningConfiguration.mIPv6ProvisioningMode·=·provisioningConfigurationParcelable.ipv6ProvisioningMode; | |
| 168 | ········} | |
| 169 | ········return·provisioningConfiguration; | 153 | ········return·provisioningConfiguration; |
| 170 | ····} | 154 | ····} |
| 171 | ···· | 155 | ···· |
| 172 | ····static·String·ipv4ProvisioningModeToString(final·int·n)·{ | |
| 173 | ········switch·(n)·{ | |
| 174 | ············default:·{ | |
| 175 | ················return·"unknown"; | |
| 176 | ············} | |
| 177 | ············case·2:·{ | |
| 178 | ················return·"dhcp"; | |
| 179 | ············} | |
| 180 | ············case·1:·{ | |
| 181 | ················return·"static"; | |
| 182 | ············} | |
| 183 | ············case·0:·{ | |
| 184 | ················return·"disabled"; | |
| 185 | ············} | |
| 186 | ········} | |
| 187 | ····} | |
| 188 | ···· | |
| 189 | ····static·String·ipv6ProvisioningModeToString(final·int·n)·{ | |
| 190 | ········switch·(n)·{ | |
| 191 | ············default:·{ | |
| 192 | ················return·"unknown"; | |
| 193 | ············} | |
| 194 | ············case·2:·{ | |
| 195 | ················return·"link-local"; | |
| 196 | ············} | |
| 197 | ············case·1:·{ | |
| 198 | ················return·"slaac"; | |
| 199 | ············} | |
| 200 | ············case·0:·{ | |
| 201 | ················return·"disabled"; | |
| 202 | ············} | |
| 203 | ········} | |
| 204 | ····} | |
| 205 | ···· | |
| 206 | ····public·boolean·equals(final·Object·o)·{ | 156 | ····public·boolean·equals(final·Object·o)·{ |
| 207 | ········final·boolean·b·=·o·instanceof·ProvisioningConfiguration; | 157 | ········final·boolean·b·=·o·instanceof·ProvisioningConfiguration; |
| 208 | ········boolean·b2·=·false; | 158 | ········boolean·b2·=·false; |
| 209 | ········if·(!b)·{ | 159 | ········if·(!b)·{ |
| 210 | ············return·false; | 160 | ············return·false; |
| 211 | ········} | 161 | ········} |
| 212 | ········final·ProvisioningConfiguration·provisioningConfiguration·=·(ProvisioningConfiguration)o; | 162 | ········final·ProvisioningConfiguration·provisioningConfiguration·=·(ProvisioningConfiguration)o; |
| 213 | ········if·(this.mEnablePreconnection·==·provisioningConfiguration.mEnablePreconnection·&&·this.mUsingMultinetworkPolicyTracker·==·provisioningConfiguration.mUsingMultinetworkPolicyTracker·&&·this.mUsingIpReachabilityMonitor·==·provisioningConfiguration.mUsingIpReachabilityMonitor·&&·this.mRequestedPreDhcpActionMs·==·provisioningConfiguration.mRequestedPreDhcpActionMs·&&·Objects.equals(this.mInitialConfig,·provisioningConfiguration.mInitialConfig)·&&·Objects.equals(this.mStaticIpConfig,·provisioningConfiguration.mStaticIpConfig)·&&·Objects.equals(this.mApfCapabilities,·provisioningConfiguration.mApfCapabilities)·&&·this.mProvisioningTimeoutMs·==·provisioningConfiguration.mProvisioningTimeoutMs·&&·this.mIPv6AddrGenMode·==·provisioningConfiguration.mIPv6AddrGenMode·&&·Objects.equals(this.mNetwork,·provisioningConfiguration.mNetwork)·&&·Objects.equals(this.mDisplayName,·provisioningConfiguration.mDisplayName)·&&·Objects.equals(this.mScanResultInfo,·provisioningConfiguration.mScanResultInfo)·&&·Objects.equals(this.mLayer2Info,·provision[·...·truncated·by·diffoscope;·len:·274,·SHA:·2c7df8dacf770881ff27de667a68aead52d8f759992c6df08530378dcae58b46·...·])·{ | 163 | ········if·(this.mEnableIPv4·==·provisioningConfiguration.mEnableIPv4·&&·this.mEnableIPv6·==·provisioningConfiguration.mEnableIPv6·&&·this.mEnablePreconnection·==·provisioningConfiguration.mEnablePreconnection·&&·this.mUsingMultinetworkPolicyTracker·==·provisioningConfiguration.mUsingMultinetworkPolicyTracker·&&·this.mUsingIpReachabilityMonitor·==·provisioningConfiguration.mUsingIpReachabilityMonitor·&&·this.mRequestedPreDhcpActionMs·==·provisioningConfiguration.mRequestedPreDhcpActionMs·&&·Objects.equals(this.mInitialConfig,·provisioningConfiguration.mInitialConfig)·&&·Objects.equals(this.mStaticIpConfig,·provisioningConfiguration.mStaticIpConfig)·&&·Objects.equals(this.mApfCapabilities,·provisioningConfiguration.mApfCapabilities)·&&·this.mProvisioningTimeoutMs·==·provisioningConfiguration.mProvisioningTimeoutMs·&&·this.mIPv6AddrGenMode·==·provisioningConfiguration.mIPv6AddrGenMode·&&·Objects.equals(this.mNetwork,·provisioningConfiguration.mNetwork)·&&·Objects.equals(this.mDisplayName,·provisioningConfiguration.mDisplayName)·&&·Obj[·...·truncated·by·diffoscope;·len:·234,·SHA:·1c5f4ecfd810124a15acee396de77243097d94e4da6c594d3a27509611277c2f·...·])·{ |
| 214 | ············b2·=·true; | 164 | ············b2·=·true; |
| 215 | ········} | 165 | ········} |
| 216 | ········return·b2; | 166 | ········return·b2; |
| 217 | ····} | 167 | ····} |
| 218 | ···· | 168 | ···· |
| 219 | ····public·boolean·isValid()·{ | 169 | ····public·boolean·isValid()·{ |
| 220 | ········final·InitialConfiguration·mInitialConfig·=·this.mInitialConfig; | 170 | ········final·InitialConfiguration·mInitialConfig·=·this.mInitialConfig; |
| 221 | ········return·mInitialConfig·==·null·||·mInitialConfig.isValid(); | 171 | ········return·mInitialConfig·==·null·||·mInitialConfig.isValid(); |
| 222 | ····} | 172 | ····} |
| 223 | ···· | 173 | ···· |
| 224 | ····public·ProvisioningConfigurationParcelable·toStableParcelable()·{ | 174 | ····public·ProvisioningConfigurationParcelable·toStableParcelable()·{ |
| 225 | ········final·ProvisioningConfigurationParcelable·provisioningConfigurationParcelable·=·new·ProvisioningConfigurationParcelable(); | 175 | ········final·ProvisioningConfigurationParcelable·provisioningConfigurationParcelable·=·new·ProvisioningConfigurationParcelable(); |
| 226 | ········final·int·miPv4ProvisioningMode·=·this.mIPv4ProvisioningMode; | |
| 227 | ········boolean·enableIPv6·=·true; | |
| 228 | ········provisioningConfigurationParcelable.enableIPv4·=·(miPv4ProvisioningMode·!=·0·&&·enableIPv6); | 176 | ········provisioningConfigurationParcelable.enableIPv4·=·this.mEnableIPv4; |
| 229 | ········provisioningConfigurationParcelable.ipv4ProvisioningMode·=·this.mIPv4ProvisioningMode; | |
| 230 | ········if·(this.mIPv6ProvisioningMode·==·0)·{ | |
| 231 | ············enableIPv6·=·false; | |
| 232 | ········} | |
| 233 | ········provisioningConfigurationParcelable.enableIPv6·=·enableIPv6; | 177 | ········provisioningConfigurationParcelable.enableIPv6·=·this.mEnableIPv6; |
| 234 | ········provisioningConfigurationParcelable.ipv6ProvisioningMode·=·this.mIPv6ProvisioningMode; | |
| 235 | ········provisioningConfigurationParcelable.enablePreconnection·=·this.mEnablePreconnection; | 178 | ········provisioningConfigurationParcelable.enablePreconnection·=·this.mEnablePreconnection; |
| 236 | ········provisioningConfigurationParcelable.usingMultinetworkPolicyTracker·=·this.mUsingMultinetworkPolicyTracker; | 179 | ········provisioningConfigurationParcelable.usingMultinetworkPolicyTracker·=·this.mUsingMultinetworkPolicyTracker; |
| 237 | ········provisioningConfigurationParcelable.usingIpReachabilityMonitor·=·this.mUsingIpReachabilityMonitor; | 180 | ········provisioningConfigurationParcelable.usingIpReachabilityMonitor·=·this.mUsingIpReachabilityMonitor; |
| 238 | ········provisioningConfigurationParcelable.requestedPreDhcpActionMs·=·this.mRequestedPreDhcpActionMs; | 181 | ········provisioningConfigurationParcelable.requestedPreDhcpActionMs·=·this.mRequestedPreDhcpActionMs; |
| 239 | ········final·InitialConfiguration·mInitialConfig·=·this.mInitialConfig; | 182 | ········final·InitialConfiguration·mInitialConfig·=·this.mInitialConfig; |
| 240 | ········List·options·=·null; | 183 | ········List·options·=·null; |
| 241 | ········InitialConfigurationParcelable·stableParcelable; | 184 | ········InitialConfigurationParcelable·stableParcelable; |
| Offset 281, 79 lines modified | Offset 224, 77 lines modified |
| 281 | ············options·=·new·ArrayList(this.mDhcpOptions); | 224 | ············options·=·new·ArrayList(this.mDhcpOptions); |
| 282 | ········} | 225 | ········} |
| 283 | ········provisioningConfigurationParcelable.options·=·options; | 226 | ········provisioningConfigurationParcelable.options·=·options; |
| 284 | ········return·provisioningConfigurationParcelable; | 227 | ········return·provisioningConfigurationParcelable; |
| 285 | ····} | 228 | ····} |
| 286 | ···· | 229 | ···· |
| 287 | ····public·String·toString()·{ | 230 | ····public·String·toString()·{ |
| 288 | ········final·String·ipv4ProvisioningModeToString·=·ipv4ProvisioningModeToString(this.mIPv4ProvisioningMode); | |
| 289 | ········final·String·ipv6ProvisioningModeToString·=·ipv6ProvisioningModeToString(this.mIPv6ProvisioningMode); | |
| 290 | ········final·StringBuilder·sb·=·new·StringBuilder(); | 231 | ········final·StringBuilder·sb·=·new·StringBuilder(); |
| 291 | ········sb.append(this.getClass().getSimpleName()); | 232 | ········sb.append(this.getClass().getSimpleName()); |
| 292 | ········sb.append("{"); | 233 | ········sb.append("{"); |
| 293 | ········final·StringJoiner·stringJoiner·=·new·StringJoiner(",·",·sb.toString(),·"}"); | 234 | ········final·StringJoiner·stringJoiner·=·new·StringJoiner(",·",·sb.toString(),·"}"); |
| 294 | ········final·StringBuilder·sb2·=·new·StringBuilder(); | 235 | ········final·StringBuilder·sb2·=·new·StringBuilder(); |
| 295 | ········sb2.append("mEnablePreconnection:·"); | 236 | ········sb2.append("mEnableIPv4:·"); |
| 296 | ········sb2.append(this.mEnablePreconnection); | 237 | ········sb2.append(this.mEnableIPv4); |
| 297 | ········final·StringJoiner·add·=·stringJoiner.add(sb2.toString()); | 238 | ········final·StringJoiner·add·=·stringJoiner.add(sb2.toString()); |
| 298 | ········final·StringBuilder·sb3·=·new·StringBuilder(); | 239 | ········final·StringBuilder·sb3·=·new·StringBuilder(); |
| 299 | ········sb3.append("mUsingMultinetworkPolicyTracker:·"); | |
| 300 | ········sb3.append(this.mUsingMultinetworkPolicyTracker); | 240 | ········sb3.append("mEnableIPv6:·"); |
| | 241 | ········sb3.append(this.mEnableIPv6); |
| 301 | ········final·StringJoiner·add2·=·add.add(sb3.toString()); | 242 | ········final·StringJoiner·add2·=·add.add(sb3.toString()); |
| 302 | ········final·StringBuilder·sb4·=·new·StringBuilder(); | 243 | ········final·StringBuilder·sb4·=·new·StringBuilder(); |
| 303 | ········sb4.append("mUsingIpReachabilityMonitor:·"); | |
| 304 | ········sb4.append(this.mUsingIpReachabilityMonitor); | 244 | ········sb4.append("mEnablePreconnection:·"); |
| | 245 | ········sb4.append(this.mEnablePreconnection); |
| 305 | ········final·StringJoiner·add3·=·add2.add(sb4.toString()); | 246 | ········final·StringJoiner·add3·=·add2.add(sb4.toString()); |
| 306 | ········final·StringBuilder·sb5·=·new·StringBuilder(); | 247 | ········final·StringBuilder·sb5·=·new·StringBuilder(); |
| 307 | ········sb5.append("mRequestedPreDhcpActionMs:·"); | |
| 308 | ········sb5.append(this.mRequestedPreDhcpActionMs); | 248 | ········sb5.append("mUsingMultinetworkPolicyTracker:·"); |
| | 249 | ········sb5.append(this.mUsingMultinetworkPolicyTracker); |
| 309 | ········final·StringJoiner·add4·=·add3.add(sb5.toString()); | 250 | ········final·StringJoiner·add4·=·add3.add(sb5.toString()); |
| 310 | ········final·StringBuilder·sb6·=·new·StringBuilder(); | 251 | ········final·StringBuilder·sb6·=·new·StringBuilder(); |
| 311 | ········sb6.append("mInitialConfig:·"); | |
| 312 | ········sb6.append(this.mInitialConfig); | 252 | ········sb6.append("mUsingIpReachabilityMonitor:·"); |
| | 253 | ········sb6.append(this.mUsingIpReachabilityMonitor); |
| 313 | ········final·StringJoiner·add5·=·add4.add(sb6.toString()); | 254 | ········final·StringJoiner·add5·=·add4.add(sb6.toString()); |
| 314 | ········final·StringBuilder·sb7·=·new·StringBuilder(); | 255 | ········final·StringBuilder·sb7·=·new·StringBuilder(); |
| 315 | ········sb7.append("mStaticIpConfig:·"); | |
| 316 | ········sb7.append(this.mStaticIpConfig); | 256 | ········sb7.append("mRequestedPreDhcpActionMs:·"); |
| | 257 | ········sb7.append(this.mRequestedPreDhcpActionMs); |
| 317 | ········final·StringJoiner·add6·=·add5.add(sb7.toString()); | 258 | ········final·StringJoiner·add6·=·add5.add(sb7.toString()); |
| 318 | ········final·StringBuilder·sb8·=·new·StringBuilder(); | 259 | ········final·StringBuilder·sb8·=·new·StringBuilder(); |
| 319 | ········sb8.append("mApfCapabilities:·"); | |
| 320 | ········sb8.append(this.mApfCapabilities); | 260 | ········sb8.append("mInitialConfig:·"); |
| | 261 | ········sb8.append(this.mInitialConfig); |
| 321 | ········final·StringJoiner·add7·=·add6.add(sb8.toString()); | 262 | ········final·StringJoiner·add7·=·add6.add(sb8.toString()); |
| 322 | ········final·StringBuilder·sb9·=·new·StringBuilder(); | 263 | ········final·StringBuilder·sb9·=·new·StringBuilder(); |
| 323 | ········sb9.append("mProvisioningTimeoutMs:·"); | |
| 324 | ········sb9.append(this.mProvisioningTimeoutMs); | 264 | ········sb9.append("mStaticIpConfig:·"); |
| | 265 | ········sb9.append(this.mStaticIpConfig); |
| 325 | ········final·StringJoiner·add8·=·add7.add(sb9.toString()); | 266 | ········final·StringJoiner·add8·=·add7.add(sb9.toString()); |
| 326 | ········final·StringBuilder·sb10·=·new·StringBuilder(); | 267 | ········final·StringBuilder·sb10·=·new·StringBuilder(); |
| 327 | ········sb10.append("mIPv6AddrGenMode:·"); | |
| 328 | ········sb10.append(this.mIPv6AddrGenMode); | 268 | ········sb10.append("mApfCapabilities:·"); |
| | 269 | ········sb10.append(this.mApfCapabilities); |
| 329 | ········final·StringJoiner·add9·=·add8.add(sb10.toString()); | 270 | ········final·StringJoiner·add9·=·add8.add(sb10.toString()); |
| 330 | ········final·StringBuilder·sb11·=·new·StringBuilder(); | 271 | ········final·StringBuilder·sb11·=·new·StringBuilder(); |
| 331 | ········sb11.append("mNetwork:·"); | |
| 332 | ········sb11.append(this.mNetwork); | 272 | ········sb11.append("mProvisioningTimeoutMs:·"); |
| | 273 | ········sb11.append(this.mProvisioningTimeoutMs); |
| 333 | ········final·StringJoiner·add10·=·add9.add(sb11.toString()); | 274 | ········final·StringJoiner·add10·=·add9.add(sb11.toString()); |
| 334 | ········final·StringBuilder·sb12·=·new·StringBuilder(); | 275 | ········final·StringBuilder·sb12·=·new·StringBuilder(); |
| 335 | ········sb12.append("mDisplayName:·"); | |
| 336 | ········sb12.append(this.mDisplayName); | 276 | ········sb12.append("mIPv6AddrGenMode:·"); |
| | 277 | ········sb12.append(this.mIPv6AddrGenMode); |
| 337 | ········final·StringJoiner·add11·=·add10.add(sb12.toString()); | 278 | ········final·StringJoiner·add11·=·add10.add(sb12.toString()); |
| 338 | ········final·StringBuilder·sb13·=·new·StringBuilder(); | 279 | ········final·StringBuilder·sb13·=·new·StringBuilder(); |
| 339 | ········sb13.append("mScanResultInfo:·"); | 280 | ········sb13.append("mNetwork:·"); |
| 340 | ········sb13.append(this.mScanResultInfo); | 281 | ········sb13.append(this.mNetwork); |
| 341 | ········final·StringJoiner·add12·=·add11.add(sb13.toString()); | 282 | ········final·StringJoiner·add12·=·add11.add(sb13.toString()); |
| 342 | ········final·StringBuilder·sb14·=·new·StringBuilder(); | 283 | ········final·StringBuilder·sb14·=·new·StringBuilder(); |
| 343 | ········sb14.append("mLayer2Info:·"); | 284 | ········sb14.append("mDisplayName:·"); |
| 344 | ········sb14.append(this.mLayer2Info); | 285 | ········sb14.append(this.mDisplayName); |
| 345 | ········final·StringJoiner·add13·=·add12.add(sb14.toString()); | 286 | ········final·StringJoiner·add13·=·add12.add(sb14.toString()); |
| 346 | ········final·StringBuilder·sb15·=·new·StringBuilder(); | 287 | ········final·StringBuilder·sb15·=·new·StringBuilder(); |
| 347 | ········sb15.append("mDhcpOptions:·"); | 288 | ········sb15.append("mScanResultInfo:·"); |
| 348 | ········sb15.append(this.mDhcpOptions); | 289 | ········sb15.append(this.mScanResultInfo); |
| 349 | ········final·StringJoiner·add14·=·add13.add(sb15.toString()); | 290 | ········final·StringJoiner·add14·=·add13.add(sb15.toString()); |
| 350 | ········final·StringBuilder·sb16·=·new·StringBuilder(); | 291 | ········final·StringBuilder·sb16·=·new·StringBuilder(); |
| 351 | ········sb16.append("mIPv4ProvisioningMode:·"); | |
| 352 | ········sb16.append(ipv4ProvisioningModeToString); | 292 | ········sb16.append("mLayer2Info:·"); |
| | 293 | ········sb16.append(this.mLayer2Info); |
| 353 | ········final·StringJoiner·add15·=·add14.add(sb16.toString()); | 294 | ········final·StringJoiner·add15·=·add14.add(sb16.toString()); |
| 354 | ········final·StringBuilder·sb17·=·new·StringBuilder(); | 295 | ········final·StringBuilder·sb17·=·new·StringBuilder(); |
| 355 | ········sb17.append("mIPv6ProvisioningMode:·"); | |
| 356 | ········sb17.append(ipv6ProvisioningModeToString); | 296 | ········sb17.append("mDhcpOptions:·"); |
| | 297 | ········sb17.append(this.mDhcpOptions); |
| 357 | ········return·add15.add(sb17.toString()).toString(); | 298 | ········return·add15.add(sb17.toString()).toString(); |
| 358 | ····} | 299 | ····} |
| 359 | } | 300 | } |