LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "BroadcastInterceptingContext: use passed-in broadcast Handler."

Browse Source
This commit is contained in:
Lorenzo Colitti
2021-02-15 10:42:18 +00:00
committed by Gerrit Code Review
parent fb84feedb1 0fd959b9cd
commit 67febba548
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -4987,9 +4987,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() { private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
// TODO: make BroadcastInterceptingContext use the Handler passed in to registerReceiver ensureRunningOnConnectivityServiceThread();
// and put this back.
// ensureRunningOnConnectivityServiceThread();
final String action = intent.getAction(); final String action = intent.getAction();
final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL); final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL);

7
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -1300,10 +1300,8 @@ public class ConnectivityServiceTest {
} }
private void processBroadcastForVpn(Intent intent) { private void processBroadcastForVpn(Intent intent) {
// The BroadcastReceiver for this broadcast checks it is being run on the handler thread. mServiceContext.sendBroadcast(intent);
final Handler handler = new Handler(mVMSHandlerThread.getLooper()); HandlerUtils.waitForIdle(mVMSHandlerThread, TIMEOUT_MS);
handler.post(() -> mServiceContext.sendBroadcast(intent));
HandlerUtils.waitForIdle(handler, TIMEOUT_MS);
waitForIdle(); waitForIdle();
} }
@@ -1430,6 +1428,7 @@ public class ConnectivityServiceTest {
FakeSettingsProvider.clearSettingsProvider(); FakeSettingsProvider.clearSettingsProvider();
mServiceContext = new MockContext(InstrumentationRegistry.getContext(), mServiceContext = new MockContext(InstrumentationRegistry.getContext(),
new FakeSettingsProvider()); new FakeSettingsProvider());
mServiceContext.setUseRegisteredHandlers(true);
LocalServices.removeServiceForTest(NetworkPolicyManagerInternal.class); LocalServices.removeServiceForTest(NetworkPolicyManagerInternal.class);
LocalServices.addService( LocalServices.addService(
NetworkPolicyManagerInternal.class, mock(NetworkPolicyManagerInternal.class)); NetworkPolicyManagerInternal.class, mock(NetworkPolicyManagerInternal.class));