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

Sync reflog extracted commits with Gerrit originals

Browse source
This commit is contained in:
Tad 2021-06-15 21:04:37 -04:00
parent d42c8f033d
commit fe1f9ec7c4
6 changed files with 29 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Patches/LineageOS-16.0/android_packages_apps_Backgrounds/308977.patch
View file

@ -15,7 +15,7 @@ diff --git a/app/src/main/java/org/lineageos/backgrounds/factory/BuiltInWallpape
index 7508d3c..264fa6b 100644 index 7508d3c..264fa6b 100644
--- a/app/src/main/java/org/lineageos/backgrounds/factory/BuiltInWallpaperFactory.java --- a/app/src/main/java/org/lineageos/backgrounds/factory/BuiltInWallpaperFactory.java
+++ b/app/src/main/java/org/lineageos/backgrounds/factory/BuiltInWallpaperFactory.java +++ b/app/src/main/java/org/lineageos/backgrounds/factory/BuiltInWallpaperFactory.java
@@ -18,6 +18,7 @@ package org.lineageos.backgrounds.factory; @@ -18,6 +18,7 @@
import android.app.WallpaperManager; import android.app.WallpaperManager;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
@ -23,7 +23,7 @@ index 7508d3c..264fa6b 100644
import androidx.annotation.DrawableRes; import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@@ -25,6 +26,7 @@ import androidx.annotation.NonNull; @@ -25,6 +26,7 @@
import org.lineageos.backgrounds.R; import org.lineageos.backgrounds.R;
import org.lineageos.backgrounds.bundle.WallpaperBundle; import org.lineageos.backgrounds.bundle.WallpaperBundle;
import org.lineageos.backgrounds.bundle.WallpaperType; import org.lineageos.backgrounds.bundle.WallpaperType;
@ -31,7 +31,7 @@ index 7508d3c..264fa6b 100644
public final class BuiltInWallpaperFactory { public final class BuiltInWallpaperFactory {
@@ -33,8 +35,9 @@ public final class BuiltInWallpaperFactory { @@ -33,8 +35,9 @@ private BuiltInWallpaperFactory() {
public static WallpaperBundle build(@NonNull final String name, public static WallpaperBundle build(@NonNull final String name,
@NonNull final Resources res, @NonNull final Resources res,
@ -47,7 +47,7 @@ diff --git a/app/src/main/java/org/lineageos/backgrounds/util/UiUtils.java b/app
index 2d5b798..b0de83b 100644 index 2d5b798..b0de83b 100644
--- a/app/src/main/java/org/lineageos/backgrounds/util/UiUtils.java --- a/app/src/main/java/org/lineageos/backgrounds/util/UiUtils.java
+++ b/app/src/main/java/org/lineageos/backgrounds/util/UiUtils.java +++ b/app/src/main/java/org/lineageos/backgrounds/util/UiUtils.java
@@ -17,6 +17,9 @@ package org.lineageos.backgrounds.util; @@ -17,6 +17,9 @@
import android.view.View; import android.view.View;
import android.view.Window; import android.view.Window;
@ -57,7 +57,7 @@ index 2d5b798..b0de83b 100644
import androidx.annotation.ColorInt; import androidx.annotation.ColorInt;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@@ -38,4 +41,41 @@ public final class UiUtils { @@ -38,4 +41,41 @@ public static void setStatusBarColor(@NonNull final Window window, @ColorInt fin
window.getDecorView().setSystemUiVisibility(flags); window.getDecorView().setSystemUiVisibility(flags);
} }
@ -99,6 +99,3 @@ index 2d5b798..b0de83b 100644
+ return BitmapFactory.decodeResource(res, resId, options); + return BitmapFactory.decodeResource(res, resId, options);
+ } + }
} }
--
2.31.1

5
Patches/LineageOS-18.1/android_device_htc_msm8974-common/312412.patch
View file

@ -11,7 +11,7 @@ Change-Id: I3cc0a885c11670cb67a33f5272d23cea41e0ec13
1 file changed, 3 insertions(+), 1 deletion(-) 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 5fad8c7..647eab8 100644 index 5fad8c7f..647eab89 100644
--- a/BoardConfigCommon.mk --- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
@ -31,6 +31,3 @@ index 5fad8c7..647eab8 100644
/system/vendor/lib/libril-qc-qmi-1.so|libshim_ril.so /system/vendor/lib/libril-qc-qmi-1.so|libshim_ril.so
# Wifi # Wifi
--
2.31.1

13
Patches/LineageOS-18.1/android_packages_apps_LineageParts/311606.patch
View file

@ -1,4 +1,4 @@
From 653c059e47ea39766d7ab62f6408351d9fc7e9d7 Mon Sep 17 00:00:00 2001 From 61685846ab27c87dd0646478c4d3c5098d584daa Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com> From: Bruno Martins <bgcngm@gmail.com>
Date: Sun, 6 Jun 2021 14:18:24 +0100 Date: Sun, 6 Jun 2021 14:18:24 +0100
Subject: [PATCH] profiles: Add FLAG_IMMUTABLE flag for security purposes Subject: [PATCH] profiles: Add FLAG_IMMUTABLE flag for security purposes
@ -12,7 +12,7 @@ Change-Id: Id5144fb3f11fc98380de0188df0f32330e976398
2 files changed, 5 insertions(+), 4 deletions(-) 2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/org/lineageos/lineageparts/profiles/NFCProfileWriter.java b/src/org/lineageos/lineageparts/profiles/NFCProfileWriter.java diff --git a/src/org/lineageos/lineageparts/profiles/NFCProfileWriter.java b/src/org/lineageos/lineageparts/profiles/NFCProfileWriter.java
index d477d69..d651e9b 100644 index d477d6969..d651e9b5c 100644
--- a/src/org/lineageos/lineageparts/profiles/NFCProfileWriter.java --- a/src/org/lineageos/lineageparts/profiles/NFCProfileWriter.java
+++ b/src/org/lineageos/lineageparts/profiles/NFCProfileWriter.java +++ b/src/org/lineageos/lineageparts/profiles/NFCProfileWriter.java
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
@ -23,7 +23,7 @@ index d477d69..d651e9b 100644
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -84,7 +84,8 @@ public class NFCProfileWriter extends Activity { @@ -84,7 +84,8 @@ protected void onPause() {
private PendingIntent getPendingIntent() { private PendingIntent getPendingIntent() {
return PendingIntent.getActivity(this, 0, return PendingIntent.getActivity(this, 0,
@ -34,7 +34,7 @@ index d477d69..d651e9b 100644
private void disableTagWriteMode() { private void disableTagWriteMode() {
diff --git a/src/org/lineageos/lineageparts/profiles/triggers/NfcTriggerFragment.java b/src/org/lineageos/lineageparts/profiles/triggers/NfcTriggerFragment.java diff --git a/src/org/lineageos/lineageparts/profiles/triggers/NfcTriggerFragment.java b/src/org/lineageos/lineageparts/profiles/triggers/NfcTriggerFragment.java
index adb684c..aac9839 100644 index adb684c32..aac98393c 100644
--- a/src/org/lineageos/lineageparts/profiles/triggers/NfcTriggerFragment.java --- a/src/org/lineageos/lineageparts/profiles/triggers/NfcTriggerFragment.java
+++ b/src/org/lineageos/lineageparts/profiles/triggers/NfcTriggerFragment.java +++ b/src/org/lineageos/lineageparts/profiles/triggers/NfcTriggerFragment.java
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
@ -45,7 +45,7 @@ index adb684c..aac9839 100644
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -89,7 +89,7 @@ public class NfcTriggerFragment extends Fragment implements NFCProfileTagCallbac @@ -89,7 +89,7 @@ public void onPause() {
private PendingIntent getPendingIntent() { private PendingIntent getPendingIntent() {
Intent intent = new Intent(getActivity(), getActivity().getClass()) Intent intent = new Intent(getActivity(), getActivity().getClass())
.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
@ -54,6 +54,3 @@ index adb684c..aac9839 100644
} }
private void disableTagWriteMode() { private void disableTagWriteMode() {
--
2.31.1

11
Patches/LineageOS-18.1/android_packages_apps_Recorder/311607.patch
View file

@ -13,7 +13,7 @@ Change-Id: Id1ebbfabb7e6282f371d10d0a9648aa99822cadc
1 file changed, 13 insertions(+), 8 deletions(-) 1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/org/lineageos/recorder/service/SoundRecorderService.java b/app/src/main/java/org/lineageos/recorder/service/SoundRecorderService.java diff --git a/app/src/main/java/org/lineageos/recorder/service/SoundRecorderService.java b/app/src/main/java/org/lineageos/recorder/service/SoundRecorderService.java
index 20bf748..b28763f 100644 index 20bf748d..b28763f9 100644
--- a/app/src/main/java/org/lineageos/recorder/service/SoundRecorderService.java --- a/app/src/main/java/org/lineageos/recorder/service/SoundRecorderService.java
+++ b/app/src/main/java/org/lineageos/recorder/service/SoundRecorderService.java +++ b/app/src/main/java/org/lineageos/recorder/service/SoundRecorderService.java
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
@ -24,7 +24,7 @@ index 20bf748..b28763f 100644
package org.lineageos.recorder.service; package org.lineageos.recorder.service;
import android.app.Notification; import android.app.Notification;
@@ -277,10 +278,11 @@ public class SoundRecorderService extends Service { @@ -277,10 +278,11 @@ private Notification createRecordingNotification() {
} }
Intent intent = new Intent(this, RecorderActivity.class); Intent intent = new Intent(this, RecorderActivity.class);
@ -38,7 +38,7 @@ index 20bf748..b28763f 100644
String duration = DateUtils.formatElapsedTime(mSbRecycle, mElapsedTime.get()); String duration = DateUtils.formatElapsedTime(mSbRecycle, mElapsedTime.get());
NotificationCompat.Builder nb = new NotificationCompat.Builder(this, NOTIFICATION_CHANNEL) NotificationCompat.Builder nb = new NotificationCompat.Builder(this, NOTIFICATION_CHANNEL)
@@ -293,11 +295,13 @@ public class SoundRecorderService extends Service { @@ -293,11 +295,13 @@ private Notification createRecordingNotification() {
if (mIsPaused) { if (mIsPaused) {
PendingIntent resumePIntent = PendingIntent.getService(this, 0, PendingIntent resumePIntent = PendingIntent.getService(this, 0,
@ -54,7 +54,7 @@ index 20bf748..b28763f 100644
nb.addAction(R.drawable.ic_pause, getString(R.string.pause), pausePIntent); nb.addAction(R.drawable.ic_pause, getString(R.string.pause), pausePIntent);
} }
nb.addAction(R.drawable.ic_stop, getString(R.string.stop), stopPIntent); nb.addAction(R.drawable.ic_stop, getString(R.string.stop), stopPIntent);
@@ -314,16 +318,17 @@ public class SoundRecorderService extends Service { @@ -314,16 +318,17 @@ private void createShareNotification(@Nullable String uri) {
String mimeType = mRecorder.getMimeType(); String mimeType = mRecorder.getMimeType();
Intent intent = new Intent(this, ListActivity.class); Intent intent = new Intent(this, ListActivity.class);
@ -76,6 +76,3 @@ index 20bf748..b28763f 100644
String duration = DateUtils.formatElapsedTime(mSbRecycle, mElapsedTime.get()); String duration = DateUtils.formatElapsedTime(mSbRecycle, mElapsedTime.get());
Notification notification = new NotificationCompat.Builder(this, NOTIFICATION_CHANNEL) Notification notification = new NotificationCompat.Builder(this, NOTIFICATION_CHANNEL)
--
2.31.1

23
Patches/LineageOS-18.1/android_packages_providers_TelephonyProvider/304614.patch
View file

@ -1,4 +1,4 @@
From 187d72f4843939180e9978d6ec0f0f8d7ea1e66e Mon Sep 17 00:00:00 2001 From 54828510a0eadfc6ba663a61a2a056ed55ab7e21 Mon Sep 17 00:00:00 2001
From: Mattias Nilsson <mattias.nilsson@sony.com> From: Mattias Nilsson <mattias.nilsson@sony.com>
Date: Fri, 13 Nov 2020 22:30:08 +0100 Date: Fri, 13 Nov 2020 22:30:08 +0100
Subject: [PATCH] Mcc and mnc from xml in RRO may be integers Subject: [PATCH] Mcc and mnc from xml in RRO may be integers
@ -29,10 +29,10 @@ Change-Id: I244ad0f76f360a0635343187e455b54c90ec45b4
1 file changed, 23 insertions(+), 12 deletions(-) 1 file changed, 23 insertions(+), 12 deletions(-)
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index 3cb4abe..b1b3146 100644 index 3cb4abeb..b1b3146d 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java --- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java +++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -128,6 +128,7 @@ import java.io.FileNotFoundException; @@ -128,6 +128,7 @@
import java.io.FileReader; import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -40,7 +40,7 @@ index 3cb4abe..b1b3146 100644
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
@@ -752,7 +753,7 @@ public class TelephonyProvider extends ContentProvider @@ -752,7 +753,7 @@ private void initDatabase(SQLiteDatabase db) {
try { try {
XmlUtils.beginDocument(parser, "apns"); XmlUtils.beginDocument(parser, "apns");
publicversion = Integer.parseInt(parser.getAttributeValue(null, "version")); publicversion = Integer.parseInt(parser.getAttributeValue(null, "version"));
@ -49,7 +49,7 @@ index 3cb4abe..b1b3146 100644
} catch (Exception e) { } catch (Exception e) {
loge("Got exception while loading APN database." + e); loge("Got exception while loading APN database." + e);
} finally { } finally {
@@ -782,7 +783,7 @@ public class TelephonyProvider extends ContentProvider @@ -782,7 +783,7 @@ private void initDatabase(SQLiteDatabase db) {
+ confFile.getAbsolutePath()); + confFile.getAbsolutePath());
} }
@ -58,7 +58,7 @@ index 3cb4abe..b1b3146 100644
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
// It's ok if the file isn't found. It means there isn't a confidential file // It's ok if the file isn't found. It means there isn't a confidential file
// Log.e(TAG, "File not found: '" + confFile.getAbsolutePath() + "'"); // Log.e(TAG, "File not found: '" + confFile.getAbsolutePath() + "'");
@@ -1665,7 +1666,7 @@ public class TelephonyProvider extends ContentProvider @@ -1665,7 +1666,7 @@ private void deleteMatchingApns(SQLiteDatabase db, XmlPullParser parser) {
try { try {
XmlUtils.nextElement(parser); XmlUtils.nextElement(parser);
while (parser.getEventType() != XmlPullParser.END_DOCUMENT) { while (parser.getEventType() != XmlPullParser.END_DOCUMENT) {
@ -67,7 +67,7 @@ index 3cb4abe..b1b3146 100644
if (row == null) { if (row == null) {
throw new XmlPullParserException("Expected 'apn' tag", parser, null); throw new XmlPullParserException("Expected 'apn' tag", parser, null);
} }
@@ -2072,9 +2073,10 @@ public class TelephonyProvider extends ContentProvider @@ -2072,9 +2073,10 @@ private void getBlobValueFromCursor(ContentValues cv, Cursor c, String key) {
* Gets the next row of apn values. * Gets the next row of apn values.
* *
* @param parser the parser * @param parser the parser
@ -79,7 +79,7 @@ index 3cb4abe..b1b3146 100644
if (!"apn".equals(parser.getName())) { if (!"apn".equals(parser.getName())) {
return null; return null;
} }
@@ -2083,11 +2085,21 @@ public class TelephonyProvider extends ContentProvider @@ -2083,11 +2085,21 @@ private ContentValues getRow(XmlPullParser parser) {
String mcc = parser.getAttributeValue(null, "mcc"); String mcc = parser.getAttributeValue(null, "mcc");
String mnc = parser.getAttributeValue(null, "mnc"); String mnc = parser.getAttributeValue(null, "mnc");
@ -105,7 +105,7 @@ index 3cb4abe..b1b3146 100644
map.put(NAME, parser.getAttributeValue(null, "carrier")); map.put(NAME, parser.getAttributeValue(null, "carrier"));
// do not add NULL to the map so that default values can be inserted in db // do not add NULL to the map so that default values can be inserted in db
@@ -2156,7 +2168,6 @@ public class TelephonyProvider extends ContentProvider @@ -2156,7 +2168,6 @@ private ContentValues getRow(XmlPullParser parser) {
map.put(MVNO_MATCH_DATA, mvno_match_data); map.put(MVNO_MATCH_DATA, mvno_match_data);
} }
} }
@ -113,7 +113,7 @@ index 3cb4abe..b1b3146 100644
return map; return map;
} }
@@ -2189,15 +2200,15 @@ public class TelephonyProvider extends ContentProvider @@ -2189,15 +2200,15 @@ private void addBoolAttribute(XmlPullParser parser, String att,
* *
* @param db the sqlite database to write to * @param db the sqlite database to write to
* @param parser the xml parser * @param parser the xml parser
@ -132,6 +132,3 @@ index 3cb4abe..b1b3146 100644
if (row == null) { if (row == null) {
throw new XmlPullParserException("Expected 'apn' tag", parser, null); throw new XmlPullParserException("Expected 'apn' tag", parser, null);
} }
--
2.31.1

11
Patches/LineageOS-18.1/android_packages_providers_TelephonyProvider/312102.patch
View file

@ -1,4 +1,4 @@
From d459c7003584f6a47bb6723238d77a1c8cb4b5dd Mon Sep 17 00:00:00 2001 From 523729038f471ac87dce34f4a48ba4dcf5bfdd34 Mon Sep 17 00:00:00 2001
From: Mattias Nilsson <Mattias.Nilsson@sony.com> From: Mattias Nilsson <Mattias.Nilsson@sony.com>
Date: Thu, 15 Apr 2021 17:11:27 +0200 Date: Thu, 15 Apr 2021 17:11:27 +0200
Subject: [PATCH] MNCs not in carrier_list can get the wrong MNC value Subject: [PATCH] MNCs not in carrier_list can get the wrong MNC value
@ -17,10 +17,10 @@ Change-Id: I1dbccf9d75a7a8ae896ca483935bc5e007843e75
1 file changed, 58 insertions(+), 10 deletions(-) 1 file changed, 58 insertions(+), 10 deletions(-)
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index b1b3146..6bddde9 100644 index b1b3146d..6bddde93 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java --- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java +++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -260,6 +260,40 @@ public class TelephonyProvider extends ContentProvider @@ -260,6 +260,40 @@
private boolean mManagedApnEnforced; private boolean mManagedApnEnforced;
@ -61,7 +61,7 @@ index b1b3146..6bddde9 100644
/** /**
* Available radio technologies for GSM, UMTS and CDMA. * Available radio technologies for GSM, UMTS and CDMA.
* Duplicates the constants from hardware/radio/include/ril.h * Duplicates the constants from hardware/radio/include/ril.h
@@ -4151,18 +4185,32 @@ public class TelephonyProvider extends ContentProvider @@ -4151,18 +4185,32 @@ private static String getBestStringMnc(Context context, String mcc, int mnc) {
} }
String twoDigitMnc = String.format(Locale.getDefault(), "%02d", mnc); String twoDigitMnc = String.format(Locale.getDefault(), "%02d", mnc);
String threeDigitMnc = "0" + twoDigitMnc; String threeDigitMnc = "0" + twoDigitMnc;
@ -104,6 +104,3 @@ index b1b3146..6bddde9 100644
} }
} }
--
2.31.1