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

Merge "Unlink listener death recipient on alarms" into sc-dev

Browse Source
This commit is contained in:
Suprabh Shukla
2021-05-26 20:52:55 +00:00
committed by Android (Google) Code Review
parent 1d4a672528 b4da4f362d
commit 18cdcb663e
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java
View File

@@ -121,7 +121,6 @@ import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.IAppOpsCallback; import com.android.internal.app.IAppOpsCallback;
import com.android.internal.app.IAppOpsService; import com.android.internal.app.IAppOpsService;
import com.android.internal.os.BinderDeathDispatcher;
import com.android.internal.util.DumpUtils; import com.android.internal.util.DumpUtils;
import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.FrameworkStatsLog;
import com.android.internal.util.LocalLog; import com.android.internal.util.LocalLog;
@@ -206,8 +205,6 @@ public class AlarmManagerService extends SystemService {
.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING .addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING
| Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND); | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
private static final BinderDeathDispatcher<IAlarmListener> sListenerDeathDispatcher =
new BinderDeathDispatcher<>();
final LocalLog mLog = new LocalLog(TAG); final LocalLog mLog = new LocalLog(TAG);
AppOpsManager mAppOps; AppOpsManager mAppOps;
@@ -1837,8 +1834,9 @@ public class AlarmManagerService extends SystemService {
} }
if (directReceiver != null) { if (directReceiver != null) {
if (sListenerDeathDispatcher.linkToDeath(directReceiver, mListenerDeathRecipient) try {
<= 0) { directReceiver.asBinder().linkToDeath(mListenerDeathRecipient, 0);
} catch (RemoteException e) {
Slog.w(TAG, "Dropping unreachable alarm listener " + listenerTag); Slog.w(TAG, "Dropping unreachable alarm listener " + listenerTag);
return; return;
} }
@@ -2851,12 +2849,6 @@ public class AlarmManagerService extends SystemService {
pw.println(); pw.println();
} }
pw.println("Listener death dispatcher state:");
pw.increaseIndent();
sListenerDeathDispatcher.dump(pw);
pw.println();
pw.decreaseIndent();
if (mLog.dump(pw, "Recent problems:")) { if (mLog.dump(pw, "Recent problems:")) {
pw.println(); pw.println();
} }
@@ -3448,6 +3440,9 @@ public class AlarmManagerService extends SystemService {
for (final Alarm removed : removedAlarms) { for (final Alarm removed : removedAlarms) {
decrementAlarmCount(removed.uid, 1); decrementAlarmCount(removed.uid, 1);
if (removed.listener != null) {
removed.listener.asBinder().unlinkToDeath(mListenerDeathRecipient, 0);
}
if (!RemovedAlarm.isLoggable(reason)) { if (!RemovedAlarm.isLoggable(reason)) {
continue; continue;
} }
@@ -4701,6 +4696,8 @@ public class AlarmManagerService extends SystemService {
// Direct listener callback alarm // Direct listener callback alarm
mListenerCount++; mListenerCount++;
alarm.listener.asBinder().unlinkToDeath(mListenerDeathRecipient, 0);
if (RECORD_ALARMS_IN_HISTORY) { if (RECORD_ALARMS_IN_HISTORY) {
if (alarm.listener == mTimeTickTrigger) { if (alarm.listener == mTimeTickTrigger) {
mTickHistory[mNextTickHistory++] = nowELAPSED; mTickHistory[mNextTickHistory++] = nowELAPSED;