From 88604f2f8ac07283fa70ec2feb3aaeadcedaf0ce Mon Sep 17 00:00:00 2001 From: Tim Volodine Date: Thu, 18 Jan 2018 20:14:08 +0000 Subject: WebView Tracing API: address comments from the API council. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Address comments from the API council regarding the WebView Tracing API. android.webkit.TracingController: * start() throws IllegalStateException if the system is already tracing (this is instead of returning false) * stop uses Executor instead of Handler * removed stop() (the method w/o arguments) * renamed stopAndFlush to stop * use OutputStream instead of a custom callback interface TracingOutputStream * dropped requirement for UI threading * updated documentation android.webkit.TracingFileOutputStream: * removed the TracingFileOutputStream file completely (functionality replaced by the existing FileOutputStream) android.webkit.TracingConfig: * removed example with CATEGORIES_NONE and “-input,-gpu”. * customCategories are List instead of String * updated documentation * added two more predefined categories: CATEGORIES_ALL, CATEGORIES_ANDROID_WEBVIEW * some refactoring, added a Builder class * ensure that only include category patterns can be specified * uniform addCategories interface for construction * predefined category sets are a bitmask now BUG: 71584598,71584599,63750258 Test: CTS Change-Id: I615ef5f43d26968329182b09e7c26178f1f85ecc --- .../android/webkit/TracingFileOutputStream.java | 63 ---------------------- 1 file changed, 63 deletions(-) delete mode 100644 core/java/android/webkit/TracingFileOutputStream.java (limited to 'core/java/android/webkit/TracingFileOutputStream.java') diff --git a/core/java/android/webkit/TracingFileOutputStream.java b/core/java/android/webkit/TracingFileOutputStream.java deleted file mode 100644 index 8a5fa36c2d99..000000000000 --- a/core/java/android/webkit/TracingFileOutputStream.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 2017 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.webkit; - -import android.annotation.NonNull; - -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; - -/** - * Simple TracingOutputStream implementation which writes the trace data from - * {@link TracingController} to a new file. - * - */ -public class TracingFileOutputStream implements TracingController.TracingOutputStream { - - private FileOutputStream mFileOutput; - - public TracingFileOutputStream(@NonNull String filename) throws FileNotFoundException { - mFileOutput = new FileOutputStream(filename); - } - - /** - * Writes bytes chunk to the file. - */ - public void write(byte[] chunk) { - try { - mFileOutput.write(chunk); - } catch (IOException e) { - onIOException(e); - } - } - - /** - * Closes the file. - */ - public void complete() { - try { - mFileOutput.close(); - } catch (IOException e) { - onIOException(e); - } - } - - private void onIOException(IOException e) { - throw new RuntimeException(e); - } -} -- cgit v1.2.3