PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix adding wifi configuration issue" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-23 08:27:47 +00:00
committed by Android (Google) Code Review
parent a387297687 f5cd7140f4
commit a12da0a8e8
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/wifi/addappnetworks/AddAppNetworksActivity.java
View File

@@ -56,8 +56,6 @@ public class AddAppNetworksActivity extends FragmentActivity {
final Bundle mBundle = new Bundle(); final Bundle mBundle = new Bundle();
@VisibleForTesting @VisibleForTesting
IActivityManager mActivityManager = ActivityManager.getService(); IActivityManager mActivityManager = ActivityManager.getService();
@VisibleForTesting
boolean mIsAddWifiConfigAllow;
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -74,8 +72,6 @@ public class AddAppNetworksActivity extends FragmentActivity {
window.setGravity(Gravity.BOTTOM); window.setGravity(Gravity.BOTTOM);
window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, window.setLayout(WindowManager.LayoutParams.MATCH_PARENT,
WindowManager.LayoutParams.WRAP_CONTENT); WindowManager.LayoutParams.WRAP_CONTENT);
mIsAddWifiConfigAllow = WifiEnterpriseRestrictionUtils.isAddWifiConfigAllowed(this);
} }
@Override @Override
@@ -90,7 +86,7 @@ public class AddAppNetworksActivity extends FragmentActivity {
@VisibleForTesting @VisibleForTesting
protected boolean showAddNetworksFragment() { protected boolean showAddNetworksFragment() {
if (!mIsAddWifiConfigAllow) { if (!isAddWifiConfigAllow()) {
Log.d(TAG, "Not allowed by Enterprise Restriction"); Log.d(TAG, "Not allowed by Enterprise Restriction");
return false; return false;
} }
@@ -129,4 +125,9 @@ public class AddAppNetworksActivity extends FragmentActivity {
} }
return packageName; return packageName;
} }
@VisibleForTesting
boolean isAddWifiConfigAllow() {
return WifiEnterpriseRestrictionUtils.isAddWifiConfigAllowed(this);
}
} }

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

@@ -39,15 +39,14 @@ public class AddAppNetworksActivityTest {
@Mock @Mock
private IActivityManager mIActivityManager; private IActivityManager mIActivityManager;
private AddAppNetworksActivity mActivity; private FakeAddAppNetworksActivity mActivity;
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mActivity = Robolectric.buildActivity(AddAppNetworksActivity.class).create().get(); mActivity = Robolectric.buildActivity(FakeAddAppNetworksActivity.class).create().get();
mActivity.mActivityManager = mIActivityManager; mActivity.mActivityManager = mIActivityManager;
mActivity.mIsAddWifiConfigAllow = true;
} }
@Test @Test
@@ -92,4 +91,13 @@ public class AddAppNetworksActivityTest {
// Do nothing. // Do nothing.
} }
} }
private static class FakeAddAppNetworksActivity extends AddAppNetworksActivity {
boolean mIsAddWifiConfigAllow = true;
@Override
boolean isAddWifiConfigAllow() {
return mIsAddWifiConfigAllow;
}
}
} }