diff options
22 files changed, 72 insertions, 2 deletions
diff --git a/core/res/res/drawable-hdpi/popup_bottom_bright.9.png b/core/res/res/drawable-hdpi/popup_bottom_bright.9.png Binary files differindex eaae624a5bc3..6e5fbb5ab262 100755..100644 --- a/core/res/res/drawable-hdpi/popup_bottom_bright.9.png +++ b/core/res/res/drawable-hdpi/popup_bottom_bright.9.png diff --git a/core/res/res/drawable-hdpi/popup_bottom_dark.9.png b/core/res/res/drawable-hdpi/popup_bottom_dark.9.png Binary files differindex 442105cb2591..3434b2dc35a9 100755..100644 --- a/core/res/res/drawable-hdpi/popup_bottom_dark.9.png +++ b/core/res/res/drawable-hdpi/popup_bottom_dark.9.png diff --git a/core/res/res/drawable-hdpi/popup_bottom_medium.9.png b/core/res/res/drawable-hdpi/popup_bottom_medium.9.png Binary files differindex 26ede44aa1d2..673a5095c44a 100755..100644 --- a/core/res/res/drawable-hdpi/popup_bottom_medium.9.png +++ b/core/res/res/drawable-hdpi/popup_bottom_medium.9.png diff --git a/core/res/res/drawable-hdpi/popup_center_bright.9.png b/core/res/res/drawable-hdpi/popup_center_bright.9.png Binary files differindex e0ea9c0fabc1..c2a739c42a8d 100755..100644 --- a/core/res/res/drawable-hdpi/popup_center_bright.9.png +++ b/core/res/res/drawable-hdpi/popup_center_bright.9.png diff --git a/core/res/res/drawable-hdpi/popup_center_dark.9.png b/core/res/res/drawable-hdpi/popup_center_dark.9.png Binary files differindex ac1f92dfff88..9d2bfb155d80 100755..100644 --- a/core/res/res/drawable-hdpi/popup_center_dark.9.png +++ b/core/res/res/drawable-hdpi/popup_center_dark.9.png diff --git a/core/res/res/drawable-hdpi/popup_center_medium.9.png b/core/res/res/drawable-hdpi/popup_center_medium.9.png Binary files differindex 5129dbd6d0f0..4375bf2d6b27 100755..100644 --- a/core/res/res/drawable-hdpi/popup_center_medium.9.png +++ b/core/res/res/drawable-hdpi/popup_center_medium.9.png diff --git a/core/res/res/drawable-hdpi/popup_full_bright.9.png b/core/res/res/drawable-hdpi/popup_full_bright.9.png Binary files differindex e5b1b4632819..6b8aa9d521be 100755..100644 --- a/core/res/res/drawable-hdpi/popup_full_bright.9.png +++ b/core/res/res/drawable-hdpi/popup_full_bright.9.png diff --git a/core/res/res/drawable-hdpi/popup_full_dark.9.png b/core/res/res/drawable-hdpi/popup_full_dark.9.png Binary files differindex c28465b98274..2884abeabe18 100755..100644 --- a/core/res/res/drawable-hdpi/popup_full_dark.9.png +++ b/core/res/res/drawable-hdpi/popup_full_dark.9.png diff --git a/core/res/res/drawable-hdpi/popup_top_bright.9.png b/core/res/res/drawable-hdpi/popup_top_bright.9.png Binary files differindex 766a65869326..76c35ec9e81b 100755..100644 --- a/core/res/res/drawable-hdpi/popup_top_bright.9.png +++ b/core/res/res/drawable-hdpi/popup_top_bright.9.png diff --git a/core/res/res/drawable-hdpi/popup_top_dark.9.png b/core/res/res/drawable-hdpi/popup_top_dark.9.png Binary files differindex 31f5f3b7c30b..f3173301c22f 100755..100644 --- a/core/res/res/drawable-hdpi/popup_top_dark.9.png +++ b/core/res/res/drawable-hdpi/popup_top_dark.9.png diff --git a/core/res/res/drawable-mdpi/popup_bottom_bright.9.png b/core/res/res/drawable-mdpi/popup_bottom_bright.9.png Binary files differindex e8e203b3dcb8..e7b713dd3ec4 100644 --- a/core/res/res/drawable-mdpi/popup_bottom_bright.9.png +++ b/core/res/res/drawable-mdpi/popup_bottom_bright.9.png diff --git a/core/res/res/drawable-mdpi/popup_bottom_dark.9.png b/core/res/res/drawable-mdpi/popup_bottom_dark.9.png Binary files differindex c21f9828c789..88ce336131b4 100644 --- a/core/res/res/drawable-mdpi/popup_bottom_dark.9.png +++ b/core/res/res/drawable-mdpi/popup_bottom_dark.9.png diff --git a/core/res/res/drawable-mdpi/popup_bottom_medium.9.png b/core/res/res/drawable-mdpi/popup_bottom_medium.9.png Binary files differindex 099213577c51..e5aaad0b4839 100755..100644 --- a/core/res/res/drawable-mdpi/popup_bottom_medium.9.png +++ b/core/res/res/drawable-mdpi/popup_bottom_medium.9.png diff --git a/core/res/res/drawable-mdpi/popup_center_bright.9.png b/core/res/res/drawable-mdpi/popup_center_bright.9.png Binary files differindex c817338db553..a25935616ce2 100644 --- a/core/res/res/drawable-mdpi/popup_center_bright.9.png +++ b/core/res/res/drawable-mdpi/popup_center_bright.9.png diff --git a/core/res/res/drawable-mdpi/popup_center_dark.9.png b/core/res/res/drawable-mdpi/popup_center_dark.9.png Binary files differindex 79ffdaa87dd5..9378dbf9f113 100644 --- a/core/res/res/drawable-mdpi/popup_center_dark.9.png +++ b/core/res/res/drawable-mdpi/popup_center_dark.9.png diff --git a/core/res/res/drawable-mdpi/popup_center_medium.9.png b/core/res/res/drawable-mdpi/popup_center_medium.9.png Binary files differindex ba2e9bf747b9..885403cacdc0 100755..100644 --- a/core/res/res/drawable-mdpi/popup_center_medium.9.png +++ b/core/res/res/drawable-mdpi/popup_center_medium.9.png diff --git a/core/res/res/drawable-mdpi/popup_full_bright.9.png b/core/res/res/drawable-mdpi/popup_full_bright.9.png Binary files differindex d33ff2b90f16..d7fb3dbbea35 100644 --- a/core/res/res/drawable-mdpi/popup_full_bright.9.png +++ b/core/res/res/drawable-mdpi/popup_full_bright.9.png diff --git a/core/res/res/drawable-mdpi/popup_full_dark.9.png b/core/res/res/drawable-mdpi/popup_full_dark.9.png Binary files differindex 84ba5ca00ddb..7b9f2918acde 100644 --- a/core/res/res/drawable-mdpi/popup_full_dark.9.png +++ b/core/res/res/drawable-mdpi/popup_full_dark.9.png diff --git a/core/res/res/drawable-mdpi/popup_top_bright.9.png b/core/res/res/drawable-mdpi/popup_top_bright.9.png Binary files differindex 727a94824fd8..72d82f0003fe 100644 --- a/core/res/res/drawable-mdpi/popup_top_bright.9.png +++ b/core/res/res/drawable-mdpi/popup_top_bright.9.png diff --git a/core/res/res/drawable-mdpi/popup_top_dark.9.png b/core/res/res/drawable-mdpi/popup_top_dark.9.png Binary files differindex 2f847ad84974..616d80f91b4b 100644 --- a/core/res/res/drawable-mdpi/popup_top_dark.9.png +++ b/core/res/res/drawable-mdpi/popup_top_dark.9.png diff --git a/core/tests/coretests/src/android/net/http/CookiesTest.java b/core/tests/coretests/src/android/net/http/CookiesTest.java new file mode 100644 index 000000000000..c9eca039f2e5 --- /dev/null +++ b/core/tests/coretests/src/android/net/http/CookiesTest.java @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net.http; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.logging.Logger; +import java.util.logging.SimpleFormatter; +import java.util.logging.StreamHandler; +import junit.framework.TestCase; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.DefaultHttpClient; +import tests.http.MockResponse; +import tests.http.MockWebServer; + +public final class CookiesTest extends TestCase { + + private MockWebServer server = new MockWebServer(); + + @Override protected void tearDown() throws Exception { + server.shutdown(); + super.tearDown(); + } + + /** + * Test that we don't log potentially sensitive cookie values. + * http://b/3095990 + */ + public void testCookiesAreNotLogged() throws IOException, URISyntaxException { + // enqueue an HTTP response with a cookie that will be rejected + server.enqueue(new MockResponse() + .addHeader("Set-Cookie: password=secret; Domain=fake.domain")); + server.play(); + + ByteArrayOutputStream out = new ByteArrayOutputStream(); + Logger logger = Logger.getLogger("org.apache.http"); + StreamHandler handler = new StreamHandler(out, new SimpleFormatter()); + logger.addHandler(handler); + try { + HttpClient client = new DefaultHttpClient(); + client.execute(new HttpGet(server.getUrl("/").toURI())); + handler.close(); + + String log = out.toString("UTF-8"); + assertTrue(log, log.contains("password")); + assertTrue(log, log.contains("fake.domain")); + assertFalse(log, log.contains("secret")); + + } finally { + logger.removeHandler(handler); + } + } +} diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index e37e446d58e4..a9b39659f6b6 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -1839,8 +1839,8 @@ status_t SurfaceFlinger::electronBeamOnAnimationImplLocked() } }; - // the full animation is 24 frames - const int nbFrames = 12; + // the full animation is 12 frames + int nbFrames = 8; s_curve_interpolator itr(nbFrames, 7.5f); s_curve_interpolator itg(nbFrames, 8.0f); s_curve_interpolator itb(nbFrames, 8.5f); @@ -1858,6 +1858,7 @@ status_t SurfaceFlinger::electronBeamOnAnimationImplLocked() hw.flip(screenBounds); } + nbFrames = 4; v_stretch vverts(hw_w, hw_h); glEnable(GL_BLEND); glBlendFunc(GL_ONE, GL_ONE); |
