Format for the list of changes shows the origin commit reference followed by the file name. 33931-p9 awt/org/apache/harmony/awt/gl/font/AndroidGlyphVector.java 33931-p9 awt/org/apache/harmony/awt/gl/image/PngDecoderJava.java 133776-p9 core/java/android/app/IntentService.java 127013-p9 core/java/android/appwidget/AppWidgetHost.java 27863-p9 core/java/android/bluetooth/BluetoothAudioGateway.java 60765-p9 core/java/android/content/SyncResult.java 43920-p9 core/java/android/content/pm/ActivityInfo.java 43920-p9 core/java/android/content/pm/ApplicationInfo.java 43920-p9 core/java/android/content/pm/InstrumentationInfo.java 43920-p9 core/java/android/content/pm/PackageInfo.java 44103-p9 core/java/android/content/pm/PackageItemInfo.java 68960-p9 core/java/android/content/pm/PackageStats.java 43920-p9 core/java/android/content/pm/ResolveInfo.java 43920-p9 core/java/android/content/pm/ServiceInfo.java 60641-p9 core/java/android/content/res/Configuration.java 60734-p9 core/java/android/content/res/TypedArray.java 137672-p9 core/java/android/inputmethodservice/ExtractButton.java 123112-p9 core/java/android/inputmethodservice/ExtractEditText.java 119291-p9 core/java/android/inputmethodservice/IInputMethodSessionWrapper.java 112946-p9 core/java/android/inputmethodservice/IInputMethodWrapper.java 115078-p9 core/java/android/os/BatteryStats.java 124790-p9 core/java/android/text/style/UpdateAppearance.java 45083-p9 core/java/android/view/RawInputEvent.java 101491-p9 core/java/android/view/inputmethod/EditorInfo.java 114701-p9 core/java/android/view/inputmethod/ExtractedText.java 123112-p9 core/java/android/view/inputmethod/ExtractedTextRequest.java 119291-p9 core/java/com/android/internal/os/HandlerCaller.java 129279-p9 core/java/com/android/internal/os/PkgUsageStats.java 114701-p9 core/java/com/android/internal/view/IInputConnectionWrapper.java 114701-p9 core/java/com/android/internal/view/InputConnectionWrapper.java 84364-p9 opengl/java/android/opengl/EGLLogWrapper.java 11355-p9 opengl/tools/glgen/src/CFunc.java 11355-p9 opengl/tools/glgen/src/CType.java 11355-p9 opengl/tools/glgen/src/CodeEmitter.java 11355-p9 opengl/tools/glgen/src/GenerateGL.java 11355-p9 opengl/tools/glgen/src/JFunc.java 11355-p9 opengl/tools/glgen/src/JType.java 11355-p9 opengl/tools/glgen/src/JniCodeEmitter.java 11355-p9 opengl/tools/glgen/src/ParameterChecker.java 57236-p9 services/java/com/android/server/status/AnimatedImageView.java 66754-p9 services/java/com/android/server/status/CloseDragHandle.java 57188-p9 services/java/com/android/server/status/DateView.java 46928-p9 services/java/com/android/server/status/ExpandedView.java 70590-p9 services/java/com/android/server/status/FixedSizeDrawable.java 45968-p9 services/java/com/android/server/status/IconData.java 57470-p9 services/java/com/android/server/status/IconMerger.java 82719-p9 services/java/com/android/server/status/LatestItemView.java 45968-p9 services/java/com/android/server/status/NotificationData.java 66754-p9 services/java/com/android/server/status/NotificationLinearLayout.java 57458-p9 services/java/com/android/server/status/NotificationViewList.java 45968-p9 services/java/com/android/server/status/StatusBarException.java 45968-p9 services/java/com/android/server/status/StatusBarIcon.java 46130-p9 services/java/com/android/server/status/StatusBarNotification.java 45968-p9 services/java/com/android/server/status/StatusBarView.java 46199-p9 services/java/com/android/server/status/Ticker.java 62286-p9 services/java/com/android/server/status/TickerView.java 57188-p9 services/java/com/android/server/status/TrackingView.java 86041-p9 telephony/java/android/telephony/PhoneStateListener.java 87020-p9 telephony/java/com/android/internal/telephony/TelephonyIntents.java 136269-p9 telephony/java/com/android/internal/telephony/gsm/SpnOverride.java 34409-p9 tests/FrameworkTest/src/com/android/frameworktest/FrameworkTestApplication.java 55717-p9 tests/FrameworkTest/src/com/android/frameworktest/performance/InvalidateCycle.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityLandscape.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityPortrait.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollablePanScan.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollableResize.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollablePanScan.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollableResize.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityPanScan.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityResize.java 127341-p9 tests/ImfTest/src/com/android/imftest/samples/ButtonActivity.java 129347-p9 tests/ImfTest/src/com/android/imftest/samples/DialogActivity.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/EditTextActivityDialog.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityNoScrollPanScan.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollPanScan.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollResize.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivityNotSelected.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivitySelected.java 25959-p9 tests/framework-tests/src/android/test/FrameworkTests.java 46162-p9 tests/framework-tests/src/com/android/internal/http/multipart/MultipartTest.java 77101-p9 tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/NinePatchTest.java9788976b14core/java/android/accounts/AuthenticatorDescription.java5333288354core/java/android/app/UiModeManager.java93e7e22ec9core/java/android/app/FullBackupAgent.java328c0e7986core/java/android/content/CursorEntityIterator.java307da1a46bcore/java/android/content/SyncQueue.java307da1a46bcore/java/android/content/SyncOperation.javaeb034652c2core/java/android/content/pm/LabeledIntent.java49237345d8core/java/android/content/pm/FeatureInfo.javaa2b6c3775ecore/java/android/content/pm/PackageInfoLite.java3ecd5f4375core/java/android/content/pm/RegisteredServicesCacheListener.java5ebbb4a6b3core/java/android/content/pm/XmlSerializerAndParser.javac4516a7b62core/java/android/database/sqlite/SQLiteTransactionListener.java9bbc21a773core/java/com/android/internal/backup/LocalTransport.java21f1bd17b2core/java/com/android/internal/content/PackageMonitor.java4c62fc0e1ecore/java/com/android/internal/view/BaseSurfaceHolder.java4c62fc0e1ecore/java/com/android/internal/view/BaseIWindow.javae540833fdfcore/java/com/android/internal/os/SamplingProfilerIntegration.java192ab90388core/tests/coretests/src/android/widget/expandablelistview/PositionTesterContextMenuListener.java1619367ab8media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java27f8002e59opengl/tools/glgen/stubs/gles11/glGetString.java560814f6b1opengl/tools/glgen/stubs/gles11/glGetProgramInfoLog.java560814f6b1opengl/tools/glgen/stubs/gles11/glGetShaderInfoLog.java560814f6b1opengl/tools/glgen/stubs/gles11/glShaderSource.java1c4907ee77opengl/tools/glgen/src/GenerateGLES.java1c4907ee77opengl/tools/glgen/src/Jsr239CodeEmitter.java1c4907ee77opengl/tools/glgen/src/GLESCodeEmitter.java69e21f5f6eopengl/tests/gldual/src/com/android/gldual/TriangleRenderer.javac028be4f3bpackages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java7c6efa13f1tests/BrowserPowerTest/src/com/android/browserpowertest/PowerMeasurement.java7c6efa13f1tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java7c6efa13f1tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestRunner.javadf8a3f31d8tests/BrowserTestPlugin/src/com/android/testplugin/TestPlugin.javacfaef699e1tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.javacfaef699e1tests/permission/src/com/android/framework/permission/tests/ServiceManagerPermissionTests.javacfaef699e1tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java Copyright header moved to top in following file: core/tests/coretests/src/android/widget/ListViewTest.java Change-Id: I3c3198be5a0ba36e18679ed834170432bf0b8418
270 lines
8.2 KiB
Java
270 lines
8.2 KiB
Java
/*
|
|
* Copyright (C) 2009 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 com.android.browserpowertest;
|
|
|
|
import android.app.Activity;
|
|
import android.app.ActivityThread;
|
|
import android.graphics.Bitmap;
|
|
import android.os.Bundle;
|
|
import android.os.Handler;
|
|
import android.os.Message;
|
|
import android.util.Log;
|
|
import android.view.ViewGroup;
|
|
import android.webkit.WebChromeClient;
|
|
import android.webkit.WebView;
|
|
import android.webkit.WebViewClient;
|
|
import android.webkit.WebSettings.LayoutAlgorithm;
|
|
import android.widget.LinearLayout;
|
|
import android.widget.LinearLayout.LayoutParams;
|
|
|
|
public class PowerTestActivity extends Activity {
|
|
|
|
public static final String LOGTAG = "PowerTestActivity";
|
|
public static final String PARAM_URL = "URL";
|
|
public static final String PARAM_TIMEOUT = "Timeout";
|
|
public static final int RESULT_TIMEOUT = 0xDEAD;
|
|
public static final int MSG_TIMEOUT = 0xC001;
|
|
public static final int MSG_NAVIGATE = 0xC002;
|
|
public static final String MSG_NAV_URL = "url";
|
|
public static final String MSG_NAV_LOGTIME = "logtime";
|
|
|
|
private WebView webView;
|
|
private SimpleWebViewClient webViewClient;
|
|
private SimpleChromeClient chromeClient;
|
|
private Handler handler;
|
|
private boolean timeoutFlag;
|
|
private boolean logTime;
|
|
private boolean pageDone;
|
|
private Object pageDoneLock;
|
|
private int pageStartCount;
|
|
private int manualDelay;
|
|
private long startTime;
|
|
private long pageLoadTime;
|
|
private PageDoneRunner pageDoneRunner = new PageDoneRunner();
|
|
|
|
public PowerTestActivity() {
|
|
}
|
|
|
|
@Override
|
|
protected void onCreate(Bundle savedInstanceState) {
|
|
super.onCreate(savedInstanceState);
|
|
|
|
Log.v(LOGTAG, "onCreate, inst=" + Integer.toHexString(hashCode()));
|
|
|
|
LinearLayout contentView = new LinearLayout(this);
|
|
contentView.setOrientation(LinearLayout.VERTICAL);
|
|
setContentView(contentView);
|
|
setTitle("Idle");
|
|
|
|
webView = new WebView(this);
|
|
webView.getSettings().setJavaScriptEnabled(true);
|
|
webView.getSettings().setJavaScriptCanOpenWindowsAutomatically(false);
|
|
webView.getSettings().setLayoutAlgorithm(LayoutAlgorithm.NORMAL);
|
|
|
|
webViewClient = new SimpleWebViewClient();
|
|
chromeClient = new SimpleChromeClient();
|
|
webView.setWebViewClient(webViewClient);
|
|
webView.setWebChromeClient(chromeClient);
|
|
|
|
contentView.addView(webView, new LayoutParams(
|
|
ViewGroup.LayoutParams.MATCH_PARENT,
|
|
ViewGroup.LayoutParams.MATCH_PARENT, 0.0f));
|
|
|
|
handler = new Handler() {
|
|
@Override
|
|
public void handleMessage(Message msg) {
|
|
switch (msg.what) {
|
|
case MSG_TIMEOUT:
|
|
handleTimeout();
|
|
return;
|
|
case MSG_NAVIGATE:
|
|
manualDelay = msg.arg2;
|
|
navigate(msg.getData().getString(MSG_NAV_URL), msg.arg1);
|
|
logTime = msg.getData().getBoolean(MSG_NAV_LOGTIME);
|
|
return;
|
|
}
|
|
}
|
|
};
|
|
|
|
pageDoneLock = new Object();
|
|
}
|
|
|
|
public void reset() {
|
|
synchronized (pageDoneLock) {
|
|
pageDone = false;
|
|
}
|
|
timeoutFlag = false;
|
|
pageStartCount = 0;
|
|
chromeClient.resetJsTimeout();
|
|
}
|
|
|
|
private void navigate(String url, int timeout) {
|
|
if(url == null) {
|
|
Log.v(LOGTAG, "URL is null, cancelling...");
|
|
finish();
|
|
}
|
|
webView.stopLoading();
|
|
if(logTime) {
|
|
webView.clearCache(true);
|
|
}
|
|
startTime = System.currentTimeMillis();
|
|
Log.v(LOGTAG, "Navigating to URL: " + url);
|
|
webView.loadUrl(url);
|
|
|
|
if(timeout != 0) {
|
|
//set a timer with specified timeout (in ms)
|
|
handler.sendMessageDelayed(handler.obtainMessage(MSG_TIMEOUT),
|
|
timeout);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
protected void onDestroy() {
|
|
super.onDestroy();
|
|
Log.v(LOGTAG, "onDestroy, inst=" + Integer.toHexString(hashCode()));
|
|
webView.clearCache(true);
|
|
webView.destroy();
|
|
}
|
|
|
|
private boolean isPageDone() {
|
|
synchronized (pageDoneLock) {
|
|
return pageDone;
|
|
}
|
|
}
|
|
|
|
private void setPageDone(boolean pageDone) {
|
|
synchronized (pageDoneLock) {
|
|
this.pageDone = pageDone;
|
|
pageDoneLock.notifyAll();
|
|
}
|
|
}
|
|
|
|
private void handleTimeout() {
|
|
int progress = webView.getProgress();
|
|
webView.stopLoading();
|
|
Log.v(LOGTAG, "Page timeout triggered, progress = " + progress);
|
|
timeoutFlag = true;
|
|
handler.postDelayed(pageDoneRunner, manualDelay);
|
|
}
|
|
|
|
public boolean waitUntilDone() {
|
|
validateNotAppThread();
|
|
synchronized (pageDoneLock) {
|
|
while(!isPageDone()) {
|
|
try {
|
|
pageDoneLock.wait();
|
|
} catch (InterruptedException ie) {
|
|
//no-op
|
|
}
|
|
}
|
|
}
|
|
return timeoutFlag;
|
|
}
|
|
|
|
public Handler getHandler() {
|
|
return handler;
|
|
}
|
|
|
|
private final void validateNotAppThread() {
|
|
if (ActivityThread.currentActivityThread() != null) {
|
|
throw new RuntimeException(
|
|
"This method can not be called from the main application thread");
|
|
}
|
|
}
|
|
|
|
public long getPageLoadTime() {
|
|
return pageLoadTime;
|
|
}
|
|
|
|
public boolean getPageError() {
|
|
return webViewClient.getPageErrorFlag();
|
|
}
|
|
|
|
class SimpleWebViewClient extends WebViewClient {
|
|
|
|
private boolean pageErrorFlag = false;
|
|
|
|
@Override
|
|
public void onReceivedError(WebView view, int errorCode, String description,
|
|
String failingUrl) {
|
|
pageErrorFlag = true;
|
|
Log.v(LOGTAG, "WebCore error: code=" + errorCode
|
|
+ ", description=" + description
|
|
+ ", url=" + failingUrl);
|
|
}
|
|
|
|
@Override
|
|
public void onPageStarted(WebView view, String url, Bitmap favicon) {
|
|
pageStartCount++;
|
|
Log.v(LOGTAG, "onPageStarted: " + url);
|
|
}
|
|
|
|
@Override
|
|
public void onPageFinished(WebView view, String url) {
|
|
Log.v(LOGTAG, "onPageFinished: " + url);
|
|
// let handleTimeout take care of finishing the page
|
|
if(!timeoutFlag)
|
|
handler.postDelayed(new WebViewStatusChecker(), 500);
|
|
}
|
|
|
|
// return true if the URL is not available or the page is down
|
|
public boolean getPageErrorFlag() {
|
|
return pageErrorFlag;
|
|
}
|
|
}
|
|
|
|
class SimpleChromeClient extends WebChromeClient {
|
|
|
|
private int timeoutCounter = 0;
|
|
|
|
public void resetJsTimeout() {
|
|
timeoutCounter = 0;
|
|
}
|
|
|
|
@Override
|
|
public void onReceivedTitle(WebView view, String title) {
|
|
PowerTestActivity.this.setTitle(title);
|
|
}
|
|
}
|
|
|
|
class WebViewStatusChecker implements Runnable {
|
|
|
|
private int initialStartCount;
|
|
|
|
public WebViewStatusChecker() {
|
|
initialStartCount = pageStartCount;
|
|
}
|
|
|
|
public void run() {
|
|
if (initialStartCount == pageStartCount && !isPageDone()) {
|
|
handler.removeMessages(MSG_TIMEOUT);
|
|
webView.stopLoading();
|
|
handler.postDelayed(pageDoneRunner, manualDelay);
|
|
}
|
|
}
|
|
}
|
|
|
|
class PageDoneRunner implements Runnable {
|
|
|
|
public void run() {
|
|
Log.v(LOGTAG, "Finishing URL: " + webView.getUrl());
|
|
pageLoadTime = System.currentTimeMillis() - startTime;
|
|
setPageDone(true);
|
|
}
|
|
}
|
|
}
|