Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2022-10-24 22:53:41 -04:00
parent 6de5e499fa
commit 11780d890f
9 changed files with 18 additions and 15 deletions

View File

@ -145,7 +145,7 @@ index 6860759eea8a..a2eef62f80be 100644
OsConstants._LINUX_CAPABILITY_VERSION_3, 0);
StructCapUserData[] data;
diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java
index 993e4e7b4b3d..756547706f60 100644
index 993e4e7b4b3d..c3e6e0453b50 100644
--- a/core/java/com/android/internal/os/ZygoteConnection.java
+++ b/core/java/com/android/internal/os/ZygoteConnection.java
@@ -29,6 +29,7 @@ import android.net.Credentials;

View File

@ -78,7 +78,7 @@ index b1e7d15cbf4a..96b56f7bd1d6 100644
+ public static native void nativeHandleRuntimeFlags(int runtimeFlags);
}
diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java
index 27518dd4cdce..a8d9400c7992 100644
index 4573cb2c0b59..9cc90f3ac142 100644
--- a/core/java/com/android/internal/os/ZygoteConnection.java
+++ b/core/java/com/android/internal/os/ZygoteConnection.java
@@ -539,7 +539,7 @@ class ZygoteConnection {

View File

@ -10,7 +10,7 @@ spawning when doing debugging.
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java
index 756547706f60..27518dd4cdce 100644
index c3e6e0453b50..4573cb2c0b59 100644
--- a/core/java/com/android/internal/os/ZygoteConnection.java
+++ b/core/java/com/android/internal/os/ZygoteConnection.java
@@ -536,7 +536,8 @@ class ZygoteConnection {

View File

@ -44,7 +44,7 @@ index 61e2db495a..3a06288497 100644
android:title="@string/native_debug_title"
diff --git a/src/com/android/settings/security/ExecSpawnPreferenceController.java b/src/com/android/settings/security/ExecSpawnPreferenceController.java
new file mode 100644
index 0000000000..78f021210a
index 0000000000..98cc3c29e1
--- /dev/null
+++ b/src/com/android/settings/security/ExecSpawnPreferenceController.java
@@ -0,0 +1,106 @@

View File

@ -90,7 +90,7 @@ index 95e3166..0a07369 100644
if (setupWizardApp.getSettingsBundle().containsKey(DISABLE_NAV_KEYS)) {
writeDisableNavkeysOption(setupWizardApp,
diff --git a/src/org/lineageos/setupwizard/LineageSettingsActivity.java b/src/org/lineageos/setupwizard/LineageSettingsActivity.java
index ace417f..5f77401 100644
index 9d1055c..d0c3aca 100644
--- a/src/org/lineageos/setupwizard/LineageSettingsActivity.java
+++ b/src/org/lineageos/setupwizard/LineageSettingsActivity.java
@@ -18,7 +18,6 @@
@ -101,7 +101,7 @@ index ace417f..5f77401 100644
import android.app.Activity;
import android.content.Context;
@@ -50,17 +49,10 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
@@ -48,17 +47,10 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
private SetupWizardApp mSetupWizardApp;
@ -119,7 +119,7 @@ index ace417f..5f77401 100644
private final View.OnClickListener mNavKeysClickListener = view -> {
boolean checked = !mNavKeys.isChecked();
mNavKeys.setChecked(checked);
@@ -80,20 +72,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
@@ -79,20 +71,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
privacyPolicy, policySummary);
getGlifLayout().setDescriptionText(servicesFullDescription);
@ -140,7 +140,7 @@ index ace417f..5f77401 100644
View navKeysRow = findViewById(R.id.nav_keys);
navKeysRow.setOnClickListener(mNavKeysClickListener);
mNavKeys = (CheckBox) findViewById(R.id.nav_keys_checkbox);
@@ -110,7 +88,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
@@ -109,7 +87,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
public void onResume() {
super.onResume();
updateDisableNavkeysOption();
@ -148,7 +148,7 @@ index ace417f..5f77401 100644
}
@Override
@@ -134,15 +111,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
@@ -133,15 +110,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
return R.drawable.ic_features;
}

View File

@ -83,6 +83,7 @@ patchWorkspace() {
repopick -it P_asb_2022-08;
repopick -it P_asb_2022-09;
repopick -it P_asb_2022-10;
repopick -it P_tzdata_2022;
sh "$DOS_SCRIPTS/Patch.sh";
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";

View File

@ -71,16 +71,16 @@ buildAll() {
buildDevice aurora avb;
buildDevice xz2c avb;
#SD730
buildDevice sunfish avb; #superseded
#buildDevice sunfish avb; #superseded
#SD632
buildDevice FP3 avb;
#SD750
buildDevice FP4 avb; #unb #superseded
#SD855
buildDevice guacamole avb; #unb #superseded
buildDevice guacamoleb avb; #unb #superseded
buildDevice hotdog avb; #unb #superseded
buildDevice hotdogb avb; #unb #superseded
buildDevice guacamole avb; #superseded
buildDevice guacamoleb avb; #superseded
buildDevice hotdog avb; #superseded
buildDevice hotdogb avb; #superseded
#buildDevice coral avb; #superseded
#buildDevice flame avb; #superseded
buildDevice vayu avb;
@ -114,6 +114,7 @@ patchWorkspace() {
gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
#source build/envsetup.sh;
#repopick -it twelve-colors;
sh "$DOS_SCRIPTS/Patch.sh";
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";

View File

@ -101,6 +101,7 @@ patchWorkspace() {
gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
#source build/envsetup.sh;
#repopick -it 13-legacy-RIL-fixes;
sh "$DOS_SCRIPTS/Patch.sh";
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";

View File

@ -167,7 +167,7 @@ export KBUILD_BUILD_HOST="dosbm";
export BUILD_USERNAME="emy";
export BUILD_HOSTNAME="dosbm";
export ANDROID_JACK_VM_ARGS="-Xmx8192m -Xms512m -Dfile.encoding=UTF-8 -XX:+TieredCompilation";
export ANDROID_JACK_VM_ARGS="-Xmx12288m -Xms512m -Dfile.encoding=UTF-8 -XX:+TieredCompilation";
export JACK_SERVER_VM_ARGUMENTS="${ANDROID_JACK_VM_ARGS}";
export EXPERIMENTAL_USE_JAVA8=true;
export GRADLE_OPTS="-Xmx2048m";