diff options
| -rw-r--r-- | core/res/res/values-fr/cm_strings.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values-nl/cm_strings.xml | 2 | ||||
| -rw-r--r-- | tools/aapt/ResourceIdCache.cpp | 2 | ||||
| -rw-r--r-- | tools/aapt/ResourceIdCache.h | 2 | ||||
| -rw-r--r-- | tools/aapt/ResourceTable.h | 3 | ||||
| -rw-r--r-- | tools/obbtool/Main.cpp | 4 |
6 files changed, 10 insertions, 5 deletions
diff --git a/core/res/res/values-fr/cm_strings.xml b/core/res/res/values-fr/cm_strings.xml index cbd8412..1f93895 100644 --- a/core/res/res/values-fr/cm_strings.xml +++ b/core/res/res/values-fr/cm_strings.xml @@ -60,6 +60,8 @@ <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> ne sera pas en mesure d\'accéder aux données personnelles</string> <string name="profile_picker_title">Profils</string> <string name="profile_none">Aucun</string> + <string name="permlab_cancelNotifications">annuler les notifications d\'application</string> + <string name="permdesc_cancelNotifications">Permet à l\'application de révoquer les notifications créées par d\'autres applications.</string> <string name="permlab_interceptSmsSent">intercepte les SMS sortants</string> <string name="permdesc_interceptSmsSent">Permet à l\'application d\'intercepter un SMS sortant. Des applications malveillantes peuvent utiliser cette option pour empêcher les SMS d\'être envoyés.</string> </resources> diff --git a/core/res/res/values-nl/cm_strings.xml b/core/res/res/values-nl/cm_strings.xml index 53b2dfb..90994ca 100644 --- a/core/res/res/values-nl/cm_strings.xml +++ b/core/res/res/values-nl/cm_strings.xml @@ -60,6 +60,8 @@ <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> zal geen toegang hebben tot persoonsgegevens</string> <string name="profile_picker_title">Profielen</string> <string name="profile_none">Geen</string> + <string name="permlab_cancelNotifications">app-meldingen sluiten</string> + <string name="permdesc_cancelNotifications">Hiermee kan de app meldingen gecreeërd door andere apps sluiten.</string> <string name="permlab_interceptSmsSent">uitgaand sms-bericht onderscheppen</string> <string name="permdesc_interceptSmsSent">Hiermee kan de app een uitgaand sms-bericht onderscheppen. Schadelijke apps kunnen dit gebruiken om uitgaande sms-berichten te blokkeren.</string> </resources> diff --git a/tools/aapt/ResourceIdCache.cpp b/tools/aapt/ResourceIdCache.cpp index e03f4f6..72b1c61 100644 --- a/tools/aapt/ResourceIdCache.cpp +++ b/tools/aapt/ResourceIdCache.cpp @@ -9,7 +9,7 @@ #include <utils/Log.h> #include "ResourceIdCache.h" #include <map> -using namespace std; +using std::map; static size_t mHits = 0; diff --git a/tools/aapt/ResourceIdCache.h b/tools/aapt/ResourceIdCache.h index 65f7781..40367c2 100644 --- a/tools/aapt/ResourceIdCache.h +++ b/tools/aapt/ResourceIdCache.h @@ -7,7 +7,7 @@ #define RESOURCE_ID_CACHE_H namespace android { -class android::String16; +class String16; class ResourceIdCache { public: diff --git a/tools/aapt/ResourceTable.h b/tools/aapt/ResourceTable.h index a3e0666..319f92d 100644 --- a/tools/aapt/ResourceTable.h +++ b/tools/aapt/ResourceTable.h @@ -13,7 +13,8 @@ #include <set> #include <map> -using namespace std; +using std::map; +using std::set; class XMLNode; class ResourceTable; diff --git a/tools/obbtool/Main.cpp b/tools/obbtool/Main.cpp index b2152e8..64808c0 100644 --- a/tools/obbtool/Main.cpp +++ b/tools/obbtool/Main.cpp @@ -89,7 +89,7 @@ void usage(void) " Prints the OBB signature information of a file.\n\n", gProgName); } -void doAdd(const char* filename, struct PackageInfo* info) { +void doAdd(const char* filename, PackageInfo* info) { ObbFile *obb = new ObbFile(); if (obb->readFrom(filename)) { fprintf(stderr, "ERROR: %s: OBB signature already present\n", filename); @@ -182,7 +182,7 @@ int main(int argc, char* const argv[]) { int opt; int option_index = 0; - struct PackageInfo package_info; + PackageInfo package_info; int result = 1; // pessimistically assume an error. |