diff options
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | core/java/android/view/SurfaceView.java | 2 | ||||
| -rw-r--r-- | core/java/android/widget/AbsListView.java | 4 | ||||
| -rw-r--r-- | tests/net/Android.mk | 1 | ||||
| -rw-r--r-- | tests/net/java/com/android/server/ConnectivityServiceTest.java | 18 | ||||
| -rw-r--r-- | tools/hiddenapi/class2greylist/src/com/android/class2greylist/Class2Greylist.java | 2 |
6 files changed, 20 insertions, 11 deletions
diff --git a/Android.bp b/Android.bp index c6828227f347..80afd48879ad 100644 --- a/Android.bp +++ b/Android.bp @@ -1141,7 +1141,9 @@ doc_defaults { metalava_enabled: true, metalava_annotations_enabled: true, metalava_previous_api: ":public-api-for-metalava-annotations", - metalava_merge_annotations_dir: "tools/metalava/manual", + metalava_merge_annotations_dirs: [ + "tools/metalava/manual", + ], } droiddoc { diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index 462dad3fad7a..70ceb0c117fe 100644 --- a/core/java/android/view/SurfaceView.java +++ b/core/java/android/view/SurfaceView.java @@ -572,7 +572,7 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb 0.0f, 0.0f, mScreenRect.height() / (float) mSurfaceHeight); } - if (sizeChanged) { + if (sizeChanged && !creating) { mSurfaceControl.setSize(mSurfaceWidth, mSurfaceHeight); } } finally { diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 6c7455d35397..256b5c96c636 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -4328,13 +4328,14 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te translateX = 0; translateY = 0; } + mEdgeGlowTop.setSize(width, height); + mEdgeGlowBottom.setSize(width, height); if (!mEdgeGlowTop.isFinished()) { final int restoreCount = canvas.save(); canvas.clipRect(translateX, translateY, translateX + width ,translateY + mEdgeGlowTop.getMaxHeight()); final int edgeY = Math.min(0, scrollY + mFirstPositionDistanceGuess) + translateY; canvas.translate(translateX, edgeY); - mEdgeGlowTop.setSize(width, height); if (mEdgeGlowTop.draw(canvas)) { invalidateTopGlow(); } @@ -4349,7 +4350,6 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te - (clipToPadding ? mPaddingBottom : 0); canvas.translate(edgeX, edgeY); canvas.rotate(180, width, 0); - mEdgeGlowBottom.setSize(width, height); if (mEdgeGlowBottom.draw(canvas)) { invalidateBottomGlow(); } diff --git a/tests/net/Android.mk b/tests/net/Android.mk index b3a82f5d8392..6c96ebd88c8f 100644 --- a/tests/net/Android.mk +++ b/tests/net/Android.mk @@ -32,7 +32,6 @@ LOCAL_CERTIFICATE := platform # These are not normally accessible from apps so they must be explicitly included. LOCAL_JNI_SHARED_LIBRARIES := \ android.hidl.token@1.0 \ - $(UBSAN_RUNTIME_LIBRARY) \ libartbase \ libbacktrace \ libbase \ diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index 5e5ba4d15e76..ae651eccd17d 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java @@ -1463,9 +1463,11 @@ public class ConnectivityServiceTest { * received. assertNoCallback may be called at any time. */ private class TestNetworkCallback extends NetworkCallback { - // Chosen to be much less than the linger timeout. This ensures that we can distinguish + // Chosen to be less than the linger timeout. This ensures that we can distinguish // between a LOST callback that arrives immediately and a LOST callback that arrives after - // the linger timeout. + // the linger timeout. For this, our assertions should run fast enough to leave less than + // (mService.mLingerDelayMs - TIMEOUT_MS) between the time callbacks are supposedly fired, + // and the time we call expectCallback. private final static int TIMEOUT_MS = 100; private final LinkedBlockingQueue<CallbackInfo> mCallbacks = new LinkedBlockingQueue<>(); @@ -1543,9 +1545,9 @@ public class ConnectivityServiceTest { if (state == CallbackState.LOSING) { String msg = String.format( "Invalid linger time value %d, must be between %d and %d", - actual.arg, 0, TEST_LINGER_DELAY_MS); + actual.arg, 0, mService.mLingerDelayMs); int maxMsToLive = (Integer) actual.arg; - assertTrue(msg, 0 <= maxMsToLive && maxMsToLive <= TEST_LINGER_DELAY_MS); + assertTrue(msg, 0 <= maxMsToLive && maxMsToLive <= mService.mLingerDelayMs); } return actual; @@ -1767,6 +1769,12 @@ public class ConnectivityServiceTest { @Test public void testMultipleLingering() { + // This test would be flaky with the default 120ms timer: that is short enough that + // lingered networks are torn down before assertions can be run. We don't want to mock the + // lingering timer to keep the WakeupMessage logic realistic: this has already proven useful + // in detecting races. + mService.mLingerDelayMs = 300; + NetworkRequest request = new NetworkRequest.Builder() .clearCapabilities().addCapability(NET_CAPABILITY_NOT_METERED) .build(); @@ -1984,7 +1992,7 @@ public class ConnectivityServiceTest { // Let linger run its course. callback.assertNoCallback(); - final int lingerTimeoutMs = TEST_LINGER_DELAY_MS + TEST_LINGER_DELAY_MS / 4; + final int lingerTimeoutMs = mService.mLingerDelayMs + mService.mLingerDelayMs / 4; callback.expectCallback(CallbackState.LOST, mCellNetworkAgent, lingerTimeoutMs); // Register a TRACK_DEFAULT request and check that it does not affect lingering. diff --git a/tools/hiddenapi/class2greylist/src/com/android/class2greylist/Class2Greylist.java b/tools/hiddenapi/class2greylist/src/com/android/class2greylist/Class2Greylist.java index bcccf4aa18a9..008bf70a2595 100644 --- a/tools/hiddenapi/class2greylist/src/com/android/class2greylist/Class2Greylist.java +++ b/tools/hiddenapi/class2greylist/src/com/android/class2greylist/Class2Greylist.java @@ -33,7 +33,7 @@ import java.io.IOException; */ public class Class2Greylist { - private static final String ANNOTATION_TYPE = "Landroid/annotation/UsedByApps;"; + private static final String ANNOTATION_TYPE = "Landroid/annotation/UnsupportedAppUsage ;"; public static void main(String[] args) { Options options = new Options(); |