Merge "Fix BuildInfo.isDebuggable to support FeatureFlags with sysui-studio."

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

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();
     }
 }