commit aefc7c81cb5b7392b75f72af965b0323fdd53076
author thiruram <thiruram@google.com> Fri Feb 19 02:56:51 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 19 02:56:51 2021 +0000
tree 6d40191b36e3a991f7f8139b8fc7bd80bd2f1eca
parent 67a3f2a0e061de9a0b2cc40b8a8b2a9e78b45519
parent 4c45d5f1eb7afe1be6d1529fc6f45ee37839f887

Replace Optional.ifPresent with simple if clause. am: 4c45d5f1eb

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13618747

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b8034c1b2b670c4dcce1d408f4f8d4ff2d9d48e

src/com/android/launcher3/logging/StatsLogManager.java

diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index 1266bb4..0802f8a 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -31,8 +31,6 @@
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.util.ResourceBasedOverride;
 
-import java.util.Optional;
-
 /**
  * Handles the user event logging in R+.
  *
@@ -486,7 +484,9 @@
      */
     public StatsLogger logger() {
         StatsLogger logger = createLogger();
-        Optional.ofNullable(mInstanceId).ifPresent(logger::withInstanceId);
+        if (mInstanceId != null) {
+            return logger.withInstanceId(mInstanceId);
+        }
         return logger;
     }