Merge "Revert "Enable Sharesheet ranking using PeopleService by default to test in Droidfood"" into rvc-dev am: d48a06e6d9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844206

Change-Id: If7e7065a3439b5122dec4c2ef87a73da56ec64f0
This commit is contained in:
TreeHugger Robot
2020-06-12 01:53:29 +00:00
committed by Automerger Merge Worker

View File

@@ -51,7 +51,7 @@ import java.util.function.Consumer;
*/
public class AppPredictionPerUserService extends
AbstractPerUserSystemService<AppPredictionPerUserService, AppPredictionManagerService>
implements RemoteAppPredictionService.RemoteAppPredictionServiceCallbacks {
implements RemoteAppPredictionService.RemoteAppPredictionServiceCallbacks {
private static final String TAG = AppPredictionPerUserService.class.getSimpleName();
private static final String PREDICT_USING_PEOPLE_SERVICE_PREFIX =
@@ -114,11 +114,8 @@ public class AppPredictionPerUserService extends
public void onCreatePredictionSessionLocked(@NonNull AppPredictionContext context,
@NonNull AppPredictionSessionId sessionId) {
if (!mSessionInfos.containsKey(sessionId)) {
// TODO(b/157500121): remove below forceUsingPeopleService logic after testing
// PeopleService for 2 weeks on Droidfood.
final boolean forceUsingPeopleService = context.getUiSurface().equals("share");
mSessionInfos.put(sessionId, new AppPredictionSessionInfo(sessionId, context,
forceUsingPeopleService || DeviceConfig.getBoolean(NAMESPACE_SYSTEMUI,
DeviceConfig.getBoolean(NAMESPACE_SYSTEMUI,
PREDICT_USING_PEOPLE_SERVICE_PREFIX + context.getUiSurface(), false),
this::removeAppPredictionSessionInfo));
}