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

Commit da9b8d0a authored by Bookatz's avatar Bookatz
Browse files

Incidentd: Fix switch break warnings 

A few switches didn't have explicit breaks in them, which was causing
warnings. They were all benign, as the logic did not necessitate a
break. But this is will stop the warnings and perhaps prevent future
bugs.

Change-Id: Idb293a4896f4df8d3f11d748e0e716efc26bbd6a
Fixes: 119047812
Test: N/A
parent 10113a7c

cmds/incidentd/src/IncidentService.cpp

+4 −2
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ static Status checkIncidentPermissions(const IncidentReportArgs& args) { 
                        Status::EX_SECURITY,

                        "Calling process does not have permission to get local data.");

            }

            break;

        case DEST_EXPLICIT:

            if (callingUid != AID_SHELL && callingUid != AID_ROOT && callingUid != AID_STATSD &&

                    callingUid != AID_SYSTEM) {
@@ -91,6 +92,7 @@ static Status checkIncidentPermissions(const IncidentReportArgs& args) { 
                        Status::EX_SECURITY,

                        "Calling process does not have permission to get explicit data.");

            }

            break;

    }

    return Status::ok();

}
@@ -298,7 +300,7 @@ status_t IncidentService::onTransact(uint32_t code, const Parcel& data, Parcel* 
            }



            return NO_ERROR;

        }

        } break;

        default: { return BnIncidentManager::onTransact(code, data, reply, flags); }

    }

}

tools/incident_section_gen/main.cpp

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ 
#include <sstream>

#include <string>



#ifndef FALLTHROUGH_INTENDED

#define FALLTHROUGH_INTENDED [[fallthrough]]

#endif



using namespace android;

using namespace android::os;

using namespace google::protobuf;
@@ -355,6 +359,7 @@ static bool generatePrivacyFlags(const Descriptor* descriptor, const Destination 
                    printPrivacy(fieldName, field, "NULL", fieldDest, fieldName + "_patterns");

                    break;

                }

                FALLTHROUGH_INTENDED;

                // else treat string field as primitive field and goes to default

            default:

                if (!hasDefaultFlags[i]) printPrivacy(fieldName, field, "NULL", fieldDest, "NULL");