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

Commit ec602020 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Catch all exception from statusReceiver.sendIntent." into rvc-dev am:... 

Merge "Catch all exception from statusReceiver.sendIntent." into rvc-dev am: 34127ce7 am: 59b3ce31

Change-Id: Iacbd324e0a86e46e86cd930b32120759ec2bce2c
parents 49689c35 59b3ce31

services/core/java/com/android/server/integrity/AppIntegrityManagerServiceImpl.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -40,7 +40,6 @@ import android.content.integrity.Rule; 
import android.content.pm.PackageInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager;

import android.content.pm.PackageManagerInternal;

import android.content.pm.PackageManagerInternal;

import android.content.pm.PackageParser;

import android.content.pm.PackageUserState;

import android.content.pm.PackageUserState;

import android.content.pm.ParceledListSlice;

import android.content.pm.ParceledListSlice;

import android.content.pm.Signature;

import android.content.pm.Signature;
@@ -202,7 +201,7 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub { 
                                intent,

                                intent,

                                /* onFinished= */ null,

                                /* onFinished= */ null,

                                /* handler= */ null);

                                /* handler= */ null);

                    } catch (IntentSender.SendIntentException e) {

                    } catch (Exception e) {

                        Slog.e(TAG, "Error sending status feedback.", e);

                        Slog.e(TAG, "Error sending status feedback.", e);

                    }

                    }

                });

                });