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

Commit ace8e026 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix CaptivePortalLoginActivity null String crash" into pi-dev

parents a78a764f c1b4efb4

packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ import android.os.Build; 
import android.os.Bundle;

import android.os.Bundle;

import android.provider.Settings;

import android.provider.Settings;

import android.support.v4.widget.SwipeRefreshLayout;

import android.support.v4.widget.SwipeRefreshLayout;

import android.text.TextUtils;

import android.util.ArrayMap;

import android.util.ArrayMap;

import android.util.Log;

import android.util.Log;

import android.util.TypedValue;

import android.util.TypedValue;
@@ -531,7 +532,7 @@ public class CaptivePortalLoginActivity extends Activity { 




    private String getHeaderTitle() {

    private String getHeaderTitle() {

        NetworkInfo info = mCm.getNetworkInfo(mNetwork);

        NetworkInfo info = mCm.getNetworkInfo(mNetwork);

        if (info == null) {

        if (info == null || TextUtils.isEmpty(info.getExtraInfo())) {

            return getString(R.string.action_bar_label);

            return getString(R.string.action_bar_label);

        }

        }

        NetworkCapabilities nc = mCm.getNetworkCapabilities(mNetwork);

        NetworkCapabilities nc = mCm.getNetworkCapabilities(mNetwork);