Offset 102, 51 lines modifiedOffset 102, 63 lines modified
102 ········this.mEventHandler·=·mEventHandler;102 ········this.mEventHandler·=·mEventHandler;
103 ········this.mClock·=·mClock;103 ········this.mClock·=·mClock;
104 ········this.mWifiMetrics·=·mWifiMetrics;104 ········this.mWifiMetrics·=·mWifiMetrics;
105 ········this.mServiceManagerDeathRecipient·=·new·SupplicantStaIfaceHal$ServiceManagerDeathRecipient(this,·(SupplicantStaIfaceHal$1)null);105 ········this.mServiceManagerDeathRecipient·=·new·SupplicantStaIfaceHal$ServiceManagerDeathRecipient(this,·(SupplicantStaIfaceHal$1)null);
106 ········this.mSupplicantDeathRecipient·=·new·SupplicantStaIfaceHal$SupplicantDeathRecipient(this,·(SupplicantStaIfaceHal$1)null);106 ········this.mSupplicantDeathRecipient·=·new·SupplicantStaIfaceHal$SupplicantDeathRecipient(this,·(SupplicantStaIfaceHal$1)null);
107 ····}107 ····}
108 ····108 ····
109 ····private·ISupplicantIface·addIfaceV1_1(final·String·name)·{109 ····private·ISupplicantIface·addIfaceV1_1(String·string)·{
110 ········synchronized·(this.mLock)·{110 ········synchronized·(this.mLock)·{
111 ············final·ISupplicant$IfaceInfo·supplicant$IfaceInfo·=·new·ISupplicant$IfaceInfo();111 ············final·ISupplicant$IfaceInfo·supplicant$IfaceInfo·=·new·ISupplicant$IfaceInfo();
112 ············supplicant$IfaceInfo.name·=·name;112 ············supplicant$IfaceInfo.name·=·string;
113 ············supplicant$IfaceInfo.type·=·0;113 ············supplicant$IfaceInfo.type·=·0;
114 ············final·GeneralUtil$Mutable·generalUtil$Mutable·=·new·GeneralUtil$Mutable();114 ············final·GeneralUtil$Mutable·generalUtil$Mutable·=·new·GeneralUtil$Mutable();
115 ············try·{115 ············try·{
116 ················final·com.android.wifi.x.android.hardware.wifi.supplicant.V1_1.ISupplicant·supplicantMockableV1_1·=·this.getSupplicantMockableV1_1();116 ················final·com.android.wifi.x.android.hardware.wifi.supplicant.V1_1.ISupplicant·supplicantMockableV1_1·=·this.getSupplicantMockableV1_1();
117 ················try·{117 ················try·{
118 ····················supplicantMockableV1_1.addInterface(supplicant$IfaceInfo,·(ISupplicant$addInterfaceCallback)new·-$$Lambda$SupplicantStaIfaceHal$beWjlixZYGQwDxbWUYVi_RNovBU(generalUtil$Mutable));118 ····················supplicantMockableV1_1.addInterface(supplicant$IfaceInfo,·(ISupplicant$addInterfaceCallback)new·-$$Lambda$SupplicantStaIfaceHal$beWjlixZYGQwDxbWUYVi_RNovBU(generalUtil$Mutable));
119 ····················Object·value·=·generalUtil$Mutable.value;119 ····················Object·value·=·generalUtil$Mutable.value;
120 ····················value·=·value;120 ····················value·=·value;
121 ····················return·(ISupplicantIface)value;121 ····················return·(ISupplicantIface)value;
122 ················}122 ················}
123 ················catch·(NoSuchElementException·ex)·{123 ················catch·(IllegalArgumentException·ex)·{
 124 ····················final·Object·value;
 125 ····················((SupplicantStaIfaceHal)value).handleIllegalArgumentException(ex,·"addInterface");
124 ····················final·String·s·=·"SupplicantStaIfaceHal";126 ····················final·String·s·=·"SupplicantStaIfaceHal";
125 ····················final·StringBuilder·sb·=·new·StringBuilder();127 ····················final·StringBuilder·sb·=·new·StringBuilder();
126 ····················sb.append("ISupplicant.addInterface·exception:·");128 ····················sb.append("ISupplicant.addInterface·exception:·");
127 ····················sb.append(ex);129 ····················sb.append(ex);
128 ····················Log.e(s,·sb.toString());130 ····················string·=·sb.toString();
129 ····················final·Object·value;131 ····················Log.e(s,·string);
130 ····················((SupplicantStaIfaceHal)value).handleNoSuchElementException(ex,·"addInterface"); 
131 ····················return·null;132 ····················return·null;
132 ················}133 ················}
133 ················catch·(RemoteException·ex2)·{134 ················catch·(NoSuchElementException·ex2)·{
134 ····················final·String·s2·=·"SupplicantStaIfaceHal";135 ····················final·String·s2·=·"SupplicantStaIfaceHal";
135 ····················final·StringBuilder·sb2·=·new·StringBuilder();136 ····················final·StringBuilder·sb2·=·new·StringBuilder();
136 ····················sb2.append("ISupplicant.addInterface·exception:·");137 ····················sb2.append("ISupplicant.addInterface·exception:·");
137 ····················sb2.append(ex2);138 ····················sb2.append(ex2);
138 ····················Log.e(s2,·sb2.toString());139 ····················Log.e(s2,·sb2.toString());
139 ····················final·Object·value;140 ····················final·Object·value;
140 ····················((SupplicantStaIfaceHal)value).handleRemoteException(ex2,·"addInterface");141 ····················((SupplicantStaIfaceHal)value).handleNoSuchElementException(ex2,·"addInterface");
 142 ····················return·null;
 143 ················}
 144 ················catch·(RemoteException·ex3)·{
 145 ····················final·String·s3·=·"SupplicantStaIfaceHal";
 146 ····················final·StringBuilder·sb3·=·new·StringBuilder();
 147 ····················sb3.append("ISupplicant.addInterface·exception:·");
 148 ····················sb3.append(ex3);
 149 ····················Log.e(s3,·sb3.toString());
 150 ····················final·Object·value;
 151 ····················((SupplicantStaIfaceHal)value).handleRemoteException(ex3,·"addInterface");
141 ····················return·null;152 ····················return·null;
142 ················}153 ················}
143 ············}154 ············}
144 ············catch·(NoSuchElementException·ex3)·{}155 ············catch·(IllegalArgumentException·ex4)·{}
145 ············catch·(RemoteException·ex4)·{}156 ············catch·(NoSuchElementException·ex5)·{}
 157 ············catch·(RemoteException·ex6)·{}
146 ········}158 ········}
147 ····}159 ····}
148 ····160 ····
149 ····private·SupplicantStaNetworkHal·addNetwork(final·String·s)·{161 ····private·SupplicantStaNetworkHal·addNetwork(final·String·s)·{
150 ········final·Object·mLock·=·this.mLock;162 ········final·Object·mLock·=·this.mLock;
151 ········//·monitorenter(mLock)163 ········//·monitorenter(mLock)
152 ········final·String·s2·=·"addNetwork";164 ········final·String·s2·=·"addNetwork";
Offset 271, 36 lines modifiedOffset 283, 46 lines modified
271 ················this.handleRemoteException(ex,·"getTransport");283 ················this.handleRemoteException(ex,·"getTransport");
272 ················return·false;284 ················return·false;
273 ············}285 ············}
274 ········}286 ········}
275 ····}287 ····}
276 ····288 ····
277 ····private·boolean·checkStatusAndLogFailure(final·SupplicantStatus·supplicantStatus,·String·s)·{289 ····private·boolean·checkStatusAndLogFailure(final·SupplicantStatus·supplicantStatus,·String·s)·{
278 ········synchronized·(this.mLock)·{290 ········final·Object·mLock·=·this.mLock;
279 ············if·(supplicantStatus.code·!=·0)·{291 ········//·monitorenter(mLock)
280 ················final·String·s2·=·"SupplicantStaIfaceHal";292 ········Label_0094:·{
281 ················final·StringBuilder·sb·=·new·StringBuilder();293 ············if·(supplicantStatus·==·null)·{
282 ················sb.append("ISupplicantStaIface.");294 ················break·Label_0094;
283 ················sb.append(s); 
284 ················s·=·"·failed:·"; 
285 ················sb.append(s); 
286 ················sb.append(supplicantStatus); 
287 ················Log.e(s2,·sb.toString()); 
288 ················return·false; 
289 ············}295 ············}
290 ············if·(this.mVerboseLoggingEnabled)·{296 ············try·{
291 ················final·String·s3·=·"SupplicantStaIfaceHal";297 ················if·(supplicantStatus.code·!=·0)·{
292 ················final·StringBuilder·sb2·=·new·StringBuilder();298 ····················final·String·s2·=·"SupplicantStaIfaceHal";
293 ················sb2.append("ISupplicantStaIface.");299 ····················final·StringBuilder·sb·=·new·StringBuilder();
294 ················sb2.append(s);300 ····················sb.append("ISupplicantStaIface.");
295 ················s·=·"·succeeded";301 ····················sb.append(s);
296 ················sb2.append(s);302 ····················s·=·"·failed:·";
297 ················Log.d(s3,·sb2.toString());303 ····················sb.append(s);
 304 ····················sb.append(supplicantStatus);
 305 ····················Log.e(s2,·sb.toString());
 306 ····················return·false;
 307 ················}
 308 ················if·(this.mVerboseLoggingEnabled)·{
 309 ····················final·String·s3·=·"SupplicantStaIfaceHal";
 310 ····················final·StringBuilder·sb2·=·new·StringBuilder();
 311 ····················sb2.append("ISupplicantStaIface.");
 312 ····················sb2.append(s);
 313 ····················s·=·"·succeeded";
 314 ····················sb2.append(s);
 315 ····················Log.d(s3,·sb2.toString());
 316 ················}
 317 ················return·true;
298 ············}318 ············}
299 ············return·true;319 ············finally·{
 320 ············}
 321 ············//·monitorexit(mLock)
300 ········}322 ········}
301 ····}323 ····}
302 ····324 ····
303 ····private·boolean·checkSupplicantAndLogFailure(String·string)·{325 ····private·boolean·checkSupplicantAndLogFailure(String·string)·{
304 ········synchronized·(this.mLock)·{326 ········synchronized·(this.mLock)·{
305 ············if·(this.mISupplicant·==·null)·{327 ············if·(this.mISupplicant·==·null)·{
306 ················final·String·s·=·"SupplicantStaIfaceHal";328 ················final·String·s·=·"SupplicantStaIfaceHal";
Offset 563, 14 lines modifiedOffset 585, 28 lines modified
563 ········}585 ········}
564 ········if·(technology·!=·n2)·{586 ········if·(technology·!=·n2)·{
565 ············return·0;587 ············return·0;
566 ········}588 ········}
567 ········return·6;589 ········return·6;
568 ····}590 ····}
569 ····591 ····
 592 ····private·void·handleIllegalArgumentException(final·IllegalArgumentException·ex,·String·string)·{
 593 ········synchronized·(this.mLock)·{
 594 ············this.clearState();
 595 ············final·String·s·=·"SupplicantStaIfaceHal";
 596 ············final·StringBuilder·sb·=·new·StringBuilder();
 597 ············sb.append("ISupplicantStaIface.");
 598 ············sb.append(string);
 599 ············string·=·"·failed·with·exception";
 600 ············sb.append(string);
 601 ············string·=·sb.toString();
 602 ············Log.e(s,·string,·(Throwable)ex);
 603 ········}
 604 ····}
 605 ····
570 ····private·void·handleNoSuchElementException(final·NoSuchElementException·ex,·String·string)·{606 ····private·void·handleNoSuchElementException(final·NoSuchElementException·ex,·String·string)·{
571 ········synchronized·(this.mLock)·{607 ········synchronized·(this.mLock)·{
572 ············this.clearState();608 ············this.clearState();
573 ············final·String·s·=·"SupplicantStaIfaceHal";609 ············final·String·s·=·"SupplicantStaIfaceHal";
574 ············final·StringBuilder·sb·=·new·StringBuilder();610 ············final·StringBuilder·sb·=·new·StringBuilder();
575 ············sb.append("ISupplicantStaIface.");611 ············sb.append("ISupplicantStaIface.");
576 ············sb.append(string);612 ············sb.append(string);
Offset 850, 25 lines modifiedOffset 886, 25 lines modified
850 ············if·(supplicantStaIface·!=·null)·{886 ············if·(supplicantStaIface·!=·null)·{
851 ················break·Label_0015;887 ················break·Label_0015;
852 ············}888 ············}
853 ············while·(true)·{889 ············while·(true)·{
854 ················try·{890 ················try·{
855 ····················//·monitorexit(mLock)891 ····················//·monitorexit(mLock)
856 ····················return·false;892 ····················return·false;
857 ····················//·monitorexit(mLock) 
858 ····················throw; 
859 ····················try·{893 ····················try·{
860 ························//·monitorexit(mLock)894 ························//·monitorexit(mLock)
861 ························return·this.checkStatusAndLogFailure(supplicantStaIface.registerCallback(supplicantStaIfaceCallback),·"registerCallback");895 ························return·this.checkStatusAndLogFailure(supplicantStaIface.registerCallback(supplicantStaIfaceCallback),·"registerCallback");
862 ····················}896 ····················}
863 ····················catch·(RemoteException·ex)·{897 ····················catch·(RemoteException·ex)·{
864 ························this.handleRemoteException(ex,·"registerCallback");898 ························this.handleRemoteException(ex,·"registerCallback");
865 ························//·monitorexit(mLock)899 ························//·monitorexit(mLock)
866 ························return·false;900 ························return·false;
867 ····················}901 ····················}
 902 ····················//·monitorexit(mLock)
 903 ····················throw;
868 ················}904 ················}
869 ················finally·{905 ················finally·{
870 ····················continue;906 ····················continue;
871 ················}907 ················}
872 ················break;908 ················break;
873 ············}909 ············}
874 ········}910 ········}
Generated by diffoscope 151