Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b87d1b3 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "rename incremental service name" into rvc-dev am: df5dff04 

Change-Id: I57c73d3d166d584eface22e8c659d20b9dad287c
parents 4f4ea785 df5dff04

core/java/android/content/Context.java

+1 −1
Original line number Diff line number Diff line
@@ -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

services/incremental/BinderIncrementalService.h

+1 −1
Original line number Diff line number Diff line
@@ -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();