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

Commit 29471149 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Merge "rename incremental service name" into rvc-dev am: df5dff04 am: 7b87d1b3 am: dc0bd58e am: f04baf48

Change-Id: I65a9194a9946e4ac36358511388564d31727778f
parents 6b1a06e6 f04baf48

core/java/android/content/Context.java

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

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