mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-16 11:24:33 -05:00
Picks
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad
parent
77b7de4b1e
commit
46c5c52393
@ -13,7 +13,7 @@ Change-Id: Ie301c2a70847dff2f0daae408fbef1e4d42e73d4
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/libvpx/vp8/encoder/onyx_if.c b/libvpx/vp8/encoder/onyx_if.c
|
||||
index df5bcf6..f3ff77e 100644
|
||||
index df5bcf688..f3ff77e71 100644
|
||||
--- a/libvpx/vp8/encoder/onyx_if.c
|
||||
+++ b/libvpx/vp8/encoder/onyx_if.c
|
||||
@@ -1514,6 +1514,14 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf)
|
||||
|
||||
@ -14,14 +14,14 @@ Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
|
||||
|
||||
diff --git a/Android.mk b/Android.mk
|
||||
new file mode 100644
|
||||
index 0000000..5053e7d
|
||||
index 00000000..5053e7d6
|
||||
--- /dev/null
|
||||
+++ b/Android.mk
|
||||
@@ -0,0 +1 @@
|
||||
+include $(call all-subdir-makefiles)
|
||||
diff --git a/src/Android.mk b/src/Android.mk
|
||||
new file mode 100644
|
||||
index 0000000..4997695
|
||||
index 00000000..4997695b
|
||||
--- /dev/null
|
||||
+++ b/src/Android.mk
|
||||
@@ -0,0 +1,170 @@
|
||||
|
||||
79
Patches/LineageOS-14.1/android_frameworks_av/373035.patch
Normal file
79
Patches/LineageOS-14.1/android_frameworks_av/373035.patch
Normal file
@ -0,0 +1,79 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Shruti Bihani <shrutibihani@google.com>
|
||||
Date: Mon, 10 Jul 2023 08:53:42 +0000
|
||||
Subject: [PATCH] Fix for heap buffer overflow issue flagged by fuzzer test.
|
||||
|
||||
OOB write occurs when a value is assigned to a buffer index which is greater than the buffer size. Adding a check on buffer bounds fixes the issue.
|
||||
|
||||
Similar checks have been added wherever applicable on other such methods of the class.
|
||||
|
||||
Bug: 243463593
|
||||
Test: Build mtp_packet_fuzzer and run on the target device
|
||||
(cherry picked from commit a669e34bb8e6f0f7b5d7a35144bd342271a24712)
|
||||
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1401a723899766632363129265b30d433ac69c44)
|
||||
Merged-In: Icd0f2307803a1a35e655bc08d9d4cca5e2b58a9b
|
||||
Change-Id: Icd0f2307803a1a35e655bc08d9d4cca5e2b58a9b
|
||||
---
|
||||
media/mtp/MtpPacket.cpp | 40 +++++++++++++++++++++++++++++++---------
|
||||
1 file changed, 31 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/media/mtp/MtpPacket.cpp b/media/mtp/MtpPacket.cpp
|
||||
index 35ecb4f23d..b7546c8437 100644
|
||||
--- a/media/mtp/MtpPacket.cpp
|
||||
+++ b/media/mtp/MtpPacket.cpp
|
||||
@@ -92,24 +92,46 @@ void MtpPacket::copyFrom(const MtpPacket& src) {
|
||||
}
|
||||
|
||||
uint16_t MtpPacket::getUInt16(int offset) const {
|
||||
- return ((uint16_t)mBuffer[offset + 1] << 8) | (uint16_t)mBuffer[offset];
|
||||
+ if ((unsigned long)(offset+2) <= mBufferSize) {
|
||||
+ return ((uint16_t)mBuffer[offset + 1] << 8) | (uint16_t)mBuffer[offset];
|
||||
+ }
|
||||
+ else {
|
||||
+ ALOGE("offset for buffer read is greater than buffer size!");
|
||||
+ abort();
|
||||
+ }
|
||||
}
|
||||
|
||||
uint32_t MtpPacket::getUInt32(int offset) const {
|
||||
- return ((uint32_t)mBuffer[offset + 3] << 24) | ((uint32_t)mBuffer[offset + 2] << 16) |
|
||||
- ((uint32_t)mBuffer[offset + 1] << 8) | (uint32_t)mBuffer[offset];
|
||||
+ if ((unsigned long)(offset+4) <= mBufferSize) {
|
||||
+ return ((uint32_t)mBuffer[offset + 3] << 24) | ((uint32_t)mBuffer[offset + 2] << 16) |
|
||||
+ ((uint32_t)mBuffer[offset + 1] << 8) | (uint32_t)mBuffer[offset];
|
||||
+ }
|
||||
+ else {
|
||||
+ ALOGE("offset for buffer read is greater than buffer size!");
|
||||
+ abort();
|
||||
+ }
|
||||
}
|
||||
|
||||
void MtpPacket::putUInt16(int offset, uint16_t value) {
|
||||
- mBuffer[offset++] = (uint8_t)(value & 0xFF);
|
||||
- mBuffer[offset++] = (uint8_t)((value >> 8) & 0xFF);
|
||||
+ if ((unsigned long)(offset+2) <= mBufferSize) {
|
||||
+ mBuffer[offset++] = (uint8_t)(value & 0xFF);
|
||||
+ mBuffer[offset++] = (uint8_t)((value >> 8) & 0xFF);
|
||||
+ }
|
||||
+ else {
|
||||
+ ALOGE("offset for buffer write is greater than buffer size!");
|
||||
+ }
|
||||
}
|
||||
|
||||
void MtpPacket::putUInt32(int offset, uint32_t value) {
|
||||
- mBuffer[offset++] = (uint8_t)(value & 0xFF);
|
||||
- mBuffer[offset++] = (uint8_t)((value >> 8) & 0xFF);
|
||||
- mBuffer[offset++] = (uint8_t)((value >> 16) & 0xFF);
|
||||
- mBuffer[offset++] = (uint8_t)((value >> 24) & 0xFF);
|
||||
+ if ((unsigned long)(offset+4) <= mBufferSize) {
|
||||
+ mBuffer[offset++] = (uint8_t)(value & 0xFF);
|
||||
+ mBuffer[offset++] = (uint8_t)((value >> 8) & 0xFF);
|
||||
+ mBuffer[offset++] = (uint8_t)((value >> 16) & 0xFF);
|
||||
+ mBuffer[offset++] = (uint8_t)((value >> 24) & 0xFF);
|
||||
+ }
|
||||
+ else {
|
||||
+ ALOGE("offset for buffer write is greater than buffer size!");
|
||||
+ }
|
||||
}
|
||||
|
||||
uint16_t MtpPacket::getContainerCode() const {
|
||||
68
Patches/LineageOS-14.1/android_frameworks_base/373033.patch
Normal file
68
Patches/LineageOS-14.1/android_frameworks_base/373033.patch
Normal file
@ -0,0 +1,68 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Songchun Fan <schfan@google.com>
|
||||
Date: Mon, 14 Aug 2023 15:24:11 -0700
|
||||
Subject: [PATCH] verify ringtone URI before setting
|
||||
|
||||
Similar to ag/24422287, but the same URI verification should be done in
|
||||
SettingsProvider as well, which can be called by apps via
|
||||
Settings.System API or ContentProvider APIs without using
|
||||
RingtoneManager.
|
||||
|
||||
BUG: 227201030
|
||||
Test: manual with a test app. Will add a CTS test.
|
||||
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1b234678ec122994ccbfc52ac48aafdad7fdb1ed)
|
||||
Merged-In: Ic0ffa1db14b5660d02880b632a7f2ad9e6e5d84b
|
||||
Change-Id: Ic0ffa1db14b5660d02880b632a7f2ad9e6e5d84b
|
||||
---
|
||||
.../providers/settings/SettingsProvider.java | 31 +++++++++++++++++++
|
||||
1 file changed, 31 insertions(+)
|
||||
|
||||
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
|
||||
index 1a5ef845c9c7..6b04584f6e69 100644
|
||||
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
|
||||
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
|
||||
@@ -1106,6 +1106,9 @@ public class SettingsProvider extends ContentProvider {
|
||||
cacheName = Settings.System.ALARM_ALERT_CACHE;
|
||||
}
|
||||
if (cacheName != null) {
|
||||
+ if (!isValidAudioUri(name, value)) {
|
||||
+ return false;
|
||||
+ }
|
||||
final File cacheFile = new File(
|
||||
getRingtoneCacheDir(UserHandle.getCallingUserId()), cacheName);
|
||||
cacheFile.delete();
|
||||
@@ -1136,6 +1139,34 @@ public class SettingsProvider extends ContentProvider {
|
||||
}
|
||||
}
|
||||
|
||||
+ private boolean isValidAudioUri(String name, String uri) {
|
||||
+ if (uri != null) {
|
||||
+ Uri audioUri = Uri.parse(uri);
|
||||
+ if (Settings.AUTHORITY.equals(
|
||||
+ ContentProvider.getAuthorityWithoutUserId(audioUri.getAuthority()))) {
|
||||
+ // Don't accept setting the default uri to self-referential URIs like
|
||||
+ // Settings.System.DEFAULT_RINGTONE_URI, which is an alias to the value of this
|
||||
+ // setting.
|
||||
+ return false;
|
||||
+ }
|
||||
+ final String mimeType = getContext().getContentResolver().getType(audioUri);
|
||||
+ if (mimeType == null) {
|
||||
+ Slog.e(LOG_TAG,
|
||||
+ "mutateSystemSetting for setting: " + name + " URI: " + audioUri
|
||||
+ + " ignored: failure to find mimeType (no access from this context?)");
|
||||
+ return false;
|
||||
+ }
|
||||
+ if (!(mimeType.startsWith("audio/") || mimeType.equals("application/ogg")
|
||||
+ || mimeType.equals("application/x-flac"))) {
|
||||
+ Slog.e(LOG_TAG,
|
||||
+ "mutateSystemSetting for setting: " + name + " URI: " + audioUri
|
||||
+ + " ignored: associated mimeType: " + mimeType + " is not an audio type");
|
||||
+ return false;
|
||||
+ }
|
||||
+ }
|
||||
+ return true;
|
||||
+ }
|
||||
+
|
||||
private boolean hasWriteSecureSettingsPermission() {
|
||||
// Write secure settings is a more protected permission. If caller has it we are good.
|
||||
if (getContext().checkCallingOrSelfPermission(Manifest.permission.WRITE_SECURE_SETTINGS)
|
||||
31
Patches/LineageOS-14.1/android_frameworks_base/373034.patch
Normal file
31
Patches/LineageOS-14.1/android_frameworks_base/373034.patch
Normal file
@ -0,0 +1,31 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: kumarashishg <kumarashishg@google.com>
|
||||
Date: Thu, 3 Aug 2023 12:01:29 +0000
|
||||
Subject: [PATCH] Use type safe API of readParcelableArray
|
||||
|
||||
Bug: 291299076
|
||||
Test: Build and flash the device and check if it throws exception for
|
||||
non UsbInterface object
|
||||
Test: atest CtsUsbManagerTestCases
|
||||
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:85d7e6712a9eeeed3bdd68ea3c3862c7e88bfe70)
|
||||
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:60bfbde79f2ffb012abced55d358fdf6380c0bae)
|
||||
Merged-In: I2917c8331b6d56caaa9a6479bcd9a2d089f5f503
|
||||
Change-Id: I2917c8331b6d56caaa9a6479bcd9a2d089f5f503
|
||||
---
|
||||
core/java/android/hardware/usb/UsbConfiguration.java | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/core/java/android/hardware/usb/UsbConfiguration.java b/core/java/android/hardware/usb/UsbConfiguration.java
|
||||
index da5c12854273..562fbfe623c8 100644
|
||||
--- a/core/java/android/hardware/usb/UsbConfiguration.java
|
||||
+++ b/core/java/android/hardware/usb/UsbConfiguration.java
|
||||
@@ -157,7 +157,8 @@ public class UsbConfiguration implements Parcelable {
|
||||
String name = in.readString();
|
||||
int attributes = in.readInt();
|
||||
int maxPower = in.readInt();
|
||||
- Parcelable[] interfaces = in.readParcelableArray(UsbInterface.class.getClassLoader());
|
||||
+ Parcelable[] interfaces = in.readParcelableArray(
|
||||
+ UsbInterface.class.getClassLoader(), UsbInterface.class);
|
||||
UsbConfiguration configuration = new UsbConfiguration(id, name, attributes, maxPower);
|
||||
configuration.setInterfaces(interfaces);
|
||||
return configuration;
|
||||
@ -20,7 +20,7 @@ Change-Id: Ibbffdb5f3930df74ca8b4ba93d451f7fad086989
|
||||
4 files changed, 69 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/res/menu/data_usage.xml b/res/menu/data_usage.xml
|
||||
index f4c207b767..e47c3b25fc 100644
|
||||
index f4c207b767d..e47c3b25fca 100644
|
||||
--- a/res/menu/data_usage.xml
|
||||
+++ b/res/menu/data_usage.xml
|
||||
@@ -21,4 +21,8 @@
|
||||
@ -33,7 +33,7 @@ index f4c207b767..e47c3b25fc 100644
|
||||
+ android:checkable="true" />
|
||||
</menu>
|
||||
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
|
||||
index 0dd77d2439..d581b975fe 100644
|
||||
index 0dd77d24396..d581b975fee 100644
|
||||
--- a/res/values/cm_strings.xml
|
||||
+++ b/res/values/cm_strings.xml
|
||||
@@ -516,4 +516,9 @@
|
||||
@ -47,7 +47,7 @@ index 0dd77d2439..d581b975fe 100644
|
||||
+ <string name="captive_portal_warning_positive">Disable</string>
|
||||
</resources>
|
||||
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
|
||||
index ece64b4310..cd4579a487 100644
|
||||
index ece64b43101..cd4579a4878 100644
|
||||
--- a/src/com/android/settings/ResetNetworkConfirm.java
|
||||
+++ b/src/com/android/settings/ResetNetworkConfirm.java
|
||||
@@ -25,6 +25,7 @@ import android.net.wifi.WifiManager;
|
||||
@ -69,7 +69,7 @@ index ece64b4310..cd4579a487 100644
|
||||
.show();
|
||||
}
|
||||
diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
|
||||
index 702e6db0ae..98df2759b2 100644
|
||||
index 702e6db0ae1..98df2759b23 100644
|
||||
--- a/src/com/android/settings/datausage/DataUsageSummary.java
|
||||
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
|
||||
@@ -15,8 +15,11 @@
|
||||
|
||||
@ -18,7 +18,7 @@ Change-Id: I2e519872954903575ac2fc47fa13d126bb5bac8e
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
|
||||
index 38568e4baf..49e2a4f2d1 100644
|
||||
index 38568e4bafb..49e2a4f2d1e 100644
|
||||
--- a/res/values/cm_arrays.xml
|
||||
+++ b/res/values/cm_arrays.xml
|
||||
@@ -269,6 +269,7 @@
|
||||
|
||||
@ -21,7 +21,7 @@ Change-Id: I38da15d4b1fb08671f6352458cbf3f735b4083bc
|
||||
2 files changed, 8 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/res/values/strings.xml b/res/values/strings.xml
|
||||
index a4fdaf58c9..322baf1566 100644
|
||||
index a4fdaf58c9c..322baf15662 100644
|
||||
--- a/res/values/strings.xml
|
||||
+++ b/res/values/strings.xml
|
||||
@@ -7961,15 +7961,18 @@
|
||||
@ -48,7 +48,7 @@ index a4fdaf58c9..322baf1566 100644
|
||||
+ <string name="request_manage_bluetooth_permission_dont_allow">Don\u2019t allow</string>
|
||||
</resources>
|
||||
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
|
||||
index ffb4f398ab..92988dd97e 100644
|
||||
index ffb4f398ab3..92988dd97ee 100644
|
||||
--- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
|
||||
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
|
||||
@@ -138,7 +138,7 @@ public class BluetoothPermissionActivity extends AlertActivity implements
|
||||
|
||||
@ -24,7 +24,7 @@ Change-Id: Iadec059b662fd91754ad573bbe688702cdd3c9af
|
||||
3 files changed, 44 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/res/values/strings.xml b/res/values/strings.xml
|
||||
index 322baf1566..f98146b139 100644
|
||||
index 322baf15662..f98146b139b 100644
|
||||
--- a/res/values/strings.xml
|
||||
+++ b/res/values/strings.xml
|
||||
@@ -7975,4 +7975,25 @@
|
||||
@ -54,7 +54,7 @@ index 322baf1566..f98146b139 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive">Connect</string>
|
||||
</resources>
|
||||
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
|
||||
index 92988dd97e..9444d49263 100644
|
||||
index 92988dd97ee..9444d49263f 100644
|
||||
--- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
|
||||
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
|
||||
@@ -25,6 +25,7 @@ import android.content.DialogInterface;
|
||||
@ -124,7 +124,7 @@ index 92988dd97e..9444d49263 100644
|
||||
}
|
||||
|
||||
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
|
||||
index 3de10a5d10..d23dea93e5 100644
|
||||
index 3de10a5d10e..d23dea93e52 100644
|
||||
--- a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
|
||||
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
|
||||
@@ -144,13 +144,17 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
|
||||
|
||||
@ -110,7 +110,7 @@ Change-Id: Id5c579245cf72f10f4d15fcb69d24bcf58dd281a
|
||||
50 files changed, 850 insertions(+)
|
||||
|
||||
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
|
||||
index 7305defade..c89e846582 100644
|
||||
index 7305defade4..c89e8465820 100644
|
||||
--- a/res/values-af/strings.xml
|
||||
+++ b/res/values-af/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -136,7 +136,7 @@ index 7305defade..c89e846582 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Koppel"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
|
||||
index 7d70dc6cbe..d3f0c6cbca 100644
|
||||
index 7d70dc6cbef..d3f0c6cbcaa 100644
|
||||
--- a/res/values-am/strings.xml
|
||||
+++ b/res/values-am/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -162,7 +162,7 @@ index 7d70dc6cbe..d3f0c6cbca 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"አገናኝ"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
|
||||
index 0353c3bcf8..e64d14a5fd 100644
|
||||
index 0353c3bcf83..e64d14a5fdf 100644
|
||||
--- a/res/values-ar/strings.xml
|
||||
+++ b/res/values-ar/strings.xml
|
||||
@@ -3403,4 +3403,21 @@
|
||||
@ -188,7 +188,7 @@ index 0353c3bcf8..e64d14a5fd 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"الاتصال"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
|
||||
index 1306c1606e..dc22a54702 100644
|
||||
index 1306c1606ee..dc22a54702c 100644
|
||||
--- a/res/values-b+sr+Latn/strings.xml
|
||||
+++ b/res/values-b+sr+Latn/strings.xml
|
||||
@@ -3295,4 +3295,21 @@
|
||||
@ -214,7 +214,7 @@ index 1306c1606e..dc22a54702 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Poveži"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
|
||||
index 535a81604a..76b9df05eb 100644
|
||||
index 535a81604a6..76b9df05eb0 100644
|
||||
--- a/res/values-bg/strings.xml
|
||||
+++ b/res/values-bg/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -240,7 +240,7 @@ index 535a81604a..76b9df05eb 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Свързване"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
|
||||
index 50ec304b9f..65cfb3610e 100644
|
||||
index 50ec304b9fa..65cfb3610e9 100644
|
||||
--- a/res/values-ca/strings.xml
|
||||
+++ b/res/values-ca/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -266,7 +266,7 @@ index 50ec304b9f..65cfb3610e 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Connecta"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
|
||||
index d313f7a3c0..204ce67618 100644
|
||||
index d313f7a3c0b..204ce67618e 100644
|
||||
--- a/res/values-cs/strings.xml
|
||||
+++ b/res/values-cs/strings.xml
|
||||
@@ -3331,4 +3331,21 @@
|
||||
@ -292,7 +292,7 @@ index d313f7a3c0..204ce67618 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Připojit"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
|
||||
index 000cb2d99f..a1878e3638 100644
|
||||
index 000cb2d99f0..a1878e36386 100644
|
||||
--- a/res/values-da/strings.xml
|
||||
+++ b/res/values-da/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -318,7 +318,7 @@ index 000cb2d99f..a1878e3638 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Opret forbindelse"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
|
||||
index 4d1b5dedcf..19d05ebf0f 100644
|
||||
index 4d1b5dedcf2..19d05ebf0fd 100644
|
||||
--- a/res/values-de/strings.xml
|
||||
+++ b/res/values-de/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -344,7 +344,7 @@ index 4d1b5dedcf..19d05ebf0f 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Verbinden"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
|
||||
index 7934c502ec..47f753c94d 100644
|
||||
index 7934c502ece..47f753c94d7 100644
|
||||
--- a/res/values-el/strings.xml
|
||||
+++ b/res/values-el/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -370,7 +370,7 @@ index 7934c502ec..47f753c94d 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Σύνδεση"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
|
||||
index e57faea997..007f5b3231 100644
|
||||
index e57faea997b..007f5b32319 100644
|
||||
--- a/res/values-en-rAU/strings.xml
|
||||
+++ b/res/values-en-rAU/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -396,7 +396,7 @@ index e57faea997..007f5b3231 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Connect"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
|
||||
index 6a22132233..562d21263d 100644
|
||||
index 6a22132233b..562d21263df 100644
|
||||
--- a/res/values-en-rGB/strings.xml
|
||||
+++ b/res/values-en-rGB/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -422,7 +422,7 @@ index 6a22132233..562d21263d 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Connect"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
|
||||
index 6a22132233..562d21263d 100644
|
||||
index 6a22132233b..562d21263df 100644
|
||||
--- a/res/values-en-rIN/strings.xml
|
||||
+++ b/res/values-en-rIN/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -448,7 +448,7 @@ index 6a22132233..562d21263d 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Connect"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
|
||||
index 7a573307bd..38c1b222d6 100644
|
||||
index 7a573307bdd..38c1b222d69 100644
|
||||
--- a/res/values-es-rUS/strings.xml
|
||||
+++ b/res/values-es-rUS/strings.xml
|
||||
@@ -3257,4 +3257,21 @@
|
||||
@ -474,7 +474,7 @@ index 7a573307bd..38c1b222d6 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Conectar"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
|
||||
index 0d867de44f..389475ecb0 100644
|
||||
index 0d867de44f7..389475ecb0c 100644
|
||||
--- a/res/values-es/strings.xml
|
||||
+++ b/res/values-es/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -500,7 +500,7 @@ index 0d867de44f..389475ecb0 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Conectar"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
|
||||
index c15eaa826c..5e0c4f0825 100644
|
||||
index c15eaa826cb..5e0c4f08250 100644
|
||||
--- a/res/values-fa/strings.xml
|
||||
+++ b/res/values-fa/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -526,7 +526,7 @@ index c15eaa826c..5e0c4f0825 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"متصل شود"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
|
||||
index 14136bd2a7..b223c0ece1 100644
|
||||
index 14136bd2a74..b223c0ece11 100644
|
||||
--- a/res/values-fi/strings.xml
|
||||
+++ b/res/values-fi/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -552,7 +552,7 @@ index 14136bd2a7..b223c0ece1 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Yhdistä"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
|
||||
index 639fcd27f0..38c27094d6 100644
|
||||
index 639fcd27f0f..38c27094d6b 100644
|
||||
--- a/res/values-fr-rCA/strings.xml
|
||||
+++ b/res/values-fr-rCA/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -578,7 +578,7 @@ index 639fcd27f0..38c27094d6 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Se connecter"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
|
||||
index 434527e316..4aaf6a4b04 100644
|
||||
index 434527e3164..4aaf6a4b04e 100644
|
||||
--- a/res/values-fr/strings.xml
|
||||
+++ b/res/values-fr/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -604,7 +604,7 @@ index 434527e316..4aaf6a4b04 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Autoriser la connexion"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
|
||||
index 2901bb8ff8..6ac0c9d200 100644
|
||||
index 2901bb8ff81..6ac0c9d2007 100644
|
||||
--- a/res/values-hi/strings.xml
|
||||
+++ b/res/values-hi/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -630,7 +630,7 @@ index 2901bb8ff8..6ac0c9d200 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"कनेक्ट करें"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
|
||||
index df896b8db3..18f20b2f05 100644
|
||||
index df896b8db31..18f20b2f05f 100644
|
||||
--- a/res/values-hr/strings.xml
|
||||
+++ b/res/values-hr/strings.xml
|
||||
@@ -3295,4 +3295,21 @@
|
||||
@ -656,7 +656,7 @@ index df896b8db3..18f20b2f05 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Poveži"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
|
||||
index b6d1ba90db..9474b452ef 100644
|
||||
index b6d1ba90db1..9474b452efe 100644
|
||||
--- a/res/values-hu/strings.xml
|
||||
+++ b/res/values-hu/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -682,7 +682,7 @@ index b6d1ba90db..9474b452ef 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Csatlakozás"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
|
||||
index 1397cdb54d..0892d1def4 100644
|
||||
index 1397cdb54d4..0892d1def4e 100644
|
||||
--- a/res/values-in/strings.xml
|
||||
+++ b/res/values-in/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -708,7 +708,7 @@ index 1397cdb54d..0892d1def4 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Hubungkan"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
|
||||
index 5c8a8c0721..29c2410f4e 100644
|
||||
index 5c8a8c07216..29c2410f4ec 100644
|
||||
--- a/res/values-it/strings.xml
|
||||
+++ b/res/values-it/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -734,7 +734,7 @@ index 5c8a8c0721..29c2410f4e 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Connetti"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
|
||||
index 2afe97516f..b45f91ba31 100644
|
||||
index 2afe97516fa..b45f91ba31e 100644
|
||||
--- a/res/values-iw/strings.xml
|
||||
+++ b/res/values-iw/strings.xml
|
||||
@@ -3333,4 +3333,21 @@
|
||||
@ -760,7 +760,7 @@ index 2afe97516f..b45f91ba31 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"התחברות"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
|
||||
index a2279c4b4c..950c2bb781 100644
|
||||
index a2279c4b4cd..950c2bb7812 100644
|
||||
--- a/res/values-ja/strings.xml
|
||||
+++ b/res/values-ja/strings.xml
|
||||
@@ -3263,4 +3263,21 @@
|
||||
@ -786,7 +786,7 @@ index a2279c4b4c..950c2bb781 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"接続"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
|
||||
index 43b80927d5..a4691a22f2 100644
|
||||
index 43b80927d5e..a4691a22f20 100644
|
||||
--- a/res/values-ko/strings.xml
|
||||
+++ b/res/values-ko/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -812,7 +812,7 @@ index 43b80927d5..a4691a22f2 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"연결"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
|
||||
index 55b074a965..645145f258 100644
|
||||
index 55b074a965a..645145f258b 100644
|
||||
--- a/res/values-lt/strings.xml
|
||||
+++ b/res/values-lt/strings.xml
|
||||
@@ -3333,4 +3333,21 @@
|
||||
@ -838,7 +838,7 @@ index 55b074a965..645145f258 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Susieti"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
|
||||
index 7513656733..8ec0790107 100644
|
||||
index 75136567337..8ec0790107b 100644
|
||||
--- a/res/values-lv/strings.xml
|
||||
+++ b/res/values-lv/strings.xml
|
||||
@@ -3295,4 +3295,21 @@
|
||||
@ -864,7 +864,7 @@ index 7513656733..8ec0790107 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Izveidot savienojumu"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
|
||||
index 1564c3aebd..e7bb6a0f6b 100644
|
||||
index 1564c3aebd9..e7bb6a0f6be 100644
|
||||
--- a/res/values-nb/strings.xml
|
||||
+++ b/res/values-nb/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -890,7 +890,7 @@ index 1564c3aebd..e7bb6a0f6b 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Koble til"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
|
||||
index b5fd751567..b57e8e5810 100644
|
||||
index b5fd7515679..b57e8e5810f 100644
|
||||
--- a/res/values-nl/strings.xml
|
||||
+++ b/res/values-nl/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -916,7 +916,7 @@ index b5fd751567..b57e8e5810 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Verbinding maken"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
|
||||
index 889ab42063..0665c17ac5 100644
|
||||
index 889ab420632..0665c17ac57 100644
|
||||
--- a/res/values-pl/strings.xml
|
||||
+++ b/res/values-pl/strings.xml
|
||||
@@ -3331,4 +3331,21 @@
|
||||
@ -942,7 +942,7 @@ index 889ab42063..0665c17ac5 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Połącz"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
|
||||
index a4dc8b2d46..66c634ecfd 100644
|
||||
index a4dc8b2d461..66c634ecfd7 100644
|
||||
--- a/res/values-pt-rBR/strings.xml
|
||||
+++ b/res/values-pt-rBR/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -968,7 +968,7 @@ index a4dc8b2d46..66c634ecfd 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Conectar"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
|
||||
index 3ad51989fd..7c822f31ef 100644
|
||||
index 3ad51989fd1..7c822f31ef7 100644
|
||||
--- a/res/values-pt-rPT/strings.xml
|
||||
+++ b/res/values-pt-rPT/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -994,7 +994,7 @@ index 3ad51989fd..7c822f31ef 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Ligar"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
|
||||
index a4dc8b2d46..66c634ecfd 100644
|
||||
index a4dc8b2d461..66c634ecfd7 100644
|
||||
--- a/res/values-pt/strings.xml
|
||||
+++ b/res/values-pt/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -1020,7 +1020,7 @@ index a4dc8b2d46..66c634ecfd 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Conectar"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
|
||||
index 7538004a6a..0b90949114 100644
|
||||
index 7538004a6a7..0b90949114a 100644
|
||||
--- a/res/values-ro/strings.xml
|
||||
+++ b/res/values-ro/strings.xml
|
||||
@@ -3295,4 +3295,21 @@
|
||||
@ -1046,7 +1046,7 @@ index 7538004a6a..0b90949114 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Conectați-vă"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
|
||||
index c2346806e5..9af521ca7b 100644
|
||||
index c2346806e5d..9af521ca7b5 100644
|
||||
--- a/res/values-ru/strings.xml
|
||||
+++ b/res/values-ru/strings.xml
|
||||
@@ -3331,4 +3331,21 @@
|
||||
@ -1072,7 +1072,7 @@ index c2346806e5..9af521ca7b 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Подключиться"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
|
||||
index 3174c120b1..043d0e6d65 100644
|
||||
index 3174c120b1e..043d0e6d65f 100644
|
||||
--- a/res/values-sk/strings.xml
|
||||
+++ b/res/values-sk/strings.xml
|
||||
@@ -3331,4 +3331,21 @@
|
||||
@ -1098,7 +1098,7 @@ index 3174c120b1..043d0e6d65 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Pripojiť"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
|
||||
index afe3ce2c0a..f17fe239d7 100644
|
||||
index afe3ce2c0ae..f17fe239d78 100644
|
||||
--- a/res/values-sl/strings.xml
|
||||
+++ b/res/values-sl/strings.xml
|
||||
@@ -3331,4 +3331,21 @@
|
||||
@ -1124,7 +1124,7 @@ index afe3ce2c0a..f17fe239d7 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Poveži"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
|
||||
index fda00b5da1..cd40bed518 100644
|
||||
index fda00b5da11..cd40bed5181 100644
|
||||
--- a/res/values-sr/strings.xml
|
||||
+++ b/res/values-sr/strings.xml
|
||||
@@ -3295,4 +3295,21 @@
|
||||
@ -1150,7 +1150,7 @@ index fda00b5da1..cd40bed518 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Повежи"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
|
||||
index 96af86a45b..0619b36d2d 100644
|
||||
index 96af86a45b8..0619b36d2db 100644
|
||||
--- a/res/values-sv/strings.xml
|
||||
+++ b/res/values-sv/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -1176,7 +1176,7 @@ index 96af86a45b..0619b36d2d 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Anslut"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
|
||||
index 17b6f5aaf0..e1044f1170 100644
|
||||
index 17b6f5aaf0d..e1044f1170f 100644
|
||||
--- a/res/values-sw/strings.xml
|
||||
+++ b/res/values-sw/strings.xml
|
||||
@@ -3263,4 +3263,21 @@
|
||||
@ -1202,7 +1202,7 @@ index 17b6f5aaf0..e1044f1170 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Unganisha"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
|
||||
index cd68a81ac5..56925e2e2e 100644
|
||||
index cd68a81ac5a..56925e2e2ec 100644
|
||||
--- a/res/values-th/strings.xml
|
||||
+++ b/res/values-th/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -1228,7 +1228,7 @@ index cd68a81ac5..56925e2e2e 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"เชื่อมต่อ"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
|
||||
index 0c6308f8a8..2569417f29 100644
|
||||
index 0c6308f8a89..2569417f294 100644
|
||||
--- a/res/values-tl/strings.xml
|
||||
+++ b/res/values-tl/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -1254,7 +1254,7 @@ index 0c6308f8a8..2569417f29 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Kumonekta"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
|
||||
index 3a5e831685..c446b27b9d 100644
|
||||
index 3a5e8316853..c446b27b9d9 100644
|
||||
--- a/res/values-tr/strings.xml
|
||||
+++ b/res/values-tr/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -1280,7 +1280,7 @@ index 3a5e831685..c446b27b9d 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Bağlan"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
|
||||
index 5cbff65844..d37c4985dc 100644
|
||||
index 5cbff65844d..d37c4985dc6 100644
|
||||
--- a/res/values-uk/strings.xml
|
||||
+++ b/res/values-uk/strings.xml
|
||||
@@ -3331,4 +3331,21 @@
|
||||
@ -1306,7 +1306,7 @@ index 5cbff65844..d37c4985dc 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Підключитися"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
|
||||
index 8c93d7f4c6..dec7547003 100644
|
||||
index 8c93d7f4c68..dec75470030 100644
|
||||
--- a/res/values-vi/strings.xml
|
||||
+++ b/res/values-vi/strings.xml
|
||||
@@ -3259,4 +3259,21 @@
|
||||
@ -1332,7 +1332,7 @@ index 8c93d7f4c6..dec7547003 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Kết nối"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
|
||||
index 74b54de365..b65a5cc646 100644
|
||||
index 74b54de365c..b65a5cc646a 100644
|
||||
--- a/res/values-zh-rCN/strings.xml
|
||||
+++ b/res/values-zh-rCN/strings.xml
|
||||
@@ -3298,4 +3298,21 @@
|
||||
@ -1358,7 +1358,7 @@ index 74b54de365..b65a5cc646 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"连接"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
|
||||
index 051663c4d6..23432b6bf6 100644
|
||||
index 051663c4d64..23432b6bf61 100644
|
||||
--- a/res/values-zh-rHK/strings.xml
|
||||
+++ b/res/values-zh-rHK/strings.xml
|
||||
@@ -3262,4 +3262,21 @@
|
||||
@ -1384,7 +1384,7 @@ index 051663c4d6..23432b6bf6 100644
|
||||
+ <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"連接"</string>
|
||||
</resources>
|
||||
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
|
||||
index ddddb7dc72..312b62ad22 100644
|
||||
index ddddb7dc723..312b62ad228 100644
|
||||
--- a/res/values-zh-rTW/strings.xml
|
||||
+++ b/res/values-zh-rTW/strings.xml
|
||||
@@ -3263,4 +3263,21 @@
|
||||
|
||||
@ -14,7 +14,7 @@ Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
|
||||
index 4871306669..86fc53bb18 100755
|
||||
index 48713066699..86fc53bb18d 100755
|
||||
--- a/AndroidManifest.xml
|
||||
+++ b/AndroidManifest.xml
|
||||
@@ -2098,6 +2098,7 @@
|
||||
|
||||
@ -15,7 +15,7 @@ Merged-In:I8f0b066de710169ee8b922c44b6519ca21b9c7ef
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/res/values/strings.xml b/res/values/strings.xml
|
||||
index f98146b139..d63cbc6b60 100644
|
||||
index f98146b139b..d63cbc6b603 100644
|
||||
--- a/res/values/strings.xml
|
||||
+++ b/res/values/strings.xml
|
||||
@@ -3508,7 +3508,7 @@
|
||||
|
||||
@ -26,7 +26,7 @@ Merged-In:Iaa2d3a9497c3266babe0789961befc9776a4db7a
|
||||
1 file changed, 17 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
|
||||
index f72bf9e97b..ee2114219e 100644
|
||||
index f72bf9e97bf..ee2114219e7 100644
|
||||
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
|
||||
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
|
||||
@@ -17,6 +17,7 @@
|
||||
|
||||
@ -28,7 +28,7 @@ Merged-In: I9dfde586616d004befbee529f2ae842d22795065
|
||||
1 file changed, 17 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
|
||||
index eed380bae4..1c82bff713 100644
|
||||
index eed380bae4f..1c82bff713f 100644
|
||||
--- a/src/com/android/settings/CredentialStorage.java
|
||||
+++ b/src/com/android/settings/CredentialStorage.java
|
||||
@@ -17,6 +17,7 @@
|
||||
|
||||
@ -22,7 +22,7 @@ Merged-In: I40496105bae313fe5cff2a36dfe329c1e2b5bbe4
|
||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
|
||||
index ee2114219e..feb8b9ef01 100644
|
||||
index ee2114219e7..feb8b9ef01f 100644
|
||||
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
|
||||
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
|
||||
@@ -654,10 +654,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
|
||||
|
||||
@ -17,7 +17,7 @@ Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
|
||||
1 file changed, 18 insertions(+)
|
||||
|
||||
diff --git a/src/com/android/settings/DefaultRingtonePreference.java b/src/com/android/settings/DefaultRingtonePreference.java
|
||||
index 4e0e1e7403..3333016565 100644
|
||||
index 4e0e1e7403e..3333016565e 100644
|
||||
--- a/src/com/android/settings/DefaultRingtonePreference.java
|
||||
+++ b/src/com/android/settings/DefaultRingtonePreference.java
|
||||
@@ -22,6 +22,7 @@ import android.content.Intent;
|
||||
|
||||
@ -23,7 +23,7 @@ Merged-In: I044b680871472a3c272f6264c4ef272df542112e
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/com/android/settings/DefaultRingtonePreference.java b/src/com/android/settings/DefaultRingtonePreference.java
|
||||
index 3333016565..75c527fa31 100644
|
||||
index 3333016565e..75c527fa316 100644
|
||||
--- a/src/com/android/settings/DefaultRingtonePreference.java
|
||||
+++ b/src/com/android/settings/DefaultRingtonePreference.java
|
||||
@@ -44,6 +44,11 @@ public class DefaultRingtonePreference extends RingtonePreference {
|
||||
|
||||
@ -17,7 +17,7 @@ Change-Id: I7449a24427c966c1aa4280a7b7e7e70b60997cca
|
||||
2 files changed, 6 insertions(+)
|
||||
|
||||
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
|
||||
index 86696bb280..db1fbb4966 100644
|
||||
index 86696bb2802..db1fbb49662 100644
|
||||
--- a/src/com/android/settings/ChooseLockPassword.java
|
||||
+++ b/src/com/android/settings/ChooseLockPassword.java
|
||||
@@ -40,6 +40,7 @@ import android.view.LayoutInflater;
|
||||
@ -38,7 +38,7 @@ index 86696bb280..db1fbb4966 100644
|
||||
setTitle(msg);
|
||||
LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
|
||||
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
|
||||
index b81a3edfef..76965d1750 100644
|
||||
index b81a3edfeff..76965d17509 100644
|
||||
--- a/src/com/android/settings/ChooseLockPattern.java
|
||||
+++ b/src/com/android/settings/ChooseLockPattern.java
|
||||
@@ -26,6 +26,7 @@ import android.view.KeyEvent;
|
||||
|
||||
@ -13,7 +13,7 @@ Change-Id: I0051e5d5fc9fd3691504cb5fbb959f701e0bce6a
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/com/android/settings/accounts/AddAccountSettings.java b/src/com/android/settings/accounts/AddAccountSettings.java
|
||||
index ce16ba3d5a..c2613e7fbc 100644
|
||||
index ce16ba3d5ac..c2613e7fbc0 100644
|
||||
--- a/src/com/android/settings/accounts/AddAccountSettings.java
|
||||
+++ b/src/com/android/settings/accounts/AddAccountSettings.java
|
||||
@@ -102,7 +102,8 @@ public class AddAccountSettings extends Activity {
|
||||
|
||||
@ -18,7 +18,7 @@ Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
|
||||
1 file changed, 22 insertions(+)
|
||||
|
||||
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
|
||||
index 96c3cda1e3..81e39359d5 100755
|
||||
index 96c3cda1e38..81e39359d5e 100755
|
||||
--- a/src/com/android/settings/ApnEditor.java
|
||||
+++ b/src/com/android/settings/ApnEditor.java
|
||||
@@ -31,6 +31,7 @@ import android.database.Cursor;
|
||||
|
||||
@ -10,7 +10,7 @@ Change-Id: Ib2d53a1d22e935ef0fa5f0f91e3bf5308d9c6459
|
||||
2 files changed, 13 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Android.mk b/Android.mk
|
||||
index e645574..7112dce 100644
|
||||
index e645574d..7112dcef 100644
|
||||
--- a/Android.mk
|
||||
+++ b/Android.mk
|
||||
@@ -115,6 +115,10 @@ LOCAL_C_INCLUDES += $(TARGET_CRYPTFS_HW_PATH)
|
||||
@ -25,7 +25,7 @@ index e645574..7112dce 100644
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
diff --git a/cryptfs.c b/cryptfs.c
|
||||
index 0ae9d9f..6141624 100644
|
||||
index 0ae9d9fe..61416241 100644
|
||||
--- a/cryptfs.c
|
||||
+++ b/cryptfs.c
|
||||
@@ -76,9 +76,17 @@
|
||||
|
||||
@ -76,7 +76,7 @@ sed -i '50i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aap
|
||||
sed -i '296iLOCAL_AAPT_FLAGS += --auto-add-overlay' core/package_internal.mk;
|
||||
awk -i inplace '!/Email/' target/product/core.mk; #Remove Email
|
||||
awk -i inplace '!/Exchange2/' target/product/core.mk;
|
||||
sed -i 's/2021-06-05/2023-10-05/' core/version_defaults.mk; #Bump Security String #n-asb-2023-10 #XXX
|
||||
sed -i 's/2021-06-05/2023-11-05/' core/version_defaults.mk; #Bump Security String #n-asb-2023-11 #XXX
|
||||
fi;
|
||||
|
||||
if enterAndClear "device/qcom/sepolicy"; then
|
||||
@ -167,6 +167,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_av/319987.patch"; #n-asb-2021-12 Fix
|
||||
applyPatch "$DOS_PATCHES/android_frameworks_av/321222.patch"; #n-asb-2022-01 SimpleDecodingSource:Prevent OOB write in heap mem
|
||||
applyPatch "$DOS_PATCHES/android_frameworks_av/358729.patch"; #n-asb-2023-06 Fix NuMediaExtractor::readSampleData buffer Handling
|
||||
applyPatch "$DOS_PATCHES/android_frameworks_av/365698.patch"; #n-asb-2023-09 Fix Segv on unknown address error flagged by fuzzer test.
|
||||
applyPatch "$DOS_PATCHES/android_frameworks_av/373035.patch"; #n-asb-2023-11 Fix for heap buffer overflow issue flagged by fuzzer test.
|
||||
fi;
|
||||
|
||||
if enterAndClear "frameworks/base"; then
|
||||
@ -236,6 +237,8 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/367635.patch"; #n-asb-2023-10 R
|
||||
applyPatch "$DOS_PATCHES/android_frameworks_base/367636.patch"; #n-asb-2023-10 Fixing DatabaseUtils to detect malformed UTF-16 strings
|
||||
applyPatch "$DOS_PATCHES/android_frameworks_base/367637.patch"; #n-asb-2023-10 Do not share key mappings with JNI object
|
||||
applyPatch "$DOS_PATCHES/android_frameworks_base/367638.patch"; #n-asb-2023-10 Fix KCM key mapping cloning
|
||||
applyPatch "$DOS_PATCHES/android_frameworks_base/373033.patch"; #n-asb-2023-11 [SettingsProvider] verify ringtone URI before setting
|
||||
applyPatch "$DOS_PATCHES/android_frameworks_base/373034.patch"; #n-asb-2023-11 Use type safe API of readParcelableArray
|
||||
git revert --no-edit 0326bb5e41219cf502727c3aa44ebf2daa19a5b3; #Re-enable doze on devices without gms
|
||||
applyPatch "$DOS_PATCHES/android_frameworks_base/248599.patch"; #Make SET_TIME_ZONE permission match SET_TIME (AOSP)
|
||||
applyPatch "$DOS_PATCHES/android_frameworks_base/0001-Reduced_Resolution.patch"; #Allow reducing resolution to save power TODO: Add 800x480 (DivestOS)
|
||||
|
||||
@ -54,6 +54,7 @@ buildAll() {
|
||||
if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi;
|
||||
#frontloaded for testing
|
||||
buildDevice bluejay avb;
|
||||
buildDevice taimen avb;
|
||||
#SD820
|
||||
buildDevice h830;
|
||||
buildDevice h850;
|
||||
@ -70,7 +71,6 @@ buildAll() {
|
||||
buildDevice vs995;
|
||||
buildDevice z2_plus verity;
|
||||
#SD835
|
||||
buildDevice taimen avb;
|
||||
buildDevice walleye avb;
|
||||
buildDevice cheeseburger verity;
|
||||
buildDevice dumpling verity;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user