Show Toast with location of trace when trace is disabled

- Rename Layer Trace development tile to Surface Flinger Trace

Bug: 64831661
Test: Manually toggle trace
Test: make RunSettingsRoboTests ROBOTEST_FILTER=LayerTraceTest && make RunSettingsRoboTests ROBOTEST_FILTER=WindowTraceTest
Change-Id: I438efca251688774f0d6f29ba93d02d116f1e574
This commit is contained in:
Vishnu Nair
2018-01-16 16:00:03 -08:00
parent d6b0490dea
commit 45603a1524
4 changed files with 36 additions and 5 deletions

View File

@@ -8732,7 +8732,7 @@
<string name="window_trace_quick_settings_title">Window Trace</string> <string name="window_trace_quick_settings_title">Window Trace</string>
<!-- [CHAR LIMIT=25] Title of developer tile to toggle layer trace --> <!-- [CHAR LIMIT=25] Title of developer tile to toggle layer trace -->
<string name="layer_trace_quick_settings_title">Layer Trace</string> <string name="layer_trace_quick_settings_title">Surface Trace</string>
<!-- [CHAR LIMIT=60] Title of work profile setting page --> <!-- [CHAR LIMIT=60] Title of work profile setting page -->
<string name="managed_profile_settings_title">Work profile settings</string> <string name="managed_profile_settings_title">Work profile settings</string>

View File

@@ -16,6 +16,7 @@
package com.android.settings.development.qstile; package com.android.settings.development.qstile;
import android.content.Context;
import android.os.IBinder; import android.os.IBinder;
import android.os.Parcel; import android.os.Parcel;
import android.os.RemoteException; import android.os.RemoteException;
@@ -30,6 +31,7 @@ import android.view.IWindowManager;
import android.view.ThreadedRenderer; import android.view.ThreadedRenderer;
import android.view.View; import android.view.View;
import android.view.WindowManagerGlobal; import android.view.WindowManagerGlobal;
import android.widget.Toast;
import com.android.internal.app.LocalePicker; import com.android.internal.app.LocalePicker;
import com.android.settings.wrapper.IWindowManagerWrapper; import com.android.settings.wrapper.IWindowManagerWrapper;
@@ -145,12 +147,17 @@ public abstract class DevelopmentTiles extends TileService {
public static class WindowTrace extends DevelopmentTiles { public static class WindowTrace extends DevelopmentTiles {
@VisibleForTesting @VisibleForTesting
IWindowManagerWrapper mWindowManager; IWindowManagerWrapper mWindowManager;
@VisibleForTesting
Toast mToast;
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
mWindowManager = new IWindowManagerWrapper(WindowManagerGlobal mWindowManager = new IWindowManagerWrapper(WindowManagerGlobal
.getWindowManagerService()); .getWindowManagerService());
Context context = getApplicationContext();
CharSequence text = "Trace written to /data/misc/wmtrace/wm_trace.pb";
mToast = Toast.makeText(context, text, Toast.LENGTH_LONG);
} }
@Override @Override
@@ -171,6 +178,7 @@ public abstract class DevelopmentTiles extends TileService {
mWindowManager.startWindowTrace(); mWindowManager.startWindowTrace();
} else { } else {
mWindowManager.stopWindowTrace(); mWindowManager.stopWindowTrace();
mToast.show();
} }
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Could not set window trace status." + e.toString()); Log.e(TAG, "Could not set window trace status." + e.toString());
@@ -188,11 +196,16 @@ public abstract class DevelopmentTiles extends TileService {
static final int SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE = 1026; static final int SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE = 1026;
@VisibleForTesting @VisibleForTesting
IBinder mSurfaceFlinger; IBinder mSurfaceFlinger;
@VisibleForTesting
Toast mToast;
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
mSurfaceFlinger = ServiceManager.getService("SurfaceFlinger"); mSurfaceFlinger = ServiceManager.getService("SurfaceFlinger");
Context context = getApplicationContext();
CharSequence text = "Trace written to /data/misc/wmtrace/layers_trace.pb";
mToast = Toast.makeText(context, text, Toast.LENGTH_LONG);
} }
@Override @Override
@@ -230,6 +243,9 @@ public abstract class DevelopmentTiles extends TileService {
data.writeInt(isEnabled ? 1 : 0); data.writeInt(isEnabled ? 1 : 0);
mSurfaceFlinger.transact(SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE, mSurfaceFlinger.transact(SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE,
data, null, 0 /* flags */); data, null, 0 /* flags */);
if (!isEnabled){
mToast.show();
}
} }
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Could not set layer tracing." + e.toString()); Log.e(TAG, "Could not set layer tracing." + e.toString());

View File

@@ -33,6 +33,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
import android.os.IBinder; import android.os.IBinder;
import android.os.RemoteException; import android.os.RemoteException;
import android.widget.Toast;
import com.android.settings.TestConfig; import com.android.settings.TestConfig;
import com.android.settings.testutils.shadow.ShadowParcel; import com.android.settings.testutils.shadow.ShadowParcel;
@@ -52,6 +53,8 @@ import org.robolectric.util.ReflectionHelpers;
public class LayerTraceTest { public class LayerTraceTest {
@Mock @Mock
private IBinder mSurfaceFlinger; private IBinder mSurfaceFlinger;
@Mock
private Toast mToast;
private DevelopmentTiles.LayerTrace mLayerTraceTile; private DevelopmentTiles.LayerTrace mLayerTraceTile;
@@ -59,13 +62,14 @@ public class LayerTraceTest {
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mLayerTraceTile = spy(new DevelopmentTiles.LayerTrace()); mLayerTraceTile = spy(new DevelopmentTiles.LayerTrace());
mLayerTraceTile.onCreate();
ReflectionHelpers.setField(mLayerTraceTile, "mSurfaceFlinger", mSurfaceFlinger); ReflectionHelpers.setField(mLayerTraceTile, "mSurfaceFlinger", mSurfaceFlinger);
ReflectionHelpers.setField(mLayerTraceTile, "mToast", mToast);
} }
@After @After
public void after() { public void after() {
verifyNoMoreInteractions(mSurfaceFlinger); verifyNoMoreInteractions(mSurfaceFlinger);
verifyNoMoreInteractions(mToast);
} }
@Test @Test
@@ -106,12 +110,13 @@ public class LayerTraceTest {
@Test @Test
@Config(shadows = {ShadowParcel.class}) @Config(shadows = {ShadowParcel.class})
public void setIsEnableFalse_shouldDisableLayerTrace() throws RemoteException { public void setIsEnableFalse_shouldDisableLayerTraceAndShowToast() throws RemoteException {
mLayerTraceTile.setIsEnabled(false); mLayerTraceTile.setIsEnabled(false);
assertThat(ShadowParcel.sWriteIntResult).isEqualTo(0); assertThat(ShadowParcel.sWriteIntResult).isEqualTo(0);
verify(mSurfaceFlinger) verify(mSurfaceFlinger)
.transact(eq(SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE), any(), isNull(), .transact(eq(SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE), any(), isNull(),
eq(0 /* flags */)); eq(0 /* flags */));
verify(mToast).show();
} }
@Test @Test

View File

@@ -25,12 +25,14 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions;
import android.os.RemoteException; import android.os.RemoteException;
import android.widget.Toast;
import com.android.settings.TestConfig; import com.android.settings.TestConfig;
import com.android.settings.testutils.shadow.ShadowParcel; import com.android.settings.testutils.shadow.ShadowParcel;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.IWindowManagerWrapper; import com.android.settings.wrapper.IWindowManagerWrapper;
import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -44,6 +46,8 @@ import org.robolectric.util.ReflectionHelpers;
public class WindowTraceTest { public class WindowTraceTest {
@Mock @Mock
private IWindowManagerWrapper mWindowManager; private IWindowManagerWrapper mWindowManager;
@Mock
private Toast mToast;
private DevelopmentTiles.WindowTrace mWindowTrace; private DevelopmentTiles.WindowTrace mWindowTrace;
@@ -51,8 +55,13 @@ public class WindowTraceTest {
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mWindowTrace = spy(new DevelopmentTiles.WindowTrace()); mWindowTrace = spy(new DevelopmentTiles.WindowTrace());
mWindowTrace.onCreate();
ReflectionHelpers.setField(mWindowTrace, "mWindowManager", mWindowManager); ReflectionHelpers.setField(mWindowTrace, "mWindowManager", mWindowManager);
ReflectionHelpers.setField(mWindowTrace, "mToast", mToast);
}
@After
public void teardown() {
verifyNoMoreInteractions(mToast);
} }
@Test @Test
@@ -83,9 +92,10 @@ public class WindowTraceTest {
@Test @Test
@Config(shadows = {ShadowParcel.class}) @Config(shadows = {ShadowParcel.class})
public void setIsEnableFalse_shouldDisableWindowTrace() throws RemoteException { public void setIsEnableFalse_shouldDisableWindowTraceAndShowToast() throws RemoteException {
mWindowTrace.setIsEnabled(false); mWindowTrace.setIsEnabled(false);
verify(mWindowManager).stopWindowTrace(); verify(mWindowManager).stopWindowTrace();
verify(mToast).show();
verifyNoMoreInteractions(mWindowManager); verifyNoMoreInteractions(mWindowManager);
} }