| | | | |
| Offset 26, 15 lines modified | Offset 26, 15 lines modified |
| 26 | ····final·String·mCallingAttributionTag; | 26 | ····final·String·mCallingAttributionTag; |
| 27 | ····final·Messenger·mMessenger; | 27 | ····final·Messenger·mMessenger; |
| 28 | ····private·final·NetworkRequest·mNetworkRequestForCallback; | 28 | ····private·final·NetworkRequest·mNetworkRequestForCallback; |
| 29 | ····final·PendingIntent·mPendingIntent; | 29 | ····final·PendingIntent·mPendingIntent; |
| 30 | ····boolean·mPendingIntentSent; | 30 | ····boolean·mPendingIntentSent; |
| 31 | ····final·ConnectivityService$PerUidCounter·mPerUidCounter; | 31 | ····final·ConnectivityService$PerUidCounter·mPerUidCounter; |
| 32 | ····final·int·mPid; | 32 | ····final·int·mPid; |
| 33 | ····final·int·mPreferenceOrder; | 33 | ····final·int·mPreferencePriority; |
| 34 | ····final·List·mRequests; | 34 | ····final·List·mRequests; |
| 35 | ····private·NetworkAgentInfo·mSatisfier; | 35 | ····private·NetworkAgentInfo·mSatisfier; |
| 36 | ····final·int·mUid; | 36 | ····final·int·mUid; |
| 37 | ····final·/*·synthetic·*/·ConnectivityService·this$0; | 37 | ····final·/*·synthetic·*/·ConnectivityService·this$0; |
| 38 | ···· | 38 | ···· |
| 39 | ····ConnectivityService$NetworkRequestInfo(final·ConnectivityService·connectivityService,·final·int·n,·final·NetworkRequest·o)·{ | 39 | ····ConnectivityService$NetworkRequestInfo(final·ConnectivityService·connectivityService,·final·int·n,·final·NetworkRequest·o)·{ |
| 40 | ········this(connectivityService,·n,·Collections.singletonList(o),·-1·>>>·1); | 40 | ········this(connectivityService,·n,·Collections.singletonList(o),·-1·>>>·1); |
| Offset 48, 54 lines modified | Offset 48, 54 lines modified |
| 48 | ········this(connectivityService,·n,·Collections.singletonList(o),·o,·messenger,·binder,·n2,·s); | 48 | ········this(connectivityService,·n,·Collections.singletonList(o),·o,·messenger,·binder,·n2,·s); |
| 49 | ····} | 49 | ····} |
| 50 | ···· | 50 | ···· |
| 51 | ····ConnectivityService$NetworkRequestInfo(final·ConnectivityService·connectivityService,·final·int·n,·final·List·list,·final·int·n2)·{ | 51 | ····ConnectivityService$NetworkRequestInfo(final·ConnectivityService·connectivityService,·final·int·n,·final·List·list,·final·int·n2)·{ |
| 52 | ········this(connectivityService,·n,·list,·list.get(0),·null,·null,·n2); | 52 | ········this(connectivityService,·n,·list,·list.get(0),·null,·null,·n2); |
| 53 | ····} | 53 | ····} |
| 54 | ···· | 54 | ···· |
| 55 | ····ConnectivityService$NetworkRequestInfo(final·ConnectivityService·this$0,·final·int·mAsUid,·final·List·list,·final·NetworkRequest·mNetworkRequestForCallback,·final·PendingIntent·mPendingIntent,·final·String·mCallingAttributionTag,·final·int·mPreferenceOrder)·{ | 55 | ····ConnectivityService$NetworkRequestInfo(final·ConnectivityService·this$0,·final·int·mAsUid,·final·List·list,·final·NetworkRequest·mNetworkRequestForCallback,·final·PendingIntent·mPendingIntent,·final·String·mCallingAttributionTag,·final·int·mPreferencePriority)·{ |
| 56 | ········this.this$0·=·this$0; | 56 | ········this.this$0·=·this$0; |
| 57 | ········ConnectivityService.access$8800(this$0,·list); | 57 | ········ConnectivityService.access$8600(this$0,·list); |
| 58 | ········this.mRequests·=·this.initializeRequests(list); | 58 | ········this.mRequests·=·this.initializeRequests(list); |
| 59 | ········this.mNetworkRequestForCallback·=·mNetworkRequestForCallback; | 59 | ········this.mNetworkRequestForCallback·=·mNetworkRequestForCallback; |
| 60 | ········this.mPendingIntent·=·mPendingIntent; | 60 | ········this.mPendingIntent·=·mPendingIntent; |
| 61 | ········this.mMessenger·=·null; | 61 | ········this.mMessenger·=·null; |
| 62 | ········this.mBinder·=·null; | 62 | ········this.mBinder·=·null; |
| 63 | ········this.mPid·=·Binder.getCallingPid(); | 63 | ········this.mPid·=·Binder.getCallingPid(); |
| 64 | ········final·int·callingUid·=·ConnectivityService.access$5600(this$0).getCallingUid(); | 64 | ········final·int·callingUid·=·ConnectivityService.access$5500(this$0).getCallingUid(); |
| 65 | ········this.mUid·=·callingUid; | 65 | ········this.mUid·=·callingUid; |
| 66 | ········this.mAsUid·=·mAsUid; | 66 | ········this.mAsUid·=·mAsUid; |
| 67 | ········(this.mPerUidCounter·=·ConnectivityService.access$8900(this$0,·this)).incrementCountOrThrow(callingUid); | 67 | ········(this.mPerUidCounter·=·ConnectivityService.access$8700(this$0,·this)).incrementCountOrThrow(callingUid); |
| 68 | ········this.mCallbackFlags·=·0; | 68 | ········this.mCallbackFlags·=·0; |
| 69 | ········this.mCallingAttributionTag·=·mCallingAttributionTag; | 69 | ········this.mCallingAttributionTag·=·mCallingAttributionTag; |
| 70 | ········this.mPreferenceOrder·=·mPreferenceOrder; | 70 | ········this.mPreferencePriority·=·mPreferencePriority; |
| 71 | ····} | 71 | ····} |
| 72 | ···· | 72 | ···· |
| 73 | ····ConnectivityService$NetworkRequestInfo(final·ConnectivityService·this$0,·final·int·mAsUid,·final·List·list,·final·NetworkRequest·mNetworkRequestForCallback,·final·Messenger·mMessenger,·final·IBinder·mBinder,·final·int·mCallbackFlags,·final·String·mCallingAttributionTag)·{ | 73 | ····ConnectivityService$NetworkRequestInfo(final·ConnectivityService·this$0,·final·int·mAsUid,·final·List·list,·final·NetworkRequest·mNetworkRequestForCallback,·final·Messenger·mMessenger,·final·IBinder·mBinder,·final·int·mCallbackFlags,·final·String·mCallingAttributionTag)·{ |
| 74 | ········this.this$0·=·this$0; | 74 | ········this.this$0·=·this$0; |
| 75 | ········ConnectivityService.access$8800(this$0,·list); | 75 | ········ConnectivityService.access$8600(this$0,·list); |
| 76 | ········this.mRequests·=·this.initializeRequests(list); | 76 | ········this.mRequests·=·this.initializeRequests(list); |
| 77 | ········this.mNetworkRequestForCallback·=·mNetworkRequestForCallback; | 77 | ········this.mNetworkRequestForCallback·=·mNetworkRequestForCallback; |
| 78 | ········this.mMessenger·=·mMessenger; | 78 | ········this.mMessenger·=·mMessenger; |
| 79 | ········this.mBinder·=·mBinder; | 79 | ········this.mBinder·=·mBinder; |
| 80 | ········this.mPid·=·Binder.getCallingPid(); | 80 | ········this.mPid·=·Binder.getCallingPid(); |
| 81 | ········final·int·callingUid·=·ConnectivityService.access$5600(this$0).getCallingUid(); | 81 | ········final·int·callingUid·=·ConnectivityService.access$5500(this$0).getCallingUid(); |
| 82 | ········this.mUid·=·callingUid; | 82 | ········this.mUid·=·callingUid; |
| 83 | ········this.mAsUid·=·mAsUid; | 83 | ········this.mAsUid·=·mAsUid; |
| 84 | ········this.mPendingIntent·=·null; | 84 | ········this.mPendingIntent·=·null; |
| 85 | ········(this.mPerUidCounter·=·ConnectivityService.access$8900(this$0,·this)).incrementCountOrThrow(callingUid); | 85 | ········(this.mPerUidCounter·=·ConnectivityService.access$8700(this$0,·this)).incrementCountOrThrow(callingUid); |
| 86 | ········this.mCallbackFlags·=·mCallbackFlags; | 86 | ········this.mCallbackFlags·=·mCallbackFlags; |
| 87 | ········this.mCallingAttributionTag·=·mCallingAttributionTag; | 87 | ········this.mCallingAttributionTag·=·mCallingAttributionTag; |
| 88 | ········this.mPreferenceOrder·=·-1·>>>·1; | 88 | ········this.mPreferencePriority·=·-1·>>>·1; |
| 89 | ········this.linkDeathRecipient(); | 89 | ········this.linkDeathRecipient(); |
| 90 | ····} | 90 | ····} |
| 91 | ···· | 91 | ···· |
| 92 | ····ConnectivityService$NetworkRequestInfo(final·ConnectivityService·this$0,·final·ConnectivityService$NetworkRequestInfo·connectivityService$NetworkRequestInfo,·final·List·list)·{ | 92 | ····ConnectivityService$NetworkRequestInfo(final·ConnectivityService·this$0,·final·ConnectivityService$NetworkRequestInfo·connectivityService$NetworkRequestInfo,·final·List·list)·{ |
| 93 | ········this.this$0·=·this$0; | 93 | ········this.this$0·=·this$0; |
| 94 | ········ConnectivityService.access$8800(this$0,·list); | 94 | ········ConnectivityService.access$8600(this$0,·list); |
| 95 | ········this.mRequests·=·this.initializeRequests(list); | 95 | ········this.mRequests·=·this.initializeRequests(list); |
| 96 | ········this.mNetworkRequestForCallback·=·connectivityService$NetworkRequestInfo.getNetworkRequestForCallback(); | 96 | ········this.mNetworkRequestForCallback·=·connectivityService$NetworkRequestInfo.getNetworkRequestForCallback(); |
| 97 | ········final·NetworkAgentInfo·satisfier·=·connectivityService$NetworkRequestInfo.getSatisfier(); | 97 | ········final·NetworkAgentInfo·satisfier·=·connectivityService$NetworkRequestInfo.getSatisfier(); |
| 98 | ········if·(satisfier·!=·null)·{ | 98 | ········if·(satisfier·!=·null)·{ |
| 99 | ············NetworkRequest·networkRequest·=·null; | 99 | ············NetworkRequest·networkRequest·=·null; |
| 100 | ············for·(final·NetworkRequest·networkRequest2·:·list)·{ | 100 | ············for·(final·NetworkRequest·networkRequest2·:·list)·{ |
| 101 | ················if·(networkRequest2.canBeSatisfiedBy(satisfier.networkCapabilities))·{ | 101 | ················if·(networkRequest2.canBeSatisfiedBy(satisfier.networkCapabilities))·{ |
| Offset 111, 15 lines modified | Offset 111, 15 lines modified |
| 111 | ········final·int·mUid·=·connectivityService$NetworkRequestInfo.mUid; | 111 | ········final·int·mUid·=·connectivityService$NetworkRequestInfo.mUid; |
| 112 | ········this.mUid·=·mUid; | 112 | ········this.mUid·=·mUid; |
| 113 | ········this.mAsUid·=·connectivityService$NetworkRequestInfo.mAsUid; | 113 | ········this.mAsUid·=·connectivityService$NetworkRequestInfo.mAsUid; |
| 114 | ········this.mPendingIntent·=·connectivityService$NetworkRequestInfo.mPendingIntent; | 114 | ········this.mPendingIntent·=·connectivityService$NetworkRequestInfo.mPendingIntent; |
| 115 | ········(this.mPerUidCounter·=·connectivityService$NetworkRequestInfo.mPerUidCounter).incrementCountOrThrow(mUid); | 115 | ········(this.mPerUidCounter·=·connectivityService$NetworkRequestInfo.mPerUidCounter).incrementCountOrThrow(mUid); |
| 116 | ········this.mCallbackFlags·=·connectivityService$NetworkRequestInfo.mCallbackFlags; | 116 | ········this.mCallbackFlags·=·connectivityService$NetworkRequestInfo.mCallbackFlags; |
| 117 | ········this.mCallingAttributionTag·=·connectivityService$NetworkRequestInfo.mCallingAttributionTag; | 117 | ········this.mCallingAttributionTag·=·connectivityService$NetworkRequestInfo.mCallingAttributionTag; |
| 118 | ········this.mPreferenceOrder·=·-1·>>>·1; | 118 | ········this.mPreferencePriority·=·-1·>>>·1; |
| 119 | ········this.linkDeathRecipient(); | 119 | ········this.linkDeathRecipient(); |
| 120 | ····} | 120 | ····} |
| 121 | ···· | 121 | ···· |
| 122 | ····private·List·initializeRequests(final·List·c)·{ | 122 | ····private·List·initializeRequests(final·List·c)·{ |
| 123 | ········return·Collections.unmodifiableList((List<?>)new·ArrayList<Object>(c)); | 123 | ········return·Collections.unmodifiableList((List<?>)new·ArrayList<Object>(c)); |
| 124 | ····} | 124 | ····} |
| 125 | ···· | 125 | ···· |
| Offset 144, 18 lines modified | Offset 144, 18 lines modified |
| 144 | ········return·this.mActiveRequest; | 144 | ········return·this.mActiveRequest; |
| 145 | ····} | 145 | ····} |
| 146 | ···· | 146 | ···· |
| 147 | ····NetworkRequest·getNetworkRequestForCallback()·{ | 147 | ····NetworkRequest·getNetworkRequestForCallback()·{ |
| 148 | ········return·this.mNetworkRequestForCallback; | 148 | ········return·this.mNetworkRequestForCallback; |
| 149 | ····} | 149 | ····} |
| 150 | ···· | 150 | ···· |
| 151 | ····int·getPreferenceOrderForNetd()·{ | 151 | ····int·getPriorityForNetd()·{ |
| 152 | ········final·int·mPreferenceOrder·=·this.mPreferenceOrder; | 152 | ········final·int·mPreferencePriority·=·this.mPreferencePriority; |
| 153 | ········if·(mPreferenceOrder·>=·0·&&·mPreferenceOrder·<=·999)·{ | 153 | ········if·(mPreferencePriority·>=·0·&&·mPreferencePriority·<=·999)·{ |
| 154 | ············return·mPreferenceOrder; | 154 | ············return·mPreferencePriority; |
| 155 | ········} | 155 | ········} |
| 156 | ········return·0; | 156 | ········return·0; |
| 157 | ····} | 157 | ····} |
| 158 | ···· | 158 | ···· |
| 159 | ····NetworkAgentInfo·getSatisfier()·{ | 159 | ····NetworkAgentInfo·getSatisfier()·{ |
| 160 | ········return·this.mSatisfier; | 160 | ········return·this.mSatisfier; |
| 161 | ····} | 161 | ····} |
| Offset 168, 16 lines modified | Offset 168, 16 lines modified |
| 168 | ········} | 168 | ········} |
| 169 | ········else·{ | 169 | ········else·{ |
| 170 | ············o·=·uidRanges; | 170 | ············o·=·uidRanges; |
| 171 | ········} | 171 | ········} |
| 172 | ········return·(Set)o; | 172 | ········return·(Set)o; |
| 173 | ····} | 173 | ····} |
| 174 | ···· | 174 | ···· |
| 175 | ····boolean·hasHigherOrderThan(final·ConnectivityService$NetworkRequestInfo·connectivityService$NetworkRequestInfo)·{ | 175 | ····boolean·hasHigherPriorityThan(final·ConnectivityService$NetworkRequestInfo·connectivityService$NetworkRequestInfo)·{ |
| 176 | ········return·this.mPreferenceOrder·<·connectivityService$NetworkRequestInfo.mPreferenceOrder; | 176 | ········return·this.mPreferencePriority·<·connectivityService$NetworkRequestInfo.mPreferencePriority; |
| 177 | ····} | 177 | ····} |
| 178 | ···· | 178 | ···· |
| 179 | ····boolean·isBeingSatisfied()·{ | 179 | ····boolean·isBeingSatisfied()·{ |
| 180 | ········return·this.mSatisfier·!=·null·&&·this.mActiveRequest·!=·null; | 180 | ········return·this.mSatisfier·!=·null·&&·this.mActiveRequest·!=·null; |
| 181 | ····} | 181 | ····} |
| 182 | ···· | 182 | ···· |
| 183 | ····boolean·isMultilayerRequest()·{ | 183 | ····boolean·isMultilayerRequest()·{ |
| Offset 246, 16 lines modified | Offset 246, 16 lines modified |
| 246 | ············sb3.append("·to·trigger·"); | 246 | ············sb3.append("·to·trigger·"); |
| 247 | ············sb3.append(this.mPendingIntent); | 247 | ············sb3.append(this.mPendingIntent); |
| 248 | ············string·=·sb3.toString(); | 248 | ············string·=·sb3.toString(); |
| 249 | ········} | 249 | ········} |
| 250 | ········sb2.append(string); | 250 | ········sb2.append(string); |
| 251 | ········sb2.append("·callback·flags:·"); | 251 | ········sb2.append("·callback·flags:·"); |
| 252 | ········sb2.append(this.mCallbackFlags); | 252 | ········sb2.append(this.mCallbackFlags); |
| 253 | ········sb2.append("·order:·"); | 253 | ········sb2.append("·priority:·"); |
| 254 | ········sb2.append(this.mPreferenceOrder); | 254 | ········sb2.append(this.mPreferencePriority); |
| 255 | ········return·sb2.toString(); | 255 | ········return·sb2.toString(); |
| 256 | ····} | 256 | ····} |
| 257 | ···· | 257 | ···· |
| 258 | ····void·unlinkDeathRecipient()·{ | 258 | ····void·unlinkDeathRecipient()·{ |
| 259 | ········final·IBinder·mBinder·=·this.mBinder; | 259 | ········final·IBinder·mBinder·=·this.mBinder; |
| 260 | ········if·(mBinder·!=·null)·{ | 260 | ········if·(mBinder·!=·null)·{ |
| 261 | ············mBinder.unlinkToDeath((IBinder$DeathRecipient)this,·0); | 261 | ············mBinder.unlinkToDeath((IBinder$DeathRecipient)this,·0); |