diff options
author | Eric Erfanian <erfanian@google.com> | 2017-03-15 14:41:07 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-03-15 16:24:23 -0700 |
commit | d5e47f6da5b08b13ecdfa7f1edc7e12aeb83fab9 (patch) | |
tree | b54abbb51fb7d66e7755a1fbb5db023ff601090b /java/com/android/voicemailomtp/mail/utility | |
parent | 30436e7e6d3f2c8755a91b2b6222b74d465a9e87 (diff) |
Update Dialer source from latest green build.
* Refactor voicemail component
* Add new enriched calling components
Test: treehugger, manual aosp testing
Change-Id: I521a0f86327d4b42e14d93927c7d613044ed5942
Diffstat (limited to 'java/com/android/voicemailomtp/mail/utility')
-rw-r--r-- | java/com/android/voicemailomtp/mail/utility/CountingOutputStream.java | 48 | ||||
-rw-r--r-- | java/com/android/voicemailomtp/mail/utility/EOLConvertingOutputStream.java | 48 |
2 files changed, 0 insertions, 96 deletions
diff --git a/java/com/android/voicemailomtp/mail/utility/CountingOutputStream.java b/java/com/android/voicemailomtp/mail/utility/CountingOutputStream.java deleted file mode 100644 index fdf81d44a..000000000 --- a/java/com/android/voicemailomtp/mail/utility/CountingOutputStream.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2015 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.voicemailomtp.mail.utility; - -import java.io.IOException; -import java.io.OutputStream; - -/** - * A simple pass-thru OutputStream that also counts how many bytes are written to it and - * makes that count available to callers. - */ -public class CountingOutputStream extends OutputStream { - private long mCount; - private final OutputStream mOutputStream; - - public CountingOutputStream(OutputStream outputStream) { - mOutputStream = outputStream; - } - - public long getCount() { - return mCount; - } - - @Override - public void write(byte[] buffer, int offset, int count) throws IOException { - mOutputStream.write(buffer, offset, count); - mCount += count; - } - - @Override - public void write(int oneByte) throws IOException { - mOutputStream.write(oneByte); - mCount++; - } -}
\ No newline at end of file diff --git a/java/com/android/voicemailomtp/mail/utility/EOLConvertingOutputStream.java b/java/com/android/voicemailomtp/mail/utility/EOLConvertingOutputStream.java deleted file mode 100644 index 5b93a92ab..000000000 --- a/java/com/android/voicemailomtp/mail/utility/EOLConvertingOutputStream.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2015 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.voicemailomtp.mail.utility; - -import java.io.FilterOutputStream; -import java.io.IOException; -import java.io.OutputStream; - -public class EOLConvertingOutputStream extends FilterOutputStream { - int lastChar; - - public EOLConvertingOutputStream(OutputStream out) { - super(out); - } - - @Override - public void write(int oneByte) throws IOException { - if (oneByte == '\n') { - if (lastChar != '\r') { - super.write('\r'); - } - } - super.write(oneByte); - lastChar = oneByte; - } - - @Override - public void flush() throws IOException { - if (lastChar == '\r') { - super.write('\n'); - lastChar = '\n'; - } - super.flush(); - } -}
\ No newline at end of file |