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

Commit ea202fe2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Bugfix]Avoid device reboot caused by SecurityException." into main am:... 

Merge "[Bugfix]Avoid device reboot caused by SecurityException." into main am: b4838c7c am: fa555189

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



Change-Id: Ieee39aece1a6b0ad46161124e8500e5343673e51
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 312e885d fa555189

services/core/java/com/android/server/am/ContentProviderHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -1434,7 +1434,7 @@ public class ContentProviderHelper { 
                                    }

                                }

                            }

                        } catch (RemoteException ignored) {

                        } catch (RemoteException|SecurityException ignored) {

                        }

                    });

                }