mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-18 04:14:19 -05:00
Quick verify of patchWorkspace for 14.1 through 19.1
Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
parent
59bf3b75c7
commit
abddd5231f
@ -94,7 +94,7 @@ external/catch2 2b2e0e9540defee10f28ea0fc97750490fa238b5
|
||||
external/cblas 2b24922070cb6d45edd5f5b533db0637099a2b17
|
||||
external/cbor-java 00c4a382dd3810f9c1b363eaad339cff34a3f6fe
|
||||
external/chromium-trace 138ade68f9d3388a1b0a6d9ce5e091ff6f7e7448
|
||||
external/chromium-webview 3ba74728e7d0280003e37090f24fcbee46222e27
|
||||
external/chromium-webview 28006ae73bf1db2470308e8b4e677539e705c015
|
||||
external/clang f1cef8e77ae220c9379303bdc9896e0c2366bd6f
|
||||
external/cldr 242ecd0dcb21f3376f825119ec0b36fcb15e7bb8
|
||||
external/cn-cbor 6a0f6a5375b8cd9b495e91c11d21ed257ec9a905
|
||||
|
@ -201,7 +201,7 @@ external/catch2 5f8628024c5a9219caa004d6a9547aacd9ba94c1
|
||||
external/cblas 4fdeda64177f60e1b226349885b3c0ea016f3068
|
||||
external/cbor-java 6b4b6adc5ff8f91e2ddef14adf510e14aaf90204
|
||||
external/chromium-trace 9456b95a6d4b95c765c9f2264a71b0334f6cf8d7
|
||||
external/chromium-webview 3ba74728e7d0280003e37090f24fcbee46222e27
|
||||
external/chromium-webview 28006ae73bf1db2470308e8b4e677539e705c015
|
||||
external/clang 9fae335badf26813486d207b69928d38b979e522
|
||||
external/cldr 7518f37169bd87d6977244e4d7471bc48fcd62e0
|
||||
external/cn-cbor 7b581886d1830f50c3ab104a56b7ab931779466f
|
||||
@ -1016,7 +1016,7 @@ kernel/prebuilts/common-modules/virtual-device/mainline/x86-64 3e167c39dd51744d8
|
||||
kernel/prebuilts/mainline/arm64 9540c4e81f937973970c3a60c82e4896d5a0287b
|
||||
kernel/prebuilts/mainline/x86_64 71bf770c97cd6e3dadbfd49a90b983685daf3e41
|
||||
kernel/razer/msm8998 f72e9e04a0c29e64fc621090e7a6169a3327f886
|
||||
kernel/razer/sdm845 b022d6171b21e25def860985f43043262c5972fa
|
||||
kernel/razer/sdm845 13d81380c7d1c479dcdd21b4a1f9de35d49db4fa
|
||||
kernel/samsung/exynos9810 6a9461f9460ca51d1217e5069a5d5556fcc79e63
|
||||
kernel/sony/sdm660 3e2dae044d515ec25c87cd3b02a2831be858c6fc
|
||||
kernel/sony/sdm845 4ee668ab2da1095a1373ba5dee5762a43bbe1bc3
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 3d934a327765cdcadc1453c2a5615a83d9162d6f Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Ray Essick <essick@google.com>
|
||||
Date: Wed, 14 Feb 2024 11:10:41 -0600
|
||||
Subject: [PATCH] fix buffer overrun in eas_wtengine
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
||||
From e399bfb1393225413dd08c407930dbec02915b9a Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Aishwarya Mallampati <amallampati@google.com>
|
||||
Date: Wed, 23 Aug 2023 18:30:46 +0000
|
||||
Subject: [PATCH] DO NOT MERGE Block access to sms/mms db from work profile.
|
||||
@ -23,10 +23,10 @@ Change-Id: I7e4cf14fabb2c00e916504ce44816462a8b5215e
|
||||
4 files changed, 189 insertions(+), 68 deletions(-)
|
||||
|
||||
diff --git a/src/com/android/providers/telephony/MmsProvider.java b/src/com/android/providers/telephony/MmsProvider.java
|
||||
index ba057828d..7e50535c6 100755
|
||||
index ba057828..7e50535c 100755
|
||||
--- a/src/com/android/providers/telephony/MmsProvider.java
|
||||
+++ b/src/com/android/providers/telephony/MmsProvider.java
|
||||
@@ -35,6 +35,7 @@
|
||||
@@ -35,6 +35,7 @@ import android.os.Binder;
|
||||
import android.os.FileUtils;
|
||||
import android.os.ParcelFileDescriptor;
|
||||
import android.os.UserHandle;
|
||||
@ -34,7 +34,7 @@ index ba057828d..7e50535c6 100755
|
||||
import android.provider.BaseColumns;
|
||||
import android.provider.Telephony;
|
||||
import android.provider.Telephony.CanonicalAddressesColumns;
|
||||
@@ -161,6 +162,16 @@ private Cursor getPdus(int itemCount, int dataCount, String[] data) {
|
||||
@@ -161,6 +162,16 @@ public class MmsProvider extends ContentProvider {
|
||||
@Override
|
||||
public Cursor query(Uri uri, String[] projection,
|
||||
String selection, String[] selectionArgs, String sortOrder) {
|
||||
@ -51,7 +51,7 @@ index ba057828d..7e50535c6 100755
|
||||
// First check if a restricted view of the "pdu" table should be used based on the
|
||||
// caller's identity. Only system, phone or the default sms app can have full access
|
||||
// of mms data. For other apps, we present a restricted view which only contains sent
|
||||
@@ -508,6 +519,15 @@ public Uri insert(Uri uri, ContentValues values) {
|
||||
@@ -508,6 +519,15 @@ public class MmsProvider extends ContentProvider {
|
||||
if (values != null && values.containsKey(Part._DATA)) {
|
||||
return null;
|
||||
}
|
||||
@ -67,7 +67,7 @@ index ba057828d..7e50535c6 100755
|
||||
final int callerUid = Binder.getCallingUid();
|
||||
final String callerPkg = getCallingPackage();
|
||||
int msgBox = Mms.MESSAGE_BOX_ALL;
|
||||
@@ -787,6 +807,14 @@ private int getMessageBoxByMatch(int match) {
|
||||
@@ -787,6 +807,14 @@ public class MmsProvider extends ContentProvider {
|
||||
@Override
|
||||
public int delete(Uri uri, String selection,
|
||||
String[] selectionArgs) {
|
||||
@ -82,7 +82,7 @@ index ba057828d..7e50535c6 100755
|
||||
int match = sURLMatcher.match(uri);
|
||||
if (LOCAL_LOGV) {
|
||||
Log.v(TAG, "Delete uri=" + uri + ", match=" + match);
|
||||
@@ -960,6 +988,14 @@ private static int deleteDataRows(SQLiteDatabase db, String table,
|
||||
@@ -960,6 +988,14 @@ public class MmsProvider extends ContentProvider {
|
||||
|
||||
@Override
|
||||
public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
|
||||
@ -98,10 +98,10 @@ index ba057828d..7e50535c6 100755
|
||||
// it from being inadvertently set. This is not supposed to be a protection against
|
||||
// malicious attack, since sql injection could still be attempted to bypass the check. On
|
||||
diff --git a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
|
||||
index 9e5715dd6..64cc50cd0 100644
|
||||
index 9e5715dd..64cc50cd 100644
|
||||
--- a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
|
||||
+++ b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
|
||||
@@ -636,78 +636,92 @@ private void createThreadIdIndex(SQLiteDatabase db) {
|
||||
@@ -636,78 +636,92 @@ public class MmsSmsDatabaseHelper extends SQLiteOpenHelper {
|
||||
}
|
||||
}
|
||||
|
||||
@ -263,10 +263,10 @@ index 9e5715dd6..64cc50cd0 100644
|
||||
// Restricted view of pdu table, only sent/received messages without wap pushes
|
||||
db.execSQL("CREATE VIEW " + MmsProvider.VIEW_PDU_RESTRICTED + " AS " +
|
||||
diff --git a/src/com/android/providers/telephony/MmsSmsProvider.java b/src/com/android/providers/telephony/MmsSmsProvider.java
|
||||
index 7b44583e6..a9914257d 100644
|
||||
index 7b44583e..a9914257 100644
|
||||
--- a/src/com/android/providers/telephony/MmsSmsProvider.java
|
||||
+++ b/src/com/android/providers/telephony/MmsSmsProvider.java
|
||||
@@ -23,12 +23,14 @@
|
||||
@@ -23,12 +23,14 @@ import android.content.Context;
|
||||
import android.content.UriMatcher;
|
||||
import android.database.Cursor;
|
||||
import android.database.DatabaseUtils;
|
||||
@ -281,7 +281,7 @@ index 7b44583e6..a9914257d 100644
|
||||
import android.provider.BaseColumns;
|
||||
import android.provider.Telephony;
|
||||
import android.provider.Telephony.CanonicalAddressesColumns;
|
||||
@@ -335,6 +337,16 @@ public boolean onCreate() {
|
||||
@@ -335,6 +337,16 @@ public class MmsSmsProvider extends ContentProvider {
|
||||
@Override
|
||||
public Cursor query(Uri uri, String[] projection,
|
||||
String selection, String[] selectionArgs, String sortOrder) {
|
||||
@ -298,7 +298,7 @@ index 7b44583e6..a9914257d 100644
|
||||
// First check if restricted views of the "sms" and "pdu" tables should be used based on the
|
||||
// caller's identity. Only system, phone or the default sms app can have full access
|
||||
// of sms/mms data. For other apps, we present a restricted view which only contains sent
|
||||
@@ -1244,6 +1256,14 @@ public String getType(Uri uri) {
|
||||
@@ -1244,6 +1256,14 @@ public class MmsSmsProvider extends ContentProvider {
|
||||
@Override
|
||||
public int delete(Uri uri, String selection,
|
||||
String[] selectionArgs) {
|
||||
@ -313,7 +313,7 @@ index 7b44583e6..a9914257d 100644
|
||||
SQLiteDatabase db = mOpenHelper.getWritableDatabase();
|
||||
Context context = getContext();
|
||||
int affectedRows = 0;
|
||||
@@ -1300,6 +1320,14 @@ private int deleteConversation(Uri uri, String selection, String[] selectionArgs
|
||||
@@ -1300,6 +1320,14 @@ public class MmsSmsProvider extends ContentProvider {
|
||||
|
||||
@Override
|
||||
public Uri insert(Uri uri, ContentValues values) {
|
||||
@ -328,7 +328,7 @@ index 7b44583e6..a9914257d 100644
|
||||
if (URI_MATCHER.match(uri) == URI_PENDING_MSG) {
|
||||
SQLiteDatabase db = mOpenHelper.getWritableDatabase();
|
||||
long rowId = db.insert(TABLE_PENDING_MSG, null, values);
|
||||
@@ -1311,6 +1339,14 @@ public Uri insert(Uri uri, ContentValues values) {
|
||||
@@ -1311,6 +1339,14 @@ public class MmsSmsProvider extends ContentProvider {
|
||||
@Override
|
||||
public int update(Uri uri, ContentValues values,
|
||||
String selection, String[] selectionArgs) {
|
||||
@ -344,10 +344,10 @@ index 7b44583e6..a9914257d 100644
|
||||
final String callerPkg = getCallingPackage();
|
||||
SQLiteDatabase db = mOpenHelper.getWritableDatabase();
|
||||
diff --git a/src/com/android/providers/telephony/SmsProvider.java b/src/com/android/providers/telephony/SmsProvider.java
|
||||
index 208175645..6fa858751 100644
|
||||
index 20817564..6fa85875 100644
|
||||
--- a/src/com/android/providers/telephony/SmsProvider.java
|
||||
+++ b/src/com/android/providers/telephony/SmsProvider.java
|
||||
@@ -38,6 +38,7 @@
|
||||
@@ -38,6 +38,7 @@ import android.database.sqlite.SQLiteQueryBuilder;
|
||||
import android.net.Uri;
|
||||
import android.os.Binder;
|
||||
import android.os.UserHandle;
|
||||
@ -355,7 +355,7 @@ index 208175645..6fa858751 100644
|
||||
import android.provider.Contacts;
|
||||
import android.provider.Telephony;
|
||||
import android.provider.Telephony.MmsSms;
|
||||
@@ -146,6 +147,16 @@ public static String getSmsTable(boolean accessRestricted) {
|
||||
@@ -146,6 +147,16 @@ public class SmsProvider extends ContentProvider {
|
||||
@Override
|
||||
public Cursor query(Uri url, String[] projectionIn, String selection,
|
||||
String[] selectionArgs, String sort) {
|
||||
@ -372,7 +372,7 @@ index 208175645..6fa858751 100644
|
||||
// First check if a restricted view of the "sms" table should be used based on the
|
||||
// caller's identity. Only system, phone or the default sms app can have full access
|
||||
// of sms data. For other apps, we present a restricted view which only contains sent
|
||||
@@ -521,6 +532,14 @@ public Uri insert(Uri url, ContentValues initialValues) {
|
||||
@@ -521,6 +532,14 @@ public class SmsProvider extends ContentProvider {
|
||||
}
|
||||
|
||||
private Uri insertInner(Uri url, ContentValues initialValues, int callerUid, String callerPkg) {
|
||||
@ -387,7 +387,7 @@ index 208175645..6fa858751 100644
|
||||
ContentValues values;
|
||||
long rowID;
|
||||
int type = Sms.MESSAGE_TYPE_ALL;
|
||||
@@ -1050,6 +1069,14 @@ private static int charToBCD(char c) {
|
||||
@@ -1050,6 +1069,14 @@ public class SmsProvider extends ContentProvider {
|
||||
|
||||
@Override
|
||||
public int delete(Uri url, String where, String[] whereArgs) {
|
||||
@ -402,7 +402,7 @@ index 208175645..6fa858751 100644
|
||||
int count;
|
||||
int match = sURLMatcher.match(url);
|
||||
SQLiteDatabase db = getDBOpenHelper(match).getWritableDatabase();
|
||||
@@ -1161,6 +1188,14 @@ private int deleteMessageFromIcc(String messageIndexString, int subId) {
|
||||
@@ -1161,6 +1188,14 @@ public class SmsProvider extends ContentProvider {
|
||||
|
||||
@Override
|
||||
public int update(Uri url, ContentValues values, String where, String[] whereArgs) {
|
||||
|
@ -98,7 +98,7 @@ sed -i '75i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aap
|
||||
awk -i inplace '!/updatable_apex.mk/' target/product/mainline_system.mk; #Disable APEX
|
||||
sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 23/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_defaults.mk; #Set the minimum supported target SDK to Pie (GrapheneOS)
|
||||
#sed -i 's/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false/' core/product_config.mk; #broken by hardenDefconfig
|
||||
sed -i 's/2024-02-05/2024-04-05/' core/version_defaults.mk; #Bump Security String #R_asb_2024-04
|
||||
sed -i 's/2023-02-05/2024-04-05/' core/version_defaults.mk; #Bump Security String #R_asb_2024-04
|
||||
fi;
|
||||
|
||||
if enterAndClear "build/soong"; then
|
||||
|
Loading…
Reference in New Issue
Block a user