Merge "Match non-crypto aware admins when registering."
diff --git a/api/current.txt b/api/current.txt
index 41b2d3e..ba73ca2 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -198,6 +198,7 @@
public static final class R.attr {
ctor public R.attr();
+ field public static final int abiOverride = 16844054; // 0x1010516
field public static final int absListViewStyle = 16842858; // 0x101006a
field public static final int accessibilityEventTypes = 16843648; // 0x1010380
field public static final int accessibilityFeedbackType = 16843650; // 0x1010382
diff --git a/api/test-current.txt b/api/test-current.txt
index 42bad76..a667a50 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -198,6 +198,7 @@
public static final class R.attr {
ctor public R.attr();
+ field public static final int abiOverride = 16844054; // 0x1010516
field public static final int absListViewStyle = 16842858; // 0x101006a
field public static final int accessibilityEventTypes = 16843648; // 0x1010380
field public static final int accessibilityFeedbackType = 16843650; // 0x1010382
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index acd4ab8..e0eb389 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -1677,7 +1677,8 @@
final char alphaShortcut = item.getAlphabeticShortcut();
if (title != null && alphaShortcut != MIN_VALUE) {
if (group == null) {
- group = new KeyboardShortcutGroup(null /* no label */);
+ final int resource = mApplication.getApplicationInfo().labelRes;
+ group = new KeyboardShortcutGroup(resource != 0 ? getString(resource) : null);
}
group.addItem(new KeyboardShortcutInfo(
title, alphaShortcut, KeyEvent.META_CTRL_ON));
diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp
index 80ccb61..43e26b3 100755
--- a/core/jni/android/graphics/Bitmap.cpp
+++ b/core/jni/android/graphics/Bitmap.cpp
@@ -1087,6 +1087,8 @@
p->writeInt32(density);
if (bitmap.colorType() == kIndex_8_SkColorType) {
+ // The bitmap needs to be locked to access its color table.
+ SkAutoLockPixels alp(bitmap);
SkColorTable* ctable = bitmap.getColorTable();
if (ctable != NULL) {
int count = ctable->count();
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml
index 15a4ad8..3a5336c 100644
--- a/core/res/res/values/attrs_manifest.xml
+++ b/core/res/res/values/attrs_manifest.xml
@@ -429,10 +429,7 @@
sets. -->
<attr name="multiArch" format ="boolean" />
- <!-- Specify abiOverride for multiArch application.
- @hide
- @SystemApi
- -->
+ <!-- Specify abiOverride for multiArch application. -->
<attr name="abiOverride" />
<!-- Specify whether a component is allowed to have multiple instances
diff --git a/libs/hwui/VectorDrawable.cpp b/libs/hwui/VectorDrawable.cpp
index c72f87d..541c799 100644
--- a/libs/hwui/VectorDrawable.cpp
+++ b/libs/hwui/VectorDrawable.cpp
@@ -460,7 +460,7 @@
mPaint.setColorFilter(colorFilter);
- int saveCount = outCanvas->save(SkCanvas::SaveFlags::kMatrixClip_SaveFlag);
+ int saveCount = outCanvas->save(SaveFlags::MatrixClip);
outCanvas->translate(mBounds.fLeft, mBounds.fTop);
// Handle RTL mirroring.
diff --git a/media/java/android/media/tv/TvRecordingClient.java b/media/java/android/media/tv/TvRecordingClient.java
index 73f1e32..1d80068 100644
--- a/media/java/android/media/tv/TvRecordingClient.java
+++ b/media/java/android/media/tv/TvRecordingClient.java
@@ -285,6 +285,18 @@
}
@Override
+ void onConnected(TvInputManager.Session session) {
+ if (DEBUG) {
+ Log.d(TAG, "onConnected()");
+ }
+ if (this != mSessionCallback) {
+ Log.w(TAG, "onConnected - session not created");
+ return;
+ }
+ mCallback.onConnected();
+ }
+
+ @Override
public void onSessionReleased(TvInputManager.Session session) {
if (DEBUG) {
Log.d(TAG, "onSessionReleased()");
diff --git a/packages/BackupRestoreConfirmation/res/values-ro/strings.xml b/packages/BackupRestoreConfirmation/res/values-ro/strings.xml
index b5731f0918..c80617c 100644
--- a/packages/BackupRestoreConfirmation/res/values-ro/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-ro/strings.xml
@@ -18,10 +18,10 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="backup_confirm_title" msgid="827563724209303345">"Copiere de rezervă completă"</string>
<string name="restore_confirm_title" msgid="5469365809567486602">"Restabilire completă"</string>
- <string name="backup_confirm_text" msgid="1878021282758896593">"S-a solicitat crearea unei copii de rezervă complete a tuturor datelor pe un computer desktop conectat. Doriți să permiteți acest lucru?\n\nDacă nu aţi solicitat dvs. copierea de rezervă, nu permiteți ca operațiunea să continue."</string>
+ <string name="backup_confirm_text" msgid="1878021282758896593">"S-a solicitat crearea unei copii de rezervă complete a tuturor datelor pe un computer desktop conectat. Doriți să permiteți acest lucru?\n\nDacă nu ați solicitat dvs. copierea de rezervă, nu permiteți ca operațiunea să continue."</string>
<string name="allow_backup_button_label" msgid="4217228747769644068">"Creați copii de rezervă pentru datele dvs."</string>
<string name="deny_backup_button_label" msgid="6009119115581097708">"Nu creați copii de rezervă"</string>
- <string name="restore_confirm_text" msgid="7499866728030461776">"S-a solicitat o restabilire completă a tuturor datelor de pe un computer desktop conectat. Doriți să permiteți acest lucru?\n\nDacă nu dvs. aţi solicitat această restabilire, nu permiteți continuarea operațiunii. Acest proces va înlocui toate datele existente în prezent pe dispozitiv!"</string>
+ <string name="restore_confirm_text" msgid="7499866728030461776">"S-a solicitat o restabilire completă a tuturor datelor de pe un computer desktop conectat. Doriți să permiteți acest lucru?\n\nDacă nu dvs. ați solicitat această restabilire, nu permiteți continuarea operațiunii. Acest proces va înlocui toate datele existente în prezent pe dispozitiv!"</string>
<string name="allow_restore_button_label" msgid="3081286752277127827">"Restabiliţi datele dvs."</string>
<string name="deny_restore_button_label" msgid="1724367334453104378">"Nu restabiliţi"</string>
<string name="current_password_text" msgid="8268189555578298067">"Introduceţi mai jos parola actuală pentru copia de rezervă:"</string>
diff --git a/packages/DocumentsUI/lint.xml b/packages/DocumentsUI/lint.xml
index 70d1ddf..09661ba 100644
--- a/packages/DocumentsUI/lint.xml
+++ b/packages/DocumentsUI/lint.xml
@@ -1,8 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<lint>
- <!-- min-sdk doesn't apply to platform apps -->
+ <!--
+ Lint configuration for the framework-lint tool (go/fwlint). See
+ http://tools.android.com/tips/lint for full docs on the lint tool.
+ -->
+
+ <!-- min-sdk doesn't apply to platform apps. -->
<issue id="UsesMinSdkAttributes" severity="ignore" />
- <!-- Protected permissions don't apply to system apps -->
+ <!-- Protected permissions don't apply to system apps. -->
<issue id="ProtectedPermissions" severity="ignore" />
+
+ <!-- Other recommended suppressions copied from go/fwlint. -->
+ <issue id="Assert" severity="ignore" />
+ <issue id="ClickableViewAccessibility" severity="ignore" />
+ <issue id="GoogleAppIndexingWarning" severity="ignore" />
+ <issue id="MissingPermission" severity="ignore" />
+ <issue id="ParcelClassLoader" severity="ignore" />
+ <issue id="ParcelCreator" severity="ignore" />
+ <issue id="Registered" severity="ignore" />
+ <issue id="RtlHardcoded" severity="ignore" />
+ <issue id="ShiftFlags" severity="ignore" />
+ <issue id="SuspiciousImport" severity="ignore" />
+
+ <!-- Don't lint automatically translated strings. -->
+ <issue id="all">
+ <ignore path="res/values-*/strings.xml" />
+ </issue>
+
+ <!-- Don't warn about missing translations. -->
+ <issue id="MissingTranslation">
+ <ignore path="res/values/strings.xml" />
+ </issue>
+
</lint>
diff --git a/packages/DocumentsUI/res/layout/fixed_layout.xml b/packages/DocumentsUI/res/layout/fixed_layout.xml
index 3135977..0dd4a33 100644
--- a/packages/DocumentsUI/res/layout/fixed_layout.xml
+++ b/packages/DocumentsUI/res/layout/fixed_layout.xml
@@ -22,7 +22,7 @@
android:layout_height="match_parent"
android:id="@+id/coordinator_layout">
- <LinearLayout
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
@@ -59,7 +59,6 @@
<include layout="@layout/directory_cluster"
android:layout_width="0dp"
- android:layout_weight="1"
android:elevation="8dp" />
</LinearLayout>
diff --git a/packages/DocumentsUI/res/values-af/strings.xml b/packages/DocumentsUI/res/values-af/strings.xml
index f0c48ec..458c309 100644
--- a/packages/DocumentsUI/res/values-af/strings.xml
+++ b/packages/DocumentsUI/res/values-af/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Lysaansig"</string>
<string name="menu_sort" msgid="7677740407158414452">"Sorteer volgens"</string>
<string name="menu_search" msgid="3816712084502856974">"Soek"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Instellings"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Maak oop"</string>
<string name="menu_save" msgid="2394743337684426338">"Stoor"</string>
<string name="menu_share" msgid="3075149983979628146">"Deel"</string>
diff --git a/packages/DocumentsUI/res/values-am/strings.xml b/packages/DocumentsUI/res/values-am/strings.xml
index aa11af1..6e08df4 100644
--- a/packages/DocumentsUI/res/values-am/strings.xml
+++ b/packages/DocumentsUI/res/values-am/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"የዝርዝር እይታ"</string>
<string name="menu_sort" msgid="7677740407158414452">"ደርድር በ"</string>
<string name="menu_search" msgid="3816712084502856974">"ፈልግ"</string>
- <string name="menu_settings" msgid="6008033148948428823">"ቅንብሮች"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"ክፈት"</string>
<string name="menu_save" msgid="2394743337684426338">"አስቀምጥ"</string>
<string name="menu_share" msgid="3075149983979628146">"አጋራ"</string>
diff --git a/packages/DocumentsUI/res/values-ar/strings.xml b/packages/DocumentsUI/res/values-ar/strings.xml
index 966fb17..4b7b4a8 100644
--- a/packages/DocumentsUI/res/values-ar/strings.xml
+++ b/packages/DocumentsUI/res/values-ar/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"عرض القائمة"</string>
<string name="menu_sort" msgid="7677740407158414452">"ترتيب بحسب"</string>
<string name="menu_search" msgid="3816712084502856974">"بحث"</string>
- <string name="menu_settings" msgid="6008033148948428823">"الإعدادات"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"فتح"</string>
<string name="menu_save" msgid="2394743337684426338">"حفظ"</string>
<string name="menu_share" msgid="3075149983979628146">"مشاركة"</string>
diff --git a/packages/DocumentsUI/res/values-az-rAZ/strings.xml b/packages/DocumentsUI/res/values-az-rAZ/strings.xml
index 8864a27..9162b95 100644
--- a/packages/DocumentsUI/res/values-az-rAZ/strings.xml
+++ b/packages/DocumentsUI/res/values-az-rAZ/strings.xml
@@ -26,7 +26,7 @@
<string name="menu_list" msgid="7279285939892417279">"Siyahı görünüşü"</string>
<string name="menu_sort" msgid="7677740407158414452">"Bunlardan biri üzrə sırala"</string>
<string name="menu_search" msgid="3816712084502856974">"Axtarış"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Ayarlar"</string>
+ <string name="menu_settings" msgid="8239065133341597825">"Yaddaş parametrləri"</string>
<string name="menu_open" msgid="432922957274920903">"Açın"</string>
<string name="menu_save" msgid="2394743337684426338">"Yadda saxlayın"</string>
<string name="menu_share" msgid="3075149983979628146">"Paylaşın"</string>
diff --git a/packages/DocumentsUI/res/values-b+sr+Latn/strings.xml b/packages/DocumentsUI/res/values-b+sr+Latn/strings.xml
index 9e9dfb1..3252a43 100644
--- a/packages/DocumentsUI/res/values-b+sr+Latn/strings.xml
+++ b/packages/DocumentsUI/res/values-b+sr+Latn/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Prikaz liste"</string>
<string name="menu_sort" msgid="7677740407158414452">"Sortiraj prema"</string>
<string name="menu_search" msgid="3816712084502856974">"Pretraži"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Podešavanja"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Otvori"</string>
<string name="menu_save" msgid="2394743337684426338">"Sačuvaj"</string>
<string name="menu_share" msgid="3075149983979628146">"Deli"</string>
diff --git a/packages/DocumentsUI/res/values-bg/strings.xml b/packages/DocumentsUI/res/values-bg/strings.xml
index 6544c57..0d901cf 100644
--- a/packages/DocumentsUI/res/values-bg/strings.xml
+++ b/packages/DocumentsUI/res/values-bg/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Списъчен изглед"</string>
<string name="menu_sort" msgid="7677740407158414452">"Сортиране по"</string>
<string name="menu_search" msgid="3816712084502856974">"Търсене"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Настройки"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Отваряне"</string>
<string name="menu_save" msgid="2394743337684426338">"Запазване"</string>
<string name="menu_share" msgid="3075149983979628146">"Споделяне"</string>
diff --git a/packages/DocumentsUI/res/values-bn-rBD/strings.xml b/packages/DocumentsUI/res/values-bn-rBD/strings.xml
index 84328a8..a990282 100644
--- a/packages/DocumentsUI/res/values-bn-rBD/strings.xml
+++ b/packages/DocumentsUI/res/values-bn-rBD/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"তালিকা দৃশ্য"</string>
<string name="menu_sort" msgid="7677740407158414452">"এই অনুসারে বাছুন"</string>
<string name="menu_search" msgid="3816712084502856974">"অনুসন্ধান করুন"</string>
- <string name="menu_settings" msgid="6008033148948428823">"সেটিংস"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"খুলুন"</string>
<string name="menu_save" msgid="2394743337684426338">"সংরক্ষণ করুন"</string>
<string name="menu_share" msgid="3075149983979628146">"ভাগ করুন"</string>
diff --git a/packages/DocumentsUI/res/values-bs-rBA/strings.xml b/packages/DocumentsUI/res/values-bs-rBA/strings.xml
index d8797a3..9d75ddc 100644
--- a/packages/DocumentsUI/res/values-bs-rBA/strings.xml
+++ b/packages/DocumentsUI/res/values-bs-rBA/strings.xml
@@ -36,7 +36,7 @@
<skip />
<!-- no translation found for menu_search (3816712084502856974) -->
<skip />
- <!-- no translation found for menu_settings (6008033148948428823) -->
+ <!-- no translation found for menu_settings (8239065133341597825) -->
<skip />
<!-- no translation found for menu_open (432922957274920903) -->
<skip />
diff --git a/packages/DocumentsUI/res/values-ca/strings.xml b/packages/DocumentsUI/res/values-ca/strings.xml
index 3cf069b..25029e9 100644
--- a/packages/DocumentsUI/res/values-ca/strings.xml
+++ b/packages/DocumentsUI/res/values-ca/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Visualització de llista"</string>
<string name="menu_sort" msgid="7677740407158414452">"Ordena per"</string>
<string name="menu_search" msgid="3816712084502856974">"Cerca"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Configuració"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Obre"</string>
<string name="menu_save" msgid="2394743337684426338">"Desa"</string>
<string name="menu_share" msgid="3075149983979628146">"Comparteix"</string>
diff --git a/packages/DocumentsUI/res/values-cs/strings.xml b/packages/DocumentsUI/res/values-cs/strings.xml
index b6b9a88..bcb1748 100644
--- a/packages/DocumentsUI/res/values-cs/strings.xml
+++ b/packages/DocumentsUI/res/values-cs/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Zobrazení seznamu"</string>
<string name="menu_sort" msgid="7677740407158414452">"Řadit podle"</string>
<string name="menu_search" msgid="3816712084502856974">"Hledat"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Nastavení"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Otevřít"</string>
<string name="menu_save" msgid="2394743337684426338">"Uložit"</string>
<string name="menu_share" msgid="3075149983979628146">"Sdílet"</string>
diff --git a/packages/DocumentsUI/res/values-da/strings.xml b/packages/DocumentsUI/res/values-da/strings.xml
index 2c45d3b..03f4881 100644
--- a/packages/DocumentsUI/res/values-da/strings.xml
+++ b/packages/DocumentsUI/res/values-da/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Listevisning"</string>
<string name="menu_sort" msgid="7677740407158414452">"Sortér efter"</string>
<string name="menu_search" msgid="3816712084502856974">"Søg"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Indstillinger"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Åbn"</string>
<string name="menu_save" msgid="2394743337684426338">"Gem"</string>
<string name="menu_share" msgid="3075149983979628146">"Del"</string>
diff --git a/packages/DocumentsUI/res/values-de/strings.xml b/packages/DocumentsUI/res/values-de/strings.xml
index 37ed4df..0abdd57 100644
--- a/packages/DocumentsUI/res/values-de/strings.xml
+++ b/packages/DocumentsUI/res/values-de/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Listenansicht"</string>
<string name="menu_sort" msgid="7677740407158414452">"Sortieren nach"</string>
<string name="menu_search" msgid="3816712084502856974">"Suchen"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Einstellungen"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Öffnen"</string>
<string name="menu_save" msgid="2394743337684426338">"Speichern"</string>
<string name="menu_share" msgid="3075149983979628146">"Teilen"</string>
diff --git a/packages/DocumentsUI/res/values-el/strings.xml b/packages/DocumentsUI/res/values-el/strings.xml
index 396fa12..819cb5b 100644
--- a/packages/DocumentsUI/res/values-el/strings.xml
+++ b/packages/DocumentsUI/res/values-el/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Προβολή λίστας"</string>
<string name="menu_sort" msgid="7677740407158414452">"Ταξινόμηση κατά"</string>
<string name="menu_search" msgid="3816712084502856974">"Αναζήτηση"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Ρυθμίσεις"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Άνοιγμα"</string>
<string name="menu_save" msgid="2394743337684426338">"Αποθήκευση"</string>
<string name="menu_share" msgid="3075149983979628146">"Κοινή χρήση"</string>
diff --git a/packages/DocumentsUI/res/values-en-rAU/strings.xml b/packages/DocumentsUI/res/values-en-rAU/strings.xml
index e96fef9..f4cd479 100644
--- a/packages/DocumentsUI/res/values-en-rAU/strings.xml
+++ b/packages/DocumentsUI/res/values-en-rAU/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"List view"</string>
<string name="menu_sort" msgid="7677740407158414452">"Sort by"</string>
<string name="menu_search" msgid="3816712084502856974">"Search"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Settings"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Open"</string>
<string name="menu_save" msgid="2394743337684426338">"Save"</string>
<string name="menu_share" msgid="3075149983979628146">"Share"</string>
diff --git a/packages/DocumentsUI/res/values-en-rGB/strings.xml b/packages/DocumentsUI/res/values-en-rGB/strings.xml
index e96fef9..f4cd479 100644
--- a/packages/DocumentsUI/res/values-en-rGB/strings.xml
+++ b/packages/DocumentsUI/res/values-en-rGB/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"List view"</string>
<string name="menu_sort" msgid="7677740407158414452">"Sort by"</string>
<string name="menu_search" msgid="3816712084502856974">"Search"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Settings"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Open"</string>
<string name="menu_save" msgid="2394743337684426338">"Save"</string>
<string name="menu_share" msgid="3075149983979628146">"Share"</string>
diff --git a/packages/DocumentsUI/res/values-en-rIN/strings.xml b/packages/DocumentsUI/res/values-en-rIN/strings.xml
index e96fef9..f4cd479 100644
--- a/packages/DocumentsUI/res/values-en-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-en-rIN/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"List view"</string>
<string name="menu_sort" msgid="7677740407158414452">"Sort by"</string>
<string name="menu_search" msgid="3816712084502856974">"Search"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Settings"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Open"</string>
<string name="menu_save" msgid="2394743337684426338">"Save"</string>
<string name="menu_share" msgid="3075149983979628146">"Share"</string>
diff --git a/packages/DocumentsUI/res/values-es-rUS/strings.xml b/packages/DocumentsUI/res/values-es-rUS/strings.xml
index 9f77732..92eb697 100644
--- a/packages/DocumentsUI/res/values-es-rUS/strings.xml
+++ b/packages/DocumentsUI/res/values-es-rUS/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Vista de lista"</string>
<string name="menu_sort" msgid="7677740407158414452">"Ordenar por"</string>
<string name="menu_search" msgid="3816712084502856974">"Buscar"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Configuración"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Abrir"</string>
<string name="menu_save" msgid="2394743337684426338">"Guardar"</string>
<string name="menu_share" msgid="3075149983979628146">"Compartir"</string>
diff --git a/packages/DocumentsUI/res/values-es/strings.xml b/packages/DocumentsUI/res/values-es/strings.xml
index 2010f8c..5368145 100644
--- a/packages/DocumentsUI/res/values-es/strings.xml
+++ b/packages/DocumentsUI/res/values-es/strings.xml
@@ -26,7 +26,7 @@
<string name="menu_list" msgid="7279285939892417279">"Vista de lista"</string>
<string name="menu_sort" msgid="7677740407158414452">"Ordenar por"</string>
<string name="menu_search" msgid="3816712084502856974">"Buscar"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Ajustes"</string>
+ <string name="menu_settings" msgid="8239065133341597825">"Ajustes de almacenamiento"</string>
<string name="menu_open" msgid="432922957274920903">"Abrir"</string>
<string name="menu_save" msgid="2394743337684426338">"Guardar"</string>
<string name="menu_share" msgid="3075149983979628146">"Compartir"</string>
diff --git a/packages/DocumentsUI/res/values-et-rEE/strings.xml b/packages/DocumentsUI/res/values-et-rEE/strings.xml
index 97577e68..982a949 100644
--- a/packages/DocumentsUI/res/values-et-rEE/strings.xml
+++ b/packages/DocumentsUI/res/values-et-rEE/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Loendikuva"</string>
<string name="menu_sort" msgid="7677740407158414452">"Sortimisalus:"</string>
<string name="menu_search" msgid="3816712084502856974">"Otsing"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Seaded"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Ava"</string>
<string name="menu_save" msgid="2394743337684426338">"Salvesta"</string>
<string name="menu_share" msgid="3075149983979628146">"Jaga"</string>
diff --git a/packages/DocumentsUI/res/values-eu-rES/strings.xml b/packages/DocumentsUI/res/values-eu-rES/strings.xml
index 036c361..8c13368 100644
--- a/packages/DocumentsUI/res/values-eu-rES/strings.xml
+++ b/packages/DocumentsUI/res/values-eu-rES/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Zerrenda-ikuspegia"</string>
<string name="menu_sort" msgid="7677740407158414452">"Ordenatzeko irizpidea"</string>
<string name="menu_search" msgid="3816712084502856974">"Bilatu"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Ezarpenak"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Ireki"</string>
<string name="menu_save" msgid="2394743337684426338">"Gorde"</string>
<string name="menu_share" msgid="3075149983979628146">"Partekatu"</string>
diff --git a/packages/DocumentsUI/res/values-fa/strings.xml b/packages/DocumentsUI/res/values-fa/strings.xml
index 7367e25..b7d09f8 100644
--- a/packages/DocumentsUI/res/values-fa/strings.xml
+++ b/packages/DocumentsUI/res/values-fa/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"نمای فهرستی"</string>
<string name="menu_sort" msgid="7677740407158414452">"مرتبسازی براساس"</string>
<string name="menu_search" msgid="3816712084502856974">"جستجو"</string>
- <string name="menu_settings" msgid="6008033148948428823">"تنظیمات"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"باز کردن"</string>
<string name="menu_save" msgid="2394743337684426338">"ذخیره"</string>
<string name="menu_share" msgid="3075149983979628146">"اشتراکگذاری"</string>
diff --git a/packages/DocumentsUI/res/values-fi/strings.xml b/packages/DocumentsUI/res/values-fi/strings.xml
index 2d65899..c9517f9 100644
--- a/packages/DocumentsUI/res/values-fi/strings.xml
+++ b/packages/DocumentsUI/res/values-fi/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Luettelonäkymä"</string>
<string name="menu_sort" msgid="7677740407158414452">"Lajitteluperuste"</string>
<string name="menu_search" msgid="3816712084502856974">"Haku"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Asetukset"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Avaa"</string>
<string name="menu_save" msgid="2394743337684426338">"Tallenna"</string>
<string name="menu_share" msgid="3075149983979628146">"Jaa"</string>
diff --git a/packages/DocumentsUI/res/values-fr-rCA/strings.xml b/packages/DocumentsUI/res/values-fr-rCA/strings.xml
index baa963a..ace072b 100644
--- a/packages/DocumentsUI/res/values-fr-rCA/strings.xml
+++ b/packages/DocumentsUI/res/values-fr-rCA/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Liste"</string>
<string name="menu_sort" msgid="7677740407158414452">"Trier par"</string>
<string name="menu_search" msgid="3816712084502856974">"Rechercher"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Paramètres"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Ouvrir"</string>
<string name="menu_save" msgid="2394743337684426338">"Enregistrer"</string>
<string name="menu_share" msgid="3075149983979628146">"Partager"</string>
diff --git a/packages/DocumentsUI/res/values-fr/strings.xml b/packages/DocumentsUI/res/values-fr/strings.xml
index d30a130..b1e4827 100644
--- a/packages/DocumentsUI/res/values-fr/strings.xml
+++ b/packages/DocumentsUI/res/values-fr/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Liste"</string>
<string name="menu_sort" msgid="7677740407158414452">"Trier par"</string>
<string name="menu_search" msgid="3816712084502856974">"Rechercher"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Paramètres"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Ouvrir"</string>
<string name="menu_save" msgid="2394743337684426338">"Enregistrer"</string>
<string name="menu_share" msgid="3075149983979628146">"Partager"</string>
diff --git a/packages/DocumentsUI/res/values-gl-rES/strings.xml b/packages/DocumentsUI/res/values-gl-rES/strings.xml
index 7c69698..9275557 100644
--- a/packages/DocumentsUI/res/values-gl-rES/strings.xml
+++ b/packages/DocumentsUI/res/values-gl-rES/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Vista de lista"</string>
<string name="menu_sort" msgid="7677740407158414452">"Ordenar por"</string>
<string name="menu_search" msgid="3816712084502856974">"Buscar"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Configuración"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Abrir"</string>
<string name="menu_save" msgid="2394743337684426338">"Gardar"</string>
<string name="menu_share" msgid="3075149983979628146">"Compartir"</string>
diff --git a/packages/DocumentsUI/res/values-gu-rIN/strings.xml b/packages/DocumentsUI/res/values-gu-rIN/strings.xml
index c650d93..5dceac2d7 100644
--- a/packages/DocumentsUI/res/values-gu-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-gu-rIN/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"સૂચિ દૃશ્ય"</string>
<string name="menu_sort" msgid="7677740407158414452">"આ પ્રમાણે સૉર્ટ કરો"</string>
<string name="menu_search" msgid="3816712084502856974">"શોધો"</string>
- <string name="menu_settings" msgid="6008033148948428823">"સેટિંગ્સ"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"ખોલો"</string>
<string name="menu_save" msgid="2394743337684426338">"સાચવો"</string>
<string name="menu_share" msgid="3075149983979628146">"શેર કરો"</string>
diff --git a/packages/DocumentsUI/res/values-hi/strings.xml b/packages/DocumentsUI/res/values-hi/strings.xml
index 4ab246d..a6eeb9f 100644
--- a/packages/DocumentsUI/res/values-hi/strings.xml
+++ b/packages/DocumentsUI/res/values-hi/strings.xml
@@ -26,7 +26,7 @@
<string name="menu_list" msgid="7279285939892417279">"सूची दृश्य"</string>
<string name="menu_sort" msgid="7677740407158414452">"इससे क्रमित करें"</string>
<string name="menu_search" msgid="3816712084502856974">"खोजें"</string>
- <string name="menu_settings" msgid="6008033148948428823">"सेटिंग"</string>
+ <string name="menu_settings" msgid="8239065133341597825">"मेमोरी सेटिंग"</string>
<string name="menu_open" msgid="432922957274920903">"खोलें"</string>
<string name="menu_save" msgid="2394743337684426338">"जोड़ें"</string>
<string name="menu_share" msgid="3075149983979628146">"साझा करें"</string>
diff --git a/packages/DocumentsUI/res/values-hr/strings.xml b/packages/DocumentsUI/res/values-hr/strings.xml
index e5d04f7..888cf32 100644
--- a/packages/DocumentsUI/res/values-hr/strings.xml
+++ b/packages/DocumentsUI/res/values-hr/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Prikaz popisa"</string>
<string name="menu_sort" msgid="7677740407158414452">"Poredano po"</string>
<string name="menu_search" msgid="3816712084502856974">"Pretraživanje"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Postavke"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Otvaranje"</string>
<string name="menu_save" msgid="2394743337684426338">"Spremi"</string>
<string name="menu_share" msgid="3075149983979628146">"Dijeli"</string>
diff --git a/packages/DocumentsUI/res/values-hu/strings.xml b/packages/DocumentsUI/res/values-hu/strings.xml
index 7a68a19..910eb0c 100644
--- a/packages/DocumentsUI/res/values-hu/strings.xml
+++ b/packages/DocumentsUI/res/values-hu/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Lista"</string>
<string name="menu_sort" msgid="7677740407158414452">"Rendezés"</string>
<string name="menu_search" msgid="3816712084502856974">"Keresés"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Beállítások"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Megnyitás"</string>
<string name="menu_save" msgid="2394743337684426338">"Mentés"</string>
<string name="menu_share" msgid="3075149983979628146">"Megosztás"</string>
diff --git a/packages/DocumentsUI/res/values-hy-rAM/strings.xml b/packages/DocumentsUI/res/values-hy-rAM/strings.xml
index e28c711..1471a6a 100644
--- a/packages/DocumentsUI/res/values-hy-rAM/strings.xml
+++ b/packages/DocumentsUI/res/values-hy-rAM/strings.xml
@@ -26,10 +26,11 @@
<string name="menu_list" msgid="7279285939892417279">"Ցուցակի տեսք"</string>
<string name="menu_sort" msgid="7677740407158414452">"Դասավորել ըստ"</string>
<string name="menu_search" msgid="3816712084502856974">"Որոնել"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Կարգավորումներ"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Բացել"</string>
<string name="menu_save" msgid="2394743337684426338">"Պահել"</string>
- <string name="menu_share" msgid="3075149983979628146">"Համօգտագործել"</string>
+ <string name="menu_share" msgid="3075149983979628146">"Կիսվել"</string>
<string name="menu_delete" msgid="8138799623850614177">"Ջնջել"</string>
<string name="menu_select_all" msgid="8323579667348729928">"Ընտրել բոլորը"</string>
<string name="menu_copy" msgid="3612326052677229148">"Պատճենել…"</string>
diff --git a/packages/DocumentsUI/res/values-in/strings.xml b/packages/DocumentsUI/res/values-in/strings.xml
index a89d99d..29f118e 100644
--- a/packages/DocumentsUI/res/values-in/strings.xml
+++ b/packages/DocumentsUI/res/values-in/strings.xml
@@ -26,7 +26,7 @@
<string name="menu_list" msgid="7279285939892417279">"Tampilan daftar"</string>
<string name="menu_sort" msgid="7677740407158414452">"Urutkan menurut"</string>
<string name="menu_search" msgid="3816712084502856974">"Telusuri"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Setelan"</string>
+ <string name="menu_settings" msgid="8239065133341597825">"Setelan penyimpanan"</string>
<string name="menu_open" msgid="432922957274920903">"Buka"</string>
<string name="menu_save" msgid="2394743337684426338">"Simpan"</string>
<string name="menu_share" msgid="3075149983979628146">"Bagikan"</string>
diff --git a/packages/DocumentsUI/res/values-is-rIS/strings.xml b/packages/DocumentsUI/res/values-is-rIS/strings.xml
index 9c69741..c95189d 100644
--- a/packages/DocumentsUI/res/values-is-rIS/strings.xml
+++ b/packages/DocumentsUI/res/values-is-rIS/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Listayfirlit"</string>
<string name="menu_sort" msgid="7677740407158414452">"Raða eftir"</string>
<string name="menu_search" msgid="3816712084502856974">"Leita"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Stillingar"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Opna"</string>
<string name="menu_save" msgid="2394743337684426338">"Vista"</string>
<string name="menu_share" msgid="3075149983979628146">"Deila"</string>
diff --git a/packages/DocumentsUI/res/values-it/strings.xml b/packages/DocumentsUI/res/values-it/strings.xml
index d06f732..276c937 100644
--- a/packages/DocumentsUI/res/values-it/strings.xml
+++ b/packages/DocumentsUI/res/values-it/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Visualizzazione elenco"</string>
<string name="menu_sort" msgid="7677740407158414452">"Ordina per"</string>
<string name="menu_search" msgid="3816712084502856974">"Cerca"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Impostazioni"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Apri"</string>
<string name="menu_save" msgid="2394743337684426338">"Salva"</string>
<string name="menu_share" msgid="3075149983979628146">"Condividi"</string>
diff --git a/packages/DocumentsUI/res/values-iw/strings.xml b/packages/DocumentsUI/res/values-iw/strings.xml
index 25d9b12..4fc5617 100644
--- a/packages/DocumentsUI/res/values-iw/strings.xml
+++ b/packages/DocumentsUI/res/values-iw/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"תצוגת רשימה"</string>
<string name="menu_sort" msgid="7677740407158414452">"מיין לפי"</string>
<string name="menu_search" msgid="3816712084502856974">"חפש"</string>
- <string name="menu_settings" msgid="6008033148948428823">"הגדרות"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"פתח"</string>
<string name="menu_save" msgid="2394743337684426338">"שמור"</string>
<string name="menu_share" msgid="3075149983979628146">"שתף"</string>
diff --git a/packages/DocumentsUI/res/values-ja/strings.xml b/packages/DocumentsUI/res/values-ja/strings.xml
index d1156ff..36a35f9 100644
--- a/packages/DocumentsUI/res/values-ja/strings.xml
+++ b/packages/DocumentsUI/res/values-ja/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"リスト表示"</string>
<string name="menu_sort" msgid="7677740407158414452">"並べ替え"</string>
<string name="menu_search" msgid="3816712084502856974">"検索"</string>
- <string name="menu_settings" msgid="6008033148948428823">"設定"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"開く"</string>
<string name="menu_save" msgid="2394743337684426338">"保存"</string>
<string name="menu_share" msgid="3075149983979628146">"共有"</string>
diff --git a/packages/DocumentsUI/res/values-ka-rGE/strings.xml b/packages/DocumentsUI/res/values-ka-rGE/strings.xml
index e1a5be4..eea4828 100644
--- a/packages/DocumentsUI/res/values-ka-rGE/strings.xml
+++ b/packages/DocumentsUI/res/values-ka-rGE/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"სიის ხედი"</string>
<string name="menu_sort" msgid="7677740407158414452">"სორტირება:"</string>
<string name="menu_search" msgid="3816712084502856974">"ძიება"</string>
- <string name="menu_settings" msgid="6008033148948428823">"პარამეტრები"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"გახსნა"</string>
<string name="menu_save" msgid="2394743337684426338">"შენახვა"</string>
<string name="menu_share" msgid="3075149983979628146">"გაზიარება"</string>
diff --git a/packages/DocumentsUI/res/values-kk-rKZ/strings.xml b/packages/DocumentsUI/res/values-kk-rKZ/strings.xml
index 3aed2a0..715db08 100644
--- a/packages/DocumentsUI/res/values-kk-rKZ/strings.xml
+++ b/packages/DocumentsUI/res/values-kk-rKZ/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Тізім көрінісі"</string>
<string name="menu_sort" msgid="7677740407158414452">"Белгіге қарай сұрыптау"</string>
<string name="menu_search" msgid="3816712084502856974">"Іздеу"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Параметрлер"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Ашу"</string>
<string name="menu_save" msgid="2394743337684426338">"Сақтау"</string>
<string name="menu_share" msgid="3075149983979628146">"Бөлісу"</string>
diff --git a/packages/DocumentsUI/res/values-km-rKH/strings.xml b/packages/DocumentsUI/res/values-km-rKH/strings.xml
index 7e5851f..efa7e88 100644
--- a/packages/DocumentsUI/res/values-km-rKH/strings.xml
+++ b/packages/DocumentsUI/res/values-km-rKH/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"ទិដ្ឋភាពបញ្ជី"</string>
<string name="menu_sort" msgid="7677740407158414452">"តម្រៀបតាម"</string>
<string name="menu_search" msgid="3816712084502856974">"ស្វែងរក"</string>
- <string name="menu_settings" msgid="6008033148948428823">"ការកំណត់"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"បើក"</string>
<string name="menu_save" msgid="2394743337684426338">"រក្សាទុក"</string>
<string name="menu_share" msgid="3075149983979628146">"ចែករំលែក"</string>
diff --git a/packages/DocumentsUI/res/values-kn-rIN/strings.xml b/packages/DocumentsUI/res/values-kn-rIN/strings.xml
index 41cdbc3..dc644a8 100644
--- a/packages/DocumentsUI/res/values-kn-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-kn-rIN/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"ಪಟ್ಟಿ ವೀಕ್ಷಣೆ"</string>
<string name="menu_sort" msgid="7677740407158414452">"ಈ ಪ್ರಕಾರ ವಿಂಗಡಿಸು"</string>
<string name="menu_search" msgid="3816712084502856974">"ಹುಡುಕು"</string>
- <string name="menu_settings" msgid="6008033148948428823">"ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"ತೆರೆ"</string>
<string name="menu_save" msgid="2394743337684426338">"ಉಳಿಸು"</string>
<string name="menu_share" msgid="3075149983979628146">"ಹಂಚು"</string>
diff --git a/packages/DocumentsUI/res/values-ko/strings.xml b/packages/DocumentsUI/res/values-ko/strings.xml
index 58edec4..f807eef 100644
--- a/packages/DocumentsUI/res/values-ko/strings.xml
+++ b/packages/DocumentsUI/res/values-ko/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"목록 보기"</string>
<string name="menu_sort" msgid="7677740407158414452">"정렬 기준"</string>
<string name="menu_search" msgid="3816712084502856974">"검색"</string>
- <string name="menu_settings" msgid="6008033148948428823">"설정"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"열기"</string>
<string name="menu_save" msgid="2394743337684426338">"저장"</string>
<string name="menu_share" msgid="3075149983979628146">"공유"</string>
diff --git a/packages/DocumentsUI/res/values-ky-rKG/strings.xml b/packages/DocumentsUI/res/values-ky-rKG/strings.xml
index fc56478..bc1ea7c 100644
--- a/packages/DocumentsUI/res/values-ky-rKG/strings.xml
+++ b/packages/DocumentsUI/res/values-ky-rKG/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Тизмек көрүнүшү"</string>
<string name="menu_sort" msgid="7677740407158414452">"Ылгоо"</string>
<string name="menu_search" msgid="3816712084502856974">"Издөө"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Тууралоолор"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Ачуу"</string>
<string name="menu_save" msgid="2394743337684426338">"Сактоо"</string>
<string name="menu_share" msgid="3075149983979628146">"Бөлүшүү"</string>
diff --git a/packages/DocumentsUI/res/values-lo-rLA/strings.xml b/packages/DocumentsUI/res/values-lo-rLA/strings.xml
index fba9244..aa1c3df 100644
--- a/packages/DocumentsUI/res/values-lo-rLA/strings.xml
+++ b/packages/DocumentsUI/res/values-lo-rLA/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"ມຸມມອງແບບລາຍຊື່"</string>
<string name="menu_sort" msgid="7677740407158414452">"ຮຽງລຳດັບຕາມ"</string>
<string name="menu_search" msgid="3816712084502856974">"ຊອກຫາ"</string>
- <string name="menu_settings" msgid="6008033148948428823">"ການຕັ້ງຄ່າ"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"ເປີດ"</string>
<string name="menu_save" msgid="2394743337684426338">"ບັນທຶກ"</string>
<string name="menu_share" msgid="3075149983979628146">"ແບ່ງປັນ"</string>
diff --git a/packages/DocumentsUI/res/values-lt/strings.xml b/packages/DocumentsUI/res/values-lt/strings.xml
index 992d4da..48339b9 100644
--- a/packages/DocumentsUI/res/values-lt/strings.xml
+++ b/packages/DocumentsUI/res/values-lt/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Sąrašo rodinys"</string>
<string name="menu_sort" msgid="7677740407158414452">"Rūšiuoti pagal"</string>
<string name="menu_search" msgid="3816712084502856974">"Ieškoti"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Nustatymai"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Atidaryti"</string>
<string name="menu_save" msgid="2394743337684426338">"Išsaugoti"</string>
<string name="menu_share" msgid="3075149983979628146">"Bendrinti"</string>
diff --git a/packages/DocumentsUI/res/values-lv/strings.xml b/packages/DocumentsUI/res/values-lv/strings.xml
index 58e507d..524feba 100644
--- a/packages/DocumentsUI/res/values-lv/strings.xml
+++ b/packages/DocumentsUI/res/values-lv/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Saraksts"</string>
<string name="menu_sort" msgid="7677740407158414452">"Kārtot pēc"</string>
<string name="menu_search" msgid="3816712084502856974">"Meklēt"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Iestatījumi"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Atvērt"</string>
<string name="menu_save" msgid="2394743337684426338">"Saglabāt"</string>
<string name="menu_share" msgid="3075149983979628146">"Kopīgot"</string>
diff --git a/packages/DocumentsUI/res/values-mk-rMK/strings.xml b/packages/DocumentsUI/res/values-mk-rMK/strings.xml
index b1ea307..15017e1 100644
--- a/packages/DocumentsUI/res/values-mk-rMK/strings.xml
+++ b/packages/DocumentsUI/res/values-mk-rMK/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Приказ на список"</string>
<string name="menu_sort" msgid="7677740407158414452">"Подреди по"</string>
<string name="menu_search" msgid="3816712084502856974">"Пребарај"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Поставки"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Отвори"</string>
<string name="menu_save" msgid="2394743337684426338">"Зачувај"</string>
<string name="menu_share" msgid="3075149983979628146">"Сподели"</string>
diff --git a/packages/DocumentsUI/res/values-ml-rIN/strings.xml b/packages/DocumentsUI/res/values-ml-rIN/strings.xml
index 9d1f353..9a79b72 100644
--- a/packages/DocumentsUI/res/values-ml-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-ml-rIN/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"ലിസ്റ്റ് കാഴ്ച"</string>
<string name="menu_sort" msgid="7677740407158414452">"ഇപ്രകാരം അടുക്കുക"</string>
<string name="menu_search" msgid="3816712084502856974">"തിരയൽ"</string>
- <string name="menu_settings" msgid="6008033148948428823">"ക്രമീകരണങ്ങൾ"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"തുറക്കുക"</string>
<string name="menu_save" msgid="2394743337684426338">"സംരക്ഷിക്കുക"</string>
<string name="menu_share" msgid="3075149983979628146">"പങ്കിടുക"</string>
diff --git a/packages/DocumentsUI/res/values-mn-rMN/strings.xml b/packages/DocumentsUI/res/values-mn-rMN/strings.xml
index 3cbdc55..67b88ef 100644
--- a/packages/DocumentsUI/res/values-mn-rMN/strings.xml
+++ b/packages/DocumentsUI/res/values-mn-rMN/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Жагсааж харах"</string>
<string name="menu_sort" msgid="7677740407158414452">"Эрэмбэлэх"</string>
<string name="menu_search" msgid="3816712084502856974">"Хайх"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Тохиргоо"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Нээх"</string>
<string name="menu_save" msgid="2394743337684426338">"Хадгалах"</string>
<string name="menu_share" msgid="3075149983979628146">"Хуваалцах"</string>
diff --git a/packages/DocumentsUI/res/values-mr-rIN/strings.xml b/packages/DocumentsUI/res/values-mr-rIN/strings.xml
index ae7a48a..53ca858 100644
--- a/packages/DocumentsUI/res/values-mr-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-mr-rIN/strings.xml
@@ -26,7 +26,7 @@
<string name="menu_list" msgid="7279285939892417279">"सूची"</string>
<string name="menu_sort" msgid="7677740407158414452">"नुसार क्रमवारी लावा"</string>
<string name="menu_search" msgid="3816712084502856974">"शोध"</string>
- <string name="menu_settings" msgid="6008033148948428823">"सेटिंग्ज"</string>
+ <string name="menu_settings" msgid="8239065133341597825">"संचयन सेटिंग्ज"</string>
<string name="menu_open" msgid="432922957274920903">"उघडा"</string>
<string name="menu_save" msgid="2394743337684426338">"जतन करा"</string>
<string name="menu_share" msgid="3075149983979628146">"सामायिक करा"</string>
diff --git a/packages/DocumentsUI/res/values-ms-rMY/strings.xml b/packages/DocumentsUI/res/values-ms-rMY/strings.xml
index 7346dd5..24fe49c 100644
--- a/packages/DocumentsUI/res/values-ms-rMY/strings.xml
+++ b/packages/DocumentsUI/res/values-ms-rMY/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Paparan senarai"</string>
<string name="menu_sort" msgid="7677740407158414452">"Isih mengikut"</string>
<string name="menu_search" msgid="3816712084502856974">"Cari"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Tetapan"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Buka"</string>
<string name="menu_save" msgid="2394743337684426338">"Simpan"</string>
<string name="menu_share" msgid="3075149983979628146">"Kongsi"</string>
diff --git a/packages/DocumentsUI/res/values-my-rMM/strings.xml b/packages/DocumentsUI/res/values-my-rMM/strings.xml
index 2e71299..4c36bd3 100644
--- a/packages/DocumentsUI/res/values-my-rMM/strings.xml
+++ b/packages/DocumentsUI/res/values-my-rMM/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"အစဉ်လိုက်မြင်ကွင်း"</string>
<string name="menu_sort" msgid="7677740407158414452">"အစဉ်အလိုက် စီခြင်း"</string>
<string name="menu_search" msgid="3816712084502856974">"ရှာဖွေရန်"</string>
- <string name="menu_settings" msgid="6008033148948428823">"ဆက်တင်များ"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"ဖွင့်ရန်"</string>
<string name="menu_save" msgid="2394743337684426338">"သိမ်းပါ"</string>
<string name="menu_share" msgid="3075149983979628146">"မျှဝေခြင်း"</string>
diff --git a/packages/DocumentsUI/res/values-nb/strings.xml b/packages/DocumentsUI/res/values-nb/strings.xml
index 57a5a76..4ff395e 100644
--- a/packages/DocumentsUI/res/values-nb/strings.xml
+++ b/packages/DocumentsUI/res/values-nb/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Listevisning"</string>
<string name="menu_sort" msgid="7677740407158414452">"Sortér etter"</string>
<string name="menu_search" msgid="3816712084502856974">"Søk"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Innstillinger"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Åpne"</string>
<string name="menu_save" msgid="2394743337684426338">"Lagre"</string>
<string name="menu_share" msgid="3075149983979628146">"Del"</string>
diff --git a/packages/DocumentsUI/res/values-ne-rNP/strings.xml b/packages/DocumentsUI/res/values-ne-rNP/strings.xml
index 1f2f29c..45934ad 100644
--- a/packages/DocumentsUI/res/values-ne-rNP/strings.xml
+++ b/packages/DocumentsUI/res/values-ne-rNP/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"सूची दृश्य"</string>
<string name="menu_sort" msgid="7677740407158414452">"यसद्वारा क्रमवद्घ गर्नुहोस्"</string>
<string name="menu_search" msgid="3816712084502856974">"खोज्नुहोस्"</string>
- <string name="menu_settings" msgid="6008033148948428823">"सेटिङहरू"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"खोल्नुहोस्"</string>
<string name="menu_save" msgid="2394743337684426338">"सुरक्षित गर्नुहोस्"</string>
<string name="menu_share" msgid="3075149983979628146">"साझेदारी गर्नुहोस्"</string>
diff --git a/packages/DocumentsUI/res/values-nl/strings.xml b/packages/DocumentsUI/res/values-nl/strings.xml
index 348c9cf..b613da3 100644
--- a/packages/DocumentsUI/res/values-nl/strings.xml
+++ b/packages/DocumentsUI/res/values-nl/strings.xml
@@ -26,7 +26,7 @@
<string name="menu_list" msgid="7279285939892417279">"Lijstweergave"</string>
<string name="menu_sort" msgid="7677740407158414452">"Sorteren op"</string>
<string name="menu_search" msgid="3816712084502856974">"Zoeken"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Instellingen"</string>
+ <string name="menu_settings" msgid="8239065133341597825">"Instellingen voor opslag"</string>
<string name="menu_open" msgid="432922957274920903">"Openen"</string>
<string name="menu_save" msgid="2394743337684426338">"Opslaan"</string>
<string name="menu_share" msgid="3075149983979628146">"Delen"</string>
diff --git a/packages/DocumentsUI/res/values-pa-rIN/strings.xml b/packages/DocumentsUI/res/values-pa-rIN/strings.xml
index add268f..d5eeb66 100644
--- a/packages/DocumentsUI/res/values-pa-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-pa-rIN/strings.xml
@@ -26,7 +26,7 @@
<string name="menu_list" msgid="7279285939892417279">"ਸੂਚੀ ਦ੍ਰਿਸ਼"</string>
<string name="menu_sort" msgid="7677740407158414452">"ਇਸ ਅਨੁਸਾਰ ਛਾਂਟੋ"</string>
<string name="menu_search" msgid="3816712084502856974">"ਖੋਜੋ"</string>
- <string name="menu_settings" msgid="6008033148948428823">"ਸੈਟਿੰਗਾਂ"</string>
+ <string name="menu_settings" msgid="8239065133341597825">"ਸਟੋਰੇਜ ਸੈਟਿੰਗਾਂ"</string>
<string name="menu_open" msgid="432922957274920903">"ਖੋਲ੍ਹੋ"</string>
<string name="menu_save" msgid="2394743337684426338">"ਸੁਰੱਖਿਅਤ ਕਰੋ"</string>
<string name="menu_share" msgid="3075149983979628146">"ਸ਼ੇਅਰ ਕਰੋ"</string>
diff --git a/packages/DocumentsUI/res/values-pl/strings.xml b/packages/DocumentsUI/res/values-pl/strings.xml
index d30ed84..90f2bdf 100644
--- a/packages/DocumentsUI/res/values-pl/strings.xml
+++ b/packages/DocumentsUI/res/values-pl/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Widok listy"</string>
<string name="menu_sort" msgid="7677740407158414452">"Sortuj według"</string>
<string name="menu_search" msgid="3816712084502856974">"Szukaj"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Ustawienia"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Otwórz"</string>
<string name="menu_save" msgid="2394743337684426338">"Zapisz"</string>
<string name="menu_share" msgid="3075149983979628146">"Udostępnij"</string>
diff --git a/packages/DocumentsUI/res/values-pt-rBR/strings.xml b/packages/DocumentsUI/res/values-pt-rBR/strings.xml
index 068a4e6..f72f43c 100644
--- a/packages/DocumentsUI/res/values-pt-rBR/strings.xml
+++ b/packages/DocumentsUI/res/values-pt-rBR/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Visualização em lista"</string>
<string name="menu_sort" msgid="7677740407158414452">"Classificar por"</string>
<string name="menu_search" msgid="3816712084502856974">"Pesquisar"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Configurações"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Abrir"</string>
<string name="menu_save" msgid="2394743337684426338">"Salvar"</string>
<string name="menu_share" msgid="3075149983979628146">"Compartilhar"</string>
diff --git a/packages/DocumentsUI/res/values-pt-rPT/strings.xml b/packages/DocumentsUI/res/values-pt-rPT/strings.xml
index 0897901..596474fd 100644
--- a/packages/DocumentsUI/res/values-pt-rPT/strings.xml
+++ b/packages/DocumentsUI/res/values-pt-rPT/strings.xml
@@ -26,7 +26,7 @@
<string name="menu_list" msgid="7279285939892417279">"Vista de lista"</string>
<string name="menu_sort" msgid="7677740407158414452">"Ordenar por"</string>
<string name="menu_search" msgid="3816712084502856974">"Pesquisar"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Definições"</string>
+ <string name="menu_settings" msgid="8239065133341597825">"Defin. de armazenamento"</string>
<string name="menu_open" msgid="432922957274920903">"Abrir"</string>
<string name="menu_save" msgid="2394743337684426338">"Guardar"</string>
<string name="menu_share" msgid="3075149983979628146">"Partilhar"</string>
diff --git a/packages/DocumentsUI/res/values-pt/strings.xml b/packages/DocumentsUI/res/values-pt/strings.xml
index 068a4e6..f72f43c 100644
--- a/packages/DocumentsUI/res/values-pt/strings.xml
+++ b/packages/DocumentsUI/res/values-pt/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Visualização em lista"</string>
<string name="menu_sort" msgid="7677740407158414452">"Classificar por"</string>
<string name="menu_search" msgid="3816712084502856974">"Pesquisar"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Configurações"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Abrir"</string>
<string name="menu_save" msgid="2394743337684426338">"Salvar"</string>
<string name="menu_share" msgid="3075149983979628146">"Compartilhar"</string>
diff --git a/packages/DocumentsUI/res/values-ro/strings.xml b/packages/DocumentsUI/res/values-ro/strings.xml
index c8c0c09..07f25f6 100644
--- a/packages/DocumentsUI/res/values-ro/strings.xml
+++ b/packages/DocumentsUI/res/values-ro/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Afișare tip listă"</string>
<string name="menu_sort" msgid="7677740407158414452">"Sortați după"</string>
<string name="menu_search" msgid="3816712084502856974">"Căutați"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Setări"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Deschideți"</string>
<string name="menu_save" msgid="2394743337684426338">"Salvați"</string>
<string name="menu_share" msgid="3075149983979628146">"Distribuiți"</string>
diff --git a/packages/DocumentsUI/res/values-ru/strings.xml b/packages/DocumentsUI/res/values-ru/strings.xml
index 3f5e53c..97bd4dd8 100644
--- a/packages/DocumentsUI/res/values-ru/strings.xml
+++ b/packages/DocumentsUI/res/values-ru/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Список"</string>
<string name="menu_sort" msgid="7677740407158414452">"Сортировать"</string>
<string name="menu_search" msgid="3816712084502856974">"Поиск"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Настройки"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Открыть"</string>
<string name="menu_save" msgid="2394743337684426338">"Сохранить"</string>
<string name="menu_share" msgid="3075149983979628146">"Поделиться"</string>
diff --git a/packages/DocumentsUI/res/values-si-rLK/strings.xml b/packages/DocumentsUI/res/values-si-rLK/strings.xml
index 1237f14..19d8e89 100644
--- a/packages/DocumentsUI/res/values-si-rLK/strings.xml
+++ b/packages/DocumentsUI/res/values-si-rLK/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"ලැයිස්තු පෙනුම"</string>
<string name="menu_sort" msgid="7677740407158414452">"අනුපිළිවෙලට සකසා ඇත්තේ"</string>
<string name="menu_search" msgid="3816712084502856974">"සෙවීම"</string>
- <string name="menu_settings" msgid="6008033148948428823">"සැකසීම්"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"විවෘත කරන්න"</string>
<string name="menu_save" msgid="2394743337684426338">"සුරකින්න"</string>
<string name="menu_share" msgid="3075149983979628146">"බෙදාගන්න"</string>
diff --git a/packages/DocumentsUI/res/values-sk/strings.xml b/packages/DocumentsUI/res/values-sk/strings.xml
index db2ec54..cf74acf 100644
--- a/packages/DocumentsUI/res/values-sk/strings.xml
+++ b/packages/DocumentsUI/res/values-sk/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Zobrazenie zoznamu"</string>
<string name="menu_sort" msgid="7677740407158414452">"Zoradiť podľa"</string>
<string name="menu_search" msgid="3816712084502856974">"Hľadať"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Nastavenia"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Otvoriť"</string>
<string name="menu_save" msgid="2394743337684426338">"Uložiť"</string>
<string name="menu_share" msgid="3075149983979628146">"Zdieľať"</string>
diff --git a/packages/DocumentsUI/res/values-sl/strings.xml b/packages/DocumentsUI/res/values-sl/strings.xml
index f000f05..7da4628 100644
--- a/packages/DocumentsUI/res/values-sl/strings.xml
+++ b/packages/DocumentsUI/res/values-sl/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Pogled seznama"</string>
<string name="menu_sort" msgid="7677740407158414452">"Razvrsti glede na"</string>
<string name="menu_search" msgid="3816712084502856974">"Iskanje"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Nastavitve"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Odpri"</string>
<string name="menu_save" msgid="2394743337684426338">"Shrani"</string>
<string name="menu_share" msgid="3075149983979628146">"Skupna raba"</string>
diff --git a/packages/DocumentsUI/res/values-sq-rAL/strings.xml b/packages/DocumentsUI/res/values-sq-rAL/strings.xml
index fa53157..fec090c 100644
--- a/packages/DocumentsUI/res/values-sq-rAL/strings.xml
+++ b/packages/DocumentsUI/res/values-sq-rAL/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Pamje liste"</string>
<string name="menu_sort" msgid="7677740407158414452">"Rendit sipas"</string>
<string name="menu_search" msgid="3816712084502856974">"Kërko"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Cilësimet"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Hap"</string>
<string name="menu_save" msgid="2394743337684426338">"Ruaj"</string>
<string name="menu_share" msgid="3075149983979628146">"Shpërnda"</string>
diff --git a/packages/DocumentsUI/res/values-sr/strings.xml b/packages/DocumentsUI/res/values-sr/strings.xml
index 7b9f659..b43a8d3 100644
--- a/packages/DocumentsUI/res/values-sr/strings.xml
+++ b/packages/DocumentsUI/res/values-sr/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Приказ листе"</string>
<string name="menu_sort" msgid="7677740407158414452">"Сортирај према"</string>
<string name="menu_search" msgid="3816712084502856974">"Претражи"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Подешавања"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Отвори"</string>
<string name="menu_save" msgid="2394743337684426338">"Сачувај"</string>
<string name="menu_share" msgid="3075149983979628146">"Дели"</string>
diff --git a/packages/DocumentsUI/res/values-sv/strings.xml b/packages/DocumentsUI/res/values-sv/strings.xml
index 3590fe7..2d1d924 100644
--- a/packages/DocumentsUI/res/values-sv/strings.xml
+++ b/packages/DocumentsUI/res/values-sv/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Listvy"</string>
<string name="menu_sort" msgid="7677740407158414452">"Sortera efter"</string>
<string name="menu_search" msgid="3816712084502856974">"Sök"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Inställningar"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Öppna"</string>
<string name="menu_save" msgid="2394743337684426338">"Spara"</string>
<string name="menu_share" msgid="3075149983979628146">"Dela"</string>
diff --git a/packages/DocumentsUI/res/values-sw/strings.xml b/packages/DocumentsUI/res/values-sw/strings.xml
index f15db63..e28365d 100644
--- a/packages/DocumentsUI/res/values-sw/strings.xml
+++ b/packages/DocumentsUI/res/values-sw/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Mwonekano orodha"</string>
<string name="menu_sort" msgid="7677740407158414452">"Panga kwa"</string>
<string name="menu_search" msgid="3816712084502856974">"Utafutaji"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Mipangilio"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Fungua"</string>
<string name="menu_save" msgid="2394743337684426338">"Hifadhi"</string>
<string name="menu_share" msgid="3075149983979628146">"Shiriki"</string>
diff --git a/packages/DocumentsUI/res/values-ta-rIN/strings.xml b/packages/DocumentsUI/res/values-ta-rIN/strings.xml
index 3b71514..fed470d 100644
--- a/packages/DocumentsUI/res/values-ta-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-ta-rIN/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"பட்டியல்"</string>
<string name="menu_sort" msgid="7677740407158414452">"இதன்படி வரிசைப்படுத்து"</string>
<string name="menu_search" msgid="3816712084502856974">"தேடு"</string>
- <string name="menu_settings" msgid="6008033148948428823">"அமைப்பு"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"திற"</string>
<string name="menu_save" msgid="2394743337684426338">"சேமி"</string>
<string name="menu_share" msgid="3075149983979628146">"பகிர்"</string>
diff --git a/packages/DocumentsUI/res/values-te-rIN/strings.xml b/packages/DocumentsUI/res/values-te-rIN/strings.xml
index 900fe41..0d90627 100644
--- a/packages/DocumentsUI/res/values-te-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-te-rIN/strings.xml
@@ -26,7 +26,7 @@
<string name="menu_list" msgid="7279285939892417279">"జాబితా వీక్షణ"</string>
<string name="menu_sort" msgid="7677740407158414452">"ఇలా క్రమబద్ధీకరించు"</string>
<string name="menu_search" msgid="3816712084502856974">"శోధించు"</string>
- <string name="menu_settings" msgid="6008033148948428823">"సెట్టింగ్లు"</string>
+ <string name="menu_settings" msgid="8239065133341597825">"నిల్వ సెట్టింగ్లు"</string>
<string name="menu_open" msgid="432922957274920903">"తెరువు"</string>
<string name="menu_save" msgid="2394743337684426338">"సేవ్ చేయి"</string>
<string name="menu_share" msgid="3075149983979628146">"భాగస్వామ్యం చేయి"</string>
diff --git a/packages/DocumentsUI/res/values-th/strings.xml b/packages/DocumentsUI/res/values-th/strings.xml
index 4d93f43..25ab564 100644
--- a/packages/DocumentsUI/res/values-th/strings.xml
+++ b/packages/DocumentsUI/res/values-th/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"มุมมองรายการ"</string>
<string name="menu_sort" msgid="7677740407158414452">"จัดเรียงตาม"</string>
<string name="menu_search" msgid="3816712084502856974">"ค้นหา"</string>
- <string name="menu_settings" msgid="6008033148948428823">"การตั้งค่า"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"เปิด"</string>
<string name="menu_save" msgid="2394743337684426338">"บันทึก"</string>
<string name="menu_share" msgid="3075149983979628146">"แชร์"</string>
diff --git a/packages/DocumentsUI/res/values-tl/strings.xml b/packages/DocumentsUI/res/values-tl/strings.xml
index d28eb69..1baa5db 100644
--- a/packages/DocumentsUI/res/values-tl/strings.xml
+++ b/packages/DocumentsUI/res/values-tl/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"View na listahan"</string>
<string name="menu_sort" msgid="7677740407158414452">"Uriin ayon sa"</string>
<string name="menu_search" msgid="3816712084502856974">"Maghanap"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Mga Setting"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Buksan"</string>
<string name="menu_save" msgid="2394743337684426338">"I-save"</string>
<string name="menu_share" msgid="3075149983979628146">"Ibahagi"</string>
diff --git a/packages/DocumentsUI/res/values-tr/strings.xml b/packages/DocumentsUI/res/values-tr/strings.xml
index 5223919..500c37f 100644
--- a/packages/DocumentsUI/res/values-tr/strings.xml
+++ b/packages/DocumentsUI/res/values-tr/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Liste görünümü"</string>
<string name="menu_sort" msgid="7677740407158414452">"Sıralama ölçütü"</string>
<string name="menu_search" msgid="3816712084502856974">"Ara"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Ayarlar"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Aç"</string>
<string name="menu_save" msgid="2394743337684426338">"Kaydet"</string>
<string name="menu_share" msgid="3075149983979628146">"Paylaş"</string>
diff --git a/packages/DocumentsUI/res/values-uk/strings.xml b/packages/DocumentsUI/res/values-uk/strings.xml
index 1987ee2..c57ca6a 100644
--- a/packages/DocumentsUI/res/values-uk/strings.xml
+++ b/packages/DocumentsUI/res/values-uk/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Режим списку"</string>
<string name="menu_sort" msgid="7677740407158414452">"Параметри сортування"</string>
<string name="menu_search" msgid="3816712084502856974">"Пошук"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Налаштування"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Відкрити"</string>
<string name="menu_save" msgid="2394743337684426338">"Зберегти"</string>
<string name="menu_share" msgid="3075149983979628146">"Поділитися"</string>
diff --git a/packages/DocumentsUI/res/values-ur-rPK/strings.xml b/packages/DocumentsUI/res/values-ur-rPK/strings.xml
index 3871496..90bce27 100644
--- a/packages/DocumentsUI/res/values-ur-rPK/strings.xml
+++ b/packages/DocumentsUI/res/values-ur-rPK/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"فہرست منظر"</string>
<string name="menu_sort" msgid="7677740407158414452">"ترتیب دیں بلحاظ"</string>
<string name="menu_search" msgid="3816712084502856974">"تلاش کریں"</string>
- <string name="menu_settings" msgid="6008033148948428823">"ترتیبات"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"کھولیں"</string>
<string name="menu_save" msgid="2394743337684426338">"محفوظ کریں"</string>
<string name="menu_share" msgid="3075149983979628146">"اشتراک کریں"</string>
diff --git a/packages/DocumentsUI/res/values-uz-rUZ/strings.xml b/packages/DocumentsUI/res/values-uz-rUZ/strings.xml
index a915afd..4a0aba2 100644
--- a/packages/DocumentsUI/res/values-uz-rUZ/strings.xml
+++ b/packages/DocumentsUI/res/values-uz-rUZ/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Ro‘yxat ko‘rinishida"</string>
<string name="menu_sort" msgid="7677740407158414452">"Saralash"</string>
<string name="menu_search" msgid="3816712084502856974">"Qidirish"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Sozlamalar"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Ochish"</string>
<string name="menu_save" msgid="2394743337684426338">"Saqlash"</string>
<string name="menu_share" msgid="3075149983979628146">"Ulashish"</string>
diff --git a/packages/DocumentsUI/res/values-vi/strings.xml b/packages/DocumentsUI/res/values-vi/strings.xml
index 536c7a5..48290d1 100644
--- a/packages/DocumentsUI/res/values-vi/strings.xml
+++ b/packages/DocumentsUI/res/values-vi/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"Chế độ xem danh sách"</string>
<string name="menu_sort" msgid="7677740407158414452">"Sắp xếp theo"</string>
<string name="menu_search" msgid="3816712084502856974">"Tìm kiếm"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Cài đặt"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"Mở"</string>
<string name="menu_save" msgid="2394743337684426338">"Lưu"</string>
<string name="menu_share" msgid="3075149983979628146">"Chia sẻ"</string>
diff --git a/packages/DocumentsUI/res/values-zh-rCN/strings.xml b/packages/DocumentsUI/res/values-zh-rCN/strings.xml
index df2cf04..f3d4e6c 100644
--- a/packages/DocumentsUI/res/values-zh-rCN/strings.xml
+++ b/packages/DocumentsUI/res/values-zh-rCN/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"列表视图"</string>
<string name="menu_sort" msgid="7677740407158414452">"排序依据"</string>
<string name="menu_search" msgid="3816712084502856974">"搜索"</string>
- <string name="menu_settings" msgid="6008033148948428823">"设置"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"打开"</string>
<string name="menu_save" msgid="2394743337684426338">"保存"</string>
<string name="menu_share" msgid="3075149983979628146">"分享"</string>
@@ -100,8 +101,7 @@
<string name="close" msgid="3043722427445528732">"关闭"</string>
<string name="copy_failure_alert_content" msgid="3715575000297709082">"以下文件无法复制：<xliff:g id="LIST">%1$s</xliff:g>"</string>
<string name="move_failure_alert_content" msgid="7151140279020481180">"以下文件无法移动：<xliff:g id="LIST">%1$s</xliff:g>"</string>
- <!-- no translation found for copy_converted_warning_content (5753861488218674361) -->
- <skip />
+ <string name="copy_converted_warning_content" msgid="5753861488218674361">"下列文件已转换成其他格式：<xliff:g id="LIST">%1$s</xliff:g>"</string>
<plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
<item quantity="other">已将 <xliff:g id="COUNT_1">%1$d</xliff:g> 个文件复制到剪贴板。</item>
<item quantity="one">已将 <xliff:g id="COUNT_0">%1$d</xliff:g> 个文件复制到剪贴板。</item>
@@ -109,8 +109,7 @@
<string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"无法将所选文件粘贴到此位置。"</string>
<string name="menu_rename" msgid="7678802479104285353">"重命名"</string>
<string name="rename_error" msgid="4203041674883412606">"无法重命名文档"</string>
- <!-- no translation found for notification_copy_files_converted_title (3153573223054275181) -->
- <skip />
+ <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"部分文件已转换成其他格式"</string>
<string name="allow" msgid="7225948811296386551">"允许"</string>
<string name="deny" msgid="2081879885755434506">"拒绝"</string>
</resources>
diff --git a/packages/DocumentsUI/res/values-zh-rHK/strings.xml b/packages/DocumentsUI/res/values-zh-rHK/strings.xml
index fa66c7f..3c55cd8 100644
--- a/packages/DocumentsUI/res/values-zh-rHK/strings.xml
+++ b/packages/DocumentsUI/res/values-zh-rHK/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"清單檢視"</string>
<string name="menu_sort" msgid="7677740407158414452">"排序方式"</string>
<string name="menu_search" msgid="3816712084502856974">"搜尋"</string>
- <string name="menu_settings" msgid="6008033148948428823">"設定"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"開啟"</string>
<string name="menu_save" msgid="2394743337684426338">"儲存"</string>
<string name="menu_share" msgid="3075149983979628146">"分享"</string>
diff --git a/packages/DocumentsUI/res/values-zh-rTW/strings.xml b/packages/DocumentsUI/res/values-zh-rTW/strings.xml
index 0288bd3..f09899c 100644
--- a/packages/DocumentsUI/res/values-zh-rTW/strings.xml
+++ b/packages/DocumentsUI/res/values-zh-rTW/strings.xml
@@ -26,7 +26,8 @@
<string name="menu_list" msgid="7279285939892417279">"清單檢視"</string>
<string name="menu_sort" msgid="7677740407158414452">"排序依據"</string>
<string name="menu_search" msgid="3816712084502856974">"搜尋"</string>
- <string name="menu_settings" msgid="6008033148948428823">"設定"</string>
+ <!-- no translation found for menu_settings (8239065133341597825) -->
+ <skip />
<string name="menu_open" msgid="432922957274920903">"開啟"</string>
<string name="menu_save" msgid="2394743337684426338">"儲存"</string>
<string name="menu_share" msgid="3075149983979628146">"共用"</string>
diff --git a/packages/DocumentsUI/res/values-zu/strings.xml b/packages/DocumentsUI/res/values-zu/strings.xml
index 9bff355..dffe241 100644
--- a/packages/DocumentsUI/res/values-zu/strings.xml
+++ b/packages/DocumentsUI/res/values-zu/strings.xml
@@ -26,7 +26,7 @@
<string name="menu_list" msgid="7279285939892417279">"Ukubuka uhlu"</string>
<string name="menu_sort" msgid="7677740407158414452">"Hlunga nge-"</string>
<string name="menu_search" msgid="3816712084502856974">"Sesha"</string>
- <string name="menu_settings" msgid="6008033148948428823">"Izilungiselelo"</string>
+ <string name="menu_settings" msgid="8239065133341597825">"Izilungiselelo zesitoreji"</string>
<string name="menu_open" msgid="432922957274920903">"Vula"</string>
<string name="menu_save" msgid="2394743337684426338">"Londoloza"</string>
<string name="menu_share" msgid="3075149983979628146">"Yabelana"</string>
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsApplication.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsApplication.java
index 547e343..9005442 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsApplication.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsApplication.java
@@ -63,6 +63,8 @@
@Override
public void onCreate() {
+ super.onCreate();
+
final ActivityManager am = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
final int memoryClassBytes = am.getMemoryClass() * 1024 * 1024;
diff --git a/packages/DocumentsUI/src/com/android/documentsui/ListItem.java b/packages/DocumentsUI/src/com/android/documentsui/ListItem.java
index 5c40f1b..6d6f21e 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/ListItem.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/ListItem.java
@@ -20,7 +20,6 @@
import android.graphics.Rect;
import android.util.AttributeSet;
import android.util.TypedValue;
-import android.view.View;
import android.widget.LinearLayout;
/**
@@ -39,14 +38,11 @@
@Override
protected void onFocusChanged(boolean gainFocus, int direction, Rect previouslyFocusedRect) {
- View indicator = findViewById(R.id.focus_indicator);
- if (gainFocus) {
- TypedValue color = new TypedValue();
- getContext().getTheme().resolveAttribute(android.R.attr.colorAccent, color, true);
- indicator.setBackgroundColor(color.data);
- } else {
- indicator.setBackgroundColor(android.R.color.transparent);
- }
+ TypedValue color = new TypedValue();
+ int colorId = gainFocus ? android.R.attr.colorAccent : android.R.color.transparent;
+ getContext().getTheme().resolveAttribute(colorId, color, true);
+
+ findViewById(R.id.focus_indicator).setBackgroundColor(color.data);
super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
}
}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java b/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java
index 5dc4f57..d601550 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java
@@ -19,17 +19,12 @@
import static android.os.Environment.isStandardDirectory;
import static com.android.documentsui.Shared.DEBUG;
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
import android.app.FragmentManager;
import android.app.FragmentTransaction;
-import android.content.ContentProvider;
import android.content.ContentProviderClient;
import android.content.ContentResolver;
import android.content.Context;
@@ -48,11 +43,15 @@
import android.text.TextUtils;
import android.util.Log;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
/**
* Activity responsible for handling {@link Intent#ACTION_OPEN_EXTERNAL_DOCUMENT}.
*/
public class OpenExternalDirectoryActivity extends Activity {
- private static final String TAG = "OpenExternalDirectoryActivity";
+ private static final String TAG = "OpenExternalDirectory";
private static final String FM_TAG = "open_external_directory";
private static final String EXTERNAL_STORAGE_AUTH = "com.android.externalstorage.documents";
private static final String EXTRA_FILE = "com.android.documentsui.FILE";
@@ -209,7 +208,7 @@
return intent;
}
- private static class OpenExternalDirectoryDialogFragment extends DialogFragment {
+ public static class OpenExternalDirectoryDialogFragment extends DialogFragment {
private File mFile;
private String mVolumeLabel;
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java
index 880da9c0..69a6711 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java
@@ -29,7 +29,6 @@
import android.view.ViewGroup;
import com.android.documentsui.State;
-
import com.google.common.collect.Sets;
import java.util.ArrayList;
@@ -42,7 +41,7 @@
*/
final class ModelBackedDocumentsAdapter extends DocumentsAdapter {
- private static final String TAG = "ModelBackedDocumentsAdapter";
+ private static final String TAG = "ModelBackedDocuments";
public static final int ITEM_TYPE_DOCUMENT = 1;
public static final int ITEM_TYPE_DIRECTORY = 2;
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/RenameDocumentFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/RenameDocumentFragment.java
index 71708c1..0bb682e 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/RenameDocumentFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/RenameDocumentFragment.java
@@ -44,13 +44,13 @@
import com.android.documentsui.BaseActivity;
import com.android.documentsui.DocumentsApplication;
-import com.android.documentsui.model.DocumentInfo;
import com.android.documentsui.R;
import com.android.documentsui.Snackbars;
+import com.android.documentsui.model.DocumentInfo;
/**
* Dialog to rename file or directory.
*/
-class RenameDocumentFragment extends DialogFragment {
+public class RenameDocumentFragment extends DialogFragment {
private static final String TAG_RENAME_DOCUMENT = "rename_document";
private DocumentInfo mDocument;
diff --git a/packages/Keyguard/res/values-ro/strings.xml b/packages/Keyguard/res/values-ro/strings.xml
index 2b279ad..439de3d 100644
--- a/packages/Keyguard/res/values-ro/strings.xml
+++ b/packages/Keyguard/res/values-ro/strings.xml
@@ -59,7 +59,7 @@
<string name="keyboardview_keycode_enter" msgid="2985864015076059467">"Enter"</string>
<string name="kg_forgot_pattern_button_text" msgid="8852021467868220608">"Model uitat"</string>
<string name="kg_wrong_pattern" msgid="1850806070801358830">"Model greşit"</string>
- <string name="kg_wrong_password" msgid="2333281762128113157">"Parolă greşită"</string>
+ <string name="kg_wrong_password" msgid="2333281762128113157">"Parolă greșită"</string>
<string name="kg_wrong_pin" msgid="1131306510833563801">"Cod PIN greşit"</string>
<string name="kg_too_many_failed_attempts_countdown" msgid="6358110221603297548">"Încercați din nou peste <xliff:g id="NUMBER">%d</xliff:g> (de) secunde."</string>
<string name="kg_pattern_instructions" msgid="398978611683075868">"Desenaţi modelul"</string>
@@ -92,8 +92,8 @@
<string name="kg_failed_attempts_almost_at_erase_profile" product="default" msgid="6853071165802933545">"Ați efectuat <xliff:g id="NUMBER_0">%1$d</xliff:g> încercări incorecte de deblocare a telefonului. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, profilul de serviciu va fi eliminat, iar toate datele profilului vor fi șterse."</string>
<string name="kg_failed_attempts_now_erasing_profile" product="tablet" msgid="4686386497449912146">"Ați efectuat <xliff:g id="NUMBER">%d</xliff:g> încercări incorecte de deblocare a tabletei. Profilul de serviciu va fi eliminat, iar toate datele profilului vor fi șterse."</string>
<string name="kg_failed_attempts_now_erasing_profile" product="default" msgid="4951507352869831265">"Ați efectuat <xliff:g id="NUMBER">%d</xliff:g> încercări incorecte de deblocare a telefonului. Profilul de serviciu va fi eliminat, iar toate datele profilului vor fi șterse."</string>
- <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereuşite, vi se va solicita să deblocaţi tableta cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string>
- <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereuşite, vi se va solicita să deblocaţi telefonul cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string>
+ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereuşite, vi se va solicita să deblocați tableta cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string>
+ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereuşite, vi se va solicita să deblocați telefonul cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string>
<string name="kg_password_wrong_pin_code_pukked" msgid="30531039455764924">"Codul PIN pentru cardul SIM este incorect. Contactați operatorul pentru a vă debloca dispozitivul."</string>
<plurals name="kg_password_wrong_pin_code" formatted="false" msgid="6721575017538162249">
<item quantity="few">Codul PIN pentru cardul SIM este incorect. V-au mai rămas <xliff:g id="NUMBER_1">%d</xliff:g> încercări.</item>
diff --git a/packages/SettingsLib/res/values-bs-rBA/strings.xml b/packages/SettingsLib/res/values-bs-rBA/strings.xml
index a3b540d..8aae5bb 100644
--- a/packages/SettingsLib/res/values-bs-rBA/strings.xml
+++ b/packages/SettingsLib/res/values-bs-rBA/strings.xml
@@ -146,50 +146,37 @@
<skip />
<string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Uklonjene aplikacije"</string>
- <!-- no translation found for data_usage_uninstalled_apps_users (7986294489899813194) -->
- <skip />
+ <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Uklonjene aplikacije i korisnici"</string>
<string name="tether_settings_title_usb" msgid="6688416425801386511">"USB dijeljenje veze"</string>
<string name="tether_settings_title_wifi" msgid="3277144155960302049">"Prenosna pristupna tačka"</string>
<string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Dijeljenje Bluetooth veze"</string>
<string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Dijeljenje veze"</string>
<string name="tether_settings_title_all" msgid="8356136101061143841">"Dijeljenje internetske veze i prenosna pristupna tačka"</string>
- <!-- no translation found for managed_user_title (8101244883654409696) -->
- <skip />
- <!-- no translation found for user_guest (8475274842845401871) -->
- <skip />
+ <string name="managed_user_title" msgid="8101244883654409696">"Profil za Work"</string>
+ <string name="user_guest" msgid="8475274842845401871">"Gost"</string>
<string name="unknown" msgid="1592123443519355854">"Nepoznato"</string>
<string name="running_process_item_user_label" msgid="3129887865552025943">"Korisnik: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
- <!-- no translation found for launch_defaults_some (313159469856372621) -->
- <skip />
- <!-- no translation found for launch_defaults_none (4241129108140034876) -->
- <skip />
+ <string name="launch_defaults_some" msgid="313159469856372621">"Neke zadane vrijednosti su postavljene"</string>
+ <string name="launch_defaults_none" msgid="4241129108140034876">"Nema postavljenih zadanih vrijednosti"</string>
<string name="tts_settings" msgid="8186971894801348327">"Postavke za pretvaranje teksta u govor"</string>
<string name="tts_settings_title" msgid="1237820681016639683">"Izlaz za pretvaranje teksta u govor"</string>
<string name="tts_default_rate_title" msgid="6030550998379310088">"Brzina govora"</string>
<string name="tts_default_rate_summary" msgid="4061815292287182801">"Brzina kojom se izgovara tekst"</string>
<string name="tts_default_lang_title" msgid="8018087612299820556">"Jezik"</string>
- <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
- <skip />
- <!-- no translation found for tts_lang_not_selected (7395787019276734765) -->
- <skip />
+ <string name="tts_lang_use_system" msgid="2679252467416513208">"Koristi sistemski jezik"</string>
+ <string name="tts_lang_not_selected" msgid="7395787019276734765">"Jezik nije izabran"</string>
<string name="tts_default_lang_summary" msgid="5219362163902707785">"Postavlja glas za dati jezik za izgovoreni tekst"</string>
<string name="tts_play_example_title" msgid="7094780383253097230">"Poslušajte primjer"</string>
<string name="tts_play_example_summary" msgid="8029071615047894486">"Reproduciraj kratku demonstraciju sintetiziranja govora"</string>
<string name="tts_install_data_title" msgid="4264378440508149986">"Instaliraj glasovne podatke"</string>
<string name="tts_install_data_summary" msgid="5742135732511822589">"Instalirajte glasovne podatke potrebne za sintetiziranje govora"</string>
<string name="tts_engine_security_warning" msgid="8786238102020223650">"Ovaj program za sintetiziranje govora može biti u mogućnosti da prikuplja sav tekst koji se izgovara, uključujući lične podatke kao što su lozinke i brojevi kreditnih kartica. Potiče od aplikacije <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Da li želite koristiti ovaj program za sintetiziranje govora?"</string>
- <!-- no translation found for tts_engine_network_required (1190837151485314743) -->
- <skip />
- <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
- <skip />
- <!-- no translation found for tts_status_title (7268566550242584413) -->
- <skip />
- <!-- no translation found for tts_status_ok (1309762510278029765) -->
- <skip />
- <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
- <skip />
- <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
- <skip />
+ <string name="tts_engine_network_required" msgid="1190837151485314743">"Ovaj jezik zahtijeva mrežnu vezu radi za izlaz tekst-u-govor."</string>
+ <string name="tts_default_sample_string" msgid="4040835213373086322">"Ovo je primjer sinteze govora"</string>
+ <string name="tts_status_title" msgid="7268566550242584413">"Zadani status jezika"</string>
+ <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> je u potpunosti podržan"</string>
+ <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> zahtjeva mrežnu vezu"</string>
+ <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> nije podržan"</string>
<!-- no translation found for tts_status_checking (5339150797940483592) -->
<skip />
<string name="tts_engine_settings_title" msgid="3499112142425680334">"Postavke za <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
@@ -205,104 +192,62 @@
<!-- no translation found for tts_rate_entries:6 (7831712693748700507) -->
<!-- no translation found for tts_rate_entries:7 (5194774745031751806) -->
<!-- no translation found for tts_rate_entries:8 (9085102246155045744) -->
- <!-- no translation found for choose_profile (8229363046053568878) -->
- <skip />
- <!-- no translation found for category_personal (1299663247844969448) -->
- <skip />
- <!-- no translation found for category_work (8699184680584175622) -->
- <skip />
+ <string name="choose_profile" msgid="8229363046053568878">"Odaberite profil"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Lično"</string>
+ <string name="category_work" msgid="8699184680584175622">"Posao"</string>
<string name="development_settings_title" msgid="215179176067683667">"Opcije za programere"</string>
<!-- no translation found for development_settings_enable (542530994778109538) -->
<skip />
<string name="development_settings_summary" msgid="1815795401632854041">"Postavi opcije za razvoj aplikacija"</string>
- <!-- no translation found for development_settings_not_available (4308569041701535607) -->
- <skip />
- <!-- no translation found for vpn_settings_not_available (956841430176985598) -->
- <skip />
- <!-- no translation found for tethering_settings_not_available (6765770438438291012) -->
- <skip />
- <!-- no translation found for apn_settings_not_available (7873729032165324000) -->
- <skip />
+ <string name="development_settings_not_available" msgid="4308569041701535607">"Opcije za programere nisu dostupne za ovog korisnika"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"VPN postavke nisu dostupne za ovog korisnika"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Postavke za privezivanje nisu dostupne za ovog korisnika"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Postavke za naziv pristupne tačke nisu dostupne za ovog korisnika"</string>
<string name="enable_adb" msgid="7982306934419797485">"USB otklanjanje grešaka"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Način rada za uklanjanje grešaka kada je povezan USB"</string>
- <!-- no translation found for clear_adb_keys (4038889221503122743) -->
- <skip />
- <!-- no translation found for bugreport_in_power (7923901846375587241) -->
- <skip />
- <!-- no translation found for bugreport_in_power_summary (1778455732762984579) -->
- <skip />
+ <string name="clear_adb_keys" msgid="4038889221503122743">"Ukini odobrenja otklanjanja grešaka USB-om"</string>
+ <string name="bugreport_in_power" msgid="7923901846375587241">"Prečica za izvještaj o greškama"</string>
+ <string name="bugreport_in_power_summary" msgid="1778455732762984579">"Prikaži tipku za prijavu grešaka u izborniku za potrošnju energije"</string>
<string name="keep_screen_on" msgid="1146389631208760344">"Ostani aktivan"</string>
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Ekran neće prelaziti u stanje mirovanja tokom punjenja"</string>
- <!-- no translation found for bt_hci_snoop_log (3340699311158865670) -->
- <skip />
- <!-- no translation found for bt_hci_snoop_log_summary (730247028210113851) -->
- <skip />
- <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
- <skip />
- <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
- <skip />
- <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
- <skip />
- <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
- <skip />
- <!-- no translation found for mock_location_app (7966220972812881854) -->
- <skip />
- <!-- no translation found for mock_location_app_not_set (809543285495344223) -->
- <skip />
- <!-- no translation found for mock_location_app_set (8966420655295102685) -->
- <skip />
- <!-- no translation found for debug_networking_category (7044075693643009662) -->
- <skip />
- <!-- no translation found for wifi_display_certification (8611569543791307533) -->
- <skip />
- <!-- no translation found for wifi_verbose_logging (4203729756047242344) -->
- <skip />
- <!-- no translation found for wifi_aggressive_handover (9194078645887480917) -->
- <skip />
- <!-- no translation found for wifi_allow_scan_with_traffic (3601853081178265786) -->
- <skip />
- <!-- no translation found for legacy_dhcp_client (694426978909127287) -->
- <skip />
- <!-- no translation found for mobile_data_always_on (7745605759775320362) -->
- <skip />
- <!-- no translation found for wifi_display_certification_summary (1155182309166746973) -->
- <skip />
- <!-- no translation found for wifi_verbose_logging_summary (6615071616111731958) -->
- <skip />
- <!-- no translation found for wifi_aggressive_handover_summary (6328455667642570371) -->
- <skip />
- <!-- no translation found for wifi_allow_scan_with_traffic_summary (2575101424972686310) -->
- <skip />
- <!-- no translation found for select_logd_size_title (7433137108348553508) -->
- <skip />
- <!-- no translation found for select_logd_size_dialog_title (1206769310236476760) -->
- <skip />
- <!-- no translation found for select_usb_configuration_title (2649938511506971843) -->
- <skip />
- <!-- no translation found for select_usb_configuration_dialog_title (6385564442851599963) -->
- <skip />
+ <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Omogući Bluetooth HCI snoop zapis"</string>
+ <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Smjesti sve Bluetooth HCI pakete u datoteku"</string>
+ <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM otključavanje"</string>
+ <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Dozvoli otključavanje bootloadera"</string>
+ <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Želite li dozvoliti OEM otključavanje?"</string>
+ <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"UPOZORENJE: Funkcije zaštite ovog uređaja neće funkcionisati dok je ova postavka uključena."</string>
+ <string name="mock_location_app" msgid="7966220972812881854">"Odaberite aplikaciju za lažne lokacije"</string>
+ <string name="mock_location_app_not_set" msgid="809543285495344223">"Aplikacija za lažnu lokaciju nije postavljena"</string>
+ <string name="mock_location_app_set" msgid="8966420655295102685">"Aplikacija za lažne lokacije: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+ <string name="debug_networking_category" msgid="7044075693643009662">"Umrežavanje"</string>
+ <string name="wifi_display_certification" msgid="8611569543791307533">"Certifikacija bežičnog prikaza"</string>
+ <string name="wifi_verbose_logging" msgid="4203729756047242344">"Omogućiti Wi-Fi Verbose zapisivanje"</string>
+ <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agresivni Wi-Fi u mobilnoj primopredaji"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Uvijek dopustiti Wi-Fi lutajuće skeniranje"</string>
+ <string name="legacy_dhcp_client" msgid="694426978909127287">"Koristi zastareli DHCP klijent"</string>
+ <string name="mobile_data_always_on" msgid="7745605759775320362">"Mobilni podaci uvijek aktivni"</string>
+ <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Pokaži opcije za certifikaciju Bežičnog prikaza"</string>
+ <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Povećajte nivo Wi-Fi zapisivanja, pokazati po SSID RSSI Wi-Fi Picker"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Kada je omogućeno, Wi-Fi će biti agresivniji u predavanju podatkovne veze mobilnoj, kada je Wi-Fi signal slab"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Dozvoli/Zabrani Wi-Fi lutajuće skeniranje na osnovu količine podatkovnog prometa prisutnog na sučelju"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Veličine bafera za zapisnik"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Izaberite veličine za Logger prema međumemoriji evidencije"</string>
+ <string name="select_usb_configuration_title" msgid="2649938511506971843">"Odaberite USB konfiguraciju"</string>
+ <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Odaberite konfiguraciju USB-a"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Dozvoli lažne lokacije"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Dozvoli lažne lokacije"</string>
- <!-- no translation found for debug_view_attributes (6485448367803310384) -->
- <skip />
- <!-- no translation found for legacy_dhcp_client_summary (163383566317652040) -->
- <skip />
- <!-- no translation found for mobile_data_always_on_summary (8149773901431697910) -->
- <skip />
+ <string name="debug_view_attributes" msgid="6485448367803310384">"Omogući pregled atributa prikaza"</string>
+ <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Koristi DHCP klijent iz Lollipopa umjesto novog Android DHCP klijenta."</string>
+ <string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Uvijek drži mobilne podatke aktivnim, čak i kada je Wi-Fi je aktivan (za brzo prebacivanje između mreža)."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Omogućiti USB otklanjanje grešaka?"</string>
<string name="adb_warning_message" msgid="7316799925425402244">"USB otklanjanje grešaka je namijenjeno samo u svrhe razvoja aplikacija. Koristite ga za kopiranje podataka između računara i uređaja, instaliranje aplikacija na uređaj bez obavještenja te čitanje podataka iz dnevnika rada."</string>
- <!-- no translation found for adb_keys_warning_message (5659849457135841625) -->
- <skip />
+ <string name="adb_keys_warning_message" msgid="5659849457135841625">"Opozvati pristup otklanjanju grešaka USB-om za sve računare koje ste prethodno ovlastili?"</string>
<string name="dev_settings_warning_title" msgid="7244607768088540165">"Dopustiti postavke za razvoj?"</string>
<string name="dev_settings_warning_message" msgid="2298337781139097964">"Ove postavke su namijenjene samo za svrhe razvoja. Mogu izazvati pogrešno ponašanje uređaja i aplikacija na njemu."</string>
- <!-- no translation found for verify_apps_over_usb_title (4177086489869041953) -->
- <skip />
- <!-- no translation found for verify_apps_over_usb_summary (9164096969924529200) -->
- <skip />
- <!-- no translation found for enable_terminal_title (95572094356054120) -->
- <skip />
- <!-- no translation found for enable_terminal_summary (67667852659359206) -->
- <skip />
+ <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Verifikuj aplikacije putem USB-a"</string>
+ <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Provjerava da li se u aplikacijama instaliranim putem ADB-a/ADT-a javlja zlonamerno ponašanje."</string>
+ <string name="enable_terminal_title" msgid="95572094356054120">"Lokalni terminal"</string>
+ <string name="enable_terminal_summary" msgid="67667852659359206">"Omogući terminalnu aplik. koja nudi pristup lok. kom. okruženju"</string>
<string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP provjeravanje"</string>
<string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Pos. ponaš. kod HDCP pr."</string>
<string name="debug_debugging_category" msgid="6781250159513471316">"Otklanjanje grešaka"</string>
@@ -315,10 +260,8 @@
<string name="wait_for_debugger_summary" msgid="1766918303462746804">"Aplikacija u kojoj se otklanjaju greške čeka da se priloži program za otklanjanje grešaka prije izvršavanja"</string>
<string name="debug_input_category" msgid="1811069939601180246">"Ulaz"</string>
<string name="debug_drawing_category" msgid="6755716469267367852">"Crtanje"</string>
- <!-- no translation found for debug_hw_drawing_category (6220174216912308658) -->
- <skip />
- <!-- no translation found for media_category (4388305075496848353) -->
- <skip />
+ <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Prikaz s hardverskom akceleracijom"</string>
+ <string name="media_category" msgid="4388305075496848353">"Mediji"</string>
<string name="debug_monitoring_category" msgid="7640508148375798343">"Praćenje"</string>
<string name="strict_mode" msgid="1938795874357830695">"Omogućen strogi režim"</string>
<string name="strict_mode_summary" msgid="142834318897332338">"Prikaži ekran uz treptanje kada aplikacije vrše duge operacije u glavnoj niti"</string>
@@ -332,42 +275,31 @@
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Prikazi uz treptanje unutar prozora kada se crta koristeći GPU"</string>
<string name="show_hw_layers_updates" msgid="5645728765605699821">"Prikaži dodatne informacije za ažuriranja za hardver"</string>
<string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Trepći hardverske slojeve zeleno kada se ažuriraju"</string>
- <!-- no translation found for debug_hw_overdraw (2968692419951565417) -->
- <skip />
+ <string name="debug_hw_overdraw" msgid="2968692419951565417">"Otkl. GPU overdraw greške"</string>
<string name="disable_overlays" msgid="2074488440505934665">"Onemog. HW preklapanja"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Uvijek koristi GPU za kompoziciju ekrana"</string>
- <!-- no translation found for simulate_color_space (6745847141353345872) -->
- <skip />
- <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
- <skip />
- <!-- no translation found for usb_audio_disable_routing (8114498436003102671) -->
- <skip />
- <!-- no translation found for usb_audio_disable_routing_summary (980282760277312264) -->
- <skip />
+ <string name="simulate_color_space" msgid="6745847141353345872">"Simuliraj prostor boje"</string>
+ <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Omogući OpenGL zapise"</string>
+ <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Isključi USB audio usmjeravanje"</string>
+ <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Onemogući autom. usmjerav. na USB audio periferije"</string>
<string name="debug_layout" msgid="5981361776594526155">"Prikaži granice rasporeda"</string>
<string name="debug_layout_summary" msgid="2001775315258637682">"Prikaži granice isječka, margine itd."</string>
- <!-- no translation found for force_rtl_layout_all_locales (2259906643093138978) -->
- <skip />
- <!-- no translation found for force_rtl_layout_all_locales_summary (9192797796616132534) -->
- <skip />
+ <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Prisilno postavi raspored s desna u lijevo"</string>
+ <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Prisilno postavi raspored ekrana s desna u lijevo za sve regije"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Prikaži korištenje CPU-a"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Trenutno korištenje CPU-a prikazuje se u nadsloju preko ekrana"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Prisili GPU iscrtavanje"</string>
<string name="force_hw_ui_summary" msgid="5535991166074861515">"Prisilno koristite GPU za 2d crtanje"</string>
- <!-- no translation found for force_msaa (7920323238677284387) -->
- <skip />
- <!-- no translation found for force_msaa_summary (9123553203895817537) -->
- <skip />
- <!-- no translation found for show_non_rect_clip (505954950474595172) -->
- <skip />
+ <string name="force_msaa" msgid="7920323238677284387">"Prinudno primjeni 4x MSAA"</string>
+ <string name="force_msaa_summary" msgid="9123553203895817537">"Omogući 4x MSAA u OpenGL ES 2.0 aplikacijama"</string>
+ <string name="show_non_rect_clip" msgid="505954950474595172">"Ispravi pogreške na nepravougaonim operacijama isecanja"</string>
<string name="track_frame_time" msgid="6146354853663863443">"Iscrtavanje GPU profila"</string>
<string name="window_animation_scale_title" msgid="6162587588166114700">"Skala animacije prozora"</string>
<string name="transition_animation_scale_title" msgid="387527540523595875">"Skaliranje animacije prelaza"</string>
<string name="animator_duration_scale_title" msgid="3406722410819934083">"Skala trajanja animatora"</string>
<string name="overlay_display_devices_title" msgid="5364176287998398539">"Simuliraj sekundarne ekrane"</string>
<string name="debug_applications_category" msgid="4206913653849771549">"Aplikacije"</string>
- <!-- no translation found for immediately_destroy_activities (1579659389568133959) -->
- <skip />
+ <string name="immediately_destroy_activities" msgid="1579659389568133959">"Ne čuvaj aktivnosti"</string>
<string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Obustavi svaku aktivnosti čim je korisnik napusti"</string>
<string name="app_process_limit_title" msgid="4280600650253107163">"Ograničenje procesa u pozadini"</string>
<string name="show_all_anrs" msgid="28462979638729082">"Prikaži sve ANR-ove"</string>
@@ -385,37 +317,34 @@
<!-- no translation found for enable_freeform_support_summary (2252563497485436534) -->
<skip />
<string name="local_backup_password_title" msgid="3860471654439418822">"Lozinka za rezervnu kopiju za radnu površinu"</string>
- <!-- no translation found for local_backup_password_summary_none (6951095485537767956) -->
- <skip />
+ <string name="local_backup_password_summary_none" msgid="6951095485537767956">"Potpune sigurnosne kopije za računare trenutno nisu zaštićene"</string>
<string name="local_backup_password_summary_change" msgid="2731163425081172638">"Dodirnite da promijenite ili uklonite lozinku za potpune rezervne kopije za radnu površinu"</string>
<string name="local_backup_password_toast_success" msgid="582016086228434290">"Nova lozinka za rezervnu kopiju postavljena"</string>
- <!-- no translation found for local_backup_password_toast_confirmation_mismatch (7805892532752708288) -->
- <skip />
+ <string name="local_backup_password_toast_confirmation_mismatch" msgid="7805892532752708288">"Nova lozinka i potvrda se ne podudaraju"</string>
<string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Nije uspjelo postavljanje lozinke za rezervnu kopiju"</string>
- <!-- no translation found for color_mode_names:0 (2425514299220523812) -->
- <!-- no translation found for color_mode_names:1 (8446070607501413455) -->
- <!-- no translation found for color_mode_names:2 (6553408765810699025) -->
- <!-- no translation found for color_mode_descriptions:0 (4979629397075120893) -->
- <!-- no translation found for color_mode_descriptions:1 (8280754435979370728) -->
- <!-- no translation found for color_mode_descriptions:2 (5363960654009010371) -->
- <!-- no translation found for inactive_apps_title (1317817863508274533) -->
- <skip />
- <!-- no translation found for inactive_app_inactive_summary (6768756967594202411) -->
- <skip />
- <!-- no translation found for inactive_app_active_summary (4512911571954375968) -->
- <skip />
+ <string-array name="color_mode_names">
+ <item msgid="2425514299220523812">"Živopisan (zadano)"</item>
+ <item msgid="8446070607501413455">"Prirodan"</item>
+ <item msgid="6553408765810699025">"Standardni"</item>
+ </string-array>
+ <string-array name="color_mode_descriptions">
+ <item msgid="4979629397075120893">"Unaprijeđene boje"</item>
+ <item msgid="8280754435979370728">"Prirodne boje onako kako ih oko vidi"</item>
+ <item msgid="5363960654009010371">"Boje optimizirane za digitalni sadržaj"</item>
+ </string-array>
+ <string name="inactive_apps_title" msgid="1317817863508274533">"Neaktivne aplikacije"</string>
+ <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Neaktivna je. Dodirnite da biste promenili."</string>
+ <string name="inactive_app_active_summary" msgid="4512911571954375968">"Aktivna je. Dodirnite da biste promenili."</string>
<string name="runningservices_settings_title" msgid="8097287939865165213">"Pokrenute usluge"</string>
<string name="runningservices_settings_summary" msgid="854608995821032748">"Prikažite trenutno pokrenute usluge i upravljajte njima"</string>
<!-- no translation found for night_mode_title (2594133148531256513) -->
<skip />
- <!-- no translation found for night_mode_summary (9196605054622017193) -->
- <skip />
+ <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
<!-- no translation found for night_mode_no (9171772244775838901) -->
<skip />
<!-- no translation found for night_mode_yes (2218157265997633432) -->
<skip />
- <!-- no translation found for night_mode_auto (7508348175804304327) -->
- <skip />
+ <string name="night_mode_auto" msgid="7508348175804304327">"Automatski"</string>
<!-- no translation found for select_webview_provider_title (4628592979751918907) -->
<skip />
<!-- no translation found for select_webview_provider_dialog_title (4370551378720004872) -->
@@ -434,46 +363,27 @@
<skip />
<!-- no translation found for button_convert_fbe (5152671181309826405) -->
<skip />
- <!-- no translation found for picture_color_mode (4560755008730283695) -->
- <skip />
- <!-- no translation found for picture_color_mode_desc (1141891467675548590) -->
- <skip />
- <!-- no translation found for daltonizer_mode_disabled (7482661936053801862) -->
- <skip />
- <!-- no translation found for daltonizer_mode_monochromacy (8485709880666106721) -->
- <skip />
- <!-- no translation found for daltonizer_mode_deuteranomaly (5475532989673586329) -->
- <skip />
- <!-- no translation found for daltonizer_mode_protanomaly (8424148009038666065) -->
- <skip />
- <!-- no translation found for daltonizer_mode_tritanomaly (481725854987912389) -->
- <skip />
- <!-- no translation found for accessibility_display_daltonizer_preference_title (5800761362678707872) -->
- <skip />
- <!-- no translation found for accessibility_display_daltonizer_preference_subtitle (3484969015295282911) -->
- <skip />
- <!-- no translation found for daltonizer_type_overridden (3116947244410245916) -->
- <skip />
- <!-- no translation found for power_discharging_duration (1605929174734600590) -->
- <skip />
- <!-- no translation found for power_charging (1779532561355864267) -->
- <skip />
- <!-- no translation found for power_charging_duration (2853265177761520490) -->
- <skip />
- <!-- no translation found for power_charging_duration_ac (3969186192576594254) -->
- <skip />
- <!-- no translation found for power_charging_duration_usb (182405645340976546) -->
- <skip />
- <!-- no translation found for power_charging_duration_wireless (1829295708243159464) -->
- <skip />
+ <string name="picture_color_mode" msgid="4560755008730283695">"Režim boja Slika"</string>
+ <string name="picture_color_mode_desc" msgid="1141891467675548590">"Koristi sRGB"</string>
+ <string name="daltonizer_mode_disabled" msgid="7482661936053801862">"Onemogućeno"</string>
+ <string name="daltonizer_mode_monochromacy" msgid="8485709880666106721">"Crno-bijelo"</string>
+ <string name="daltonizer_mode_deuteranomaly" msgid="5475532989673586329">"Deuteranomalija (crveno-zeleno)"</string>
+ <string name="daltonizer_mode_protanomaly" msgid="8424148009038666065">"Protanomalija (crveno-zeleno)"</string>
+ <string name="daltonizer_mode_tritanomaly" msgid="481725854987912389">"Tritanomalija (plavo-žuta)"</string>
+ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Ispravka boje"</string>
+ <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Ova funkcija je eksperimentalna te može utjecati na performanse."</string>
+ <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Zamjenjuje <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+ <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – preostalo vreme je otprilike <xliff:g id="TIME">%2$s</xliff:g>"</string>
+ <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string>
+ <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do pune baterije"</string>
+ <string name="power_charging_duration_ac" msgid="3969186192576594254">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do kraja punjenja na el. napajanju"</string>
+ <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do pune baterije preko USB-a"</string>
+ <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do pune baterije bežičnim punjenjem"</string>
<string name="battery_info_status_unknown" msgid="196130600938058547">"Nepoznato"</string>
<string name="battery_info_status_charging" msgid="1705179948350365604">"Puni se"</string>
- <!-- no translation found for battery_info_status_charging_ac (2909861890674399949) -->
- <skip />
- <!-- no translation found for battery_info_status_charging_usb (2207489369680923929) -->
- <skip />
- <!-- no translation found for battery_info_status_charging_wireless (3574032603735446573) -->
- <skip />
+ <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Puni se na punjaču"</string>
+ <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Punjenje preko USB-a"</string>
+ <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Bežično punjenje"</string>
<string name="battery_info_status_discharging" msgid="310932812698268588">"Ne puni se"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ne puni se"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Puna"</string>
diff --git a/packages/SettingsLib/res/values-ro/arrays.xml b/packages/SettingsLib/res/values-ro/arrays.xml
index 141f877..30d6cf3 100644
--- a/packages/SettingsLib/res/values-ro/arrays.xml
+++ b/packages/SettingsLib/res/values-ro/arrays.xml
@@ -86,7 +86,7 @@
<item msgid="2219332261255416635">"Animație la scara 1x"</item>
<item msgid="3544428804137048509">"Animație la scara 1,5x"</item>
<item msgid="3110710404225974514">"Animație la scara 2x"</item>
- <item msgid="4402738611528318731">"Animaţie la scara 5x"</item>
+ <item msgid="4402738611528318731">"Animație la scara 5x"</item>
<item msgid="6189539267968330656">"Animație la scara 10x"</item>
</string-array>
<string-array name="transition_animation_scale_entries">
@@ -99,13 +99,13 @@
<item msgid="6660750935954853365">"Animație la scara 10x"</item>
</string-array>
<string-array name="animator_duration_scale_entries">
- <item msgid="6039901060648228241">"Animaţie dezactivată"</item>
- <item msgid="1138649021950863198">"Animaţie la scara 0,5x"</item>
- <item msgid="4394388961370833040">"Animaţie la scara 1x"</item>
- <item msgid="8125427921655194973">"Animaţie la scara 1,5x"</item>
- <item msgid="3334024790739189573">"Animaţie la scara 2x"</item>
- <item msgid="3170120558236848008">"Animaţie la scara 5x"</item>
- <item msgid="1069584980746680398">"Animaţie la scara 10x"</item>
+ <item msgid="6039901060648228241">"Animație dezactivată"</item>
+ <item msgid="1138649021950863198">"Animație la scara 0,5x"</item>
+ <item msgid="4394388961370833040">"Animație la scara 1x"</item>
+ <item msgid="8125427921655194973">"Animație la scara 1,5x"</item>
+ <item msgid="3334024790739189573">"Animație la scara 2x"</item>
+ <item msgid="3170120558236848008">"Animație la scara 5x"</item>
+ <item msgid="1069584980746680398">"Animație la scara 10x"</item>
</string-array>
<string-array name="overlay_display_devices_entries">
<item msgid="1606809880904982133">"Niciuna"</item>
diff --git a/packages/SettingsLib/res/values-ro/strings.xml b/packages/SettingsLib/res/values-ro/strings.xml
index 04cba99..97bdd51 100644
--- a/packages/SettingsLib/res/values-ro/strings.xml
+++ b/packages/SettingsLib/res/values-ro/strings.xml
@@ -191,7 +191,7 @@
<string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Configurați verific. HDCP"</string>
<string name="debug_debugging_category" msgid="6781250159513471316">"Depanare"</string>
<string name="debug_app" msgid="8349591734751384446">"Selectați aplicația de depanare"</string>
- <string name="debug_app_not_set" msgid="718752499586403499">"Nu aţi setat o aplicație de depanare"</string>
+ <string name="debug_app_not_set" msgid="718752499586403499">"Nu ați setat o aplicație de depanare"</string>
<string name="debug_app_set" msgid="2063077997870280017">"Aplicaţie de depanare: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="select_application" msgid="5156029161289091703">"Selectaţi o aplicație"</string>
<string name="no_application" msgid="2813387563129153880">"Niciuna"</string>
@@ -251,7 +251,7 @@
<string name="enable_freeform_support_summary" msgid="2252563497485436534">"Activează compatibilitatea pentru ferestrele experimentale cu formă liberă."</string>
<string name="local_backup_password_title" msgid="3860471654439418822">"Parolă copie rez. desktop"</string>
<string name="local_backup_password_summary_none" msgid="6951095485537767956">"În prezent, copiile de rezervă complete pe desktop nu sunt protejate"</string>
- <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Atingeţi pentru a modifica sau pentru a elimina parola pentru copiile de rezervă complete pe desktop"</string>
+ <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Atingeți pentru a modifica sau pentru a elimina parola pentru copiile de rezervă complete pe desktop"</string>
<string name="local_backup_password_toast_success" msgid="582016086228434290">"A fost setată o parolă de rezervă nouă"</string>
<string name="local_backup_password_toast_confirmation_mismatch" msgid="7805892532752708288">"Parola nouă și confirmarea acesteia nu se potrivesc."</string>
<string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Setarea parolei de rezervă a eșuat"</string>
diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java
index 85cc3e4..78c530c 100644
--- a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java
@@ -427,6 +427,19 @@
return null;
}
+ public static EnforcedAdmin getDeviceOwner(Context context) {
+ final DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(
+ Context.DEVICE_POLICY_SERVICE);
+ if (dpm == null) {
+ return null;
+ }
+ ComponentName adminComponent = dpm.getDeviceOwnerComponentOnAnyUser();
+ if (adminComponent != null) {
+ return new EnforcedAdmin(adminComponent, dpm.getDeviceOwnerUserId());
+ }
+ return null;
+ }
+
/**
* Set the menu item as disabled by admin by adding a restricted padlock at the end of the
* text and set the click listener which will send an intent to show the admin support details
diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml
index c4dad9f..7edf3a0 100644
--- a/packages/SystemUI/res/values-ca/strings.xml
+++ b/packages/SystemUI/res/values-ca/strings.xml
@@ -504,16 +504,16 @@
<string name="center" msgid="4327473927066010960">"Centre"</string>
<string name="end" msgid="125797972524818282">"Final"</string>
<string name="space" msgid="804232271282109749">"Separador"</string>
- <string name="menu_ime" msgid="4943221416525250684">"Menú / Commutador del teclat"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"Commutador del teclat/menú"</string>
<string name="select_button" msgid="1597989540662710653">"Tria un botó per afegir-lo"</string>
<string name="add_button" msgid="4134946063432258161">"Afegeix un botó"</string>
<string name="save" msgid="2311877285724540644">"Desa"</string>
<string name="reset" msgid="2448168080964209908">"Reinicia"</string>
- <string name="no_home_title" msgid="1563808595146071549">"Cap botó de pàgina d\'inici"</string>
- <string name="no_home_message" msgid="5408485011659260911">"Per poder navegar per aquest dispositiu, cal un botó de pàgina d\'inici. Afegeix-ne un abans de desar."</string>
+ <string name="no_home_title" msgid="1563808595146071549">"No s\'ha trobat cap botó d\'inici"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"Per poder navegar per aquest dispositiu, cal un botó d\'inici. Afegeix-ne un abans de desar."</string>
<string name="adjust_button_width" msgid="6138616087197632947">"Ajusta l\'amplada del botó"</string>
<string name="clipboard" msgid="1313879395099896312">"Porta-retalls"</string>
- <string name="clipboard_description" msgid="3819919243940546364">"Pots arrossegar elements al porta-retalls directament. Per treure\'n elements, també els pots arrossegar directament cap a fora."</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Pots arrossegar elements al porta-retalls directament. Si conté elements, també els pots treure directament arrossegant-los."</string>
<string name="accessibility_key" msgid="5701989859305675896">"Botó de navegació personalitzat"</string>
<string name="keycode" msgid="7335281375728356499">"Codi de tecla"</string>
<string name="keycode_description" msgid="1403795192716828949">"Amb els botons de codi de tecla es poden afegir tecles del teclat a la barra de navegació. En prémer aquests botons es duen a terme les mateixes accions que quan es prem la tecla corresponent. Primer cal seleccionar la tecla del botó i, a continuació, triar la imatge que es mostrarà."</string>
diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml
index a60b498..62fe2c7 100644
--- a/packages/SystemUI/res/values-fr/strings.xml
+++ b/packages/SystemUI/res/values-fr/strings.xml
@@ -515,8 +515,8 @@
<string name="clipboard" msgid="1313879395099896312">"Presse-papiers"</string>
<string name="clipboard_description" msgid="3819919243940546364">"Vous pouvez faire glisser des éléments directement dans le Presse-papiers et inversement."</string>
<string name="accessibility_key" msgid="5701989859305675896">"Bouton de navigation personnalisé"</string>
- <string name="keycode" msgid="7335281375728356499">"Code touche"</string>
- <string name="keycode_description" msgid="1403795192716828949">"Les boutons de codes touche permettent d\'ajouter des touches du clavier à la barre de navigation. Lorsque vous appuyez sur l\'un de ces boutons, il reproduit la fonction de la touche du clavier correspondante. Vous devez d\'abord sélectionner la touche pour le bouton, puis l\'image à afficher sur celui-ci."</string>
+ <string name="keycode" msgid="7335281375728356499">"Code de touche"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Les boutons de codes de touche permettent d\'ajouter des touches du clavier à la barre de navigation. Lorsque vous appuyez sur l\'un de ces boutons, il reproduit la fonction de la touche du clavier correspondante. Vous devez d\'abord sélectionner la touche pour le bouton, puis l\'image à afficher sur celui-ci."</string>
<string name="select_keycode" msgid="7413765103381924584">"Sélectionner la touche du clavier"</string>
<string name="preview" msgid="9077832302472282938">"Aperçu"</string>
</resources>
diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml
index 929150b..d1e117f 100644
--- a/packages/SystemUI/res/values-hu/strings.xml
+++ b/packages/SystemUI/res/values-hu/strings.xml
@@ -505,7 +505,7 @@
<string name="end" msgid="125797972524818282">"Vége"</string>
<string name="space" msgid="804232271282109749">"Távtartó"</string>
<string name="menu_ime" msgid="4943221416525250684">"Menü/Billentyűzetváltó"</string>
- <string name="select_button" msgid="1597989540662710653">"Gomb kiválasztása hozzáadáshoz"</string>
+ <string name="select_button" msgid="1597989540662710653">"Hozzáadni kívánt gomb kiválasztása"</string>
<string name="add_button" msgid="4134946063432258161">"Gomb hozzáadása"</string>
<string name="save" msgid="2311877285724540644">"Mentés"</string>
<string name="reset" msgid="2448168080964209908">"Alaphelyzet"</string>
diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml
index d8bf205..537dbf0 100644
--- a/packages/SystemUI/res/values-ja/strings.xml
+++ b/packages/SystemUI/res/values-ja/strings.xml
@@ -519,7 +519,7 @@
<string name="clipboard_description" msgid="3819919243940546364">"クリップボード機能ではクリップボードにアイテムを直接ドラッグできます。クリップボードにアイテムがある場合、直接そのアイテムをドラッグして取り出すこともできます。"</string>
<string name="accessibility_key" msgid="5701989859305675896">"カスタム ナビゲーション ボタン"</string>
<string name="keycode" msgid="7335281375728356499">"キーコード"</string>
- <string name="keycode_description" msgid="1403795192716828949">"キーコード ボタンを利用すると、ナビゲーション バーにキーボードのキー機能を追加できるようになります。ボタンを押すと選択済みのキーボードのキーがエミュレートされます。まずボタン用にキーを選択する必要があり、選択するとボタン上に画像が表示されます。"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"キーコード ボタンを利用すると、ナビゲーション バーにキーボードのキー機能を追加できるようになります。ボタンを押すと選択済みのキーボードのキーがエミュレートされます。まずボタン用にキーを選択し、次にボタン上の画像を選択する必要があります。"</string>
<string name="select_keycode" msgid="7413765103381924584">"キーボードのボタンの選択"</string>
<string name="preview" msgid="9077832302472282938">"プレビュー"</string>
</resources>
diff --git a/packages/SystemUI/res/values-ky-rKG/strings.xml b/packages/SystemUI/res/values-ky-rKG/strings.xml
index 197a76c7..66f79e7 100644
--- a/packages/SystemUI/res/values-ky-rKG/strings.xml
+++ b/packages/SystemUI/res/values-ky-rKG/strings.xml
@@ -146,7 +146,7 @@
<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
<string name="accessibility_no_sim" msgid="8274017118472455155">"SIM карта жок."</string>
- <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Уюлдук дайындар өчүк"</string>
+ <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Мобилдик дайындарды өткөрүү өчүрүлгөн"</string>
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth аркылуу интернет бөлүшүү."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"Учак тартиби."</string>
<string name="accessibility_no_sims" msgid="3957997018324995781">"SIM-карта жок"</string>
@@ -501,7 +501,7 @@
<string name="switch_bar_on" msgid="1142437840752794229">"Күйүк"</string>
<string name="nav_bar" msgid="1993221402773877607">"Чабыттоо тилкеси"</string>
<string name="start" msgid="6873794757232879664">"Баштоо"</string>
- <string name="center" msgid="4327473927066010960">"Борбор"</string>
+ <string name="center" msgid="4327473927066010960">"Экрандын ортосунда"</string>
<string name="end" msgid="125797972524818282">"Бүтүрүү"</string>
<string name="space" msgid="804232271282109749">"Боштук калтыргыч"</string>
<string name="menu_ime" msgid="4943221416525250684">"Меню / Баскычтоп которуштургуч"</string>
@@ -513,10 +513,10 @@
<string name="no_home_message" msgid="5408485011659260911">"Бул түзмөктө чабыттоо үчүн башкы бет баскычы керек. Сактаардан мурун, башкы бет баскычын кошуңуз."</string>
<string name="adjust_button_width" msgid="6138616087197632947">"Баскычтын жазылыгын тууралоо"</string>
<string name="clipboard" msgid="1313879395099896312">"Алмашуу буфери"</string>
- <string name="clipboard_description" msgid="3819919243940546364">"Алмашуу буфери нерселерди түздөн-түз буферге сүйрөө мүмкүнчүлүгүн берет. Нерселерди буферден түздөн-түз сүйрөп чыкса да болот."</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"Бул баскычтын жардамы менен файлдарды алмашуу буферине көчүрүп, анын ичинен сүйрөп чыгууга болот."</string>
<string name="accessibility_key" msgid="5701989859305675896">"Ыңгайлаштырылган чабыттоо баскычы"</string>
<string name="keycode" msgid="7335281375728356499">"Баскыч коду"</string>
- <string name="keycode_description" msgid="1403795192716828949">"Баскыч коддору баскычтоптун баскычтарын Чабыттоо тилкесине кошуу мүмкүнчүлүгүн берет. Алар басылганда, баскычтоптогу тандалган баскычтын функциясын аткарат. Адегенде баскыч, андан соң баскычта көрсөтүлө турган сүрөт тандалат."</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Бул баскычтын жардамы менен баскычтоптогу баскычтарды чабыттоо тилкесине кошууга болот. Ал үчүн баскычты жана тийиштүү баскычтын көрүнүшүн тандаңыз."</string>
<string name="select_keycode" msgid="7413765103381924584">"Баскычтоптогу баскычты тандоо"</string>
<string name="preview" msgid="9077832302472282938">"Алдын ала көрүү"</string>
</resources>
diff --git a/packages/SystemUI/res/values-ne-rNP/strings.xml b/packages/SystemUI/res/values-ne-rNP/strings.xml
index a0faf75..ffd2b8f 100644
--- a/packages/SystemUI/res/values-ne-rNP/strings.xml
+++ b/packages/SystemUI/res/values-ne-rNP/strings.xml
@@ -499,7 +499,7 @@
<string name="accessibility_data_saver_on" msgid="8454111686783887148">"डेटा सेभर अन छ"</string>
<string name="accessibility_data_saver_off" msgid="8841582529453005337">"डेटा सेभर बन्द छ"</string>
<string name="switch_bar_on" msgid="1142437840752794229">"सक्रिय गर्नुहोस्"</string>
- <string name="nav_bar" msgid="1993221402773877607">"नेभिगेसन पट्टी"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"नेभिगेशन पट्टी"</string>
<string name="start" msgid="6873794757232879664">"सुरु गर्नुहोस्"</string>
<string name="center" msgid="4327473927066010960">"केन्द्र"</string>
<string name="end" msgid="125797972524818282">"अन्त्य गर्नुहोस्"</string>
@@ -514,9 +514,9 @@
<string name="adjust_button_width" msgid="6138616087197632947">"बटनको चौडाइ समायोजन गर्नुहोस्"</string>
<string name="clipboard" msgid="1313879395099896312">"क्लिपबोर्ड"</string>
<string name="clipboard_description" msgid="3819919243940546364">"क्लिपबोर्डले वस्तुहरूलाई क्लिपबोर्डमा प्रत्यक्ष तान्न अनुमति दिन्छ। प्रस्तुत गर्दा वस्तुहरूलाई क्लिपबोर्डबाट प्रत्यक्ष रूपमा बाहिर तान्न पनि सकिन्छ।"</string>
- <string name="accessibility_key" msgid="5701989859305675896">"अनुकूलन नेभिगेशन बटन"</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"अनुकूलनको नेभिगेशन बटन"</string>
<string name="keycode" msgid="7335281375728356499">"Keycode"</string>
- <string name="keycode_description" msgid="1403795192716828949">"Keycode बटनहरूले किबोर्ड कुञ्जीहरूलाई नेभिगेसन पट्टीमा थपिने अनुमति दिन्छ। थिच्दा तिनीहरूले चयन गरिएको किबोर्ड कुञ्जी अनुकरण गर्छन्। सुरुमा बटनका लागि कुञ्जी चयन गर्नुपर्छ, त्यसपछि बटनमा छवि देखिनुपर्छ।"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Keycode बटनहरूले किबोर्ड कुञ्जीहरूलाई नेभिगेशन पट्टीमा थपिने अनुमति दिन्छ। थिच्दा तिनीहरूले चयन गरिएको किबोर्ड कुञ्जी अनुकरण गर्छन्। सुरुमा बटनका लागि कुञ्जी चयन गर्नुपर्छ, त्यसपछि बटनमा छवि देखिनुपर्छ।"</string>
<string name="select_keycode" msgid="7413765103381924584">"किबोर्ड बटन चयन गर्नुहोस्"</string>
<string name="preview" msgid="9077832302472282938">"पूर्वावलोकन"</string>
</resources>
diff --git a/packages/SystemUI/res/values-ta-rIN/strings.xml b/packages/SystemUI/res/values-ta-rIN/strings.xml
index 5eaf15d..914c544 100644
--- a/packages/SystemUI/res/values-ta-rIN/strings.xml
+++ b/packages/SystemUI/res/values-ta-rIN/strings.xml
@@ -495,9 +495,9 @@
<string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"ஹெட்ஃபோன்கள் இணைக்கப்பட்டன"</string>
<string name="accessibility_status_bar_headset" msgid="8666419213072449202">"ஹெட்செட் இணைக்கப்பட்டது"</string>
<string name="tuner_status_bar_explanation" msgid="9032196769944137864">"நிலைப் பட்டியில் ஐகான்களைக் காட்டுவதை இயக்கும் அல்லது முடக்கும்."</string>
- <string name="data_saver" msgid="5037565123367048522">"தரவுச் சேமிப்பான்"</string>
- <string name="accessibility_data_saver_on" msgid="8454111686783887148">"தரவுச் சேமிப்பான் இயக்கப்பட்டது"</string>
- <string name="accessibility_data_saver_off" msgid="8841582529453005337">"தரவுச் சேமிப்பான் முடக்கப்பட்டது"</string>
+ <string name="data_saver" msgid="5037565123367048522">"தரவுச்சேமிப்பான்"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"தரவு சேமிப்பான் இயக்கப்பட்டது"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"தரவு சேமிப்பான் முடக்கப்பட்டது"</string>
<string name="switch_bar_on" msgid="1142437840752794229">"இயக்கு"</string>
<string name="nav_bar" msgid="1993221402773877607">"வழிசெலுத்தல் பட்டி"</string>
<string name="start" msgid="6873794757232879664">"தொடங்கு"</string>
diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml
index 25843f9..318997c6 100644
--- a/packages/SystemUI/res/values-zh-rCN/strings.xml
+++ b/packages/SystemUI/res/values-zh-rCN/strings.xml
@@ -302,8 +302,7 @@
<string name="recents_search_bar_label" msgid="8074997400187836677">"搜索"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"无法启动<xliff:g id="APP">%s</xliff:g>。"</string>
<string name="recents_history_button_label" msgid="5153358867807604821">"历史记录"</string>
- <!-- no translation found for recents_history_clear_all_button_label (5905258334958006953) -->
- <skip />
+ <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"清除"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"水平分割"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"垂直分割"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"自定义分割"</string>
@@ -469,8 +468,7 @@
<string name="color_matrix_none" msgid="2121957926040543148">"常规颜色"</string>
<string name="color_matrix_night" msgid="5943817622105307072">"夜间颜色"</string>
<string name="color_matrix_custom" msgid="3655576492322298713">"自定义颜色"</string>
- <!-- no translation found for color_matrix_auto (4896624757412029265) -->
- <skip />
+ <string name="color_matrix_auto" msgid="4896624757412029265">"自动"</string>
<string name="color_matrix_unknown" msgid="2709202104256265107">"未知颜色"</string>
<string name="color_transform" msgid="6985460408079086090">"颜色修改"</string>
<string name="color_matrix_show_qs" msgid="1763244354399276679">"显示“快捷设置”图块"</string>
@@ -500,45 +498,25 @@
<string name="data_saver" msgid="5037565123367048522">"流量节省程序"</string>
<string name="accessibility_data_saver_on" msgid="8454111686783887148">"流量节省程序已开启"</string>
<string name="accessibility_data_saver_off" msgid="8841582529453005337">"流量节省程序已关闭"</string>
- <!-- no translation found for switch_bar_on (1142437840752794229) -->
- <skip />
- <!-- no translation found for nav_bar (1993221402773877607) -->
- <skip />
- <!-- no translation found for start (6873794757232879664) -->
- <skip />
- <!-- no translation found for center (4327473927066010960) -->
- <skip />
- <!-- no translation found for end (125797972524818282) -->
- <skip />
- <!-- no translation found for space (804232271282109749) -->
- <skip />
- <!-- no translation found for menu_ime (4943221416525250684) -->
- <skip />
- <!-- no translation found for select_button (1597989540662710653) -->
- <skip />
- <!-- no translation found for add_button (4134946063432258161) -->
- <skip />
- <!-- no translation found for save (2311877285724540644) -->
- <skip />
+ <string name="switch_bar_on" msgid="1142437840752794229">"开启"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"导航栏"</string>
+ <string name="start" msgid="6873794757232879664">"顶部"</string>
+ <string name="center" msgid="4327473927066010960">"中心位置"</string>
+ <string name="end" msgid="125797972524818282">"底部"</string>
+ <string name="space" msgid="804232271282109749">"空格键"</string>
+ <string name="menu_ime" msgid="4943221416525250684">"菜单/键盘切换器"</string>
+ <string name="select_button" msgid="1597989540662710653">"选择要添加的按钮"</string>
+ <string name="add_button" msgid="4134946063432258161">"添加按钮"</string>
+ <string name="save" msgid="2311877285724540644">"保存"</string>
<string name="reset" msgid="2448168080964209908">"重置"</string>
- <!-- no translation found for no_home_title (1563808595146071549) -->
- <skip />
- <!-- no translation found for no_home_message (5408485011659260911) -->
- <skip />
- <!-- no translation found for adjust_button_width (6138616087197632947) -->
- <skip />
- <!-- no translation found for clipboard (1313879395099896312) -->
- <skip />
- <!-- no translation found for clipboard_description (3819919243940546364) -->
- <skip />
- <!-- no translation found for accessibility_key (5701989859305675896) -->
- <skip />
- <!-- no translation found for keycode (7335281375728356499) -->
- <skip />
- <!-- no translation found for keycode_description (1403795192716828949) -->
- <skip />
- <!-- no translation found for select_keycode (7413765103381924584) -->
- <skip />
- <!-- no translation found for preview (9077832302472282938) -->
- <skip />
+ <string name="no_home_title" msgid="1563808595146071549">"未找到主屏幕按钮"</string>
+ <string name="no_home_message" msgid="5408485011659260911">"要在此设备上导航，您必须使用主屏幕按钮。请先添加主屏幕按钮，然后再保存。"</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"调整按钮宽度"</string>
+ <string name="clipboard" msgid="1313879395099896312">"剪贴板"</string>
+ <string name="clipboard_description" msgid="3819919243940546364">"您可以利用“剪贴板”按钮将相应内容直接拖动到剪贴板中。剪贴板中有内容时，您也可以将剪贴板中的内容直接拖出来。"</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"自定义导航按钮"</string>
+ <string name="keycode" msgid="7335281375728356499">"键码"</string>
+ <string name="keycode_description" msgid="1403795192716828949">"您可以利用“键码”按钮将键盘按键添加到导航栏中。只要按下这些按钮，按钮即可模仿所选键盘按键执行相应的操作。要使用这项功能，您必须先为按钮选择相应的按键，然后再选择要在按钮上显示的图片。"</string>
+ <string name="select_keycode" msgid="7413765103381924584">"选择键盘按钮"</string>
+ <string name="preview" msgid="9077832302472282938">"预览"</string>
</resources>
diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml
index 8ab2302..76c2696 100644
--- a/packages/SystemUI/res/values-zu/strings.xml
+++ b/packages/SystemUI/res/values-zu/strings.xml
@@ -512,11 +512,11 @@
<string name="no_home_title" msgid="1563808595146071549">"Ayikho inkinobho yasekhaya etholakele"</string>
<string name="no_home_message" msgid="5408485011659260911">"Inkinobho yasekhaya iyadingeka ukuthi inikwe amandla ukuze uzule kule divayisi. Sicela ungeze inkinobho yasekhaya ngaphambi kokulondoloza."</string>
<string name="adjust_button_width" msgid="6138616087197632947">"Lungisa ububanzi benkinobho"</string>
- <string name="clipboard" msgid="1313879395099896312">"Ibhodi lokumanathisela"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Ibhodi lokunamathisela"</string>
<string name="clipboard_description" msgid="3819919243940546364">"Ibhodi lokunamathisela livumela izinto ukuthi zihudulelwe ngqo ebhodini lokunamathisela. Izinto zingahudulelwa ngqo ngaphandle kwebhodi lokunamathisela uma zikhona."</string>
<string name="accessibility_key" msgid="5701989859305675896">"Inkinobho yokuzula yangokwezifiso"</string>
<string name="keycode" msgid="7335281375728356499">"Ikhodi yokhiye"</string>
- <string name="keycode_description" msgid="1403795192716828949">"Izinkinobho zebhodi yokhiye zivumela okhiye bekhibhodi ukuthi bangezwe kwibha yokuzula. Uma zicindezelwa zusula ukhiye wekhibhodi okhethiwe. Kokuqala ukhiye kufanele akhethelwe inkinobho, ulandelwe isithombe esizoboniswa kwinkinobho."</string>
+ <string name="keycode_description" msgid="1403795192716828949">"Izinkinobho zebhodi yokhiye zivumela okhiye bekhibhodi ukuthi bangezwe kwibha yokuzula. Uma zicindezelwa zisula ukhiye wekhibhodi okhethiwe. Kokuqala ukhiye kufanele ukhethelwe inkinobho, ulandelwe isithombe esizoboniswa kwinkinobho."</string>
<string name="select_keycode" msgid="7413765103381924584">"Khetha inkinobho yekhibhodi"</string>
<string name="preview" msgid="9077832302472282938">"Hlola kuqala"</string>
</resources>
diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto
index 697777c..0e67a24 100644
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -342,5 +342,11 @@
// QS Tile for Data Saver.
QS_DATA_SAVER = 284;
+
+ // OPEN: Settings > Security > User credentials
+ // CATEGORY: Settings
+ // OS: 6.1
+ // GMS: 7.8.99
+ USER_CREDENTIALS = 285;
}
}
diff --git a/services/net/java/android/net/apf/ApfGenerator.java b/services/net/java/android/net/apf/ApfGenerator.java
new file mode 100644
index 0000000..96c2ba5
--- /dev/null
+++ b/services/net/java/android/net/apf/ApfGenerator.java
@@ -0,0 +1,883 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net.apf;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+/**
+ * APF assembler/generator. A tool for generating an APF program.
+ *
+ * Call add*() functions to add instructions to the program, then call
+ * {@link generate} to get the APF bytecode for the program.
+ *
+ * @hide
+ */
+public class ApfGenerator {
+ /**
+ * This exception is thrown when an attempt is made to generate an illegal instruction.
+ */
+ public static class IllegalInstructionException extends Exception {
+ IllegalInstructionException(String msg) {
+ super(msg);
+ }
+ }
+ private enum Opcodes {
+ LABEL(-1),
+ LDB(1), // Load 1 byte from immediate offset, e.g. "ldb R0, [5]"
+ LDH(2), // Load 2 bytes from immediate offset, e.g. "ldh R0, [5]"
+ LDW(3), // Load 4 bytes from immediate offset, e.g. "ldw R0, [5]"
+ LDBX(4), // Load 1 byte from immediate offset plus register, e.g. "ldbx R0, [5]R0"
+ LDHX(5), // Load 2 byte from immediate offset plus register, e.g. "ldhx R0, [5]R0"
+ LDWX(6), // Load 4 byte from immediate offset plus register, e.g. "ldwx R0, [5]R0"
+ ADD(7), // Add, e.g. "add R0,5"
+ MUL(8), // Multiply, e.g. "mul R0,5"
+ DIV(9), // Divide, e.g. "div R0,5"
+ AND(10), // And, e.g. "and R0,5"
+ OR(11), // Or, e.g. "or R0,5"
+ SH(12), // Left shift, e.g, "sh R0, 5" or "sh R0, -5" (shifts right)
+ LI(13), // Load immediate, e.g. "li R0,5" (immediate encoded as signed value)
+ JMP(14), // Jump, e.g. "jmp label"
+ JEQ(15), // Compare equal and branch, e.g. "jeq R0,5,label"
+ JNE(16), // Compare not equal and branch, e.g. "jne R0,5,label"
+ JGT(17), // Compare greater than and branch, e.g. "jgt R0,5,label"
+ JLT(18), // Compare less than and branch, e.g. "jlt R0,5,label"
+ JSET(19), // Compare any bits set and branch, e.g. "jset R0,5,label"
+ JNEBS(20), // Compare not equal byte sequence, e.g. "jnebs R0,5,label,0x1122334455"
+ EXT(21); // Followed by immediate indicating ExtendedOpcodes.
+
+ final int value;
+
+ private Opcodes(int value) {
+ this.value = value;
+ }
+ }
+ // Extended opcodes. Primary opcode is Opcodes.EXT. ExtendedOpcodes are encoded in the immediate
+ // field.
+ private enum ExtendedOpcodes {
+ LDM(0), // Load from memory, e.g. "ldm R0,5"
+ STM(16), // Store to memory, e.g. "stm R0,5"
+ NOT(32), // Not, e.g. "not R0"
+ NEG(33), // Negate, e.g. "neg R0"
+ SWAP(34), // Swap, e.g. "swap R0,R1"
+ MOVE(35); // Move, e.g. "move R0,R1"
+
+ final int value;
+
+ private ExtendedOpcodes(int value) {
+ this.value = value;
+ }
+ }
+ public enum Register {
+ R0(0),
+ R1(1);
+
+ final int value;
+
+ private Register(int value) {
+ this.value = value;
+ }
+ }
+ private class Instruction {
+ private final byte mOpcode; // A "Opcode" value.
+ private final byte mRegister; // A "Register" value.
+ private boolean mHasImm;
+ private byte mImmSize;
+ private boolean mImmSigned;
+ private int mImm;
+ // When mOpcode is a jump:
+ private byte mTargetLabelSize;
+ private String mTargetLabel;
+ // When mOpcode == Opcodes.LABEL:
+ private String mLabel;
+ // When mOpcode == Opcodes.JNEBS:
+ private byte[] mCompareBytes;
+ // Offset in bytes from the begining of this program. Set by {@link ApfGenerator#generate}.
+ int offset;
+
+ Instruction(Opcodes opcode, Register register) {
+ mOpcode = (byte)opcode.value;
+ mRegister = (byte)register.value;
+ }
+
+ Instruction(Opcodes opcode) {
+ this(opcode, Register.R0);
+ }
+
+ void setImm(int imm, boolean signed) {
+ mHasImm = true;
+ mImm = imm;
+ mImmSigned = signed;
+ mImmSize = calculateImmSize(imm, signed);
+ }
+
+ void setUnsignedImm(int imm) {
+ setImm(imm, false);
+ }
+
+ void setSignedImm(int imm) {
+ setImm(imm, true);
+ }
+
+ void setLabel(String label) throws IllegalInstructionException {
+ if (mLabels.containsKey(label)) {
+ throw new IllegalInstructionException("duplicate label " + label);
+ }
+ if (mOpcode != Opcodes.LABEL.value) {
+ throw new IllegalStateException("adding label to non-label instruction");
+ }
+ mLabel = label;
+ mLabels.put(label, this);
+ }
+
+ void setTargetLabel(String label) {
+ mTargetLabel = label;
+ mTargetLabelSize = 4; // May shrink later on in generate().
+ }
+
+ void setCompareBytes(byte[] bytes) {
+ if (mOpcode != Opcodes.JNEBS.value) {
+ throw new IllegalStateException("adding compare bytes to non-JNEBS instruction");
+ }
+ mCompareBytes = bytes;
+ }
+
+ /**
+ * @return size of instruction in bytes.
+ */
+ int size() {
+ if (mOpcode == Opcodes.LABEL.value) {
+ return 0;
+ }
+ int size = 1;
+ if (mHasImm) {
+ size += generatedImmSize();
+ }
+ if (mTargetLabel != null) {
+ size += generatedImmSize();
+ }
+ if (mCompareBytes != null) {
+ size += mCompareBytes.length;
+ }
+ return size;
+ }
+
+ /**
+ * Resize immediate value field so that it's only as big as required to
+ * contain the offset of the jump destination.
+ * @return {@code true} if shrunk.
+ */
+ boolean shrink() throws IllegalInstructionException {
+ if (mTargetLabel == null) {
+ return false;
+ }
+ int oldSize = size();
+ int oldTargetLabelSize = mTargetLabelSize;
+ mTargetLabelSize = calculateImmSize(calculateTargetLabelOffset(), false);
+ if (mTargetLabelSize > oldTargetLabelSize) {
+ throw new IllegalStateException("instruction grew");
+ }
+ return size() < oldSize;
+ }
+
+ /**
+ * Assemble value for instruction size field.
+ */
+ private byte generateImmSizeField() {
+ byte immSize = generatedImmSize();
+ // Encode size field to fit in 2 bits: 0->0, 1->1, 2->2, 3->4.
+ return immSize == 4 ? 3 : immSize;
+ }
+
+ /**
+ * Assemble first byte of generated instruction.
+ */
+ private byte generateInstructionByte() {
+ byte sizeField = generateImmSizeField();
+ return (byte)((mOpcode << 3) | (sizeField << 1) | mRegister);
+ }
+
+ /**
+ * Write {@code value} at offset {@code writingOffset} into {@code bytecode}.
+ * {@link generatedImmSize} bytes are written. {@code value} is truncated to
+ * {@code generatedImmSize} bytes. {@code value} is treated simply as a
+ * 32-bit value, so unsigned values should be zero extended and the truncation
+ * should simply throw away their zero-ed upper bits, and signed values should
+ * be sign extended and the truncation should simply throw away their signed
+ * upper bits.
+ */
+ private int writeValue(int value, byte[] bytecode, int writingOffset) {
+ for (int i = generatedImmSize() - 1; i >= 0; i--) {
+ bytecode[writingOffset++] = (byte)((value >> (i * 8)) & 255);
+ }
+ return writingOffset;
+ }
+
+ /**
+ * Generate bytecode for this instruction at offset {@link offset}.
+ */
+ void generate(byte[] bytecode) throws IllegalInstructionException {
+ if (mOpcode == Opcodes.LABEL.value) {
+ return;
+ }
+ int writingOffset = offset;
+ bytecode[writingOffset++] = generateInstructionByte();
+ if (mTargetLabel != null) {
+ writingOffset = writeValue(calculateTargetLabelOffset(), bytecode, writingOffset);
+ }
+ if (mHasImm) {
+ writingOffset = writeValue(mImm, bytecode, writingOffset);
+ }
+ if (mCompareBytes != null) {
+ System.arraycopy(mCompareBytes, 0, bytecode, writingOffset, mCompareBytes.length);
+ writingOffset += mCompareBytes.length;
+ }
+ if ((writingOffset - offset) != size()) {
+ throw new IllegalStateException("wrote " + (writingOffset - offset) +
+ " but should have written " + size());
+ }
+ }
+
+ /**
+ * Calculate the size of either the immediate field or the target label field, if either is
+ * present. Most instructions have either an immediate or a target label field, but for the
+ * instructions that have both, the size of the target label field must be the same as the
+ * size of the immediate field, because there is only one length field in the instruction
+ * byte, hence why this function simply takes the maximum of the two sizes, so neither is
+ * truncated.
+ */
+ private byte generatedImmSize() {
+ return mImmSize > mTargetLabelSize ? mImmSize : mTargetLabelSize;
+ }
+
+ private int calculateTargetLabelOffset() throws IllegalInstructionException {
+ Instruction targetLabelInstruction;
+ if (mTargetLabel == DROP_LABEL) {
+ targetLabelInstruction = mDropLabel;
+ } else if (mTargetLabel == PASS_LABEL) {
+ targetLabelInstruction = mPassLabel;
+ } else {
+ targetLabelInstruction = mLabels.get(mTargetLabel);
+ }
+ if (targetLabelInstruction == null) {
+ throw new IllegalInstructionException("label not found: " + mTargetLabel);
+ }
+ // Calculate distance from end of this instruction to instruction.offset.
+ final int targetLabelOffset = targetLabelInstruction.offset - (offset + size());
+ if (targetLabelOffset < 0) {
+ throw new IllegalInstructionException("backward branches disallowed; label: " +
+ mTargetLabel);
+ }
+ return targetLabelOffset;
+ }
+
+ private byte calculateImmSize(int imm, boolean signed) {
+ if (imm == 0) {
+ return 0;
+ }
+ if (signed && (imm >= -128 && imm <= 127) ||
+ !signed && (imm >= 0 && imm <= 255)) {
+ return 1;
+ }
+ if (signed && (imm >= -32768 && imm <= 32767) ||
+ !signed && (imm >= 0 && imm <= 65535)) {
+ return 2;
+ }
+ return 4;
+ }
+ }
+
+ /**
+ * Jump to this label to terminate the program and indicate the packet
+ * should be dropped.
+ */
+ public static final String DROP_LABEL = "__DROP__";
+
+ /**
+ * Jump to this label to terminate the program and indicate the packet
+ * should be passed to the AP.
+ */
+ public static final String PASS_LABEL = "__PASS__";
+
+ /**
+ * Number of memory slots available for access via APF stores to memory and loads from memory.
+ * The memory slots are numbered 0 to {@code MEMORY_SLOTS} - 1. This must be kept in sync with
+ * the APF interpreter.
+ */
+ public static final int MEMORY_SLOTS = 16;
+
+ /**
+ * Memory slot number that is prefilled with the IPv4 header length.
+ * Note that this memory slot may be overwritten by a program that
+ * executes stores to this memory slot. This must be kept in sync with
+ * the APF interpreter.
+ */
+ public static final int IPV4_HEADER_SIZE_MEMORY_SLOT = 13;
+
+ /**
+ * Memory slot number that is prefilled with the size of the packet being filtered in bytes.
+ * Note that this memory slot may be overwritten by a program that
+ * executes stores to this memory slot. This must be kept in sync with the APF interpreter.
+ */
+ public static final int PACKET_SIZE_MEMORY_SLOT = 14;
+
+ /**
+ * Memory slot number that is prefilled with the age of the filter in seconds. The age of the
+ * filter is the time since the filter was installed until now.
+ * Note that this memory slot may be overwritten by a program that
+ * executes stores to this memory slot. This must be kept in sync with the APF interpreter.
+ */
+ public static final int FILTER_AGE_MEMORY_SLOT = 15;
+
+ /**
+ * First memory slot containing prefilled values. Can be used in range comparisons to determine
+ * if memory slot index is within prefilled slots.
+ */
+ public static final int FIRST_PREFILLED_MEMORY_SLOT = IPV4_HEADER_SIZE_MEMORY_SLOT;
+
+ /**
+ * Last memory slot containing prefilled values. Can be used in range comparisons to determine
+ * if memory slot index is within prefilled slots.
+ */
+ public static final int LAST_PREFILLED_MEMORY_SLOT = FILTER_AGE_MEMORY_SLOT;
+
+ private final ArrayList<Instruction> mInstructions = new ArrayList<Instruction>();
+ private final HashMap<String, Instruction> mLabels = new HashMap<String, Instruction>();
+ private final Instruction mDropLabel = new Instruction(Opcodes.LABEL);
+ private final Instruction mPassLabel = new Instruction(Opcodes.LABEL);
+ private boolean mGenerated;
+
+ /**
+ * Set version of APF instruction set to generate instructions for. Returns {@code true}
+ * if generating for this version is supported, {@code false} otherwise.
+ */
+ public boolean setApfVersion(int version) {
+ // This version number syncs up with APF_VERSION in hardware/google/apf/apf_interpreter.h
+ return version == 2;
+ }
+
+ private void addInstruction(Instruction instruction) {
+ if (mGenerated) {
+ throw new IllegalStateException("Program already generated");
+ }
+ mInstructions.add(instruction);
+ }
+
+ /**
+ * Define a label at the current end of the program. Jumps can jump to this label. Labels are
+ * their own separate instructions, though with size 0. This facilitates having labels with
+ * no corresponding code to execute, for example a label at the end of a program. For example
+ * an {@link ApfGenerator} might be passed to a function that adds a filter like so:
+ * <pre>
+ * load from packet
+ * compare loaded data, jump if not equal to "next_filter"
+ * load from packet
+ * compare loaded data, jump if not equal to "next_filter"
+ * jump to drop label
+ * define "next_filter" here
+ * </pre>
+ * In this case "next_filter" may not have any generated code associated with it.
+ */
+ public ApfGenerator defineLabel(String name) throws IllegalInstructionException {
+ Instruction instruction = new Instruction(Opcodes.LABEL);
+ instruction.setLabel(name);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an unconditional jump instruction to the end of the program.
+ */
+ public ApfGenerator addJump(String target) {
+ Instruction instruction = new Instruction(Opcodes.JMP);
+ instruction.setTargetLabel(target);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to load the byte at offset {@code offset}
+ * bytes from the begining of the packet into {@code register}.
+ */
+ public ApfGenerator addLoad8(Register register, int offset) {
+ Instruction instruction = new Instruction(Opcodes.LDB, register);
+ instruction.setUnsignedImm(offset);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to load 16-bits at offset {@code offset}
+ * bytes from the begining of the packet into {@code register}.
+ */
+ public ApfGenerator addLoad16(Register register, int offset) {
+ Instruction instruction = new Instruction(Opcodes.LDH, register);
+ instruction.setUnsignedImm(offset);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to load 32-bits at offset {@code offset}
+ * bytes from the begining of the packet into {@code register}.
+ */
+ public ApfGenerator addLoad32(Register register, int offset) {
+ Instruction instruction = new Instruction(Opcodes.LDW, register);
+ instruction.setUnsignedImm(offset);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to load a byte from the packet into
+ * {@code register}. The offset of the loaded byte from the begining of the packet is
+ * the sum of {@code offset} and the value in register R1.
+ */
+ public ApfGenerator addLoad8Indexed(Register register, int offset) {
+ Instruction instruction = new Instruction(Opcodes.LDBX, register);
+ instruction.setUnsignedImm(offset);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to load 16-bits from the packet into
+ * {@code register}. The offset of the loaded 16-bits from the begining of the packet is
+ * the sum of {@code offset} and the value in register R1.
+ */
+ public ApfGenerator addLoad16Indexed(Register register, int offset) {
+ Instruction instruction = new Instruction(Opcodes.LDHX, register);
+ instruction.setUnsignedImm(offset);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to load 32-bits from the packet into
+ * {@code register}. The offset of the loaded 32-bits from the begining of the packet is
+ * the sum of {@code offset} and the value in register R1.
+ */
+ public ApfGenerator addLoad32Indexed(Register register, int offset) {
+ Instruction instruction = new Instruction(Opcodes.LDWX, register);
+ instruction.setUnsignedImm(offset);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to add {@code value} to register R0.
+ */
+ public ApfGenerator addAdd(int value) {
+ Instruction instruction = new Instruction(Opcodes.ADD);
+ instruction.setSignedImm(value);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to multiply register R0 by {@code value}.
+ */
+ public ApfGenerator addMul(int value) {
+ Instruction instruction = new Instruction(Opcodes.MUL);
+ instruction.setSignedImm(value);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to divide register R0 by {@code value}.
+ */
+ public ApfGenerator addDiv(int value) {
+ Instruction instruction = new Instruction(Opcodes.DIV);
+ instruction.setSignedImm(value);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to logically and register R0 with {@code value}.
+ */
+ public ApfGenerator addAnd(int value) {
+ Instruction instruction = new Instruction(Opcodes.AND);
+ instruction.setUnsignedImm(value);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to logically or register R0 with {@code value}.
+ */
+ public ApfGenerator addOr(int value) {
+ Instruction instruction = new Instruction(Opcodes.OR);
+ instruction.setUnsignedImm(value);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to shift left register R0 by {@code value} bits.
+ */
+ public ApfGenerator addLeftShift(int value) {
+ Instruction instruction = new Instruction(Opcodes.SH);
+ instruction.setSignedImm(value);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to shift right register R0 by {@code value}
+ * bits.
+ */
+ public ApfGenerator addRightShift(int value) {
+ Instruction instruction = new Instruction(Opcodes.SH);
+ instruction.setSignedImm(-value);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to add register R1 to register R0.
+ */
+ public ApfGenerator addAddR1() {
+ Instruction instruction = new Instruction(Opcodes.ADD, Register.R1);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to multiply register R0 by register R1.
+ */
+ public ApfGenerator addMulR1() {
+ Instruction instruction = new Instruction(Opcodes.MUL, Register.R1);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to divide register R0 by register R1.
+ */
+ public ApfGenerator addDivR1() {
+ Instruction instruction = new Instruction(Opcodes.DIV, Register.R1);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to logically and register R0 with register R1
+ * and store the result back into register R0.
+ */
+ public ApfGenerator addAndR1() {
+ Instruction instruction = new Instruction(Opcodes.AND, Register.R1);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to logically or register R0 with register R1
+ * and store the result back into register R0.
+ */
+ public ApfGenerator addOrR1() {
+ Instruction instruction = new Instruction(Opcodes.OR, Register.R1);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to shift register R0 left by the value in
+ * register R1.
+ */
+ public ApfGenerator addLeftShiftR1() {
+ Instruction instruction = new Instruction(Opcodes.SH, Register.R1);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to move {@code value} into {@code register}.
+ */
+ public ApfGenerator addLoadImmediate(Register register, int value) {
+ Instruction instruction = new Instruction(Opcodes.LI, register);
+ instruction.setSignedImm(value);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to jump to {@code target} if register R0's
+ * value equals {@code value}.
+ */
+ public ApfGenerator addJumpIfR0Equals(int value, String target) {
+ Instruction instruction = new Instruction(Opcodes.JEQ);
+ instruction.setUnsignedImm(value);
+ instruction.setTargetLabel(target);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to jump to {@code target} if register R0's
+ * value does not equal {@code value}.
+ */
+ public ApfGenerator addJumpIfR0NotEquals(int value, String target) {
+ Instruction instruction = new Instruction(Opcodes.JNE);
+ instruction.setUnsignedImm(value);
+ instruction.setTargetLabel(target);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to jump to {@code target} if register R0's
+ * value is greater than {@code value}.
+ */
+ public ApfGenerator addJumpIfR0GreaterThan(int value, String target) {
+ Instruction instruction = new Instruction(Opcodes.JGT);
+ instruction.setUnsignedImm(value);
+ instruction.setTargetLabel(target);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to jump to {@code target} if register R0's
+ * value is less than {@code value}.
+ */
+ public ApfGenerator addJumpIfR0LessThan(int value, String target) {
+ Instruction instruction = new Instruction(Opcodes.JLT);
+ instruction.setUnsignedImm(value);
+ instruction.setTargetLabel(target);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to jump to {@code target} if register R0's
+ * value has any bits set that are also set in {@code value}.
+ */
+ public ApfGenerator addJumpIfR0AnyBitsSet(int value, String target) {
+ Instruction instruction = new Instruction(Opcodes.JSET);
+ instruction.setUnsignedImm(value);
+ instruction.setTargetLabel(target);
+ addInstruction(instruction);
+ return this;
+ }
+ /**
+ * Add an instruction to the end of the program to jump to {@code target} if register R0's
+ * value equals register R1's value.
+ */
+ public ApfGenerator addJumpIfR0EqualsR1(String target) {
+ Instruction instruction = new Instruction(Opcodes.JEQ, Register.R1);
+ instruction.setTargetLabel(target);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to jump to {@code target} if register R0's
+ * value does not equal register R1's value.
+ */
+ public ApfGenerator addJumpIfR0NotEqualsR1(String target) {
+ Instruction instruction = new Instruction(Opcodes.JNE, Register.R1);
+ instruction.setTargetLabel(target);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to jump to {@code target} if register R0's
+ * value is greater than register R1's value.
+ */
+ public ApfGenerator addJumpIfR0GreaterThanR1(String target) {
+ Instruction instruction = new Instruction(Opcodes.JGT, Register.R1);
+ instruction.setTargetLabel(target);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to jump to {@code target} if register R0's
+ * value is less than register R1's value.
+ */
+ public ApfGenerator addJumpIfR0LessThanR1(String target) {
+ Instruction instruction = new Instruction(Opcodes.JLT, Register.R1);
+ instruction.setTargetLabel(target);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to jump to {@code target} if register R0's
+ * value has any bits set that are also set in R1's value.
+ */
+ public ApfGenerator addJumpIfR0AnyBitsSetR1(String target) {
+ Instruction instruction = new Instruction(Opcodes.JSET, Register.R1);
+ instruction.setTargetLabel(target);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to jump to {@code target} if the bytes of the
+ * packet at, an offset specified by {@code register}, match {@code bytes}.
+ */
+ public ApfGenerator addJumpIfBytesNotEqual(Register register, byte[] bytes, String target) {
+ Instruction instruction = new Instruction(Opcodes.JNEBS, register);
+ instruction.setUnsignedImm(bytes.length);
+ instruction.setTargetLabel(target);
+ instruction.setCompareBytes(bytes);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to load memory slot {@code slot} into
+ * {@code register}.
+ */
+ public ApfGenerator addLoadFromMemory(Register register, int slot)
+ throws IllegalInstructionException {
+ if (slot < 0 || slot > (MEMORY_SLOTS - 1)) {
+ throw new IllegalInstructionException("illegal memory slot number: " + slot);
+ }
+ Instruction instruction = new Instruction(Opcodes.EXT, register);
+ instruction.setUnsignedImm(ExtendedOpcodes.LDM.value + slot);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to store {@code register} into memory slot
+ * {@code slot}.
+ */
+ public ApfGenerator addStoreToMemory(Register register, int slot)
+ throws IllegalInstructionException {
+ if (slot < 0 || slot > (MEMORY_SLOTS - 1)) {
+ throw new IllegalInstructionException("illegal memory slot number: " + slot);
+ }
+ Instruction instruction = new Instruction(Opcodes.EXT, register);
+ instruction.setUnsignedImm(ExtendedOpcodes.STM.value + slot);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to logically not {@code register}.
+ */
+ public ApfGenerator addNot(Register register) {
+ Instruction instruction = new Instruction(Opcodes.EXT, register);
+ instruction.setUnsignedImm(ExtendedOpcodes.NOT.value);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to negate {@code register}.
+ */
+ public ApfGenerator addNeg(Register register) {
+ Instruction instruction = new Instruction(Opcodes.EXT, register);
+ instruction.setUnsignedImm(ExtendedOpcodes.NEG.value);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to swap the values in register R0 and register R1.
+ */
+ public ApfGenerator addSwap() {
+ Instruction instruction = new Instruction(Opcodes.EXT);
+ instruction.setUnsignedImm(ExtendedOpcodes.SWAP.value);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Add an instruction to the end of the program to move the value into
+ * {@code register} from the other register.
+ */
+ public ApfGenerator addMove(Register register) {
+ Instruction instruction = new Instruction(Opcodes.EXT, register);
+ instruction.setUnsignedImm(ExtendedOpcodes.MOVE.value);
+ addInstruction(instruction);
+ return this;
+ }
+
+ /**
+ * Updates instruction offset fields using latest instruction sizes.
+ * @return current program length in bytes.
+ */
+ private int updateInstructionOffsets() {
+ int offset = 0;
+ for (Instruction instruction : mInstructions) {
+ instruction.offset = offset;
+ offset += instruction.size();
+ }
+ return offset;
+ }
+
+ /**
+ * Returns an overestimate of the size of the generated program. {@link #generate} may return
+ * a program that is smaller.
+ */
+ public int programLengthOverEstimate() {
+ return updateInstructionOffsets();
+ }
+
+ /**
+ * Generate the bytecode for the APF program.
+ * @return the bytecode.
+ * @throws IllegalStateException if a label is referenced but not defined.
+ */
+ public byte[] generate() throws IllegalInstructionException {
+ // Enforce that we can only generate once because we cannot unshrink instructions and
+ // PASS/DROP labels may move further away requiring unshrinking if we add further
+ // instructions.
+ if (mGenerated) {
+ throw new IllegalStateException("Can only generate() once!");
+ }
+ mGenerated = true;
+ int total_size;
+ boolean shrunk;
+ // Shrink the immediate value fields of instructions.
+ // As we shrink the instructions some branch offset
+ // fields may shrink also, thereby shrinking the
+ // instructions further. Loop until we've reached the
+ // minimum size. Rarely will this loop more than a few times.
+ // Limit iterations to avoid O(n^2) behavior.
+ int iterations_remaining = 10;
+ do {
+ total_size = updateInstructionOffsets();
+ // Update drop and pass label offsets.
+ mDropLabel.offset = total_size + 1;
+ mPassLabel.offset = total_size;
+ // Limit run-time in aberant circumstances.
+ if (iterations_remaining-- == 0) break;
+ // Attempt to shrink instructions.
+ shrunk = false;
+ for (Instruction instruction : mInstructions) {
+ if (instruction.shrink()) {
+ shrunk = true;
+ }
+ }
+ } while (shrunk);
+ // Generate bytecode for instructions.
+ byte[] bytecode = new byte[total_size];
+ for (Instruction instruction : mInstructions) {
+ instruction.generate(bytecode);
+ }
+ return bytecode;
+ }
+}
+
diff --git a/services/net/java/android/net/ip/IpManager.java b/services/net/java/android/net/ip/IpManager.java
index 9c9719f..06b6ee7 100644
--- a/services/net/java/android/net/ip/IpManager.java
+++ b/services/net/java/android/net/ip/IpManager.java
@@ -43,6 +43,7 @@
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
+import java.util.Objects;
/**
@@ -113,10 +114,9 @@
private static final int CMD_STOP = 1;
private static final int CMD_START = 2;
private static final int CMD_CONFIRM = 3;
- private static final int CMD_UPDATE_DHCPV4_RESULTS = 4;
- private static final int EVENT_PRE_DHCP_ACTION_COMPLETE = 5;
+ private static final int EVENT_PRE_DHCP_ACTION_COMPLETE = 4;
// Sent by NetlinkTracker to communicate netlink events.
- private static final int EVENT_NETLINK_LINKPROPERTIES_CHANGED = 6;
+ private static final int EVENT_NETLINK_LINKPROPERTIES_CHANGED = 5;
private static final int MAX_LOG_RECORDS = 1000;
@@ -285,6 +285,12 @@
return delta;
}
+ private boolean linkPropertiesUnchanged(LinkProperties newLp) {
+ synchronized (mLock) {
+ return Objects.equals(newLp, mLinkProperties);
+ }
+ }
+
private LinkProperties assembleLinkProperties() {
// [1] Create a new LinkProperties object to populate.
LinkProperties newLp = new LinkProperties();
@@ -343,6 +349,19 @@
}
}
+ private void handleIPv4Success(DhcpResults dhcpResults) {
+ mDhcpResults = new DhcpResults(dhcpResults);
+ setLinkProperties(assembleLinkProperties());
+ mCallback.onIPv4ProvisioningSuccess(dhcpResults);
+ }
+
+ private void handleIPv4Failure() {
+ clearIPv4Address();
+ mDhcpResults = null;
+ setLinkProperties(assembleLinkProperties());
+ mCallback.onIPv4ProvisioningFailure();
+ }
+
class StoppedState extends State {
@Override
public void enter() {
@@ -418,9 +437,9 @@
// handle the result accordingly.
if (mStaticIpConfig != null) {
if (applyStaticIpConfig()) {
- sendMessage(CMD_UPDATE_DHCPV4_RESULTS, new DhcpResults(mStaticIpConfig));
+ handleIPv4Success(new DhcpResults(mStaticIpConfig));
} else {
- sendMessage(CMD_UPDATE_DHCPV4_RESULTS);
+ handleIPv4Failure();
}
} else {
// Start DHCPv4.
@@ -465,21 +484,6 @@
}
break;
- case CMD_UPDATE_DHCPV4_RESULTS: {
- final DhcpResults dhcpResults = (DhcpResults) msg.obj;
- if (dhcpResults != null) {
- mDhcpResults = new DhcpResults(dhcpResults);
- setLinkProperties(assembleLinkProperties());
- mCallback.onIPv4ProvisioningSuccess(dhcpResults);
- } else {
- clearIPv4Address();
- mDhcpResults = null;
- setLinkProperties(assembleLinkProperties());
- mCallback.onIPv4ProvisioningFailure();
- }
- break;
- }
-
case EVENT_PRE_DHCP_ACTION_COMPLETE:
// It's possible to reach here if, for example, someone
// calls completedPreDhcpAction() after provisioning with
@@ -492,6 +496,9 @@
case EVENT_NETLINK_LINKPROPERTIES_CHANGED: {
final LinkProperties newLp = assembleLinkProperties();
+ if (linkPropertiesUnchanged(newLp)) {
+ break;
+ }
final ProvisioningChange delta = setLinkProperties(newLp);
// NOTE: The only receiver of these callbacks currently
@@ -527,15 +534,10 @@
final DhcpResults dhcpResults = (DhcpResults) msg.obj;
switch (msg.arg1) {
case DhcpStateMachine.DHCP_SUCCESS:
- mDhcpResults = new DhcpResults(dhcpResults);
- setLinkProperties(assembleLinkProperties());
- mCallback.onIPv4ProvisioningSuccess(dhcpResults);
+ handleIPv4Success(dhcpResults);
break;
case DhcpStateMachine.DHCP_FAILURE:
- clearIPv4Address();
- mDhcpResults = null;
- setLinkProperties(assembleLinkProperties());
- mCallback.onIPv4ProvisioningFailure();
+ handleIPv4Failure();
break;
default:
Log.e(TAG, "Unknown CMD_POST_DHCP_ACTION status:" + msg.arg1);
diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk
index 3ad26d3..25cb64c 100644
--- a/services/tests/servicestests/Android.mk
+++ b/services/tests/servicestests/Android.mk
@@ -1,3 +1,7 @@
+#########################################################################
+# Build FrameworksServicesTests package
+#########################################################################
+
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -22,5 +26,36 @@
LOCAL_CERTIFICATE := platform
+LOCAL_JNI_SHARED_LIBRARIES := libapfjni
+
include $(BUILD_PACKAGE)
+#########################################################################
+# Build JNI Shared Library
+#########################################################################
+
+LOCAL_PATH:= $(LOCAL_PATH)/jni
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_CFLAGS := -Wall -Werror
+
+LOCAL_C_INCLUDES := \
+ libpcap \
+ hardware/google/apf
+
+LOCAL_SRC_FILES := apf_jni.cpp
+
+LOCAL_SHARED_LIBRARIES := \
+ libnativehelper \
+ liblog
+
+LOCAL_STATIC_LIBRARIES := \
+ libpcap \
+ libapf
+
+LOCAL_MODULE := libapfjni
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/services/tests/servicestests/jni/apf_jni.cpp b/services/tests/servicestests/jni/apf_jni.cpp
new file mode 100644
index 0000000..7d142eb
--- /dev/null
+++ b/services/tests/servicestests/jni/apf_jni.cpp
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2016, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <JNIHelp.h>
+#include <ScopedUtfChars.h>
+#include <jni.h>
+#include <pcap.h>
+#include <stdlib.h>
+#include <string>
+#include <utils/Log.h>
+
+#include "apf_interpreter.h"
+
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+
+// JNI function acting as simply call-through to native APF interpreter.
+static jint com_android_server_ApfTest_apfSimulate(
+ JNIEnv* env, jclass, jbyteArray program, jbyteArray packet, jint filter_age) {
+ return accept_packet(
+ (uint8_t*)env->GetByteArrayElements(program, NULL),
+ env->GetArrayLength(program),
+ (uint8_t*)env->GetByteArrayElements(packet, NULL),
+ env->GetArrayLength(packet),
+ filter_age);
+}
+
+class ScopedPcap {
+ public:
+ ScopedPcap(pcap_t* pcap) : pcap_ptr(pcap) {}
+ ~ScopedPcap() {
+ pcap_close(pcap_ptr);
+ }
+
+ pcap_t* get() const { return pcap_ptr; };
+ private:
+ pcap_t* const pcap_ptr;
+};
+
+class ScopedFILE {
+ public:
+ ScopedFILE(FILE* fp) : file(fp) {}
+ ~ScopedFILE() {
+ fclose(file);
+ }
+
+ FILE* get() const { return file; };
+ private:
+ FILE* const file;
+};
+
+static void throwException(JNIEnv* env, const std::string& error) {
+ jclass newExcCls = env->FindClass("java/lang/IllegalStateException");
+ if (newExcCls == 0) {
+ abort();
+ return;
+ }
+ env->ThrowNew(newExcCls, error.c_str());
+}
+
+static jstring com_android_server_ApfTest_compileToBpf(JNIEnv* env, jclass, jstring jfilter) {
+ ScopedUtfChars filter(env, jfilter);
+ std::string bpf_string;
+ ScopedPcap pcap(pcap_open_dead(DLT_EN10MB, 65535));
+ if (pcap.get() == NULL) {
+ throwException(env, "pcap_open_dead failed");
+ return NULL;
+ }
+
+ // Compile "filter" to a BPF program
+ bpf_program bpf;
+ if (pcap_compile(pcap.get(), &bpf, filter.c_str(), 0, PCAP_NETMASK_UNKNOWN)) {
+ throwException(env, "pcap_compile failed");
+ return NULL;
+ }
+
+ // Translate BPF program to human-readable format
+ const struct bpf_insn* insn = bpf.bf_insns;
+ for (uint32_t i = 0; i < bpf.bf_len; i++) {
+ bpf_string += bpf_image(insn++, i);
+ bpf_string += "\n";
+ }
+
+ return env->NewStringUTF(bpf_string.c_str());
+}
+
+static jboolean com_android_server_ApfTest_compareBpfApf(JNIEnv* env, jclass, jstring jfilter,
+ jstring jpcap_filename, jbyteArray japf_program) {
+ ScopedUtfChars filter(env, jfilter);
+ ScopedUtfChars pcap_filename(env, jpcap_filename);
+ const uint8_t* apf_program = (uint8_t*)env->GetByteArrayElements(japf_program, NULL);
+ const uint32_t apf_program_len = env->GetArrayLength(japf_program);
+
+ // Open pcap file for BPF filtering
+ ScopedFILE bpf_fp(fopen(pcap_filename.c_str(), "rb"));
+ char pcap_error[PCAP_ERRBUF_SIZE];
+ ScopedPcap bpf_pcap(pcap_fopen_offline(bpf_fp.get(), pcap_error));
+ if (bpf_pcap.get() == NULL) {
+ throwException(env, "pcap_fopen_offline failed: " + std::string(pcap_error));
+ return false;
+ }
+
+ // Open pcap file for APF filtering
+ ScopedFILE apf_fp(fopen(pcap_filename.c_str(), "rb"));
+ ScopedPcap apf_pcap(pcap_fopen_offline(apf_fp.get(), pcap_error));
+ if (apf_pcap.get() == NULL) {
+ throwException(env, "pcap_fopen_offline failed: " + std::string(pcap_error));
+ return false;
+ }
+
+ // Compile "filter" to a BPF program
+ bpf_program bpf;
+ if (pcap_compile(bpf_pcap.get(), &bpf, filter.c_str(), 0, PCAP_NETMASK_UNKNOWN)) {
+ throwException(env, "pcap_compile failed");
+ return false;
+ }
+
+ // Install BPF filter on bpf_pcap
+ if (pcap_setfilter(bpf_pcap.get(), &bpf)) {
+ throwException(env, "pcap_setfilter failed");
+ return false;
+ }
+
+ while (1) {
+ pcap_pkthdr bpf_header, apf_header;
+ // Run BPF filter to the next matching packet.
+ const uint8_t* bpf_packet = pcap_next(bpf_pcap.get(), &bpf_header);
+
+ // Run APF filter to the next matching packet.
+ const uint8_t* apf_packet;
+ do {
+ apf_packet = pcap_next(apf_pcap.get(), &apf_header);
+ } while (apf_packet != NULL && !accept_packet(
+ apf_program, apf_program_len, apf_packet, apf_header.len, 0));
+
+ // Make sure both filters matched the same packet.
+ if (apf_packet == NULL && bpf_packet == NULL)
+ break;
+ if (apf_packet == NULL || bpf_packet == NULL)
+ return false;
+ if (apf_header.len != bpf_header.len ||
+ apf_header.ts.tv_sec != bpf_header.ts.tv_sec ||
+ apf_header.ts.tv_usec != bpf_header.ts.tv_usec ||
+ memcmp(apf_packet, bpf_packet, apf_header.len))
+ return false;
+ }
+ return true;
+}
+
+extern "C" jint JNI_OnLoad(JavaVM* vm, void*) {
+ JNIEnv *env;
+ if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
+ ALOGE("ERROR: GetEnv failed");
+ return -1;
+ }
+
+ static JNINativeMethod gMethods[] = {
+ { "apfSimulate", "([B[BI)I",
+ (void*)com_android_server_ApfTest_apfSimulate },
+ { "compileToBpf", "(Ljava/lang/String;)Ljava/lang/String;",
+ (void*)com_android_server_ApfTest_compileToBpf },
+ { "compareBpfApf", "(Ljava/lang/String;Ljava/lang/String;[B)Z",
+ (void*)com_android_server_ApfTest_compareBpfApf },
+ };
+
+ jniRegisterNativeMethods(env, "com/android/server/ApfTest",
+ gMethods, ARRAY_SIZE(gMethods));
+
+ return JNI_VERSION_1_6;
+}
diff --git a/services/tests/servicestests/res/raw/apf.pcap b/services/tests/servicestests/res/raw/apf.pcap
new file mode 100644
index 0000000..963165f
--- /dev/null
+++ b/services/tests/servicestests/res/raw/apf.pcap
Binary files differ
diff --git a/services/tests/servicestests/src/com/android/server/ApfTest.java b/services/tests/servicestests/src/com/android/server/ApfTest.java
new file mode 100644
index 0000000..640a6c9
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/ApfTest.java
@@ -0,0 +1,560 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server;
+
+import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.LargeTest;
+
+import com.android.frameworks.servicestests.R;
+import android.net.apf.ApfGenerator;
+import android.net.apf.ApfGenerator.IllegalInstructionException;
+import android.net.apf.ApfGenerator.Register;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import libcore.io.IoUtils;
+import libcore.io.Streams;
+
+/**
+ * Tests for APF program generator and interpreter.
+ *
+ * Build, install and run with:
+ * runtest frameworks-services -c com.android.server.ApfTest
+ */
+public class ApfTest extends AndroidTestCase {
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ // Load up native shared library containing APF interpreter exposed via JNI.
+ System.loadLibrary("apfjni");
+ }
+
+ // Expected return codes from APF interpreter.
+ private final static int PASS = 1;
+ private final static int DROP = 0;
+ // Interpreter will just accept packets without link layer headers, so pad fake packet to at
+ // least the minimum packet size.
+ private final static int MIN_PKT_SIZE = 15;
+
+ private void assertVerdict(int expected, byte[] program, byte[] packet, int filterAge) {
+ assertEquals(expected, apfSimulate(program, packet, filterAge));
+ }
+
+ private void assertPass(byte[] program, byte[] packet, int filterAge) {
+ assertVerdict(PASS, program, packet, filterAge);
+ }
+
+ private void assertDrop(byte[] program, byte[] packet, int filterAge) {
+ assertVerdict(DROP, program, packet, filterAge);
+ }
+
+ private void assertVerdict(int expected, ApfGenerator gen, byte[] packet, int filterAge)
+ throws IllegalInstructionException {
+ assertEquals(expected, apfSimulate(gen.generate(), packet, filterAge));
+ }
+
+ private void assertPass(ApfGenerator gen, byte[] packet, int filterAge)
+ throws IllegalInstructionException {
+ assertVerdict(PASS, gen, packet, filterAge);
+ }
+
+ private void assertDrop(ApfGenerator gen, byte[] packet, int filterAge)
+ throws IllegalInstructionException {
+ assertVerdict(DROP, gen, packet, filterAge);
+ }
+
+ private void assertPass(ApfGenerator gen)
+ throws IllegalInstructionException {
+ assertVerdict(PASS, gen, new byte[MIN_PKT_SIZE], 0);
+ }
+
+ private void assertDrop(ApfGenerator gen)
+ throws IllegalInstructionException {
+ assertVerdict(DROP, gen, new byte[MIN_PKT_SIZE], 0);
+ }
+
+ /**
+ * Test each instruction by generating a program containing the instruction,
+ * generating bytecode for that program and running it through the
+ * interpreter to verify it functions correctly.
+ */
+ @LargeTest
+ public void testApfInstructions() throws IllegalInstructionException {
+ // Empty program should pass because having the program counter reach the
+ // location immediately after the program indicates the packet should be
+ // passed to the AP.
+ ApfGenerator gen = new ApfGenerator();
+ assertPass(gen);
+
+ // Test jumping to pass label.
+ gen = new ApfGenerator();
+ gen.addJump(gen.PASS_LABEL);
+ byte[] program = gen.generate();
+ assertEquals(1, program.length);
+ assertEquals((14 << 3) | (0 << 1) | 0, program[0]);
+ assertPass(program, new byte[MIN_PKT_SIZE], 0);
+
+ // Test jumping to drop label.
+ gen = new ApfGenerator();
+ gen.addJump(gen.DROP_LABEL);
+ program = gen.generate();
+ assertEquals(2, program.length);
+ assertEquals((14 << 3) | (1 << 1) | 0, program[0]);
+ assertEquals(1, program[1]);
+ assertDrop(program, new byte[15], 15);
+
+ // Test jumping if equal to 0.
+ gen = new ApfGenerator();
+ gen.addJumpIfR0Equals(0, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test jumping if not equal to 0.
+ gen = new ApfGenerator();
+ gen.addJumpIfR0NotEquals(0, gen.DROP_LABEL);
+ assertPass(gen);
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 1);
+ gen.addJumpIfR0NotEquals(0, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test jumping if registers equal.
+ gen = new ApfGenerator();
+ gen.addJumpIfR0EqualsR1(gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test jumping if registers not equal.
+ gen = new ApfGenerator();
+ gen.addJumpIfR0NotEqualsR1(gen.DROP_LABEL);
+ assertPass(gen);
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 1);
+ gen.addJumpIfR0NotEqualsR1(gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test load immediate.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 1234567890);
+ gen.addJumpIfR0Equals(1234567890, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test add.
+ gen = new ApfGenerator();
+ gen.addAdd(1234567890);
+ gen.addJumpIfR0Equals(1234567890, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test subtract.
+ gen = new ApfGenerator();
+ gen.addAdd(-1234567890);
+ gen.addJumpIfR0Equals(-1234567890, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test or.
+ gen = new ApfGenerator();
+ gen.addOr(1234567890);
+ gen.addJumpIfR0Equals(1234567890, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test and.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 1234567890);
+ gen.addAnd(123456789);
+ gen.addJumpIfR0Equals(1234567890 & 123456789, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test left shift.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 1234567890);
+ gen.addLeftShift(1);
+ gen.addJumpIfR0Equals(1234567890 << 1, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test right shift.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 1234567890);
+ gen.addRightShift(1);
+ gen.addJumpIfR0Equals(1234567890 >> 1, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test multiply.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 1234567890);
+ gen.addMul(2);
+ gen.addJumpIfR0Equals(1234567890 * 2, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test divide.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 1234567890);
+ gen.addDiv(2);
+ gen.addJumpIfR0Equals(1234567890 / 2, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test divide by zero.
+ gen = new ApfGenerator();
+ gen.addDiv(0);
+ gen.addJump(gen.DROP_LABEL);
+ assertPass(gen);
+
+ // Test add.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R1, 1234567890);
+ gen.addAddR1();
+ gen.addJumpIfR0Equals(1234567890, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test subtract.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R1, -1234567890);
+ gen.addAddR1();
+ gen.addJumpIfR0Equals(-1234567890, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test or.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R1, 1234567890);
+ gen.addOrR1();
+ gen.addJumpIfR0Equals(1234567890, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test and.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 1234567890);
+ gen.addLoadImmediate(Register.R1, 123456789);
+ gen.addAndR1();
+ gen.addJumpIfR0Equals(1234567890 & 123456789, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test left shift.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 1234567890);
+ gen.addLoadImmediate(Register.R1, 1);
+ gen.addLeftShiftR1();
+ gen.addJumpIfR0Equals(1234567890 << 1, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test right shift.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 1234567890);
+ gen.addLoadImmediate(Register.R1, -1);
+ gen.addLeftShiftR1();
+ gen.addJumpIfR0Equals(1234567890 >> 1, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test multiply.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 1234567890);
+ gen.addLoadImmediate(Register.R1, 2);
+ gen.addMulR1();
+ gen.addJumpIfR0Equals(1234567890 * 2, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test divide.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 1234567890);
+ gen.addLoadImmediate(Register.R1, 2);
+ gen.addDivR1();
+ gen.addJumpIfR0Equals(1234567890 / 2, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test divide by zero.
+ gen = new ApfGenerator();
+ gen.addDivR1();
+ gen.addJump(gen.DROP_LABEL);
+ assertPass(gen);
+
+ // Test byte load.
+ gen = new ApfGenerator();
+ gen.addLoad8(Register.R0, 1);
+ gen.addJumpIfR0Equals(45, gen.DROP_LABEL);
+ assertDrop(gen, new byte[]{123,45,0,0,0,0,0,0,0,0,0,0,0,0,0}, 0);
+
+ // Test out of bounds load.
+ gen = new ApfGenerator();
+ gen.addLoad8(Register.R0, 16);
+ gen.addJumpIfR0Equals(0, gen.DROP_LABEL);
+ assertPass(gen, new byte[]{123,45,0,0,0,0,0,0,0,0,0,0,0,0,0}, 0);
+
+ // Test half-word load.
+ gen = new ApfGenerator();
+ gen.addLoad16(Register.R0, 1);
+ gen.addJumpIfR0Equals((45 << 8) | 67, gen.DROP_LABEL);
+ assertDrop(gen, new byte[]{123,45,67,0,0,0,0,0,0,0,0,0,0,0,0}, 0);
+
+ // Test word load.
+ gen = new ApfGenerator();
+ gen.addLoad32(Register.R0, 1);
+ gen.addJumpIfR0Equals((45 << 24) | (67 << 16) | (89 << 8) | 12, gen.DROP_LABEL);
+ assertDrop(gen, new byte[]{123,45,67,89,12,0,0,0,0,0,0,0,0,0,0}, 0);
+
+ // Test byte indexed load.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R1, 1);
+ gen.addLoad8Indexed(Register.R0, 0);
+ gen.addJumpIfR0Equals(45, gen.DROP_LABEL);
+ assertDrop(gen, new byte[]{123,45,0,0,0,0,0,0,0,0,0,0,0,0,0}, 0);
+
+ // Test out of bounds indexed load.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R1, 8);
+ gen.addLoad8Indexed(Register.R0, 8);
+ gen.addJumpIfR0Equals(0, gen.DROP_LABEL);
+ assertPass(gen, new byte[]{123,45,0,0,0,0,0,0,0,0,0,0,0,0,0}, 0);
+
+ // Test half-word indexed load.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R1, 1);
+ gen.addLoad16Indexed(Register.R0, 0);
+ gen.addJumpIfR0Equals((45 << 8) | 67, gen.DROP_LABEL);
+ assertDrop(gen, new byte[]{123,45,67,0,0,0,0,0,0,0,0,0,0,0,0}, 0);
+
+ // Test word indexed load.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R1, 1);
+ gen.addLoad32Indexed(Register.R0, 0);
+ gen.addJumpIfR0Equals((45 << 24) | (67 << 16) | (89 << 8) | 12, gen.DROP_LABEL);
+ assertDrop(gen, new byte[]{123,45,67,89,12,0,0,0,0,0,0,0,0,0,0}, 0);
+
+ // Test jumping if greater than.
+ gen = new ApfGenerator();
+ gen.addJumpIfR0GreaterThan(0, gen.DROP_LABEL);
+ assertPass(gen);
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 1);
+ gen.addJumpIfR0GreaterThan(0, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test jumping if less than.
+ gen = new ApfGenerator();
+ gen.addJumpIfR0LessThan(0, gen.DROP_LABEL);
+ assertPass(gen);
+ gen = new ApfGenerator();
+ gen.addJumpIfR0LessThan(1, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test jumping if any bits set.
+ gen = new ApfGenerator();
+ gen.addJumpIfR0AnyBitsSet(3, gen.DROP_LABEL);
+ assertPass(gen);
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 1);
+ gen.addJumpIfR0AnyBitsSet(3, gen.DROP_LABEL);
+ assertDrop(gen);
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 3);
+ gen.addJumpIfR0AnyBitsSet(3, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test jumping if register greater than.
+ gen = new ApfGenerator();
+ gen.addJumpIfR0GreaterThanR1(gen.DROP_LABEL);
+ assertPass(gen);
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 2);
+ gen.addLoadImmediate(Register.R1, 1);
+ gen.addJumpIfR0GreaterThanR1(gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test jumping if register less than.
+ gen = new ApfGenerator();
+ gen.addJumpIfR0LessThanR1(gen.DROP_LABEL);
+ assertPass(gen);
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R1, 1);
+ gen.addJumpIfR0LessThanR1(gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test jumping if any bits set in register.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R1, 3);
+ gen.addJumpIfR0AnyBitsSetR1(gen.DROP_LABEL);
+ assertPass(gen);
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R1, 3);
+ gen.addLoadImmediate(Register.R0, 1);
+ gen.addJumpIfR0AnyBitsSetR1(gen.DROP_LABEL);
+ assertDrop(gen);
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R1, 3);
+ gen.addLoadImmediate(Register.R0, 3);
+ gen.addJumpIfR0AnyBitsSetR1(gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test load from memory.
+ gen = new ApfGenerator();
+ gen.addLoadFromMemory(Register.R0, 0);
+ gen.addJumpIfR0Equals(0, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test store to memory.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R1, 1234567890);
+ gen.addStoreToMemory(Register.R1, 12);
+ gen.addLoadFromMemory(Register.R0, 12);
+ gen.addJumpIfR0Equals(1234567890, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test filter age pre-filled memory.
+ gen = new ApfGenerator();
+ gen.addLoadFromMemory(Register.R0, gen.FILTER_AGE_MEMORY_SLOT);
+ gen.addJumpIfR0Equals(1234567890, gen.DROP_LABEL);
+ assertDrop(gen, new byte[MIN_PKT_SIZE], 1234567890);
+
+ // Test packet size pre-filled memory.
+ gen = new ApfGenerator();
+ gen.addLoadFromMemory(Register.R0, gen.PACKET_SIZE_MEMORY_SLOT);
+ gen.addJumpIfR0Equals(MIN_PKT_SIZE, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test IPv4 header size pre-filled memory.
+ gen = new ApfGenerator();
+ gen.addLoadFromMemory(Register.R0, gen.IPV4_HEADER_SIZE_MEMORY_SLOT);
+ gen.addJumpIfR0Equals(20, gen.DROP_LABEL);
+ assertDrop(gen, new byte[]{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x45}, 0);
+
+ // Test not.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 1234567890);
+ gen.addNot(Register.R0);
+ gen.addJumpIfR0Equals(~1234567890, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test negate.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 1234567890);
+ gen.addNeg(Register.R0);
+ gen.addJumpIfR0Equals(-1234567890, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test move.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R1, 1234567890);
+ gen.addMove(Register.R0);
+ gen.addJumpIfR0Equals(1234567890, gen.DROP_LABEL);
+ assertDrop(gen);
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 1234567890);
+ gen.addMove(Register.R1);
+ gen.addJumpIfR0Equals(1234567890, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test swap.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R1, 1234567890);
+ gen.addSwap();
+ gen.addJumpIfR0Equals(1234567890, gen.DROP_LABEL);
+ assertDrop(gen);
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 1234567890);
+ gen.addSwap();
+ gen.addJumpIfR0Equals(0, gen.DROP_LABEL);
+ assertDrop(gen);
+
+ // Test jump if bytes not equal.
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 1);
+ gen.addJumpIfBytesNotEqual(Register.R0, new byte[]{123}, gen.DROP_LABEL);
+ program = gen.generate();
+ assertEquals(6, program.length);
+ assertEquals((13 << 3) | (1 << 1) | 0, program[0]);
+ assertEquals(1, program[1]);
+ assertEquals(((20 << 3) | (1 << 1) | 0) - 256, program[2]);
+ assertEquals(1, program[3]);
+ assertEquals(1, program[4]);
+ assertEquals(123, program[5]);
+ assertDrop(program, new byte[MIN_PKT_SIZE], 0);
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 1);
+ gen.addJumpIfBytesNotEqual(Register.R0, new byte[]{123}, gen.DROP_LABEL);
+ byte[] packet123 = new byte[]{0,123,0,0,0,0,0,0,0,0,0,0,0,0,0};
+ assertPass(gen, packet123, 0);
+ gen = new ApfGenerator();
+ gen.addJumpIfBytesNotEqual(Register.R0, new byte[]{123}, gen.DROP_LABEL);
+ assertDrop(gen, packet123, 0);
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 1);
+ gen.addJumpIfBytesNotEqual(Register.R0, new byte[]{1,2,30,4,5}, gen.DROP_LABEL);
+ byte[] packet12345 = new byte[]{0,1,2,3,4,5,0,0,0,0,0,0,0,0,0};
+ assertDrop(gen, packet12345, 0);
+ gen = new ApfGenerator();
+ gen.addLoadImmediate(Register.R0, 1);
+ gen.addJumpIfBytesNotEqual(Register.R0, new byte[]{1,2,3,4,5}, gen.DROP_LABEL);
+ assertPass(gen, packet12345, 0);
+ }
+
+ /**
+ * Generate some BPF programs, translate them to APF, then run APF and BPF programs
+ * over packet traces and verify both programs filter out the same packets.
+ */
+ @LargeTest
+ public void testApfAgainstBpf() throws Exception {
+ String[] tcpdump_filters = new String[]{ "udp", "tcp", "icmp", "icmp6", "udp port 53",
+ "arp", "dst 239.255.255.250", "arp or tcp or udp port 53", "net 192.168.1.0/24",
+ "arp or icmp6 or portrange 53-54", "portrange 53-54 or portrange 100-50000",
+ "tcp[tcpflags] & (tcp-ack|tcp-fin) != 0 and (ip[2:2] > 57 or icmp)" };
+ String pcap_filename = stageFile(R.raw.apf);
+ for (String tcpdump_filter : tcpdump_filters) {
+ byte[] apf_program = Bpf2Apf.convert(compileToBpf(tcpdump_filter));
+ assertTrue("Failed to match for filter: " + tcpdump_filter,
+ compareBpfApf(tcpdump_filter, pcap_filename, apf_program));
+ }
+ }
+
+ /**
+ * Stage a file for testing, i.e. make it native accessible. Given a resource ID,
+ * copy that resource into the app's data directory and return the path to it.
+ */
+ private String stageFile(int rawId) throws Exception {
+ File file = new File(getContext().getFilesDir(), "staged_file");
+ new File(file.getParent()).mkdirs();
+ InputStream in = null;
+ OutputStream out = null;
+ try {
+ in = getContext().getResources().openRawResource(rawId);
+ out = new FileOutputStream(file);
+ Streams.copy(in, out);
+ } finally {
+ if (in != null) in.close();
+ if (out != null) out.close();
+ }
+ return file.getAbsolutePath();
+ }
+
+ /**
+ * Call the APF interpreter the run {@code program} on {@code packet} pretending the
+ * filter was installed {@code filter_age} seconds ago.
+ */
+ private native static int apfSimulate(byte[] program, byte[] packet, int filter_age);
+
+ /**
+ * Compile a tcpdump human-readable filter (e.g. "icmp" or "tcp port 54") into a BPF
+ * prorgam and return a human-readable dump of the BPF program identical to "tcpdump -d".
+ */
+ private native static String compileToBpf(String filter);
+
+ /**
+ * Open packet capture file {@code pcap_filename} and filter the packets using tcpdump
+ * human-readable filter (e.g. "icmp" or "tcp port 54") compiled to a BPF program and
+ * at the same time using APF program {@code apf_program}. Return {@code true} if
+ * both APF and BPF programs filter out exactly the same packets.
+ */
+ private native static boolean compareBpfApf(String filter, String pcap_filename,
+ byte[] apf_program);
+}
diff --git a/services/tests/servicestests/src/com/android/server/Bpf2Apf.java b/services/tests/servicestests/src/com/android/server/Bpf2Apf.java
new file mode 100644
index 0000000..29594a8
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/Bpf2Apf.java
@@ -0,0 +1,327 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server;
+
+import android.net.apf.ApfGenerator;
+import android.net.apf.ApfGenerator.IllegalInstructionException;
+import android.net.apf.ApfGenerator.Register;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+
+/**
+ * BPF to APF translator.
+ *
+ * Note: This is for testing purposes only and is not guaranteed to support
+ * translation of all BPF programs.
+ *
+ * Example usage:
+ * javac net/java/android/net/apf/ApfGenerator.java \
+ * tests/servicestests/src/com/android/server/Bpf2Apf.java
+ * sudo tcpdump -i em1 -d icmp | java -classpath tests/servicestests/src:net/java \
+ * com.android.server.Bpf2Apf
+ */
+public class Bpf2Apf {
+ private static int parseImm(String line, String arg) {
+ if (!arg.startsWith("#0x")) {
+ throw new IllegalArgumentException("Unhandled instruction: " + line);
+ }
+ final long val_long = Long.parseLong(arg.substring(3), 16);
+ if (val_long < 0 || val_long > Long.parseLong("ffffffff", 16)) {
+ throw new IllegalArgumentException("Unhandled instruction: " + line);
+ }
+ return new Long((val_long << 32) >> 32).intValue();
+ }
+
+ /**
+ * Convert a single line of "tcpdump -d" (human readable BPF program dump) {@code line} into
+ * APF instruction(s) and append them to {@code gen}. Here's an example line:
+ * (001) jeq #0x86dd jt 2 jf 7
+ */
+ private static void convertLine(String line, ApfGenerator gen)
+ throws IllegalInstructionException {
+ if (line.indexOf("(") != 0 || line.indexOf(")") != 4 || line.indexOf(" ") != 5) {
+ throw new IllegalArgumentException("Unhandled instruction: " + line);
+ }
+ int label = Integer.parseInt(line.substring(1, 4));
+ gen.defineLabel(Integer.toString(label));
+ String opcode = line.substring(6, 10).trim();
+ String arg = line.substring(15, Math.min(32, line.length())).trim();
+ switch (opcode) {
+ case "ld":
+ case "ldh":
+ case "ldb":
+ case "ldx":
+ case "ldxb":
+ case "ldxh":
+ Register dest = opcode.contains("x") ? Register.R1 : Register.R0;
+ if (arg.equals("4*([14]&0xf)")) {
+ if (!opcode.equals("ldxb")) {
+ throw new IllegalArgumentException("Unhandled instruction: " + line);
+ }
+ gen.addLoadFromMemory(dest, gen.IPV4_HEADER_SIZE_MEMORY_SLOT);
+ break;
+ }
+ if (arg.equals("#pktlen")) {
+ if (!opcode.equals("ld")) {
+ throw new IllegalArgumentException("Unhandled instruction: " + line);
+ }
+ gen.addLoadFromMemory(dest, gen.PACKET_SIZE_MEMORY_SLOT);
+ break;
+ }
+ if (arg.startsWith("#0x")) {
+ if (!opcode.equals("ld")) {
+ throw new IllegalArgumentException("Unhandled instruction: " + line);
+ }
+ gen.addLoadImmediate(dest, parseImm(line, arg));
+ break;
+ }
+ if (arg.startsWith("M[")) {
+ if (!opcode.startsWith("ld")) {
+ throw new IllegalArgumentException("Unhandled instruction: " + line);
+ }
+ int memory_slot = Integer.parseInt(arg.substring(2, arg.length() - 1));
+ if (memory_slot < 0 || memory_slot >= gen.MEMORY_SLOTS ||
+ // Disallow use of pre-filled slots as BPF programs might
+ // wrongfully assume they're initialized to 0.
+ (memory_slot >= gen.FIRST_PREFILLED_MEMORY_SLOT &&
+ memory_slot <= gen.LAST_PREFILLED_MEMORY_SLOT)) {
+ throw new IllegalArgumentException("Unhandled instruction: " + line);
+ }
+ gen.addLoadFromMemory(dest, memory_slot);
+ break;
+ }
+ if (arg.startsWith("[x + ")) {
+ int offset = Integer.parseInt(arg.substring(5, arg.length() - 1));
+ switch (opcode) {
+ case "ld":
+ case "ldx":
+ gen.addLoad32Indexed(dest, offset);
+ break;
+ case "ldh":
+ case "ldxh":
+ gen.addLoad16Indexed(dest, offset);
+ break;
+ case "ldb":
+ case "ldxb":
+ gen.addLoad8Indexed(dest, offset);
+ break;
+ }
+ } else {
+ int offset = Integer.parseInt(arg.substring(1, arg.length() - 1));
+ switch (opcode) {
+ case "ld":
+ case "ldx":
+ gen.addLoad32(dest, offset);
+ break;
+ case "ldh":
+ case "ldxh":
+ gen.addLoad16(dest, offset);
+ break;
+ case "ldb":
+ case "ldxb":
+ gen.addLoad8(dest, offset);
+ break;
+ }
+ }
+ break;
+ case "st":
+ case "stx":
+ Register src = opcode.contains("x") ? Register.R1 : Register.R0;
+ if (!arg.startsWith("M[")) {
+ throw new IllegalArgumentException("Unhandled instruction: " + line);
+ }
+ int memory_slot = Integer.parseInt(arg.substring(2, arg.length() - 1));
+ if (memory_slot < 0 || memory_slot >= gen.MEMORY_SLOTS ||
+ // Disallow overwriting pre-filled slots
+ (memory_slot >= gen.FIRST_PREFILLED_MEMORY_SLOT &&
+ memory_slot <= gen.LAST_PREFILLED_MEMORY_SLOT)) {
+ throw new IllegalArgumentException("Unhandled instruction: " + line);
+ }
+ gen.addStoreToMemory(src, memory_slot);
+ break;
+ case "add":
+ case "and":
+ case "or":
+ case "sub":
+ if (arg.equals("x")) {
+ switch(opcode) {
+ case "add":
+ gen.addAddR1();
+ break;
+ case "and":
+ gen.addAndR1();
+ break;
+ case "or":
+ gen.addOrR1();
+ break;
+ case "sub":
+ gen.addNeg(Register.R1);
+ gen.addAddR1();
+ gen.addNeg(Register.R1);
+ break;
+ }
+ } else {
+ int imm = parseImm(line, arg);
+ switch(opcode) {
+ case "add":
+ gen.addAdd(imm);
+ break;
+ case "and":
+ gen.addAnd(imm);
+ break;
+ case "or":
+ gen.addOr(imm);
+ break;
+ case "sub":
+ gen.addAdd(-imm);
+ break;
+ }
+ }
+ break;
+ case "jeq":
+ case "jset":
+ case "jgt":
+ case "jge":
+ int val = 0;
+ boolean reg_compare;
+ if (arg.startsWith("x")) {
+ reg_compare = true;
+ } else {
+ reg_compare = false;
+ val = parseImm(line, arg);
+ }
+ int jt_offset = line.indexOf("jt");
+ int jf_offset = line.indexOf("jf");
+ String true_label = line.substring(jt_offset + 2, jf_offset).trim();
+ String false_label = line.substring(jf_offset + 2).trim();
+ boolean true_label_is_fallthrough = Integer.parseInt(true_label) == label + 1;
+ boolean false_label_is_fallthrough = Integer.parseInt(false_label) == label + 1;
+ if (true_label_is_fallthrough && false_label_is_fallthrough)
+ break;
+ switch (opcode) {
+ case "jeq":
+ if (!true_label_is_fallthrough) {
+ if (reg_compare) {
+ gen.addJumpIfR0EqualsR1(true_label);
+ } else {
+ gen.addJumpIfR0Equals(val, true_label);
+ }
+ }
+ if (!false_label_is_fallthrough) {
+ if (!true_label_is_fallthrough) {
+ gen.addJump(false_label);
+ } else if (reg_compare) {
+ gen.addJumpIfR0NotEqualsR1(false_label);
+ } else {
+ gen.addJumpIfR0NotEquals(val, false_label);
+ }
+ }
+ break;
+ case "jset":
+ if (reg_compare) {
+ gen.addJumpIfR0AnyBitsSetR1(true_label);
+ } else {
+ gen.addJumpIfR0AnyBitsSet(val, true_label);
+ }
+ if (!false_label_is_fallthrough) {
+ gen.addJump(false_label);
+ }
+ break;
+ case "jgt":
+ if (!true_label_is_fallthrough ||
+ // We have no less-than-or-equal-to register to register
+ // comparison instruction, so in this case we'll jump
+ // around an unconditional jump.
+ (!false_label_is_fallthrough && reg_compare)) {
+ if (reg_compare) {
+ gen.addJumpIfR0GreaterThanR1(true_label);
+ } else {
+ gen.addJumpIfR0GreaterThan(val, true_label);
+ }
+ }
+ if (!false_label_is_fallthrough) {
+ if (!true_label_is_fallthrough || reg_compare) {
+ gen.addJump(false_label);
+ } else {
+ gen.addJumpIfR0LessThan(val + 1, false_label);
+ }
+ }
+ break;
+ case "jge":
+ if (!false_label_is_fallthrough ||
+ // We have no greater-than-or-equal-to register to register
+ // comparison instruction, so in this case we'll jump
+ // around an unconditional jump.
+ (!true_label_is_fallthrough && reg_compare)) {
+ if (reg_compare) {
+ gen.addJumpIfR0LessThanR1(false_label);
+ } else {
+ gen.addJumpIfR0LessThan(val, false_label);
+ }
+ }
+ if (!true_label_is_fallthrough) {
+ if (!false_label_is_fallthrough || reg_compare) {
+ gen.addJump(true_label);
+ } else {
+ gen.addJumpIfR0GreaterThan(val - 1, true_label);
+ }
+ }
+ break;
+ }
+ break;
+ case "ret":
+ if (arg.equals("#0")) {
+ gen.addJump(gen.DROP_LABEL);
+ } else {
+ gen.addJump(gen.PASS_LABEL);
+ }
+ break;
+ case "tax":
+ gen.addMove(Register.R1);
+ break;
+ case "txa":
+ gen.addMove(Register.R0);
+ break;
+ default:
+ throw new IllegalArgumentException("Unhandled instruction: " + line);
+ }
+ }
+
+ /**
+ * Convert the output of "tcpdump -d" (human readable BPF program dump) {@code bpf} into an APF
+ * program and return it.
+ */
+ public static byte[] convert(String bpf) throws IllegalInstructionException {
+ ApfGenerator gen = new ApfGenerator();
+ for (String line : bpf.split("\\n")) convertLine(line, gen);
+ return gen.generate();
+ }
+
+ /**
+ * Convert the output of "tcpdump -d" (human readable BPF program dump) piped in stdin into an
+ * APF program and output it via stdout.
+ */
+ public static void main(String[] args) throws Exception {
+ BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+ String line = null;
+ StringBuilder responseData = new StringBuilder();
+ ApfGenerator gen = new ApfGenerator();
+ while ((line = in.readLine()) != null) convertLine(line, gen);
+ System.out.write(gen.generate());
+ }
+}