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

Commit e8334d9b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix adding wifi configuration issue" into tm-dev am: a12da0a8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17335743

Change-Id: I4bf75ada3b1291d0a457d424c82fd266f0a2949f
parents 2bba6ac2 a12da0a8

src/com/android/settings/wifi/addappnetworks/AddAppNetworksActivity.java

+6 −5
Original line number Diff line number Diff line
@@ -56,8 +56,6 @@ public class AddAppNetworksActivity extends FragmentActivity { 
    final Bundle mBundle = new Bundle();

    @VisibleForTesting

    IActivityManager mActivityManager = ActivityManager.getService();

    @VisibleForTesting

    boolean mIsAddWifiConfigAllow;



    @Override

    protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -74,8 +72,6 @@ public class AddAppNetworksActivity extends FragmentActivity { 
        window.setGravity(Gravity.BOTTOM);

        window.setLayout(WindowManager.LayoutParams.MATCH_PARENT,

                WindowManager.LayoutParams.WRAP_CONTENT);



        mIsAddWifiConfigAllow = WifiEnterpriseRestrictionUtils.isAddWifiConfigAllowed(this);

    }



    @Override
@@ -90,7 +86,7 @@ public class AddAppNetworksActivity extends FragmentActivity { 


    @VisibleForTesting

    protected boolean showAddNetworksFragment() {

        if (!mIsAddWifiConfigAllow) {

        if (!isAddWifiConfigAllow()) {

            Log.d(TAG, "Not allowed by Enterprise Restriction");

            return false;

        }
@@ -129,4 +125,9 @@ public class AddAppNetworksActivity extends FragmentActivity { 
        }

        return packageName;

    }



    @VisibleForTesting

    boolean isAddWifiConfigAllow() {

        return WifiEnterpriseRestrictionUtils.isAddWifiConfigAllowed(this);

    }

}

tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksActivityTest.java

+11 −3
Original line number Diff line number Diff line
@@ -39,15 +39,14 @@ public class AddAppNetworksActivityTest { 
    @Mock

    private IActivityManager mIActivityManager;



    private AddAppNetworksActivity mActivity;

    private FakeAddAppNetworksActivity mActivity;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);



        mActivity = Robolectric.buildActivity(AddAppNetworksActivity.class).create().get();

        mActivity = Robolectric.buildActivity(FakeAddAppNetworksActivity.class).create().get();

        mActivity.mActivityManager = mIActivityManager;

        mActivity.mIsAddWifiConfigAllow = true;

    }



    @Test
@@ -92,4 +91,13 @@ public class AddAppNetworksActivityTest { 
            // Do nothing.

        }

    }



    private static class FakeAddAppNetworksActivity extends AddAppNetworksActivity {

        boolean mIsAddWifiConfigAllow = true;



        @Override

        boolean isAddWifiConfigAllow() {

            return mIsAddWifiConfigAllow;

        }

    }

}