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

Commit 814d4300 authored by Matt Casey's avatar Matt Casey
Browse files

Remove unneeded getUserOrDefault 

User is already non-nullable.

Bug: NONE
Flag: EXEMPT trivial cleanup
Test: presubmits
Change-Id: Ic8f8a810c5f37364107e43f18364bf69acfd4703
parent b28ca285

packages/SystemUI/src/com/android/systemui/screenshot/LegacyScreenshotController.java

+1 −1
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ public class LegacyScreenshotController implements InteractiveScreenshotHandler 
    private void saveScreenshotInBackground(ScreenshotData screenshot, UUID requestId,

            Consumer<Uri> finisher, Consumer<ImageExporter.Result> onResult) {

        ListenableFuture<ImageExporter.Result> future = mImageExporter.export(mBgExecutor,

                requestId, screenshot.getBitmap(), screenshot.getUserOrDefault(),

                requestId, screenshot.getBitmap(), screenshot.getUserHandle(),

                mDisplay.getDisplayId());

        future.addListener(() -> {

            try {

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotData.kt

+0 −5
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ import android.content.ComponentName 
import android.graphics.Bitmap

import android.graphics.Insets

import android.graphics.Rect

import android.os.Process

import android.os.UserHandle

import android.view.Display

import android.view.WindowManager
@@ -30,10 +29,6 @@ data class ScreenshotData( 
    val packageNameString

        get() = topComponent?.packageName ?: ""



    fun getUserOrDefault(): UserHandle {

        return userHandle ?: Process.myUserHandle()

    }



    companion object {

        @JvmStatic

        fun fromRequest(request: ScreenshotRequest, displayId: Int = Display.DEFAULT_DISPLAY) =