commit 38d1640da59ab8bb46ddd3e49b840a3ad7f7c1aa
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 22 11:28:23 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 22 11:28:23 2019 +0000
tree 474160eb6e885fc28a2ace9e10ccc86f524f6603
parent cb93eb69f0adbcf9db533309c1823775b7507513
parent 3055df31a0308ccacebcc99dabe5c87994431013

Merge "Fix testcase error"

src/com/android/settings/wifi/AddNetworkFragment.java

diff --git a/src/com/android/settings/wifi/AddNetworkFragment.java b/src/com/android/settings/wifi/AddNetworkFragment.java
index 1a64e2f..651b25f 100644
--- a/src/com/android/settings/wifi/AddNetworkFragment.java
+++ b/src/com/android/settings/wifi/AddNetworkFragment.java
@@ -61,7 +61,11 @@
             Bundle savedInstanceState) {
         final View rootView = inflater.inflate(R.layout.wifi_add_network_view, container, false);
 
-        rootView.findViewById(android.R.id.button3).setVisibility(View.GONE);
+        final Button neutral = rootView.findViewById(android.R.id.button3);
+        if (neutral != null) {
+            neutral.setVisibility(View.GONE);
+        }
+
         mSubmitBtn = rootView.findViewById(SUBMIT_BUTTON_ID);
         mCancelBtn = rootView.findViewById(CANCEL_BUTTON_ID);
         final ImageButton scannerButton = rootView.findViewById(SCANNER_BUTTON_ID);