From cde82783e51798154331055fb45dbde62f4fcd32 Mon Sep 17 00:00:00 2001 From: Wen Zhang Date: Mon, 29 Jan 2024 11:57:30 +0000 Subject: [Bugfix]Avoid device reboot caused by SecurityException. The user manually installed an old version of the GMS core app on a device without the GMS framework. When unlocking the device, the lack of INTERACT_ACROSS_USERS permission caused the system server to crash. Bug:322749757 Change-Id: If68206b4ebe223d94b91dbbcc3246a2ed41563aa --- services/core/java/com/android/server/am/ContentProviderHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/ContentProviderHelper.java b/services/core/java/com/android/server/am/ContentProviderHelper.java index da408266bfac..f72fdf84446b 100644 --- a/services/core/java/com/android/server/am/ContentProviderHelper.java +++ b/services/core/java/com/android/server/am/ContentProviderHelper.java @@ -1433,7 +1433,7 @@ public class ContentProviderHelper { } } } - } catch (RemoteException ignored) { + } catch (RemoteException|SecurityException ignored) { } }); } -- cgit v1.2.3-59-g8ed1b