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

Commit a318d1e8 authored by Irfan Sheriff's avatar Irfan Sheriff
Browse files

Fix p2p settings NPE 

Bug: 6138959
Change-Id: I0c930686220ad8a77e3a998a108158b2467b5707
parent 891b3ca8

res/values/strings.xml

+4 −4
Original line number Diff line number Diff line
@@ -1399,13 +1399,13 @@ 
    <string name="wifi_p2p_device_info">Device information</string>

    <string name="wifi_p2p_persist_network">Remember this connection</string>

    <!-- Menu option to discover peers-->

    <string name="wifi_p2p_menu_search">SEARCH FOR DEVICES</string>

    <!-- Menu option when discovery is in progress-->

    <string name="wifi_p2p_menu_searching">SEARCHING</string>

    <string name="wifi_p2p_menu_search">Search for devices</string>

    <!-- Menu option when discovery is in progress [CHAR LIMIT=25] -->

    <string name="wifi_p2p_menu_searching">Searching\u2026</string>

    <!-- Menu option to Rename-->

    <string name="wifi_p2p_menu_rename">Rename device</string>

    <!-- Title for available p2p devices -->

    <string name="wifi_p2p_peer_devices">PEER DEVICES</string>

    <string name="wifi_p2p_peer_devices">Peer devices</string>

    <!-- Toast text for a failed connection initiation -->

    <string name="wifi_p2p_failed_connect_message">Couldn\'t connect.</string>

    <!-- Title for disconnect dialog -->

src/com/android/settings/wifi/p2p/WifiP2pSettings.java

+4 −4
Original line number Diff line number Diff line
@@ -161,6 +161,8 @@ public class WifiP2pSettings extends SettingsPreferenceFragment 
            }

        };



        setHasOptionsMenu(true);



        final PreferenceScreen preferenceScreen = getPreferenceScreen();

        preferenceScreen.removeAll();
@@ -168,7 +170,8 @@ public class WifiP2pSettings extends SettingsPreferenceFragment 
        mThisDevicePref = new Preference(getActivity());

        preferenceScreen.addPreference(mThisDevicePref);



        setHasOptionsMenu(true);

        mPeersGroup = new PreferenceCategory(getActivity());

        mPeersGroup.setTitle(R.string.wifi_p2p_peer_devices);

    }



    @Override
@@ -310,11 +313,8 @@ public class WifiP2pSettings extends SettingsPreferenceFragment 
            preferenceScreen.removeAll();



            preferenceScreen.setOrderingAsAdded(true);

            mThisDevicePref = new Preference(getActivity());

            preferenceScreen.addPreference(mThisDevicePref);



            mPeersGroup = new PreferenceCategory(getActivity());

            mPeersGroup.setTitle(R.string.wifi_p2p_peer_devices);

            mPeersGroup.setEnabled(true);

            preferenceScreen.addPreference(mPeersGroup);