Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix unused-but-set-variable warnings" am: eab658e213 am: 0699d0238b am: f05b15d261 am: a0fdfa3524

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

Change-Id: I5a240f999bb994fd4593067d2cf57451afa133f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-08-12 21:30:27 +00:00
committed by Automerger Merge Worker
parent a28a5c4666 a0fdfa3524
commit 4472bf50e2
2 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/aapt/Command.cpp
View File

@@ -1028,7 +1028,6 @@ int doDump(Bundle* bundle)
// These permissions are required by services implementing services // These permissions are required by services implementing services
// the system binds to (IME, Accessibility, PrintServices, etc.) // the system binds to (IME, Accessibility, PrintServices, etc.)
bool hasBindDeviceAdminPermission = false; bool hasBindDeviceAdminPermission = false;
bool hasBindInputMethodPermission = false;
bool hasBindAccessibilityServicePermission = false; bool hasBindAccessibilityServicePermission = false;
bool hasBindPrintServicePermission = false; bool hasBindPrintServicePermission = false;
bool hasBindNfcServicePermission = false; bool hasBindNfcServicePermission = false;
@@ -1757,7 +1756,6 @@ int doDump(Bundle* bundle)
hasMetaHostPaymentCategory = false; hasMetaHostPaymentCategory = false;
hasMetaOffHostPaymentCategory = false; hasMetaOffHostPaymentCategory = false;
hasBindDeviceAdminPermission = false; hasBindDeviceAdminPermission = false;
hasBindInputMethodPermission = false;
hasBindAccessibilityServicePermission = false; hasBindAccessibilityServicePermission = false;
hasBindPrintServicePermission = false; hasBindPrintServicePermission = false;
hasBindNfcServicePermission = false; hasBindNfcServicePermission = false;
@@ -1871,9 +1869,7 @@ int doDump(Bundle* bundle)
String8 permission = AaptXml::getAttribute(tree, PERMISSION_ATTR, String8 permission = AaptXml::getAttribute(tree, PERMISSION_ATTR,
&error); &error);
if (error == "") { if (error == "") {
if (permission == "android.permission.BIND_INPUT_METHOD") { if (permission ==
hasBindInputMethodPermission = true;
} else if (permission ==
"android.permission.BIND_ACCESSIBILITY_SERVICE") { "android.permission.BIND_ACCESSIBILITY_SERVICE") {
hasBindAccessibilityServicePermission = true; hasBindAccessibilityServicePermission = true;
} else if (permission == } else if (permission ==

8
tools/aapt/ResourceTable.cpp
View File

@@ -2970,14 +2970,6 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp<const ResourceFilter>&
} }
e->setNameIndex(keyStrings.add(e->getName(), true)); 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, status_t err = e->prepareFlatten(&valueStrings, this,
&configTypeName, &config); &configTypeName, &config);
if (err != NO_ERROR) { if (err != NO_ERROR) {