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

Commit 86726b14 authored by Michael Wright's avatar Michael Wright
Browse files

Add nullness annotations to Binder shell command callbacks. 

Because Binder annotates them, the IDE complains if the subclass doesn't
as well. Go ahead and annotate them just to quiet it.

Bug: 342006701
Test: Compile
Change-Id: Idbd10c0015938485b1a37959f0b5086cc0e1c380
parent b38e9292

services/core/java/com/android/server/display/DisplayManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -4147,7 +4147,7 @@ public final class DisplayManagerService extends SystemService { 
        }



        @Override // Binder call

        public void dump(FileDescriptor fd, final PrintWriter pw, String[] args) {

        public void dump(@NonNull FileDescriptor fd, @NonNull final PrintWriter pw, String[] args) {

            if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return;



            final long token = Binder.clearCallingIdentity();
@@ -4423,8 +4423,8 @@ public final class DisplayManagerService extends SystemService { 


        @Override // Binder call

        public void onShellCommand(FileDescriptor in, FileDescriptor out,

                FileDescriptor err, String[] args, ShellCallback callback,

                ResultReceiver resultReceiver) {

                FileDescriptor err, @NonNull String[] args, ShellCallback callback,

                @NonNull ResultReceiver resultReceiver) {

            new DisplayManagerShellCommand(DisplayManagerService.this, mFlags).exec(this, in, out,

                    err, args, callback, resultReceiver);

        }