Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72eca0ce authored by Tamas Berghammer's avatar Tamas Berghammer Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE: Revert "Update package names to work with the proto3... 

Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp
parents 18125108 a2dc503a

src/java/com/android/internal/telephony/RIL.java

+2 −1
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ import android.text.TextUtils; 
import android.util.SparseArray;

import android.view.Display;



import com.android.internal.telephony.TelephonyProto.SmsSession;

import com.android.internal.telephony.TelephonyProto.TelephonySettings;

import com.android.internal.telephony.cdma.CdmaCallWaitingNotification;

import com.android.internal.telephony.cdma.CdmaInformationRecords;

import com.android.internal.telephony.cdma.CdmaSmsBroadcastConfigInfo;
@@ -63,7 +65,6 @@ import com.android.internal.telephony.gsm.SmsBroadcastConfigInfo; 
import com.android.internal.telephony.gsm.SsData;

import com.android.internal.telephony.gsm.SuppServiceNotification;

import com.android.internal.telephony.metrics.TelephonyMetrics;

import com.android.internal.telephony.nano.TelephonyProto.SmsSession;

import com.android.internal.telephony.uicc.IccCardApplicationStatus;

import com.android.internal.telephony.uicc.IccCardStatus;

import com.android.internal.telephony.uicc.IccIoResult;

src/java/com/android/internal/telephony/SmsApplication.java

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ import android.util.Log; 


import com.android.internal.content.PackageMonitor;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.logging.MetricsProto.MetricsEvent;



import java.util.Collection;

import java.util.HashMap;

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+3 −3
Original line number Diff line number Diff line
@@ -74,12 +74,12 @@ import com.android.internal.telephony.Connection; 
import com.android.internal.telephony.Phone;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.TelephonyProperties;

import com.android.internal.telephony.TelephonyProto.ImsConnectionState;

import com.android.internal.telephony.TelephonyProto.TelephonyCallSession;

import com.android.internal.telephony.TelephonyProto.TelephonyCallSession.Event.ImsCommand;

import com.android.internal.telephony.dataconnection.DataEnabledSettings;

import com.android.internal.telephony.gsm.SuppServiceNotification;

import com.android.internal.telephony.metrics.TelephonyMetrics;

import com.android.internal.telephony.nano.TelephonyProto.ImsConnectionState;

import com.android.internal.telephony.nano.TelephonyProto.TelephonyCallSession;

import com.android.internal.telephony.nano.TelephonyProto.TelephonyCallSession.Event.ImsCommand;



import java.io.FileDescriptor;

import java.io.PrintWriter;

src/java/com/android/internal/telephony/metrics/CallSessionEventBuilder.java

+7 −7
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 


package com.android.internal.telephony.metrics;



import com.android.internal.telephony.nano.TelephonyProto.ImsCapabilities;

import com.android.internal.telephony.nano.TelephonyProto.ImsConnectionState;

import com.android.internal.telephony.nano.TelephonyProto.ImsReasonInfo;

import com.android.internal.telephony.nano.TelephonyProto.RilDataCall;

import com.android.internal.telephony.nano.TelephonyProto.TelephonyCallSession;

import com.android.internal.telephony.nano.TelephonyProto.TelephonyServiceState;

import com.android.internal.telephony.nano.TelephonyProto.TelephonySettings;

import com.android.internal.telephony.TelephonyProto.ImsCapabilities;

import com.android.internal.telephony.TelephonyProto.ImsConnectionState;

import com.android.internal.telephony.TelephonyProto.ImsReasonInfo;

import com.android.internal.telephony.TelephonyProto.RilDataCall;

import com.android.internal.telephony.TelephonyProto.TelephonyCallSession;

import com.android.internal.telephony.TelephonyProto.TelephonyServiceState;

import com.android.internal.telephony.TelephonyProto.TelephonySettings;



public class CallSessionEventBuilder {

    private final TelephonyCallSession.Event mEvent = new TelephonyCallSession.Event();

src/java/com/android/internal/telephony/metrics/InProgressCallSession.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.internal.telephony.metrics; 


import android.os.SystemClock;



import com.android.internal.telephony.nano.TelephonyProto.TelephonyCallSession;

import com.android.internal.telephony.TelephonyProto.TelephonyCallSession;



import java.util.ArrayDeque;

import java.util.Deque;