Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix CS external dependencies on CarrierDefaultApp"

Browse Source
This commit is contained in:
Paul Hu
2021-03-19 01:41:25 +00:00
committed by Gerrit Code Review
parent 6df94880b3 01e4479247
commit 25be9509b8
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java
View File

@@ -86,7 +86,7 @@ public class CaptivePortalLoginActivity extends Activity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
mCm = ConnectivityManager.from(this); mCm = getSystemService(ConnectivityManager.class);
mUrl = getUrlForCaptivePortal(); mUrl = getUrlForCaptivePortal();
if (mUrl == null) { if (mUrl == null) {
done(false); done(false);
@@ -161,7 +161,6 @@ public class CaptivePortalLoginActivity extends Activity {
if (network != null) { if (network != null) {
network = network.getPrivateDnsBypassingCopy(); network = network.getPrivateDnsBypassingCopy();
mCm.bindProcessToNetwork(network); mCm.bindProcessToNetwork(network);
mCm.setProcessDefaultNetworkForHostResolution(network);
} }
mNetwork = network; mNetwork = network;
} }

2
packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/ProvisionObserver.java
View File

@@ -49,7 +49,7 @@ public class ProvisionObserver extends JobService {
case PROVISION_OBSERVER_REEVALUATION_JOB_ID: case PROVISION_OBSERVER_REEVALUATION_JOB_ID:
if (isProvisioned(this)) { if (isProvisioned(this)) {
Log.d(TAG, "device provisioned, force network re-evaluation"); Log.d(TAG, "device provisioned, force network re-evaluation");
final ConnectivityManager connMgr = ConnectivityManager.from(this); final ConnectivityManager connMgr = getSystemService(ConnectivityManager.class);
Network[] info = connMgr.getAllNetworks(); Network[] info = connMgr.getAllNetworks();
for (Network nw : info) { for (Network nw : info) {
final NetworkCapabilities nc = connMgr.getNetworkCapabilities(nw); final NetworkCapabilities nc = connMgr.getNetworkCapabilities(nw);