From 29266c9ebe3ce7bdefe74dbe0ec397d0051a96fa Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Thu, 9 Jul 2020 12:21:40 -0700 Subject: [PATCH] Updating some comments and variables Change-Id: Ib3223c66e9ce187cebc6ce26a46b228f95787778 --- .../src/com/android/quickstep/TouchInteractionService.java | 4 ++-- .../src/com/android/quickstep/views/LauncherRecentsView.java | 2 +- src/com/android/launcher3/BaseDraggingActivity.java | 2 +- .../android/launcher3/graphics/LauncherPreviewRenderer.java | 4 ++-- .../android/launcher3/util/MainThreadInitializedObject.java | 2 +- src/com/android/launcher3/util/TraceHelper.java | 2 +- src/com/android/launcher3/views/BaseDragLayer.java | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java index 6e0b517b25..601f87f65e 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java @@ -547,7 +547,7 @@ public class TouchInteractionService extends Service implements PluginListener mAM.getRunningTask(false /* filterOnlyVisibleRecents */))); } return gestureState; @@ -660,7 +660,7 @@ public class TouchInteractionService extends Service implements PluginListener mAM.getRunningTask(true /* filterOnlyVisibleRecents */))); ComponentName homeComponent = mOverviewComponentObserver.getHomeIntent().getComponent(); ComponentName runningComponent = diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java index 846b94463f..79028d1cc2 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java @@ -189,7 +189,7 @@ public class LauncherRecentsView extends RecentsView @Override public boolean shouldUseMultiWindowTaskSizeStrategy() { - return TraceHelper.whitelistIpcs("isInMultiWindowMode", mActivity::isInMultiWindowMode); + return TraceHelper.allowIpcs("isInMultiWindowMode", mActivity::isInMultiWindowMode); } @Override diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java index 9cb8cf2c51..f2a5c656ff 100644 --- a/src/com/android/launcher3/BaseDraggingActivity.java +++ b/src/com/android/launcher3/BaseDraggingActivity.java @@ -82,7 +82,7 @@ public abstract class BaseDraggingActivity extends BaseActivity super.onCreate(savedInstanceState); - mIsSafeModeEnabled = TraceHelper.whitelistIpcs("isSafeMode", + mIsSafeModeEnabled = TraceHelper.allowIpcs("isSafeMode", () -> getPackageManager().isSafeMode()); DefaultDisplay.INSTANCE.get(this).addChangeListener(this); diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java index 885fb6698b..5dd05db16e 100644 --- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java +++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java @@ -123,7 +123,7 @@ public class LauncherPreviewRenderer { */ public static class PreviewContext extends ContextWrapper { - private static final Set WHITELIST = new HashSet<>( + private final Set mAllowedObjects = new HashSet<>( Arrays.asList(UserCache.INSTANCE, InstallSessionHelper.INSTANCE, LauncherAppState.INSTANCE, InvariantDeviceProfile.INSTANCE, CustomWidgetManager.INSTANCE, PluginManagerWrapper.INSTANCE)); @@ -157,7 +157,7 @@ public class LauncherPreviewRenderer { */ public T getObject(MainThreadInitializedObject mainThreadInitializedObject, MainThreadInitializedObject.ObjectProvider provider) { - if (!WHITELIST.contains(mainThreadInitializedObject)) { + if (!mAllowedObjects.contains(mainThreadInitializedObject)) { throw new IllegalStateException("Leaking unknown objects"); } if (mainThreadInitializedObject == LauncherAppState.INSTANCE) { diff --git a/src/com/android/launcher3/util/MainThreadInitializedObject.java b/src/com/android/launcher3/util/MainThreadInitializedObject.java index fc9f8f7ec4..f6003dd7bf 100644 --- a/src/com/android/launcher3/util/MainThreadInitializedObject.java +++ b/src/com/android/launcher3/util/MainThreadInitializedObject.java @@ -46,7 +46,7 @@ public class MainThreadInitializedObject { if (mValue == null) { if (Looper.myLooper() == Looper.getMainLooper()) { - mValue = TraceHelper.whitelistIpcs("main.thread.object", + mValue = TraceHelper.allowIpcs("main.thread.object", () -> mProvider.get(context.getApplicationContext())); } else { try { diff --git a/src/com/android/launcher3/util/TraceHelper.java b/src/com/android/launcher3/util/TraceHelper.java index 168227db6e..c23df77db1 100644 --- a/src/com/android/launcher3/util/TraceHelper.java +++ b/src/com/android/launcher3/util/TraceHelper.java @@ -78,7 +78,7 @@ public class TraceHelper { * Temporarily ignore blocking binder calls for the duration of this {@link Supplier}. */ @MainThread - public static T whitelistIpcs(String rpcName, Supplier supplier) { + public static T allowIpcs(String rpcName, Supplier supplier) { Object traceToken = INSTANCE.beginSection(rpcName, FLAG_IGNORE_BINDERS); try { return supplier.get(); diff --git a/src/com/android/launcher3/views/BaseDragLayer.java b/src/com/android/launcher3/views/BaseDragLayer.java index b010b4b94b..357eeb81f9 100644 --- a/src/com/android/launcher3/views/BaseDragLayer.java +++ b/src/com/android/launcher3/views/BaseDragLayer.java @@ -602,13 +602,13 @@ public abstract class BaseDragLayer */ private boolean computeAllowSysuiScrims(@Nullable WallpaperInfo newWallpaperInfo) { if (newWallpaperInfo == null) { - // New wallpaper is static, not live. Thus, blacklist isn't applicable. + // Static wallpapers need scrim unless determined otherwise by wallpaperColors. return true; } ComponentName newWallpaper = newWallpaperInfo.getComponent(); for (String wallpaperWithoutScrim : mWallpapersWithoutSysuiScrims) { if (newWallpaper.equals(ComponentName.unflattenFromString(wallpaperWithoutScrim))) { - // New wallpaper is blacklisted from showing a scrim. + // New wallpaper does not need a scrim. return false; } }