Merge tag 'android-security-10.0.0_r53' into int/10/fp2
Android security 10.0.0 release 53
* tag 'android-security-10.0.0_r53':
Add SQL tokenizer and disallow subqueries in selection
Add SafetyNet logging to Tvprovider
Change-Id: Id1527ac256e280dfb48a533e733cfc2ecbf99a0d
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 79051e1..5892c6a 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -17,6 +17,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7454398782183407432">"Сховішча тэлевізара"</string>
- <string name="permlab_readTvListings" msgid="5272001606068276291">"чытаць усе спісы тэлеперадач"</string>
+ <string name="permlab_readTvListings" msgid="5272001606068276291">"чытаць спіс тэлеперадач"</string>
<string name="permdesc_readTvListings" msgid="1165157606059567535">"чытаць усе спісы тэлеперадач, даступныя на вашай прыладзе"</string>
</resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 326a41b..cfffe9d 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -17,6 +17,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7454398782183407432">"TV Storage"</string>
- <string name="permlab_readTvListings" msgid="5272001606068276291">"pročitajte sve spiskove TV kanala"</string>
+ <string name="permlab_readTvListings" msgid="5272001606068276291">"Čitanje svih TV programa"</string>
<string name="permdesc_readTvListings" msgid="1165157606059567535">"pročitajte sve spiskove TV kanala koji su dostupni na vašem uređaju"</string>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index c59b9bf..5ed8026 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -17,6 +17,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7454398782183407432">"TV Storage"</string>
- <string name="permlab_readTvListings" msgid="5272001606068276291">"čtení všech seznamů televizních programů"</string>
+ <string name="permlab_readTvListings" msgid="5272001606068276291">"čtení všech TV seznamů"</string>
<string name="permdesc_readTvListings" msgid="1165157606059567535">"čtení všech seznamů televizních programů dostupných v zařízení"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 981ea19..6c54a71 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -17,6 +17,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7454398782183407432">"TV Storage"</string>
- <string name="permlab_readTvListings" msgid="5272001606068276291">"læse alle tv-programoversigter"</string>
- <string name="permdesc_readTvListings" msgid="1165157606059567535">"læse alle tv-programoversigter, der er tilgængelige på din enhed"</string>
+ <string name="permlab_readTvListings" msgid="5272001606068276291">"læse tv-oversigter"</string>
+ <string name="permdesc_readTvListings" msgid="1165157606059567535">"læse alle tv-programoversigter på din enhed"</string>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 18aa1cc..3b55891 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -17,6 +17,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7454398782183407432">"TV Storage"</string>
- <string name="permlab_readTvListings" msgid="5272001606068276291">"ανάγνωση του προγράμματος τηλεόρασης"</string>
+ <string name="permlab_readTvListings" msgid="5272001606068276291">"προγρ. τηλεόρασης"</string>
<string name="permdesc_readTvListings" msgid="1165157606059567535">"ανάγνωση του προγράμματος τηλεόρασης που είναι διαθέσιμο στη συσκευή σας"</string>
</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index f6c7b41..c4a024e 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -17,6 +17,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7454398782183407432">"TV Storage"</string>
- <string name="permlab_readTvListings" msgid="5272001606068276291">"saate lugeda kõiki telerikirjeid"</string>
- <string name="permdesc_readTvListings" msgid="1165157606059567535">"saate lugeda kõiki teie seadmes saadaolevaid telerikirjeid"</string>
+ <string name="permlab_readTvListings" msgid="5272001606068276291">"TV-kirjete lugemine"</string>
+ <string name="permdesc_readTvListings" msgid="1165157606059567535">"Seadmes olevate TV-kirjete lugemine"</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1c02a8b..f972cd6 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -17,6 +17,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7454398782183407432">"TV Storage"</string>
- <string name="permlab_readTvListings" msgid="5272001606068276291">"lire toutes les sources TV"</string>
+ <string name="permlab_readTvListings" msgid="5272001606068276291">"Lire toutes les sources TV"</string>
<string name="permdesc_readTvListings" msgid="1165157606059567535">"lire toutes les sources TV disponibles sur votre appareil"</string>
</resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 843b07d..7125c07 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -17,6 +17,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7454398782183407432">"Almacenamento da televisión"</string>
- <string name="permlab_readTvListings" msgid="5272001606068276291">"le toda a programación da televisión"</string>
- <string name="permdesc_readTvListings" msgid="1165157606059567535">"ler toda a programación da televisión dispoñible no teu dispositivo"</string>
+ <string name="permlab_readTvListings" msgid="5272001606068276291">"ler toda a programación de TV"</string>
+ <string name="permdesc_readTvListings" msgid="1165157606059567535">"ler toda a programación de TV dispoñible no teu dispositivo"</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index f373d24..9ea767f 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -17,6 +17,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7454398782183407432">"TV pohrana"</string>
- <string name="permlab_readTvListings" msgid="5272001606068276291">"čitati sve TV unose"</string>
- <string name="permdesc_readTvListings" msgid="1165157606059567535">"čitati sve TV unose dostupne na uređaju"</string>
+ <string name="permlab_readTvListings" msgid="5272001606068276291">"čitanje svih TV programa"</string>
+ <string name="permdesc_readTvListings" msgid="1165157606059567535">"čitanje svih TV programa dostupnih na uređaju"</string>
</resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 2608406..d6ec123 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -17,6 +17,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7454398782183407432">"TV Storage"</string>
- <string name="permlab_readTvListings" msgid="5272001606068276291">"կարդալ բոլոր հեռուստահաղորդումների ծրագրերը"</string>
+ <string name="permlab_readTvListings" msgid="5272001606068276291">"կարդալ հեռուստահաղորդումների ցանկը"</string>
<string name="permdesc_readTvListings" msgid="1165157606059567535">"կարդալ ձեր սարքում պահվող բոլոր հեռուստահաղորդումների ծրագրերը"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index b0420f9..0d42700 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -17,6 +17,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7454398782183407432">"TV Storage"</string>
- <string name="permlab_readTvListings" msgid="5272001606068276291">"baca semua daftar TV"</string>
+ <string name="permlab_readTvListings" msgid="5272001606068276291">"baca semua jadwal TV"</string>
<string name="permdesc_readTvListings" msgid="1165157606059567535">"baca semua daftar TV yang tersedia di perangkat Anda"</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index acaedf4..a8cf85e 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -17,6 +17,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7454398782183407432">"TV Storage"</string>
- <string name="permlab_readTvListings" msgid="5272001606068276291">"すべてのテレビ番組表の読み取り"</string>
+ <string name="permlab_readTvListings" msgid="5272001606068276291">"すべてのTV番組表の読み取り"</string>
<string name="permdesc_readTvListings" msgid="1165157606059567535">"デバイスで利用できるすべてのテレビ番組表の読み取り"</string>
</resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index de783bf..a03b803 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -17,6 +17,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7454398782183407432">"TV Storage"</string>
- <string name="permlab_readTvListings" msgid="5272001606068276291">"барлық ТД тізімдерін оқу"</string>
- <string name="permdesc_readTvListings" msgid="1165157606059567535">"құрылғыңызда қолжетімді барлық ТД тізімдерін оқу"</string>
+ <string name="permlab_readTvListings" msgid="5272001606068276291">"телебағдарламалар тізімін оқу"</string>
+ <string name="permdesc_readTvListings" msgid="1165157606059567535">"Құрылғыда қолжетімді телебағдарламалар тізімін оқу"</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 74a50f1..f0ed728 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -17,6 +17,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7454398782183407432">"TV Storage"</string>
- <string name="permlab_readTvListings" msgid="5272001606068276291">"모든 TV 편성정보 읽기"</string>
+ <string name="permlab_readTvListings" msgid="5272001606068276291">"모든 TV 프로그램 목록 읽기"</string>
<string name="permdesc_readTvListings" msgid="1165157606059567535">"기기에서 사용 가능한 모든 TV 편성정보 읽기"</string>
</resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 8bc0eb5..e7d90d4 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -17,6 +17,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7454398782183407432">"TV Storage"</string>
- <string name="permlab_readTvListings" msgid="5272001606068276291">"бардык TV тизмелерин окуу"</string>
- <string name="permdesc_readTvListings" msgid="1165157606059567535">"түзмөгүңүздө жеткиликтүү болгон бардык TV тизмелерин окуу"</string>
+ <string name="permlab_readTvListings" msgid="5272001606068276291">"бардык TV программаларын окуу"</string>
+ <string name="permdesc_readTvListings" msgid="1165157606059567535">"түзмөгүңүздөгү бардык TV программаларын окуу"</string>
</resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 14f2a34..1ba3b26 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -17,6 +17,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7454398782183407432">"TV Storage"</string>
- <string name="permlab_readTvListings" msgid="5272001606068276291">"читај ги сите TV списоци"</string>
- <string name="permdesc_readTvListings" msgid="1165157606059567535">"читај ги сите TV списоци што се достапни на уредот"</string>
+ <string name="permlab_readTvListings" msgid="5272001606068276291">"читање на сите TV-програми"</string>
+ <string name="permdesc_readTvListings" msgid="1165157606059567535">"читај ги сите TV-програми достапни на уредот"</string>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index acea0f8..549da10 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -17,6 +17,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7454398782183407432">"TV Storage"</string>
- <string name="permlab_readTvListings" msgid="5272001606068276291">"Lese alle TV-programoversiktene"</string>
+ <string name="permlab_readTvListings" msgid="5272001606068276291">"Lese TV-programoversikter"</string>
<string name="permdesc_readTvListings" msgid="1165157606059567535">"lese alle TV-programoversiktene som er tilgjengelige på enheten din"</string>
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b6003b9..3add640 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -17,6 +17,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7454398782183407432">"TV Storage"</string>
- <string name="permlab_readTvListings" msgid="5272001606068276291">"alle tv-vermeldingen lezen"</string>
- <string name="permdesc_readTvListings" msgid="1165157606059567535">"alle tv-vermeldingen lezen die beschikbaar zijn op je apparaat"</string>
+ <string name="permlab_readTvListings" msgid="5272001606068276291">"Alle tv-vermeldingen lezen"</string>
+ <string name="permdesc_readTvListings" msgid="1165157606059567535">"Alle tv-vermeldingen lezen die beschikbaar zijn op je apparaat"</string>
</resources>