tree c1228440ef7742fe4a3d0ab35b916a06afa9f0b1
parent 927b3b120839954a575b4e8c498b1b4d4d375afa
author Valerie Hau <vhau@google.com> 1595030354 -0700
committer Valerie Hau <vhau@google.com> 1595388753 +0000

RESTRICT AUTOMERGE: Fix security bug

Small bug fix - || instead of && causing flickering and incorrect layer
removal

Bug: 150845631, 137284057
Test: build, boot, SurfaceFlinger_test, libsurfaceflinger_unittest,
manual

Change-Id: I6c4e5239254300c70b802aa935fb638412a445ee