mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-06-26 06:32:28 +00:00
Churn
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad
parent
742a2fb7e2
commit
9f82763c53
|
|
@ -10,10 +10,10 @@ requiring the READ_PHONE_STATE permission.
|
|||
1 file changed, 1 insertion(+), 6 deletions(-)
|
||||
|
||||
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
|
||||
index a32aa6d895ef..fc3702c43607 100644
|
||||
index d8508eac22ed..c9b158987403 100644
|
||||
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
|
||||
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
|
||||
@@ -4479,12 +4479,7 @@ public class ActivityManagerService extends IActivityManager.Stub
|
||||
@@ -4482,12 +4482,7 @@ public class ActivityManagerService extends IActivityManager.Stub
|
||||
|
||||
ProfilerInfo profilerInfo = mAppProfiler.setupProfilerInfoLocked(thread, app, instr);
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ index cb6ef5a8f1ae..4692ddb26491 100644
|
|||
<!-- Allows applications to access information about networks.
|
||||
<p>Protection level: normal
|
||||
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
index e7c141d3e5fd..41bb1878e0dc 100644
|
||||
index 93cd3a988e62..03545705ae65 100644
|
||||
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
@@ -2632,7 +2632,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ index 27c9026c863a..4a8624222ae8 100644
|
|||
<string name="permlab_readCalendar">Read calendar events and details</string>
|
||||
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
|
||||
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
index 41bb1878e0dc..897134430015 100644
|
||||
index 03545705ae65..5652a109f618 100644
|
||||
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
@@ -2632,7 +2632,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ Subject: [PATCH] extend special runtime permission implementation
|
|||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
index 5be5d735598c..e7c141d3e5fd 100644
|
||||
index 41128e4c617e..93cd3a988e62 100644
|
||||
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
@@ -1881,7 +1881,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ Signed-off-by: Danny Lin <danny@kdrag0n.dev>
|
|||
1 file changed, 20 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
index 5e54f937fc98..5be5d735598c 100644
|
||||
index 9d0b2543e5ef..41128e4c617e 100644
|
||||
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
|
||||
@@ -1525,7 +1525,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
|
||||
|
|
|
|||
|
|
@ -38,10 +38,10 @@ Such ops are being constructed due to another bug.
|
|||
1 file changed, 3 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java
|
||||
index 3808e0c93a38..c1e5b7eeafc2 100644
|
||||
index 759099f89b76..e9d8437d84dc 100644
|
||||
--- a/services/core/java/com/android/server/appop/AppOpsService.java
|
||||
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
|
||||
@@ -5126,15 +5126,13 @@ public class AppOpsService extends IAppOpsService.Stub {
|
||||
@@ -5122,15 +5122,13 @@ public class AppOpsService extends IAppOpsService.Stub {
|
||||
String lastPkg = null;
|
||||
for (int i=0; i<allOps.size(); i++) {
|
||||
AppOpsManager.PackageOps pkg = allOps.get(i);
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@ crashes.
|
|||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java
|
||||
index c1e5b7eeafc2..162e4d91d1a2 100644
|
||||
index e9d8437d84dc..d31bb1c70854 100644
|
||||
--- a/services/core/java/com/android/server/appop/AppOpsService.java
|
||||
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
|
||||
@@ -5126,6 +5126,9 @@ public class AppOpsService extends IAppOpsService.Stub {
|
||||
@@ -5122,6 +5122,9 @@ public class AppOpsService extends IAppOpsService.Stub {
|
||||
String lastPkg = null;
|
||||
for (int i=0; i<allOps.size(); i++) {
|
||||
AppOpsManager.PackageOps pkg = allOps.get(i);
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ index 7db234a29942..1bf84aed7803 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
|
||||
index 65f5b836bfcf..4a3f25eae6af 100644
|
||||
index 65f5b836bfcf..3c8c9b6efb9e 100644
|
||||
--- a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
|
||||
+++ b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
|
||||
@@ -90,6 +90,7 @@ import android.telephony.gsm.GsmCellLocation;
|
||||
|
|
@ -95,7 +95,7 @@ index 65f5b836bfcf..4a3f25eae6af 100644
|
|||
+ false, new ContentObserver(mHandler) {
|
||||
+ @Override
|
||||
+ public void onChange(boolean selfChange) {
|
||||
+ var cr = mContext.getContentResolver();
|
||||
+ ContentResolver cr = mContext.getContentResolver();
|
||||
+ String key = Settings.Global.FORCE_DISABLE_SUPL;
|
||||
+ int def = Settings.Global.FORCE_DISABLE_SUPL_DEFAULT;
|
||||
+
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@ Subject: [PATCH] add a toggle for forcibly disabling SUPL
|
|||
---
|
||||
res/values/strings.xml | 3 ++
|
||||
res/xml/location_settings.xml | 7 +++
|
||||
.../ForceDisableSuplPrefController.java | 45 +++++++++++++++++++
|
||||
3 files changed, 55 insertions(+)
|
||||
.../ForceDisableSuplPrefController.java | 46 +++++++++++++++++++
|
||||
3 files changed, 56 insertions(+)
|
||||
create mode 100644 src/com/android/settings/location/ForceDisableSuplPrefController.java
|
||||
|
||||
diff --git a/res/values/strings.xml b/res/values/strings.xml
|
||||
index 3d44ae6ca6..d2ffb91417 100644
|
||||
index 3d44ae6ca6..b970538e6e 100644
|
||||
--- a/res/values/strings.xml
|
||||
+++ b/res/values/strings.xml
|
||||
@@ -13706,4 +13706,7 @@
|
||||
|
|
@ -42,12 +42,13 @@ index fe87efd73d..74502a7d58 100644
|
|||
<com.android.settingslib.widget.FooterPreference
|
||||
diff --git a/src/com/android/settings/location/ForceDisableSuplPrefController.java b/src/com/android/settings/location/ForceDisableSuplPrefController.java
|
||||
new file mode 100644
|
||||
index 0000000000..3a44261cc5
|
||||
index 0000000000..879174f3c8
|
||||
--- /dev/null
|
||||
+++ b/src/com/android/settings/location/ForceDisableSuplPrefController.java
|
||||
@@ -0,0 +1,45 @@
|
||||
@@ -0,0 +1,46 @@
|
||||
+package com.android.settings.location;
|
||||
+
|
||||
+import android.content.ContentResolver;
|
||||
+import android.content.Context;
|
||||
+import android.os.Process;
|
||||
+import android.provider.Settings;
|
||||
|
|
@ -71,7 +72,7 @@ index 0000000000..3a44261cc5
|
|||
+
|
||||
+ @Override
|
||||
+ public boolean isChecked() {
|
||||
+ var cr = mContext.getContentResolver();
|
||||
+ ContentResolver cr = mContext.getContentResolver();
|
||||
+ String key = Settings.Global.FORCE_DISABLE_SUPL;
|
||||
+ int def = Settings.Global.FORCE_DISABLE_SUPL_DEFAULT;
|
||||
+
|
||||
|
|
@ -80,7 +81,7 @@ index 0000000000..3a44261cc5
|
|||
+
|
||||
+ @Override
|
||||
+ public boolean setChecked(boolean isChecked) {
|
||||
+ var cr = mContext.getContentResolver();
|
||||
+ ContentResolver cr = mContext.getContentResolver();
|
||||
+ String key = Settings.Global.FORCE_DISABLE_SUPL;
|
||||
+
|
||||
+ return Settings.Global.putInt(cr, key, isChecked ? 1 : 0);
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@ Change-Id: I26dc2942736cf0cfe4e7b92ddfdd04b9d74dbae5
|
|||
1 file changed, 2 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
|
||||
index c189641..980bed6 100644
|
||||
index 79ded8f..69a5252 100644
|
||||
--- a/src/org/lineageos/updater/misc/Utils.java
|
||||
+++ b/src/org/lineageos/updater/misc/Utils.java
|
||||
@@ -154,16 +154,9 @@ public class Utils {
|
||||
@@ -153,16 +153,9 @@ public class Utils {
|
||||
String incrementalVersion = SystemProperties.get(Constants.PROP_BUILD_VERSION_INCREMENTAL);
|
||||
String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,
|
||||
SystemProperties.get(Constants.PROP_DEVICE));
|
||||
|
|
|
|||
|
|
@ -296,7 +296,7 @@ index b9c4b5d..b94fff0 100644
|
|||
mClient.connect();
|
||||
int responseCode = mClient.getResponseCode();
|
||||
diff --git a/src/org/lineageos/updater/misc/Constants.java b/src/org/lineageos/updater/misc/Constants.java
|
||||
index 554098e..dbdc983 100644
|
||||
index 6144ed7..37e81d8 100644
|
||||
--- a/src/org/lineageos/updater/misc/Constants.java
|
||||
+++ b/src/org/lineageos/updater/misc/Constants.java
|
||||
@@ -30,6 +30,7 @@ public final class Constants {
|
||||
|
|
@ -308,7 +308,7 @@ index 554098e..dbdc983 100644
|
|||
public static final String PREF_AB_PERF_MODE = "ab_perf_mode";
|
||||
public static final String PREF_MOBILE_DATA_WARNING = "pref_mobile_data_warning";
|
||||
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
|
||||
index 980bed6..73985da 100644
|
||||
index 69a5252..2b42726 100644
|
||||
--- a/src/org/lineageos/updater/misc/Utils.java
|
||||
+++ b/src/org/lineageos/updater/misc/Utils.java
|
||||
@@ -44,6 +44,7 @@ import java.io.BufferedReader;
|
||||
|
|
@ -319,7 +319,7 @@ index 980bed6..73985da 100644
|
|||
import java.util.ArrayList;
|
||||
import java.util.Enumeration;
|
||||
import java.util.HashSet;
|
||||
@@ -150,11 +151,75 @@ public class Utils {
|
||||
@@ -149,11 +150,75 @@ public class Utils {
|
||||
return updates;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,66 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tad <tad@spotco.us>
|
||||
Date: Sun, 8 Jan 2023 21:16:28 -0500
|
||||
Subject: [PATCH] Enable stabilization by default
|
||||
|
||||
Change-Id: I77417dd0877f8ea765b1fd70ac824c743d3ed3a0
|
||||
Signed-off-by: Tad <tad@spotco.us>
|
||||
---
|
||||
.../java/org/lineageos/aperture/SharedPreferencesExt.kt | 6 +++---
|
||||
app/src/main/res/xml/root_preferences.xml | 6 +++---
|
||||
2 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/app/src/main/java/org/lineageos/aperture/SharedPreferencesExt.kt b/app/src/main/java/org/lineageos/aperture/SharedPreferencesExt.kt
|
||||
index accf276..c3ac511 100644
|
||||
--- a/app/src/main/java/org/lineageos/aperture/SharedPreferencesExt.kt
|
||||
+++ b/app/src/main/java/org/lineageos/aperture/SharedPreferencesExt.kt
|
||||
@@ -331,7 +331,7 @@ internal var SharedPreferences.lastSavedUri: Uri?
|
||||
// Image stabilization
|
||||
private const val IMAGE_STABILIZATION_KEY = "image_stabilization"
|
||||
internal val SharedPreferences.imageStabilizationMode: StabilizationMode
|
||||
- get() = if (getBoolean(IMAGE_STABILIZATION_KEY, false)) {
|
||||
+ get() = if (getBoolean(IMAGE_STABILIZATION_KEY, true)) {
|
||||
StabilizationMode.OPTICAL
|
||||
} else {
|
||||
StabilizationMode.OFF
|
||||
@@ -343,8 +343,8 @@ private const val VIDEO_STABILIZATION_OIS_KEY = "video_stabilization_ois"
|
||||
private const val VIDEO_STABILIZATION_PREVIEW_KEY = "video_stabilization_preview"
|
||||
internal val SharedPreferences.videoStabilizationMode: StabilizationMode
|
||||
get() {
|
||||
- val videoStabilization = getBoolean(VIDEO_STABILIZATION_KEY, false)
|
||||
- val videoStabilizationOis = getBoolean(VIDEO_STABILIZATION_OIS_KEY, false)
|
||||
+ val videoStabilization = getBoolean(VIDEO_STABILIZATION_KEY, true)
|
||||
+ val videoStabilizationOis = getBoolean(VIDEO_STABILIZATION_OIS_KEY, true)
|
||||
val videoStabilizationPreview = getBoolean(VIDEO_STABILIZATION_PREVIEW_KEY, false)
|
||||
|
||||
return when {
|
||||
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
|
||||
index 96eb553..507ceb8 100644
|
||||
--- a/app/src/main/res/xml/root_preferences.xml
|
||||
+++ b/app/src/main/res/xml/root_preferences.xml
|
||||
@@ -53,7 +53,7 @@
|
||||
app:useSimpleSummaryProvider="true" />
|
||||
|
||||
<SwitchPreference
|
||||
- app:defaultValue="false"
|
||||
+ app:defaultValue="true"
|
||||
app:iconSpaceReserved="false"
|
||||
app:key="image_stabilization"
|
||||
app:summary="@string/image_stabilization_summary"
|
||||
@@ -66,14 +66,14 @@
|
||||
app:title="@string/video_header">
|
||||
|
||||
<SwitchPreference
|
||||
- app:defaultValue="false"
|
||||
+ app:defaultValue="true"
|
||||
app:iconSpaceReserved="false"
|
||||
app:key="video_stabilization"
|
||||
app:summary="@string/video_stabilization_summary"
|
||||
app:title="@string/video_stabilization_title" />
|
||||
|
||||
<SwitchPreference
|
||||
- app:defaultValue="false"
|
||||
+ app:defaultValue="true"
|
||||
app:iconSpaceReserved="false"
|
||||
app:key="video_stabilization_ois"
|
||||
app:summary="@string/video_stabilization_ois_summary"
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 5d411c4057ecabb24fac5aabaecee27a29d37ae7
|
||||
Subproject commit e112eec32dc4ccb944011bca56b98f96aeb8cbbc
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit f0d83f62a1485644e2d3967916171c1552612977
|
||||
Subproject commit 7c98239521f3c3ddcb79642675650c2360d4eb77
|
||||
|
|
@ -80,9 +80,8 @@ patchWorkspace() {
|
|||
verifyAllPlatformTags;
|
||||
gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
|
||||
|
||||
source build/envsetup.sh;
|
||||
#source build/envsetup.sh;
|
||||
#repopick -it ten-firewall;
|
||||
repopick -it Q_asb_2023-02;
|
||||
|
||||
sh "$DOS_SCRIPTS/Patch.sh";
|
||||
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
|
||||
|
|
|
|||
|
|
@ -189,10 +189,6 @@ rm -rf packages/OsuLogin; #Automatic Wi-Fi connection non-sense
|
|||
rm -rf packages/PrintRecommendationService; #Creates popups to install proprietary print apps
|
||||
fi;
|
||||
|
||||
if enterAndClear "frameworks/ml"; then
|
||||
git fetch https://github.com/LineageOS/android_frameworks_ml refs/changes/94/348894/1 && git cherry-pick FETCH_HEAD; #Q_asb_2023-02
|
||||
fi;
|
||||
|
||||
if enterAndClear "frameworks/native"; then
|
||||
applyPatch "$DOS_PATCHES/android_frameworks_native/0001-Sensors.patch"; #Require OTHER_SENSORS permission for sensors (GrapheneOS)
|
||||
fi;
|
||||
|
|
|
|||
|
|
@ -109,11 +109,10 @@ patchWorkspace() {
|
|||
verifyAllPlatformTags;
|
||||
gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
|
||||
|
||||
source build/envsetup.sh;
|
||||
#source build/envsetup.sh;
|
||||
#repopick -it eleven-firewall;
|
||||
#repopick -i 314453; #TaskViewTouchController: Null check current animation on drag
|
||||
#repopick -i 325011; #lineage: Opt-in to shipping full recovery image by default
|
||||
repopick -it R_asb_2023-02;
|
||||
|
||||
sh "$DOS_SCRIPTS/Patch.sh";
|
||||
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
|
||||
|
|
|
|||
|
|
@ -183,10 +183,6 @@ if enterAndClear "frameworks/ex"; then
|
|||
if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_ex/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
|
||||
fi;
|
||||
|
||||
if enterAndClear "frameworks/ml"; then
|
||||
git fetch https://github.com/LineageOS/android_frameworks_ml refs/changes/79/348879/1 && git cherry-pick FETCH_HEAD; #R_asb_2023-02
|
||||
fi;
|
||||
|
||||
if enterAndClear "frameworks/native"; then
|
||||
applyPatch "$DOS_PATCHES/android_frameworks_native/0001-Sensors.patch"; #Require OTHER_SENSORS permission for sensors (GrapheneOS)
|
||||
applyPatch "$DOS_PATCHES/android_frameworks_native/0002-fix-uaf.patch"; #Fix use-after-free in adbd_auth (GrapheneOS)
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ buildAll() {
|
|||
buildDevice discovery;
|
||||
#SD835
|
||||
buildDevice cheryl verity;
|
||||
buildDevice mata verity;
|
||||
#buildDevice mata verity; #superseded
|
||||
#SD632
|
||||
buildDevice FP3 avb;
|
||||
#SD855
|
||||
|
|
@ -74,11 +74,10 @@ patchWorkspace() {
|
|||
verifyAllPlatformTags;
|
||||
gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
|
||||
|
||||
source build/envsetup.sh;
|
||||
#source build/envsetup.sh;
|
||||
#repopick -ift twelve-bt-sbc-hd-dualchannel;
|
||||
#repopick -it twelve-colors;
|
||||
repopick -if 330099; #Updater: Add prop for allowing major updates
|
||||
#repopick -it S_asb_2023-02;
|
||||
|
||||
sh "$DOS_SCRIPTS/Patch.sh";
|
||||
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
|
||||
|
|
|
|||
|
|
@ -258,10 +258,6 @@ if enterAndClear "lineage-sdk"; then
|
|||
if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then awk -i inplace '!/LineageAudioService/' lineage/res/res/values/config.xml; fi; #Remove AudioFX
|
||||
fi;
|
||||
|
||||
if enterAndClear "packages/apps/Aperture"; then
|
||||
applyPatch "$DOS_PATCHES/android_packages_apps_Aperture/0001-IS.patch"; #Enable stabilization by default (DivestOS)
|
||||
fi;
|
||||
|
||||
#if enterAndClear "packages/apps/CarrierConfig"; then
|
||||
#rm -rf assets/*.xml;
|
||||
#cp $DOS_PATCHES_COMMON/android_packages_apps_CarrierConfig/*.xml assets/;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user