Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev

Browse Source
This commit is contained in:
Jeremy Joslin
2014-12-01 19:36:01 +00:00
committed by Android (Google) Code Review
parent 015b9e56d4 a68e7d730c
commit 500f781110
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -3768,8 +3768,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
int notificationType) {
if (notificationType == ConnectivityManager.CALLBACK_AVAILABLE) {
Intent intent = new Intent();
intent.putExtra(ConnectivityManager.EXTRA_NETWORK, nri.request);
intent.putExtra(ConnectivityManager.EXTRA_NETWORK_REQUEST, networkAgent.network);
intent.putExtra(ConnectivityManager.EXTRA_NETWORK, networkAgent.network);
intent.putExtra(ConnectivityManager.EXTRA_NETWORK_REQUEST, nri.request);
sendIntent(nri.mPendingIntent, intent);
}
// else not handled