From 8369df095a73a77b3715f8ae7ba06089cebca4ce Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Wed, 3 May 2017 10:27:13 -0700 Subject: This change reflects the Dialer V10 RC00 branch. RC00 is based on: branch: dialer-android_release_branch/153304843.1 synced to: 153304843 following the instructions at go/dialer-aosp-release. In this release: * Removes final apache sources. * Uses native lite compilation. More drops will follow with subsequent release candidates until we reach our final v10 release, in cadence with our prebuilt drops. Test: TreeHugger, on device Change-Id: Ic9684057230f9b579c777820c746cd21bf45ec0f --- .../dialer/enrichedcall/EnrichedCallManager.java | 6 +- .../historyquery/nano/HistoryResult.java | 203 --------------------- .../historyquery/proto/history_result.proto | 23 +++ .../enrichedcall/stub/EnrichedCallManagerStub.java | 6 +- 4 files changed, 29 insertions(+), 209 deletions(-) delete mode 100644 java/com/android/dialer/enrichedcall/historyquery/nano/HistoryResult.java create mode 100644 java/com/android/dialer/enrichedcall/historyquery/proto/history_result.proto (limited to 'java/com/android/dialer/enrichedcall') diff --git a/java/com/android/dialer/enrichedcall/EnrichedCallManager.java b/java/com/android/dialer/enrichedcall/EnrichedCallManager.java index 978fb1346..fa822a659 100644 --- a/java/com/android/dialer/enrichedcall/EnrichedCallManager.java +++ b/java/com/android/dialer/enrichedcall/EnrichedCallManager.java @@ -20,9 +20,9 @@ import android.support.annotation.IntDef; import android.support.annotation.MainThread; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import com.android.dialer.calldetails.nano.CallDetailsEntries; -import com.android.dialer.calldetails.nano.CallDetailsEntries.CallDetailsEntry; -import com.android.dialer.enrichedcall.historyquery.proto.nano.HistoryResult; +import com.android.dialer.calldetails.CallDetailsEntries; +import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry; +import com.android.dialer.enrichedcall.historyquery.proto.HistoryResult; import com.android.dialer.enrichedcall.videoshare.VideoShareListener; import com.android.dialer.multimedia.MultimediaData; import java.lang.annotation.Retention; diff --git a/java/com/android/dialer/enrichedcall/historyquery/nano/HistoryResult.java b/java/com/android/dialer/enrichedcall/historyquery/nano/HistoryResult.java deleted file mode 100644 index 2fdc2da50..000000000 --- a/java/com/android/dialer/enrichedcall/historyquery/nano/HistoryResult.java +++ /dev/null @@ -1,203 +0,0 @@ -/* - * Copyright (C) 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. - */ - -// Generated by the protocol buffer compiler. DO NOT EDIT! - -package com.android.dialer.enrichedcall.historyquery.proto.nano; - -/** This file is autogenerated, but javadoc required. */ -@SuppressWarnings("hiding") -public final class HistoryResult - extends com.google.protobuf.nano.ExtendableMessageNano { - - /** This file is autogenerated, but javadoc required. */ - // enum Type - public interface Type { - public static final int INCOMING_CALL_COMPOSER = 1; - public static final int OUTGOING_CALL_COMPOSER = 2; - public static final int INCOMING_POST_CALL = 3; - public static final int OUTGOING_POST_CALL = 4; - } - - private static volatile HistoryResult[] _emptyArray; - - public static HistoryResult[] emptyArray() { - // Lazily initializes the empty array - if (_emptyArray == null) { - synchronized (com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) { - if (_emptyArray == null) { - _emptyArray = new HistoryResult[0]; - } - } - } - return _emptyArray; - } - - // optional .com.android.dialer.enrichedcall.historyquery.proto.HistoryResult.Type type = 1; - public int type; - - // optional string text = 2; - public java.lang.String text; - - // optional string image_uri = 4; - public java.lang.String imageUri; - - // optional string image_content_type = 5; - public java.lang.String imageContentType; - - // optional int64 timestamp = 7; - public long timestamp; - - // @@protoc_insertion_point(class_scope:com.android.dialer.enrichedcall.historyquery.proto.HistoryResult) - - public HistoryResult() { - clear(); - } - - public HistoryResult clear() { - type = - com.android.dialer.enrichedcall.historyquery.proto.nano.HistoryResult.Type - .INCOMING_CALL_COMPOSER; - text = ""; - imageUri = ""; - imageContentType = ""; - timestamp = 0L; - unknownFieldData = null; - cachedSize = -1; - return this; - } - - @Override - public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output) - throws java.io.IOException { - if (this.type - != com.android.dialer.enrichedcall.historyquery.proto.nano.HistoryResult.Type - .INCOMING_CALL_COMPOSER) { - output.writeInt32(1, this.type); - } - if (this.text != null && !this.text.equals("")) { - output.writeString(2, this.text); - } - if (this.imageUri != null && !this.imageUri.equals("")) { - output.writeString(4, this.imageUri); - } - if (this.imageContentType != null && !this.imageContentType.equals("")) { - output.writeString(5, this.imageContentType); - } - if (this.timestamp != 0L) { - output.writeInt64(7, this.timestamp); - } - super.writeTo(output); - } - - @Override - protected int computeSerializedSize() { - int size = super.computeSerializedSize(); - if (this.type - != com.android.dialer.enrichedcall.historyquery.proto.nano.HistoryResult.Type - .INCOMING_CALL_COMPOSER) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano.computeInt32Size(1, this.type); - } - if (this.text != null && !this.text.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano.computeStringSize(2, this.text); - } - if (this.imageUri != null && !this.imageUri.equals("")) { - size += - com.google.protobuf.nano.CodedOutputByteBufferNano.computeStringSize(4, this.imageUri); - } - if (this.imageContentType != null && !this.imageContentType.equals("")) { - size += - com.google.protobuf.nano.CodedOutputByteBufferNano.computeStringSize( - 5, this.imageContentType); - } - if (this.timestamp != 0L) { - size += - com.google.protobuf.nano.CodedOutputByteBufferNano.computeInt64Size(7, this.timestamp); - } - return size; - } - - @Override - public HistoryResult mergeFrom(com.google.protobuf.nano.CodedInputByteBufferNano input) - throws java.io.IOException { - while (true) { - int tag = input.readTag(); - switch (tag) { - case 0: - return this; - default: - { - if (!super.storeUnknownField(input, tag)) { - return this; - } - break; - } - case 8: - { - int initialPos = input.getPosition(); - int value = input.readInt32(); - switch (value) { - case com.android.dialer.enrichedcall.historyquery.proto.nano.HistoryResult.Type - .INCOMING_CALL_COMPOSER: - case com.android.dialer.enrichedcall.historyquery.proto.nano.HistoryResult.Type - .OUTGOING_CALL_COMPOSER: - case com.android.dialer.enrichedcall.historyquery.proto.nano.HistoryResult.Type - .INCOMING_POST_CALL: - case com.android.dialer.enrichedcall.historyquery.proto.nano.HistoryResult.Type - .OUTGOING_POST_CALL: - this.type = value; - break; - default: - input.rewindToPosition(initialPos); - storeUnknownField(input, tag); - break; - } - break; - } - case 18: - { - this.text = input.readString(); - break; - } - case 34: - { - this.imageUri = input.readString(); - break; - } - case 42: - { - this.imageContentType = input.readString(); - break; - } - case 56: - { - this.timestamp = input.readInt64(); - break; - } - } - } - } - - public static HistoryResult parseFrom(byte[] data) - throws com.google.protobuf.nano.InvalidProtocolBufferNanoException { - return com.google.protobuf.nano.MessageNano.mergeFrom(new HistoryResult(), data); - } - - public static HistoryResult parseFrom(com.google.protobuf.nano.CodedInputByteBufferNano input) - throws java.io.IOException { - return new HistoryResult().mergeFrom(input); - } -} diff --git a/java/com/android/dialer/enrichedcall/historyquery/proto/history_result.proto b/java/com/android/dialer/enrichedcall/historyquery/proto/history_result.proto new file mode 100644 index 000000000..62d013a46 --- /dev/null +++ b/java/com/android/dialer/enrichedcall/historyquery/proto/history_result.proto @@ -0,0 +1,23 @@ +syntax = "proto2"; + +option java_package = "com.android.dialer.enrichedcall.historyquery.proto"; +option java_multiple_files = true; +option optimize_for = LITE_RUNTIME; + +package com.android.dialer.enrichedcall.historyquery.proto; + +// Holds data that was used in an enrichedcall in the past +message HistoryResult { + optional Type type = 1; + optional string text = 2; + optional string image_uri = 4; + optional string image_content_type = 5; + optional int64 timestamp = 7; + + enum Type { + INCOMING_CALL_COMPOSER = 1; + OUTGOING_CALL_COMPOSER = 2; + INCOMING_POST_CALL = 3; + OUTGOING_POST_CALL = 4; + } +} diff --git a/java/com/android/dialer/enrichedcall/stub/EnrichedCallManagerStub.java b/java/com/android/dialer/enrichedcall/stub/EnrichedCallManagerStub.java index bedfdae34..1d008ca05 100644 --- a/java/com/android/dialer/enrichedcall/stub/EnrichedCallManagerStub.java +++ b/java/com/android/dialer/enrichedcall/stub/EnrichedCallManagerStub.java @@ -19,13 +19,13 @@ package com.android.dialer.enrichedcall.stub; import android.support.annotation.MainThread; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import com.android.dialer.calldetails.nano.CallDetailsEntries; -import com.android.dialer.calldetails.nano.CallDetailsEntries.CallDetailsEntry; +import com.android.dialer.calldetails.CallDetailsEntries; +import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry; import com.android.dialer.common.Assert; import com.android.dialer.enrichedcall.EnrichedCallCapabilities; import com.android.dialer.enrichedcall.EnrichedCallManager; import com.android.dialer.enrichedcall.Session; -import com.android.dialer.enrichedcall.historyquery.proto.nano.HistoryResult; +import com.android.dialer.enrichedcall.historyquery.proto.HistoryResult; import com.android.dialer.enrichedcall.videoshare.VideoShareListener; import com.android.dialer.multimedia.MultimediaData; import java.util.List; -- cgit v1.2.3