diff options
| author | 2022-11-15 19:43:49 +0000 | |
|---|---|---|
| committer | 2022-11-15 19:47:41 +0000 | |
| commit | e4abcbec1dd751cbfb46ad4ea1c2d74bacc385a4 (patch) | |
| tree | 89c8e0f90492a00a73ab963e7b73ec3f18f57eec /services/contentcapture/java | |
| parent | 17b55fca1527d2c439500fa26265005c98bbe18b (diff) | |
| parent | d3c499dabc9f267a00e59a05c578083dfc82f96b (diff) | |
[conflict] Merge "Fix errorprone warnings that should be errors" am: 677d6cd780 am: f9df26ae3c am: d3c499dabc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2256563
Change-Id: I84d67fdfcc99f9f6fca218d4264ab8e0bc1f1653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'services/contentcapture/java')
| -rw-r--r-- | services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java b/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java index 0f101b08ba70..08ee6d76f284 100644 --- a/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java +++ b/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java @@ -658,7 +658,6 @@ public final class ContentCaptureManagerService extends int sessionId, int flags, @NonNull IResultReceiver result) { Objects.requireNonNull(activityToken); Objects.requireNonNull(shareableActivityToken); - Objects.requireNonNull(sessionId); final int userId = UserHandle.getCallingUserId(); final ActivityPresentationInfo activityPresentationInfo = getAmInternal() @@ -677,7 +676,6 @@ public final class ContentCaptureManagerService extends @Override public void finishSession(int sessionId) { - Objects.requireNonNull(sessionId); final int userId = UserHandle.getCallingUserId(); synchronized (mLock) { |