[Settings] Try to reduce the time pending on BroadcastReceiver
This is not a design which could resolve the issue, but try to improve it through reducing the time blocking on BroadcastReceiver and reducing the happening of ANR. Bug: 262209170 Test: local and auto Change-Id: Idec4da3d1deaffb121a5c7a73aeb84b4b0331374
This commit is contained in:
@@ -4647,6 +4647,9 @@
|
|||||||
</intent-filter>
|
</intent-filter>
|
||||||
</receiver>
|
</receiver>
|
||||||
|
|
||||||
|
<service android:name=".sim.receivers.SimSlotChangeService"
|
||||||
|
android:permission="android.permission.BIND_JOB_SERVICE" />
|
||||||
|
|
||||||
<receiver
|
<receiver
|
||||||
android:name=".sim.receivers.SimCompleteBootReceiver"
|
android:name=".sim.receivers.SimCompleteBootReceiver"
|
||||||
android:exported="true">
|
android:exported="true">
|
||||||
|
@@ -21,6 +21,7 @@
|
|||||||
<integer name="job_anomaly_detection">102</integer>
|
<integer name="job_anomaly_detection">102</integer>
|
||||||
<integer name="device_index_update">103</integer>
|
<integer name="device_index_update">103</integer>
|
||||||
<integer name="sim_notification_send">104</integer>
|
<integer name="sim_notification_send">104</integer>
|
||||||
|
<integer name="sim_slot_changed">105</integer>
|
||||||
|
|
||||||
<!-- Controls the maximum number of faces enrollable during SUW -->
|
<!-- Controls the maximum number of faces enrollable during SUW -->
|
||||||
<integer name="suw_max_faces_enrollable">1</integer>
|
<integer name="suw_max_faces_enrollable">1</integer>
|
||||||
|
@@ -37,9 +37,6 @@ import java.util.List;
|
|||||||
public class SimSlotChangeReceiver extends BroadcastReceiver {
|
public class SimSlotChangeReceiver extends BroadcastReceiver {
|
||||||
private static final String TAG = "SlotChangeReceiver";
|
private static final String TAG = "SlotChangeReceiver";
|
||||||
|
|
||||||
private final SimSlotChangeHandler mSlotChangeHandler = SimSlotChangeHandler.get();
|
|
||||||
private final Object mLock = new Object();
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onReceive(Context context, Intent intent) {
|
public void onReceive(Context context, Intent intent) {
|
||||||
|
|
||||||
@@ -49,20 +46,17 @@ public class SimSlotChangeReceiver extends BroadcastReceiver {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
final PendingResult pendingResult = goAsync();
|
SimSlotChangeService.scheduleSimSlotChange(context);
|
||||||
ThreadUtils.postOnBackgroundThread(
|
}
|
||||||
() -> {
|
|
||||||
synchronized (mLock) {
|
public static void runOnBackgroundThread(Context context) {
|
||||||
if (shouldHandleSlotChange(context)) {
|
if (shouldHandleSlotChange(context)) {
|
||||||
mSlotChangeHandler.onSlotsStatusChange(context.getApplicationContext());
|
SimSlotChangeHandler.get().onSlotsStatusChange(context.getApplicationContext());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ThreadUtils.postOnMainThread(pendingResult::finish);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Checks whether the slot event should be handled.
|
// Checks whether the slot event should be handled.
|
||||||
private boolean shouldHandleSlotChange(Context context) {
|
private static boolean shouldHandleSlotChange(Context context) {
|
||||||
if (!context.getResources().getBoolean(R.bool.config_handle_sim_slot_change)) {
|
if (!context.getResources().getBoolean(R.bool.config_handle_sim_slot_change)) {
|
||||||
Log.i(TAG, "The flag is off. Ignore slot changes.");
|
Log.i(TAG, "The flag is off. Ignore slot changes.");
|
||||||
return false;
|
return false;
|
||||||
@@ -88,7 +82,7 @@ public class SimSlotChangeReceiver extends BroadcastReceiver {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Checks whether the SIM slot state is valid for slot change event.
|
// Checks whether the SIM slot state is valid for slot change event.
|
||||||
private boolean isSimSlotStateValid(Context context) {
|
private static boolean isSimSlotStateValid(Context context) {
|
||||||
final TelephonyManager telMgr = context.getSystemService(TelephonyManager.class);
|
final TelephonyManager telMgr = context.getSystemService(TelephonyManager.class);
|
||||||
UiccSlotInfo[] slotInfos = telMgr.getUiccSlotsInfo();
|
UiccSlotInfo[] slotInfos = telMgr.getUiccSlotsInfo();
|
||||||
if (slotInfos == null) {
|
if (slotInfos == null) {
|
||||||
@@ -136,7 +130,8 @@ public class SimSlotChangeReceiver extends BroadcastReceiver {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
private UiccCardInfo findUiccCardInfoBySlot(TelephonyManager telMgr, int physicalSlotIndex) {
|
private static UiccCardInfo findUiccCardInfoBySlot(TelephonyManager telMgr,
|
||||||
|
int physicalSlotIndex) {
|
||||||
List<UiccCardInfo> cardInfos = telMgr.getUiccCardsInfo();
|
List<UiccCardInfo> cardInfos = telMgr.getUiccCardsInfo();
|
||||||
if (cardInfos == null) {
|
if (cardInfos == null) {
|
||||||
return null;
|
return null;
|
||||||
|
@@ -0,0 +1,77 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2022 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.sim.receivers;
|
||||||
|
|
||||||
|
import android.app.job.JobInfo;
|
||||||
|
import android.app.job.JobParameters;
|
||||||
|
import android.app.job.JobScheduler;
|
||||||
|
import android.app.job.JobService;
|
||||||
|
import android.content.ComponentName;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.Handler;
|
||||||
|
import android.os.HandlerThread;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
import com.android.settingslib.utils.ThreadUtils;
|
||||||
|
|
||||||
|
import java.util.concurrent.Phaser;
|
||||||
|
|
||||||
|
/** A JobService work on SIM slot change. */
|
||||||
|
public class SimSlotChangeService extends JobService {
|
||||||
|
|
||||||
|
private static final String TAG = "SimSlotChangeService";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Schedules a service to work on SIM slot change.
|
||||||
|
*
|
||||||
|
* @param context is the caller context.
|
||||||
|
*/
|
||||||
|
public static void scheduleSimSlotChange(Context context) {
|
||||||
|
Context appContext = context.getApplicationContext();
|
||||||
|
JobScheduler jobScheduler = appContext.getSystemService(JobScheduler.class);
|
||||||
|
ComponentName component = new ComponentName(appContext, SimSlotChangeService.class);
|
||||||
|
|
||||||
|
jobScheduler.schedule(
|
||||||
|
new JobInfo.Builder(R.integer.sim_slot_changed, component).build());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onStartJob(JobParameters params) {
|
||||||
|
|
||||||
|
HandlerThread thread = new HandlerThread(TAG);
|
||||||
|
thread.start();
|
||||||
|
final Phaser blocker = new Phaser(1);
|
||||||
|
Handler handler = new Handler(thread.getLooper());
|
||||||
|
handler.post(() -> {
|
||||||
|
try {
|
||||||
|
SimSlotChangeReceiver.runOnBackgroundThread(this);
|
||||||
|
} catch (Throwable exception) {
|
||||||
|
Log.e(TAG, "Exception running job", exception);
|
||||||
|
}
|
||||||
|
blocker.arrive();
|
||||||
|
});
|
||||||
|
blocker.awaitAdvance(0);
|
||||||
|
thread.quit();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onStopJob(JobParameters params) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,61 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2022 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.sim.receivers;
|
||||||
|
|
||||||
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
|
import static org.mockito.Mockito.doReturn;
|
||||||
|
import static org.mockito.Mockito.spy;
|
||||||
|
import static org.mockito.Mockito.verify;
|
||||||
|
|
||||||
|
import android.app.job.JobScheduler;
|
||||||
|
import android.content.Context;
|
||||||
|
import androidx.test.core.app.ApplicationProvider;
|
||||||
|
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
import org.mockito.MockitoAnnotations;
|
||||||
|
|
||||||
|
@RunWith(AndroidJUnit4.class)
|
||||||
|
public class SimSlotChangeServiceTest {
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private JobScheduler mJobScheduler;
|
||||||
|
|
||||||
|
private Context mContext;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
MockitoAnnotations.initMocks(this);
|
||||||
|
|
||||||
|
mContext = spy(ApplicationProvider.getApplicationContext());
|
||||||
|
doReturn(mContext).when(mContext).getApplicationContext();
|
||||||
|
mockService(Context.JOB_SCHEDULER_SERVICE, JobScheduler.class, mJobScheduler);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void scheduleSimSlotChange_addSchedule_whenInvoked() {
|
||||||
|
SimSlotChangeService.scheduleSimSlotChange(mContext);
|
||||||
|
verify(mJobScheduler).schedule(any());
|
||||||
|
}
|
||||||
|
|
||||||
|
private <T> void mockService(String serviceName, Class<T> serviceClass, T service) {
|
||||||
|
doReturn(serviceName).when(mContext).getSystemServiceName(serviceClass);
|
||||||
|
doReturn(service).when(mContext).getSystemService(serviceName);
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user