Merge "Remove unused notification pipeline flag code" into tm-qpr-dev am: 241b46e657 am: d05f2ef342
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20176971 Change-Id: If1e159db2f43e0148879fa314ffa88a5348653df Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -54,9 +54,6 @@ public class Flags {
|
||||
public static final UnreleasedFlag NSSL_DEBUG_REMOVE_ANIMATION =
|
||||
new UnreleasedFlag(106);
|
||||
|
||||
public static final UnreleasedFlag NEW_PIPELINE_CRASH_ON_CALL_TO_OLD_PIPELINE =
|
||||
new UnreleasedFlag(107);
|
||||
|
||||
public static final ResourceBooleanFlag NOTIFICATION_DRAG_TO_CONTENTS =
|
||||
new ResourceBooleanFlag(108, R.bool.config_notificationToContents);
|
||||
|
||||
|
||||
@@ -17,30 +17,14 @@
|
||||
package com.android.systemui.statusbar.notification
|
||||
|
||||
import android.content.Context
|
||||
import android.util.Log
|
||||
import android.widget.Toast
|
||||
import com.android.systemui.flags.FeatureFlags
|
||||
import com.android.systemui.flags.Flags
|
||||
import com.android.systemui.util.Compile
|
||||
import javax.inject.Inject
|
||||
|
||||
class NotifPipelineFlags @Inject constructor(
|
||||
val context: Context,
|
||||
val featureFlags: FeatureFlags
|
||||
) {
|
||||
fun checkLegacyPipelineEnabled(): Boolean {
|
||||
if (Compile.IS_DEBUG) {
|
||||
Toast.makeText(context, "Old pipeline code running!", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
if (featureFlags.isEnabled(Flags.NEW_PIPELINE_CRASH_ON_CALL_TO_OLD_PIPELINE)) {
|
||||
throw RuntimeException("Old pipeline code running with new pipeline enabled")
|
||||
} else {
|
||||
Log.d("NotifPipeline", "Old pipeline code running with new pipeline enabled",
|
||||
Exception())
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
fun isDevLoggingEnabled(): Boolean =
|
||||
featureFlags.isEnabled(Flags.NOTIFICATION_PIPELINE_DEVELOPER_LOGGING)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user