From d1c62a4e8958fa3dac3c51d3ab1c118feef81f93 Mon Sep 17 00:00:00 2001
From: Songchun Fan <schfan@google.com>
Date: Thu, 5 Mar 2020 09:16:08 -0800
Subject: [PATCH] rename incremental service name

Previously we had to use "incremental_service" because the proxy service
was using "incremental". Now that we have removed the proxy service, we
can just use "incremental".

Test: adb shell dumpsys incremental
Test: atest PackageManagerShellCommandIncrementalTest
BUG: 150406132
Change-Id: I0788cb90bf73b074506f9079253c433429eef782
---
 core/java/android/content/Context.java          | 2 +-
 services/incremental/BinderIncrementalService.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index a8f7610ecaf0c..33d7b9785ac0c 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -5138,7 +5138,7 @@ public abstract class Context {
      * {@link android.os.incremental.IncrementalManager}.
      * @hide
      */
-    public static final String INCREMENTAL_SERVICE = "incremental_service";
+    public static final String INCREMENTAL_SERVICE = "incremental";
 
     /**
      * Use with {@link #getSystemService(String)} to retrieve an
diff --git a/services/incremental/BinderIncrementalService.h b/services/incremental/BinderIncrementalService.h
index 4075da6d81599..28613e101b7c1 100644
--- a/services/incremental/BinderIncrementalService.h
+++ b/services/incremental/BinderIncrementalService.h
@@ -31,7 +31,7 @@ public:
     BinderIncrementalService(const sp<IServiceManager>& sm);
 
     static BinderIncrementalService* start();
-    static const char16_t* getServiceName() { return u"incremental_service"; }
+    static const char16_t* getServiceName() { return u"incremental"; }
     status_t dump(int fd, const Vector<String16>& args) final;
 
     void onSystemReady();