diff --git a/Patches/LineageOS-15.1/android_frameworks_base/318648.patch b/Patches/LineageOS-15.1/android_frameworks_base/318648.patch index 5a0b34b8..a0b0a1ca 100644 --- a/Patches/LineageOS-15.1/android_frameworks_base/318648.patch +++ b/Patches/LineageOS-15.1/android_frameworks_base/318648.patch @@ -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 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 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() { @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() { @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() { @Override public VendorTagDescriptorCache createFromParcel(Parcel source) { diff --git a/Patches/LineageOS-15.1/android_frameworks_base/318649.patch b/Patches/LineageOS-15.1/android_frameworks_base/318649.patch index 11dd3dfd..bee888fc 100644 --- a/Patches/LineageOS-15.1/android_frameworks_base/318649.patch +++ b/Patches/LineageOS-15.1/android_frameworks_base/318649.patch @@ -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 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 { diff --git a/Patches/LineageOS-15.1/android_frameworks_base/318650.patch b/Patches/LineageOS-15.1/android_frameworks_base/318650.patch index 991f0425..7d6b1542 100644 --- a/Patches/LineageOS-15.1/android_frameworks_base/318650.patch +++ b/Patches/LineageOS-15.1/android_frameworks_base/318650.patch @@ -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 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); diff --git a/Patches/LineageOS-15.1/android_frameworks_base/318651.patch b/Patches/LineageOS-15.1/android_frameworks_base/318651.patch index 958ed72e..b3d23d60 100644 --- a/Patches/LineageOS-15.1/android_frameworks_base/318651.patch +++ b/Patches/LineageOS-15.1/android_frameworks_base/318651.patch @@ -1,4 +1,4 @@ -From 42d49fdc6c1fd642ee9cce75091f7a9eeea83649 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: shubang 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(); diff --git a/Patches/LineageOS-15.1/android_packages_apps_Contacts/318654.patch b/Patches/LineageOS-15.1/android_packages_apps_Contacts/318654.patch index 8f9c63d2..113501a5 100644 --- a/Patches/LineageOS-15.1/android_packages_apps_Contacts/318654.patch +++ b/Patches/LineageOS-15.1/android_packages_apps_Contacts/318654.patch @@ -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 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 @@ 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) { diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index b2feeffd..78e1ebc7 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -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