diff options
| -rw-r--r-- | core/java/android/app/Activity.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index c89848e2a14f..f8ef39bef57c 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -1023,7 +1023,9 @@ public class Activity extends ContextThemeWrapper * * @return The content capture manager */ - @NonNull private ContentCaptureManager getContentCaptureManager() { + @Nullable private ContentCaptureManager getContentCaptureManager() { + // ContextCapture disabled for system apps + if (getApplicationInfo().isSystemApp()) return null; if (mContentCaptureManager == null) { mContentCaptureManager = getSystemService(ContentCaptureManager.class); } |