Commit 525a89b2 authored Apr 26, 2021 by Pinyao Ting

Fixes a potential error in setDynamicShortcut

In the current implementation, ret.complete will still be called after
ret.completeExceptionally is called. Although the second call doesn't do
anything right now since the implementation of AndroidFuture ignores
consecutive attempts at calling complete on an already completed future,
it is better to avoid these kind of behaviors in the first place.

Bug: 186237458
Test: manual
Change-Id: I65e44c28ded947d499ba74aafd9a2686f02a9f18

parent 00475ff2

services/core/java/com/android/server/pm/ShortcutService.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1992,10 +1992,11 @@ public class ShortcutService extends IShortcutService.Stub {
		packageShortcutsChanged(packageName, userId, changedShortcuts, removedShortcuts);

		verifyStates();

		ret.complete(true);
		} catch (Exception e) {
		ret.completeExceptionally(e);
		}
		ret.complete(true);
		});
		return ret;
		}