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

Commit 6849f9a6 authored by Hui Yu's avatar Hui Yu
Browse files

Do not print exception and stack trace. 

When upgrading a device from P build to Q build, since mInstanceId,
majorVersion, minorVersion are newly added fields in Q build, P version
XML file does not have this fields and Q build will get
java.net.ProtocolException and these newly fields are assigned default
value. This is normal during upgrade process. There is no need to
printout the exception and stack trace because that would confuse
people.

Bug: 127451110
Test: NA.
Change-Id: I0fb38a68d7f049b7f417c9ca444db61c4e5c3657
parent 4e953bb4

services/usage/java/com/android/server/usage/UsageStatsXmlV1.java

+3 −3
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ final class UsageStatsXmlV1 { 
        try {

            event.mInstanceId = XmlUtils.readIntAttribute(parser, INSTANCE_ID_ATTR);

        } catch (IOException e) {

            Log.e(TAG, "Failed to parse mInstanceId", e);

            Log.i(TAG, "Failed to parse mInstanceId");

        }



        switch (event.mEventType) {
@@ -390,13 +390,13 @@ final class UsageStatsXmlV1 { 
        try {

            statsOut.majorVersion = XmlUtils.readIntAttribute(parser, MAJOR_VERSION_ATTR);

        } catch (IOException e) {

            Log.e(TAG, "Failed to parse majorVersion", e);

            Log.i(TAG, "Failed to parse majorVersion");

        }



        try {

            statsOut.minorVersion = XmlUtils.readIntAttribute(parser, MINOR_VERSION_ATTR);

        } catch (IOException e) {

            Log.e(TAG, "Failed to parse minorVersion", e);

            Log.i(TAG, "Failed to parse minorVersion");

        }



        int eventCode;