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

Commit da243aa6 authored by Jack Yu's avatar Jack Yu
Browse files

Removed nano proto accessors usage 

The generated proto java files consists 484 methods which
might break DEX's 64k method limit. Removed the accessors and
directly accessing the fields can lower the generated method
counts to 140. This will require some changes on the server
side as well.

Test: runtest -x frameworks/opt/telephony/tests/telephonytests/src/
com/android/internal/telephony/metrics/TelephonyMetricsTest.java

bug: 32544494
Change-Id: I766bf3402a138cf0570d5374ed0d8e1d95f25d52
parent 65d2fbff

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ LOCAL_JAVA_LIBRARIES := voip-common ims-common 
LOCAL_MODULE_TAGS := optional

LOCAL_MODULE := telephony-common

LOCAL_PROTOC_OPTIMIZE_TYPE := nano

LOCAL_PROTO_JAVA_OUTPUT_PARAMS := optional_field_style=accessors,store_unknown_fields=true,enum_style=java

LOCAL_PROTO_JAVA_OUTPUT_PARAMS := store_unknown_fields=true,enum_style=java



LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/jarjar-rules.txt

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

+14 −14
Original line number Diff line number Diff line
@@ -32,46 +32,46 @@ public class CallSessionEventBuilder { 
    }



    public CallSessionEventBuilder(int type) {

        mEvent.setType(type);

        mEvent.type = type;

    }



    public CallSessionEventBuilder setDelay(int delay) {

        mEvent.setDelay(delay);

        mEvent.delay = delay;

        return this;

    }



    public CallSessionEventBuilder setRilRequest(int rilRequestType) {

        mEvent.setRilRequest(rilRequestType);

        mEvent.rilRequest = rilRequestType;

        return this;

    }



    public CallSessionEventBuilder setRilRequestId(int rilRequestId) {

        mEvent.setRilRequestId(rilRequestId);

        mEvent.rilRequestId = rilRequestId;

        return this;

    }



    public CallSessionEventBuilder setRilError(int rilError) {

        mEvent.setError(rilError);

        mEvent.error = rilError;

        return this;

    }



    public CallSessionEventBuilder setCallIndex(int callIndex) {

        mEvent.setCallIndex(callIndex);

        mEvent.callIndex = callIndex;

        return this;

    }



    public CallSessionEventBuilder setCallState(int state) {

        mEvent.setCallState(state);

        mEvent.callState = state;

        return this;

    }



    public CallSessionEventBuilder setSrvccState(int srvccState) {

        mEvent.setSrvccState(srvccState);

        mEvent.srvccState = srvccState;

        return this;

    }



    public CallSessionEventBuilder setImsCommand(int imsCommand) {

        mEvent.setImsCommand(imsCommand);

        mEvent.imsCommand = imsCommand;

        return this;

    }
@@ -81,12 +81,12 @@ public class CallSessionEventBuilder { 
    }



    public CallSessionEventBuilder setSrcAccessTech(int tech) {

        mEvent.setSrcAccessTech(tech);

        mEvent.srcAccessTech = tech;

        return this;

    }



    public CallSessionEventBuilder setTargetAccessTech(int tech) {

        mEvent.setTargetAccessTech(tech);

        mEvent.targetAccessTech = tech;

        return this;

    }
@@ -116,12 +116,12 @@ public class CallSessionEventBuilder { 
    }



    public CallSessionEventBuilder setPhoneState(int phoneState) {

        mEvent.setPhoneState(phoneState);

        mEvent.phoneState = phoneState;

        return this;

    }



    public CallSessionEventBuilder setNITZ(long timestamp) {

        mEvent.setNitzTimestampMillis(timestamp);

        mEvent.nitzTimestampMillis = timestamp;

        return this;

    }

}
 
 No newline at end of file

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

+7 −7
Original line number Diff line number Diff line
@@ -31,26 +31,26 @@ public class SmsSessionEventBuilder { 
    }



    public SmsSessionEventBuilder(int type) {

        mEvent.setType(type);

        mEvent.type = type;

    }



    public SmsSessionEventBuilder setDelay(int delay) {

        mEvent.setDelay(delay);

        mEvent.delay = delay;

        return this;

    }



    public SmsSessionEventBuilder setTech(int tech) {

        mEvent.setTech(tech);

        mEvent.tech = tech;

        return this;

    }



    public SmsSessionEventBuilder setErrorCode(int code) {

        mEvent.setErrorCode(code);

        mEvent.errorCode = code;

        return this;

    }



    public SmsSessionEventBuilder setRilErrno(int errno) {

        mEvent.setError(errno);

        mEvent.error = errno;

        return this;

    }
@@ -80,12 +80,12 @@ public class SmsSessionEventBuilder { 
    }



    public SmsSessionEventBuilder setRilRequestId(int id) {

        mEvent.setRilRequestId(id);

        mEvent.rilRequestId = id;

        return this;

    }



    public SmsSessionEventBuilder setFormat(int format) {

        mEvent.setFormat(format);

        mEvent.format = format;

        return this;

    }

}

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

+17 −17
Original line number Diff line number Diff line
@@ -41,78 +41,78 @@ public class TelephonyEventBuilder { 
    }



    public TelephonyEventBuilder(long timestamp, int phoneId) {

        mEvent.setTimestampMillis(timestamp);

        mEvent.setPhoneId(phoneId);

        mEvent.timestampMillis = timestamp;

        mEvent.phoneId = phoneId;

    }



    public TelephonyEventBuilder setSettings(TelephonySettings settings) {

        mEvent.setType(TelephonyEvent.Type.SETTINGS_CHANGED);

        mEvent.type = TelephonyEvent.Type.SETTINGS_CHANGED;

        mEvent.settings = settings;

        return this;

    }



    public TelephonyEventBuilder setServiceState(TelephonyServiceState state) {

        mEvent.setType(TelephonyEvent.Type.RIL_SERVICE_STATE_CHANGED);

        mEvent.type = TelephonyEvent.Type.RIL_SERVICE_STATE_CHANGED;

        mEvent.serviceState = state;

        return this;

    }



    public TelephonyEventBuilder setImsConnectionState(ImsConnectionState state) {

        mEvent.setType(TelephonyEvent.Type.IMS_CONNECTION_STATE_CHANGED);

        mEvent.type = TelephonyEvent.Type.IMS_CONNECTION_STATE_CHANGED;

        mEvent.imsConnectionState = state;

        return this;

    }



    public TelephonyEventBuilder setImsCapabilities(ImsCapabilities capabilities) {

        mEvent.setType(TelephonyEvent.Type.IMS_CAPABILITIES_CHANGED);

        mEvent.type = TelephonyEvent.Type.IMS_CAPABILITIES_CHANGED;

        mEvent.imsCapabilities = capabilities;

        return this;

    }



    public TelephonyEventBuilder setDataStallRecoveryAction(int action) {

        mEvent.setType(TelephonyEvent.Type.DATA_STALL_ACTION);

        mEvent.setDataStallAction(action);

        mEvent.type = TelephonyEvent.Type.DATA_STALL_ACTION;

        mEvent.dataStallAction = action;

        return this;

    }



    public TelephonyEventBuilder setSetupDataCall(RilSetupDataCall request) {

        mEvent.setType(TelephonyEvent.Type.DATA_CALL_SETUP);

        mEvent.type = TelephonyEvent.Type.DATA_CALL_SETUP;

        mEvent.setupDataCall = request;

        return this;

    }



    public TelephonyEventBuilder setSetupDataCallResponse(RilSetupDataCallResponse rsp) {

        mEvent.setType(TelephonyEvent.Type.DATA_CALL_SETUP_RESPONSE);

        mEvent.type = TelephonyEvent.Type.DATA_CALL_SETUP_RESPONSE;

        mEvent.setupDataCallResponse = rsp;

        return this;

    }



    public TelephonyEventBuilder setDeactivateDataCall(RilDeactivateDataCall request) {

        mEvent.setType(TelephonyEvent.Type.DATA_CALL_DEACTIVATE);

        mEvent.type = TelephonyEvent.Type.DATA_CALL_DEACTIVATE;

        mEvent.deactivateDataCall = request;

        return this;

    }



    public TelephonyEventBuilder setDeactivateDataCallResponse(int errno) {

        mEvent.setType(TelephonyEvent.Type.DATA_CALL_DEACTIVATE_RESPONSE);

        mEvent.setError(errno);

        mEvent.type = TelephonyEvent.Type.DATA_CALL_DEACTIVATE_RESPONSE;

        mEvent.error = errno;

        return this;

    }



    public TelephonyEventBuilder setDataCalls(RilDataCall[] dataCalls) {

        mEvent.setType(TelephonyEvent.Type.DATA_CALL_LIST_CHANGED);

        mEvent.type = TelephonyEvent.Type.DATA_CALL_LIST_CHANGED;

        mEvent.dataCalls = dataCalls;

        return this;

    }



    public TelephonyEventBuilder setNITZ(long timestamp) {

        mEvent.setType(TelephonyEvent.Type.NITZ_TIME);

        mEvent.setNitzTimestampMillis(timestamp);

        mEvent.type = TelephonyEvent.Type.NITZ_TIME;

        mEvent.nitzTimestampMillis = timestamp;

        return this;

    }



    public TelephonyEventBuilder setModemRestart(ModemRestart modemRestart) {

        mEvent.setType(TelephonyEvent.Type.MODEM_RESTART);

        mEvent.type = TelephonyEvent.Type.MODEM_RESTART;

        mEvent.modemRestart = modemRestart;

        return this;

    }

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

+100 −107

File changed.

Preview size limit exceeded, changes collapsed.