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

Commit 0699d023 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix unused-but-set-variable warnings" am: eab658e2 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2160458



Change-Id: Iaf85e75223310d32ea972c779d5146748f2d9653
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e8764668 eab658e2

tools/aapt/Command.cpp

+1 −5
Original line number Diff line number Diff line
@@ -1028,7 +1028,6 @@ int doDump(Bundle* bundle) 
            // These permissions are required by services implementing services

            // the system binds to (IME, Accessibility, PrintServices, etc.)

            bool hasBindDeviceAdminPermission = false;

            bool hasBindInputMethodPermission = false;

            bool hasBindAccessibilityServicePermission = false;

            bool hasBindPrintServicePermission = false;

            bool hasBindNfcServicePermission = false;
@@ -1757,7 +1756,6 @@ int doDump(Bundle* bundle) 
                    hasMetaHostPaymentCategory = false;

                    hasMetaOffHostPaymentCategory = false;

                    hasBindDeviceAdminPermission = false;

                    hasBindInputMethodPermission = false;

                    hasBindAccessibilityServicePermission = false;

                    hasBindPrintServicePermission = false;

                    hasBindNfcServicePermission = false;
@@ -1871,9 +1869,7 @@ int doDump(Bundle* bundle) 
                            String8 permission = AaptXml::getAttribute(tree, PERMISSION_ATTR,

                                    &error);

                            if (error == "") {

                                if (permission == "android.permission.BIND_INPUT_METHOD") {

                                    hasBindInputMethodPermission = true;

                                } else if (permission ==

                                if (permission ==

                                        "android.permission.BIND_ACCESSIBILITY_SERVICE") {

                                    hasBindAccessibilityServicePermission = true;

                                } else if (permission ==

tools/aapt/ResourceTable.cpp

+0 −8
Original line number Diff line number Diff line
@@ -2970,14 +2970,6 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp<const ResourceFilter>& 
                    }

                    e->setNameIndex(keyStrings.add(e->getName(), true));



                    // If this entry has no values for other configs,

                    // and is the default config, then it is special.  Otherwise

                    // we want to add it with the config info.

                    ConfigDescription* valueConfig = NULL;

                    if (N != 1 || config == nullConfig) {

                        valueConfig = &config;

                    }



                    status_t err = e->prepareFlatten(&valueStrings, this,

                            &configTypeName, &config);

                    if (err != NO_ERROR) {