Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 500f7811 authored by Jeremy Joslin's avatar Jeremy Joslin Committed by Android (Google) Code Review
Browse files

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

parents 015b9e56 a68e7d73

services/core/java/com/android/server/ConnectivityService.java

+2 −2
Original line number Diff line number Diff line
@@ -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