Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "rename incremental service name" into rvc-dev am: df5dff04db am: 4e4eecba69

Browse Source 
Change-Id: I6f58ef373327f34cf79716b91217a7af699c1132
This commit is contained in:
Automerger Merge Worker
2020-03-09 14:18:03 +00:00
parent d2935f0f5d 4e4eecba69
commit 27b07bb786
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/Context.java
View File

@@ -5128,7 +5128,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

2
services/incremental/BinderIncrementalService.h
View File

@@ -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();