From f4ad622cc8660c4919f57b3f5ced1e2546c9f1b9 Mon Sep 17 00:00:00 2001 From: Jeff DeCew Date: Fri, 20 Aug 2021 15:09:49 -0400 Subject: [PATCH] Fix BuildInfo.isDebuggable to support FeatureFlags with sysui-studio. Also explicitly log whether the new pipeline rendering is enabled or not. Fixes: 197343061 Test: manual Change-Id: I2345d367b9a06c9e7a59c1d34d9b38394aad0f3c --- .../collection/init/NotifPipelineInitializer.java | 3 ++- .../src/com/android/systemui/util/wrapper/BuildInfo.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/init/NotifPipelineInitializer.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/init/NotifPipelineInitializer.java index db49e4476a991..585d8c88f889d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/init/NotifPipelineInitializer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/init/NotifPipelineInitializer.java @@ -100,7 +100,8 @@ public class NotifPipelineInitializer implements Dumpable { mNotifCollection.attach(mGroupCoalescer); mGroupCoalescer.attach(notificationService); - Log.d(TAG, "Notif pipeline initialized"); + Log.d(TAG, "Notif pipeline initialized." + + " rendering=" + mFeatureFlags.isNewNotifPipelineRenderingEnabled()); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/util/wrapper/BuildInfo.java b/packages/SystemUI/src/com/android/systemui/util/wrapper/BuildInfo.java index 5e68a15f8ec77..d91a14083472c 100644 --- a/packages/SystemUI/src/com/android/systemui/util/wrapper/BuildInfo.java +++ b/packages/SystemUI/src/com/android/systemui/util/wrapper/BuildInfo.java @@ -32,6 +32,8 @@ public class BuildInfo { /** @see Build#IS_DEBUGGABLE */ public boolean isDebuggable() { - return Build.IS_DEBUGGABLE; + // Build.IS_DEBUGGABLE is inlined by the gradle build, causing this to incorrectly + // return false when using sysui-studio. + return Build.isDebuggable(); } }