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

Commit 48b846ee authored by Pablo Gamito's avatar Pablo Gamito Committed by Android (Google) Code Review
Browse files

Merge changes from topic "move-protlog-out-of-common" into main 

* changes:
  Update protolog-class used by protolog tool in build rules
  Move ProtoLog class out of common
parents 0b8d6213 f89a94dd

core/java/com/android/internal/protolog/common/ProtoLog.java→core/java/com/android/internal/protolog/ProtoLog.java

+5 −1
Original line number Diff line number Diff line
@@ -14,7 +14,11 @@ 
 * limitations under the License.

 */



package com.android.internal.protolog.common;

package com.android.internal.protolog;



import com.android.internal.protolog.common.IProtoLog;

import com.android.internal.protolog.common.IProtoLogGroup;

import com.android.internal.protolog.common.LogLevel;



/**

 * ProtoLog API - exposes static logging methods. Usage of this API is similar

libs/WindowManager/Shell/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ genrule { 
    ],

    tools: ["protologtool"],

    cmd: "$(location protologtool) transform-protolog-calls " +

        "--protolog-class com.android.internal.protolog.common.ProtoLog " +

        "--protolog-class com.android.internal.protolog.ProtoLog " +

        "--loggroups-class com.android.wm.shell.protolog.ShellProtoLogGroup " +

        "--loggroups-jar $(location :wm_shell_protolog-groups) " +

        "--viewer-config-file-path /system_ext/etc/wmshell.protolog.pb " +
@@ -107,7 +107,7 @@ genrule { 
    ],

    tools: ["protologtool"],

    cmd: "$(location protologtool) generate-viewer-config " +

        "--protolog-class com.android.internal.protolog.common.ProtoLog " +

        "--protolog-class com.android.internal.protolog.ProtoLog " +

        "--loggroups-class com.android.wm.shell.protolog.ShellProtoLogGroup " +

        "--loggroups-jar $(location :wm_shell_protolog-groups) " +

        "--viewer-config-type json " +
@@ -124,7 +124,7 @@ genrule { 
    ],

    tools: ["protologtool"],

    cmd: "$(location protologtool) generate-viewer-config " +

        "--protolog-class com.android.internal.protolog.common.ProtoLog " +

        "--protolog-class com.android.internal.protolog.ProtoLog " +

        "--loggroups-class com.android.wm.shell.protolog.ShellProtoLogGroup " +

        "--loggroups-jar $(location :wm_shell_protolog-groups) " +

        "--viewer-config-type proto " +

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubblePositionerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import android.view.WindowManager 
import androidx.test.core.app.ApplicationProvider

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.internal.protolog.common.ProtoLog

import com.android.internal.protolog.ProtoLog

import com.android.wm.shell.R

import com.android.wm.shell.bubbles.BubblePositioner.MAX_HEIGHT

import com.android.wm.shell.common.bubbles.BubbleBarLocation

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleStackViewTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 
import androidx.test.filters.SmallTest

import androidx.test.platform.app.InstrumentationRegistry

import com.android.internal.logging.testing.UiEventLoggerFake

import com.android.internal.protolog.common.ProtoLog

import com.android.internal.protolog.ProtoLog

import com.android.launcher3.icons.BubbleIconFactory

import com.android.wm.shell.Flags

import com.android.wm.shell.R

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/bar/BubbleExpandedViewPinControllerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import androidx.test.core.app.ApplicationProvider 
import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation

import com.android.internal.protolog.common.ProtoLog

import com.android.internal.protolog.ProtoLog

import com.android.wm.shell.R

import com.android.wm.shell.bubbles.BubblePositioner

import com.android.wm.shell.bubbles.DeviceConfig