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

Commit 022bcda2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Change log tag of DynamicSystemClient to match class name" am:... 

Merge "Change log tag of DynamicSystemClient to match class name" am: 916dfddf am: 198e4b4c am: b7042224

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537885

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I218799056e3b1c85505a6201b9275234648bc07c
parents 4a56cdb8 b7042224

core/java/android/os/image/DynamicSystemClient.java

+4 −4
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ import java.util.concurrent.Executor; 
 */

@SystemApi

public class DynamicSystemClient {

    private static final String TAG = "DynamicSystemClient";



    /** @hide */

    @IntDef(prefix = { "STATUS_" }, value = {

            STATUS_UNKNOWN,
@@ -92,8 +94,6 @@ public class DynamicSystemClient { 
    @Retention(RetentionPolicy.SOURCE)

    public @interface StatusChangedCause {}



    private static final String TAG = "DynSystemClient";



    /** Listener for installation status updates. */

    public interface OnStatusChangedListener {

        /**
@@ -240,7 +240,7 @@ public class DynamicSystemClient { 


    private class DynSystemServiceConnection implements ServiceConnection {

        public void onServiceConnected(ComponentName className, IBinder service) {

            Slog.v(TAG, "DynSystemService connected");

            Slog.v(TAG, "onServiceConnected: " + className);



            mService = new Messenger(service);
@@ -262,7 +262,7 @@ public class DynamicSystemClient { 
        }



        public void onServiceDisconnected(ComponentName className) {

            Slog.v(TAG, "DynSystemService disconnected");

            Slog.v(TAG, "onServiceDisconnected: " + className);

            mService = null;

        }

    }

packages/DynamicSystemInstallationService/src/com/android/dynsystem/DynamicSystemInstallationService.java

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ import java.util.ArrayList; 
public class DynamicSystemInstallationService extends Service

        implements InstallationAsyncTask.ProgressListener {



    private static final String TAG = "DynSystemInstallationService";

    private static final String TAG = "DynamicSystemInstallationService";



    // TODO (b/131866826): This is currently for test only. Will move this to System API.

    static final String KEY_ENABLE_WHEN_COMPLETED = "KEY_ENABLE_WHEN_COMPLETED";