diff options
| -rw-r--r-- | services/core/java/com/android/server/webkit/WebViewUpdateService.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/webkit/WebViewUpdateService.java b/services/core/java/com/android/server/webkit/WebViewUpdateService.java index 3b400b43b725..d7458f2f6e1a 100644 --- a/services/core/java/com/android/server/webkit/WebViewUpdateService.java +++ b/services/core/java/com/android/server/webkit/WebViewUpdateService.java @@ -92,7 +92,7 @@ public class WebViewUpdateService extends SystemService { (intent.getExtras().getBoolean(Intent.EXTRA_REPLACING) ? PACKAGE_ADDED_REPLACED : PACKAGE_ADDED), userId); break; - case Intent.ACTION_USER_ADDED: + case Intent.ACTION_USER_STARTED: mImpl.handleNewUser(userId); break; case Intent.ACTION_USER_REMOVED: @@ -115,7 +115,7 @@ public class WebViewUpdateService extends SystemService { null /* broadcast permission */, null /* handler */); IntentFilter userAddedFilter = new IntentFilter(); - userAddedFilter.addAction(Intent.ACTION_USER_ADDED); + userAddedFilter.addAction(Intent.ACTION_USER_STARTED); userAddedFilter.addAction(Intent.ACTION_USER_REMOVED); getContext().registerReceiverAsUser(mWebViewUpdatedReceiver, UserHandle.ALL, userAddedFilter, null /* broadcast permission */, null /* handler */); diff --git a/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java b/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java index b1acbec329af..fe90ba952024 100644 --- a/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java +++ b/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java @@ -116,6 +116,10 @@ public class WebViewUpdateServiceImpl { } void handleNewUser(int userId) { + // The system user is always started at boot, and by that point we have already run one + // round of the package-changing logic (through prepareWebViewInSystemServer()), so early + // out here. + if (userId == UserHandle.USER_SYSTEM) return; handleUserChange(); } |