summaryrefslogtreecommitdiff
path: root/services/appprediction
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-06-12 01:31:53 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-12 01:31:53 +0000
commitd48a06e6d996fad6401637dc1786ad9db9d8c297 (patch)
tree2ed6594848727f9ac3249144a5733c47b2faf9db /services/appprediction
parent7f572a5a76cc6b182bbbd0e414b352dc88358b7a (diff)
parent80c1856cf6ddaef8b27f9fd48155d8f796c49c37 (diff)
Merge "Revert "Enable Sharesheet ranking using PeopleService by default to test in Droidfood"" into rvc-dev
Diffstat (limited to 'services/appprediction')
-rw-r--r--services/appprediction/java/com/android/server/appprediction/AppPredictionPerUserService.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/services/appprediction/java/com/android/server/appprediction/AppPredictionPerUserService.java b/services/appprediction/java/com/android/server/appprediction/AppPredictionPerUserService.java
index 26e85beba58b..103151dcdda5 100644
--- a/services/appprediction/java/com/android/server/appprediction/AppPredictionPerUserService.java
+++ b/services/appprediction/java/com/android/server/appprediction/AppPredictionPerUserService.java
@@ -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));
}