diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-05-03 23:18:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-03 23:18:35 +0000 |
| commit | 2034759538273aed8a0b412d8fb90994eba1f7ea (patch) | |
| tree | 1a45d60921e293c6088efeaf4d9c408456f3e0e2 /java/com/android/dialer/callintent/CallIntentParser.java | |
| parent | 86baedee44a4902097310c689ee3ae7f0cdb1c8d (diff) | |
| parent | d67f1627521b174f12e0c247f154c7c93c5e408e (diff) | |
This change reflects the Dialer V10 RC00 branch. am: 8369df095a
am: d67f162752
Change-Id: I94f923a6a8af0a580723017002922e299bd335f3
Diffstat (limited to 'java/com/android/dialer/callintent/CallIntentParser.java')
| -rw-r--r-- | java/com/android/dialer/callintent/CallIntentParser.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/java/com/android/dialer/callintent/CallIntentParser.java b/java/com/android/dialer/callintent/CallIntentParser.java index 40c8ee348..b54f7c78b 100644 --- a/java/com/android/dialer/callintent/CallIntentParser.java +++ b/java/com/android/dialer/callintent/CallIntentParser.java @@ -19,10 +19,8 @@ package com.android.dialer.callintent; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import com.android.dialer.callintent.nano.CallSpecificAppData; import com.android.dialer.common.Assert; -import com.google.protobuf.nano.InvalidProtocolBufferNanoException; -import com.google.protobuf.nano.MessageNano; +import com.google.protobuf.InvalidProtocolBufferException; /** Parses data for a call extra to get any dialer specific app data. */ public class CallIntentParser { @@ -38,7 +36,7 @@ public class CallIntentParser { } try { return CallSpecificAppData.parseFrom(flatArray); - } catch (InvalidProtocolBufferNanoException e) { + } catch (InvalidProtocolBufferException e) { Assert.fail("unexpected exception: " + e); return null; } @@ -46,8 +44,7 @@ public class CallIntentParser { public static void putCallSpecificAppData( @NonNull Bundle extras, @NonNull CallSpecificAppData callSpecificAppData) { - extras.putByteArray( - Constants.EXTRA_CALL_SPECIFIC_APP_DATA, MessageNano.toByteArray(callSpecificAppData)); + extras.putByteArray(Constants.EXTRA_CALL_SPECIFIC_APP_DATA, callSpecificAppData.toByteArray()); } private CallIntentParser() {} |