From 0991b39ed3331f0d7ba9e6701e3dfa25976425bc Mon Sep 17 00:00:00 2001 From: hoffc Date: Thu, 17 Feb 2022 10:04:01 +0800 Subject: [PATCH] Settings: Fix NPE FC when access saved wifi p2p device after screen rotation Rotating screen, wifi p2p setting fragement will be re-created and the selected wifi p2p device will be saved in onSaveInstanceState. However, now this saved wifi p2p device is restored in onActivityCreated, this is too late. So when getting this saved wifi p2p device return NULL in onCreateDialog and leads to NPE force close. Restore the saved wifi p2p device in onCreateView instead of onActivityCreated. Bug: 220025725 Test: manual test make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest Change-Id: I9b746e21f7f3651c69b1445f2389c089ec19319c --- .../settings/wifi/p2p/WifiP2pSettings.java | 9 +++-- .../wifi/p2p/WifiP2pSettingsTest.java | 35 ++++++++++--------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java index c1365dd752f..435c3e9e370 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java @@ -47,6 +47,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; +import android.view.ViewGroup; import android.widget.EditText; import android.widget.Toast; @@ -199,7 +200,10 @@ public class WifiP2pSettings extends DashboardFragment } @Override - public void onActivityCreated(Bundle savedInstanceState) { + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + final View root = super.onCreateView(inflater, container, savedInstanceState); + final Activity activity = getActivity(); if (mWifiP2pManager == null) { mWifiP2pManager = (WifiP2pManager) getSystemService(Context.WIFI_P2P_SERVICE); @@ -332,8 +336,7 @@ public class WifiP2pSettings extends DashboardFragment } } }; - - super.onActivityCreated(savedInstanceState); + return root; } @Override diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java index 796cdef4341..78e696d6418 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java @@ -39,7 +39,7 @@ import android.net.wifi.p2p.WifiP2pInfo; import android.net.wifi.p2p.WifiP2pManager; import android.os.Bundle; import android.view.MenuItem; - +import android.view.LayoutInflater; import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; @@ -110,30 +110,30 @@ public class WifiP2pSettingsTest { } @Test - public void onActivityCreate_withNullBundle_canNotGetValue() { - mFragment.onActivityCreated(null); + public void onCreateView_withNullBundle_canNotGetValue() { + mFragment.onCreateView(LayoutInflater.from(mContext), null, null); assertThat(mFragment.mSelectedWifiPeer).isNull(); } @Test - public void onActivityCreate_withDeviceName_shouldGetDeviceName() { + public void onCreateView_withDeviceName_shouldGetDeviceName() { final String fakeDeviceName = "fakename"; final Bundle bundle = new Bundle(); bundle.putString(WifiP2pSettings.SAVE_DEVICE_NAME, fakeDeviceName); - mFragment.onActivityCreated(bundle); + mFragment.onCreateView(LayoutInflater.from(mContext), null, bundle); assertThat(mFragment.mSavedDeviceName).isEqualTo(fakeDeviceName); } @Test - public void onActivityCreate_withGroupName_shouldGetGroupName() { + public void onCreateView_withGroupName_shouldGetGroupName() { final String fakeGroupName = "fakegroup"; final Bundle bundle = new Bundle(); bundle.putString(WifiP2pSettings.SAVE_SELECTED_GROUP, fakeGroupName); - mFragment.onActivityCreated(bundle); + mFragment.onCreateView(LayoutInflater.from(mContext), null, bundle); assertThat(mFragment.mSelectedGroupName).isEqualTo(fakeGroupName); assertThat(mFragment.mSavedDeviceName).isNull(); @@ -279,7 +279,7 @@ public class WifiP2pSettingsTest { final String fakeDeviceName = "fakeName"; final Bundle bundle = new Bundle(); bundle.putString(WifiP2pSettings.SAVE_DEVICE_NAME, fakeDeviceName); - mFragment.onActivityCreated(bundle); + mFragment.onCreateView(LayoutInflater.from(mContext), null, bundle); final Dialog dialog = mFragment.onCreateDialog(WifiP2pSettings.DIALOG_RENAME); mFragment.mRenameListener.onClick(dialog, DialogInterface.BUTTON_POSITIVE); @@ -292,7 +292,8 @@ public class WifiP2pSettingsTest { final String fakeDeviceName = "wrongName***"; final Bundle bundle = new Bundle(); bundle.putString(WifiP2pSettings.SAVE_DEVICE_NAME, fakeDeviceName); - mFragment.onActivityCreated(bundle); + mFragment.onCreateView(LayoutInflater.from(mContext), null, bundle); + final Dialog dialog = mFragment.onCreateDialog(WifiP2pSettings.DIALOG_RENAME); mFragment.mRenameListener.onClick(dialog, DialogInterface.BUTTON_POSITIVE); @@ -394,7 +395,7 @@ public class WifiP2pSettingsTest { final String fakeDeviceName = "fakeName"; final Bundle createBundle = new Bundle(); createBundle.putString(WifiP2pSettings.SAVE_DEVICE_NAME, fakeDeviceName); - mFragment.onActivityCreated(createBundle); + mFragment.onCreateView(LayoutInflater.from(mContext), null, createBundle); final Bundle outBundle = new Bundle(); final Dialog dialog = mFragment.onCreateDialog(WifiP2pSettings.DIALOG_RENAME); @@ -430,7 +431,7 @@ public class WifiP2pSettingsTest { doReturn(groupList).when(wifiP2pGroupList).getGroupList(); final Bundle bundle = new Bundle(); bundle.putString(WifiP2pSettings.SAVE_SELECTED_GROUP, fakeGroupName); - mFragment.onActivityCreated(bundle); + mFragment.onCreateView(LayoutInflater.from(mContext), null, bundle); mFragment.onPersistentGroupInfoAvailable(wifiP2pGroupList); @@ -503,20 +504,20 @@ public class WifiP2pSettingsTest { } @Test - public void onActivityCreate_withNullP2pManager_shouldGetP2pManagerAgain() { - mFragment.mChannel = null; // Reset channel to re-test onActivityCreated flow + public void onCreateView_withNullP2pManager_shouldGetP2pManagerAgain() { + mFragment.mChannel = null; // Reset channel to re-test onCreateView flow mFragment.mWifiP2pManager = null; - mFragment.onActivityCreated(new Bundle()); + mFragment.onCreateView(LayoutInflater.from(mContext), null, new Bundle()); assertThat(mFragment.mWifiP2pManager).isNotNull(); } @Test - public void onActivityCreate_withNullChannel_shouldSetP2pManagerNull() { + public void onCreateView_withNullChannel_shouldSetP2pManagerNull() { doReturn(null).when(mWifiP2pManager).initialize(any(), any(), any()); - mFragment.mChannel = null; // Reset channel to re-test onActivityCreated flow - mFragment.onActivityCreated(new Bundle()); + mFragment.mChannel = null; // Reset channel to re-test onCreateView flow + mFragment.onCreateView(LayoutInflater.from(mContext), null, new Bundle()); assertThat(mFragment.mWifiP2pManager).isNull(); }