From 00b540e1443acbaa5cda1a263106ace24339f8ac Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 28 Feb 2022 01:08:12 +0000 Subject: [PATCH] Unregister receiver when destroying TrustAgentWrapper. Make sure to unregister the receiver when TrustAgentWrapper gets detroyed. This will prevent over registering for the receiver and a potential crash if too many recievers are created. The unregistering and registering of this receiver now take place in the same location as the other receiver in the class. Fixes: 221506550 Test: Trivial Change-Id: Icfd12949d9edb2fa6fbb052db35c16f950328c9a --- .../core/java/com/android/server/trust/TrustAgentWrapper.java | 1 + 1 file changed, 1 insertion(+) diff --git a/services/core/java/com/android/server/trust/TrustAgentWrapper.java b/services/core/java/com/android/server/trust/TrustAgentWrapper.java index fa243c023a878..20cd8f5c12f87 100644 --- a/services/core/java/com/android/server/trust/TrustAgentWrapper.java +++ b/services/core/java/com/android/server/trust/TrustAgentWrapper.java @@ -671,6 +671,7 @@ public class TrustAgentWrapper { mContext.unbindService(mConnection); mBound = false; mContext.unregisterReceiver(mBroadcastReceiver); + mContext.unregisterReceiver(mTrustableDowngradeReceiver); mTrustAgentService = null; mSetTrustAgentFeaturesToken = null; mHandler.sendEmptyMessage(MSG_REVOKE_TRUST);