Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 710b99f6 authored by Song Chun Fan's avatar Song Chun Fan Committed by Automerger Merge Worker
Browse files

Merge "[am] catch IllegalArgumentException from getHarmfulAppWarning" into... 

Merge "[am] catch IllegalArgumentException from getHarmfulAppWarning" into tm-qpr-dev am: 73784f47

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20306304



Change-Id: I6f3abc4e536ed196c505a950137c8a0cd0c17cb8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 096dd1a3 73784f47

services/core/java/com/android/server/wm/ActivityStartInterceptor.java

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ class ActivityStartInterceptor { 
        try {

            harmfulAppWarning = mService.getPackageManager()

                    .getHarmfulAppWarning(mAInfo.packageName, mUserId);

        } catch (RemoteException ex) {

        } catch (RemoteException | IllegalArgumentException ex) {

            return false;

        }