Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2025-01-12 07:59:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixup 9c105b79

Browse Source 
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2021-11-08 18:42:55 -05:00
parent 9c105b799f
commit c95421b6d2
8 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Patches/LineageOS-15.1/android_frameworks_base/318648.patch
View File

@ -1,4 +1,4 @@
From 340e98580c8462c961a2d840ddae289bd56f9cd5 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jayant Chowdhary <jchowdhary@google.com>
Date: Wed, 9 Jun 2021 14:34:54 -0700
Subject: [PATCH] camera2: Fix exception swallowing in params classes
@ -30,10 +30,10 @@ Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
3 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/core/java/android/hardware/camera2/params/OutputConfiguration.java b/core/java/android/hardware/camera2/params/OutputConfiguration.java
index 1ee3c933b326..71d69e665411 100644
index 05c4dc378890..2b6eb8080fd4 100644
--- a/core/java/android/hardware/camera2/params/OutputConfiguration.java
+++ b/core/java/android/hardware/camera2/params/OutputConfiguration.java
@@ -630,13 +630,7 @@ public int getSurfaceGroupId() {
@@ -501,13 +501,7 @@ public final class OutputConfiguration implements Parcelable {
new Parcelable.Creator<OutputConfiguration>() {
@Override
public OutputConfiguration createFromParcel(Parcel source) {
@ -52,7 +52,7 @@ diff --git a/core/java/android/hardware/camera2/params/VendorTagDescriptor.java
index ea424e594081..893bde1e1430 100644
--- a/core/java/android/hardware/camera2/params/VendorTagDescriptor.java
+++ b/core/java/android/hardware/camera2/params/VendorTagDescriptor.java
@@ -36,13 +36,7 @@ private VendorTagDescriptor(Parcel source) {
@@ -36,13 +36,7 @@ public final class VendorTagDescriptor implements Parcelable {
new Parcelable.Creator<VendorTagDescriptor>() {
@Override
public VendorTagDescriptor createFromParcel(Parcel source) {
@ -71,7 +71,7 @@ diff --git a/core/java/android/hardware/camera2/params/VendorTagDescriptorCache.
index 1f92f6d9ebf1..423020870869 100644
--- a/core/java/android/hardware/camera2/params/VendorTagDescriptorCache.java
+++ b/core/java/android/hardware/camera2/params/VendorTagDescriptorCache.java
@@ -36,13 +36,7 @@ private VendorTagDescriptorCache(Parcel source) {
@@ -36,13 +36,7 @@ public final class VendorTagDescriptorCache implements Parcelable {
new Parcelable.Creator<VendorTagDescriptorCache>() {
@Override
public VendorTagDescriptorCache createFromParcel(Parcel source) {

6
Patches/LineageOS-15.1/android_frameworks_base/318649.patch
View File

@ -1,4 +1,4 @@
From d6e2ed21c5c8be3dfb7916626003375f0756514b Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Hansong Zhang <hsz@google.com>
Date: Wed, 18 Aug 2021 16:35:00 -0700
Subject: [PATCH] DO NOT MERGE Bluetooth: Fix formatting in getAlias()
@ -12,10 +12,10 @@ Change-Id: Ic309f4aad116fd424d5d0d0e2016d61be8826b78
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java
index 3cf80746652e..8916b537ff29 100644
index 9498f125c2a6..7918e449acfb 100644
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -894,7 +894,14 @@ public String getAlias() {
@@ -855,7 +855,14 @@ public final class BluetoothDevice implements Parcelable {
return null;
}
try {

8
Patches/LineageOS-15.1/android_frameworks_base/318650.patch
View File

@ -1,4 +1,4 @@
From 8cc2e34a67e31f4bc08c7fb70cbd2d79fefacd42 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Evan Chen <evanxinchen@google.com>
Date: Thu, 2 Sep 2021 21:57:41 +0000
Subject: [PATCH] Backporting the change of ag/15629060 to pi-dev
@ -14,10 +14,10 @@ Test: Manual
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java
index 34139a8e58e9..06a56095aa0a 100644
index 18cec01dadf0..97fd4bd4bcf2 100644
--- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java
+++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java
@@ -64,8 +64,8 @@ public void onCreate(Bundle savedInstanceState) {
@@ -63,8 +63,8 @@ public class DeviceChooserActivity extends Activity {
final DeviceFilterPair selectedDevice = getService().mDevicesFound.get(0);
setTitle(Html.fromHtml(getString(
R.string.confirmation_title,
@ -28,7 +28,7 @@ index 34139a8e58e9..06a56095aa0a 100644
mPairButton = findViewById(R.id.button_pair);
mPairButton.setOnClickListener(v -> onDeviceConfirmed(getService().mSelectedDevice));
getService().mSelectedDevice = selectedDevice;
@@ -74,7 +74,8 @@ public void onCreate(Bundle savedInstanceState) {
@@ -73,7 +73,8 @@ public class DeviceChooserActivity extends Activity {
setContentView(R.layout.device_chooser);
mPairButton = findViewById(R.id.button_pair);
mPairButton.setVisibility(View.GONE);

6
Patches/LineageOS-15.1/android_frameworks_base/318651.patch
View File

@ -1,4 +1,4 @@
From 42d49fdc6c1fd642ee9cce75091f7a9eeea83649 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: shubang <shubang@google.com>
Date: Fri, 13 Aug 2021 15:42:15 -0700
Subject: [PATCH] TIF: fix issue of using caller-aware methods after
@ -14,10 +14,10 @@ Change-Id: Iced6c2245c0099bc4bcdaceb51f8cce4dbc0a392
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/services/core/java/com/android/server/tv/TvInputManagerService.java b/services/core/java/com/android/server/tv/TvInputManagerService.java
index d5e59c8dfd6a..e6d2cb50bf52 100644
index 1afde550f027..93b1f040d24c 100644
--- a/services/core/java/com/android/server/tv/TvInputManagerService.java
+++ b/services/core/java/com/android/server/tv/TvInputManagerService.java
@@ -1970,10 +1970,9 @@ private void ensureCaptureTvInputPermission() {
@@ -1963,10 +1963,9 @@ public final class TvInputManagerService extends SystemService {
public void requestChannelBrowsable(Uri channelUri, int userId)
throws RemoteException {
final String callingPackageName = getCallingPackageName();

6
Patches/LineageOS-15.1/android_packages_apps_Contacts/318654.patch
View File

@ -1,4 +1,4 @@
From 8cd9ccedaffec38a5845e9f624179995c21fde84 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: John Shao <johnshao@google.com>
Date: Wed, 25 Aug 2021 23:29:56 +0000
Subject: [PATCH] Add permission to start NFC activity to ensure it is from NFC
@ -13,10 +13,10 @@ Change-Id: I41b5ddf464f45e68a4da6ad880cbc9b12e447ec5
1 file changed, 1 insertion(+)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 98d7677463..221dd69289 100644
index b3d290b33..87491c80d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -492,6 +492,7 @@
@@ -490,6 +490,7 @@
<activity
android:name=".vcard.NfcImportVCardActivity"

2
Patches/LineageOS-15.1/android_vendor_nxp_opensource_external_libnfc-nci/318656.patch
View File

@ -13,7 +13,7 @@ Change-Id: I53bfc1b7eca4c3306f20488dc5fb8ccf9ed0e330
1 file changed, 10 insertions(+)
diff --git a/halimpl/pn54x/hal/phNxpNciHal_ext.c b/halimpl/pn54x/hal/phNxpNciHal_ext.c
index fff4477b..c0145500 100644
index 3f356932..1d6fd61a 100644
--- a/halimpl/pn54x/hal/phNxpNciHal_ext.c
+++ b/halimpl/pn54x/hal/phNxpNciHal_ext.c
@@ -16,6 +16,7 @@

6
Patches/LineageOS-15.1/android_vendor_nxp_opensource_external_libnfc-nci/318657.patch
View File

@ -14,10 +14,10 @@ Change-Id: I05959cc1bbba12aab896fd93684ce163217e599d
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/halimpl/pn54x/hal/phNxpNciHal_ext.c b/halimpl/pn54x/hal/phNxpNciHal_ext.c
index 3f356932..fff4477b 100644
index 1d6fd61a..c0145500 100644
--- a/halimpl/pn54x/hal/phNxpNciHal_ext.c
+++ b/halimpl/pn54x/hal/phNxpNciHal_ext.c
@@ -273,6 +273,11 @@ NFCSTATUS phNxpNciHal_process_ext_rsp(uint8_t* p_ntf, uint16_t* p_len) {
@@ -283,6 +283,11 @@ NFCSTATUS phNxpNciHal_process_ext_rsp(uint8_t* p_ntf, uint16_t* p_len) {
}
if(nxpncihal_ctrl.nci_info.nci_version != NCI_VERSION_2_0)
{
@ -29,7 +29,7 @@ index 3f356932..fff4477b 100644
#if 0 /* this is work around added initially. not required now */
if (p_ntf[p_ntf[2] + 2] == 0x00) {
NXPLOG_NCIHAL_D("> Data of ISO-15693");
@@ -291,8 +296,8 @@ NFCSTATUS phNxpNciHal_process_ext_rsp(uint8_t* p_ntf, uint16_t* p_len) {
@@ -301,8 +306,8 @@ NFCSTATUS phNxpNciHal_process_ext_rsp(uint8_t* p_ntf, uint16_t* p_len) {
icode_send_eof = 0;
} else if (*p_len == 4 && p_ntf[0] == 0x40 && p_ntf[1] == 0x02 &&
p_ntf[2] == 0x01 && p_ntf[3] == 0x06) {

6
Scripts/LineageOS-15.1/Patch.sh
View File

@ -187,7 +187,7 @@ fi;
if enterAndClear "packages/apps/Contacts"; then
applyPatch "$DOS_PATCHES_COMMON/android_packages_apps_Contacts/0001-No_Google_Links.patch"; #Remove Privacy Policy and Terms of Service links (GrapheneOS)
applyPatch "$DOS_PATCHES_COMMON/android_packages_apps_Contacts/318654.patch"; #O_asb_2021-11
applyPatch "$DOS_PATCHES/android_packages_apps_Contacts/318654.patch"; #O_asb_2021-11
fi;
if enterAndClear "packages/apps/LineageParts"; then
@ -279,8 +279,8 @@ if [ "$DOS_HOSTS_BLOCKING" = false ]; then echo "PRODUCT_PACKAGES += $DOS_HOSTS_
fi;
if enterAndClear "vendor/nxp/opensource/external/libnfc-nci"; then
applyPatch "$DOS_PATCHES_COMMON/android_packages_apps_Contacts/318656.patch"; #O_asb_2021-11
applyPatch "$DOS_PATCHES_COMMON/android_packages_apps_Contacts/318657.patch";
applyPatch "$DOS_PATCHES/android_vendor_nxp_opensource_external_libnfc-nci/318656.patch"; #O_asb_2021-11
applyPatch "$DOS_PATCHES/android_vendor_nxp_opensource_external_libnfc-nci/318657.patch";
fi;
#
#END OF ROM CHANGES