Merge "Ensure all AttributionSources are deregistered in PMS" into tm-qpr-dev (7b46b29b) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+10 −4

Original line number	Diff line number	Diff line
		@@ -1112,15 +1112,21 @@ public class PermissionManagerService extends IPermissionManager.Stub {
		resolvedAttributionSource, skipCurrentFinish);
		}

		if (next == null \|\| next.getNext() == null) {
		return;
		}

		RegisteredAttribution registered =
		sRunningAttributionSources.remove(current.getToken());
		if (registered != null) {
		registered.unregister();
		}

		if (next == null \|\| next.getNext() == null) {
		if (next != null) {
		registered = sRunningAttributionSources.remove(next.getToken());
		if (registered != null) {
		registered.unregister();
		}
		}
		return;
		}
		current = next;
		}
		}