tree b3b938bdefd2ec7b86c4cc145a70ad75a88d5bd6
parent f4a27950fbbeeeb4a81063b22159763e78913c98
parent 8998e466353c5085807ec35bfdd5ff28cb7a1279
author Bharath <bharath@teamb58.org> 1681190065 +0530
committer Bharath <bharath@teamb58.org> 1681190065 +0530
mergetag object 8998e466353c5085807ec35bfdd5ff28cb7a1279
 type commit
 tag android-13.0.0_r38
 tagger The Android Open Source Project <initial-contribution@android.com> 1681153660 -0700
 
 Android 13.0.0 Release 38 (TQ2A.230405.003)
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZDRefAAKCRDorT+BmrEO
 eN99AJ9PlvezZBGvAMgvaqbqi/kTSKawLgCggSM3aSHoqAsoTBDmiXEwDGOWnkQ=
 =8cNh
 -----END PGP SIGNATURE-----

Merge tag 'android-13.0.0_r38' into int/13/fp3

Android 13.0.0 Release 38 (TQ2A.230405.003)

* tag 'android-13.0.0_r38':
  Prevent falling into OtherActivityInputConsumer when over lockscreen
  Prevent falling into OtherActivityInputConsumer when over lockscreen

Change-Id: I6f30da8346ce246c2239a0a373befe9baf276d01