21.0: trying to compile

frameworks/base/core/java/android/util/NtpTrustedTime.java:275: error: cannot find symbol
            final ContentResolver resolver = getContext().getContentResolver();

frameworks/base/core/java/android/content/pm/SpecialRuntimePermAppUtils.java:38: error: method checkPermission in class PermissionManager cannot be applied to given types;
        return PermissionManager.checkPermission(Manifest.permission.INTERNET, Process.myPid(), Process.myUid())

Signed-off-by: Tavi <tavi@divested.dev>

Patches/LineageOS-21.0/android_frameworks_base/0026-Crash_Details.patch

@@ -1,194 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dmitry Muhomor <muhomor.dmitry@gmail.com>
-Date: Mon, 8 Aug 2022 19:03:37 +0300
-Subject: [PATCH] add an option to show the details of an application error to
- the user
-
-Adds a "Show details" item to crash and ANR (app not responding) dialogs that takes the user to a
-SystemUI activity which shows the error details and allows to copy them to the clipboard or to
-export them via the standard sharing UI.
----
- .../android/app/ApplicationErrorReport.java   | 29 +++++++++++++++++--
- core/res/res/layout/app_anr_dialog.xml        |  4 +--
- core/res/res/layout/app_error_dialog.xml      |  4 +--
- core/res/res/values/strings.xml               |  2 ++
- core/res/res/values/symbols.xml               |  3 ++
- .../java/com/android/server/am/AppErrors.java |  1 +
- 6 files changed, 37 insertions(+), 6 deletions(-)
-
-diff --git a/core/java/android/app/ApplicationErrorReport.java b/core/java/android/app/ApplicationErrorReport.java
-index 9cea5e8ef4cf..a8f51104d0fa 100644
---- a/core/java/android/app/ApplicationErrorReport.java
-+++ b/core/java/android/app/ApplicationErrorReport.java
-@@ -25,6 +25,8 @@ import android.content.pm.ResolveInfo;
- import android.os.Binder;
- import android.os.Parcel;
- import android.os.Parcelable;
-+import android.os.Process;
-+import android.os.SystemClock;
- import android.os.SystemProperties;
- import android.provider.Settings;
- import android.util.Printer;
-@@ -98,6 +100,9 @@ public class ApplicationErrorReport implements Parcelable {
-      */
-     public String packageName;
- 
-+    /** @hide */
-+    public long packageVersion;
-+
-     /**
-      * Package name of the application which installed the application this
-      * report pertains to.
-@@ -162,13 +167,19 @@ public class ApplicationErrorReport implements Parcelable {
-             String packageName, int appFlags) {
-         // check if error reporting is enabled in secure settings
-         int enabled = Settings.Global.getInt(context.getContentResolver(),
--                Settings.Global.SEND_ACTION_APP_ERROR, 0);
-+                Settings.Global.SEND_ACTION_APP_ERROR, 1);
-         if (enabled == 0) {
-             return null;
-         }
- 
-         PackageManager pm = context.getPackageManager();
- 
-+        ComponentName logViewerApp = getErrorReportReceiver(pm, packageName,
-+                android.ext.LogViewerApp.getPackageName());
-+        if (logViewerApp != null) {
-+            return logViewerApp;
-+        }
-+
-         // look for receiver in the installer package
-         String candidate = null;
-         ComponentName result = null;
-@@ -233,6 +244,7 @@ public class ApplicationErrorReport implements Parcelable {
-     public void writeToParcel(Parcel dest, int flags) {
-         dest.writeInt(type);
-         dest.writeString(packageName);
-+        dest.writeLong(packageVersion);
-         dest.writeString(installerPackageName);
-         dest.writeString(processName);
-         dest.writeLong(time);
-@@ -260,6 +272,7 @@ public class ApplicationErrorReport implements Parcelable {
-     public void readFromParcel(Parcel in) {
-         type = in.readInt();
-         packageName = in.readString();
-+        packageVersion = in.readLong();
-         installerPackageName = in.readString();
-         processName = in.readString();
-         time = in.readLong();
-@@ -345,6 +358,11 @@ public class ApplicationErrorReport implements Parcelable {
-          */
-         public String crashTag;
- 
-+        /** @hide */
-+        public long processUptimeMs;
-+        /** @hide */
-+        public long processStartupLatencyMs;
-+
-         /**
-          * Create an uninitialized instance of CrashInfo.
-          */
-@@ -398,6 +416,9 @@ public class ApplicationErrorReport implements Parcelable {
-             }
- 
-             exceptionMessage = sanitizeString(exceptionMessage);
-+
-+            processUptimeMs = SystemClock.elapsedRealtime() - Process.getStartElapsedRealtime();
-+            processStartupLatencyMs = Process.getStartElapsedRealtime() - Process.getStartRequestedElapsedRealtime();
-         }
- 
-         /** {@hide} */
-@@ -439,6 +460,8 @@ public class ApplicationErrorReport implements Parcelable {
-             throwLineNumber = in.readInt();
-             stackTrace = in.readString();
-             crashTag = in.readString();
-+            processUptimeMs = in.readLong();
-+            processStartupLatencyMs = in.readLong();
-         }
- 
-         /**
-@@ -455,6 +478,8 @@ public class ApplicationErrorReport implements Parcelable {
-             dest.writeInt(throwLineNumber);
-             dest.writeString(stackTrace);
-             dest.writeString(crashTag);
-+            dest.writeLong(processUptimeMs);
-+            dest.writeLong(processStartupLatencyMs);
-             int total = dest.dataPosition()-start;
-             if (Binder.CHECK_PARCEL_SIZE && total > 20*1024) {
-                 Slog.d("Error", "ERR: exHandler=" + exceptionHandlerClassName);
-@@ -704,7 +729,7 @@ public class ApplicationErrorReport implements Parcelable {
-      */
-     public void dump(Printer pw, String prefix) {
-         pw.println(prefix + "type: " + type);
--        pw.println(prefix + "packageName: " + packageName);
-+        pw.println(prefix + "packageName: " + packageName + ":" + packageVersion);
-         pw.println(prefix + "installerPackageName: " + installerPackageName);
-         pw.println(prefix + "processName: " + processName);
-         pw.println(prefix + "time: " + time);
-diff --git a/core/res/res/layout/app_anr_dialog.xml b/core/res/res/layout/app_anr_dialog.xml
-index 5ad0f4c0f6cc..ad3a2d2991de 100644
---- a/core/res/res/layout/app_anr_dialog.xml
-+++ b/core/res/res/layout/app_anr_dialog.xml
-@@ -41,8 +41,8 @@
-             android:id="@+id/aerr_report"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content"
--            android:text="@string/aerr_report"
--            android:drawableStart="@drawable/ic_feedback"
-+            android:text="@string/aerr_show_details"
-+            android:drawableStart="@drawable/ic_info_outline_24"
-             style="@style/aerr_list_item" />
- 
- </LinearLayout>
-diff --git a/core/res/res/layout/app_error_dialog.xml b/core/res/res/layout/app_error_dialog.xml
-index c3b149a1e295..a47b82018377 100644
---- a/core/res/res/layout/app_error_dialog.xml
-+++ b/core/res/res/layout/app_error_dialog.xml
-@@ -52,8 +52,8 @@
-         android:id="@+id/aerr_report"
-         android:layout_width="match_parent"
-         android:layout_height="wrap_content"
--        android:text="@string/aerr_report"
--        android:drawableStart="@drawable/ic_feedback"
-+        android:text="@string/aerr_show_details"
-+        android:drawableStart="@drawable/ic_info_outline_24"
-         style="@style/aerr_list_item" />
- 
-     <Button
-diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
-index fe69b195ea4c..bca56dba6b76 100644
---- a/core/res/res/values/strings.xml
-+++ b/core/res/res/values/strings.xml
-@@ -6380,4 +6380,6 @@ ul.</string>
-     <!-- Communal profile label on a screen. This can be used as a tab label for this profile in tabbed views and can be used to represent the profile in sharing surfaces, etc. [CHAR LIMIT=20] -->
-     <string name="profile_label_communal">Communal</string>
- 
-+    <!-- Button that opens the screen with details of an application error -->
-+    <string name="aerr_show_details">Show details</string>
- </resources>
-diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
-index fd6158d02b8f..6c3c6c1f4e46 100644
---- a/core/res/res/values/symbols.xml
-+++ b/core/res/res/values/symbols.xml
-@@ -5129,6 +5129,9 @@
-   <java-symbol type="id" name="language_picker_item" />
-   <java-symbol type="id" name="language_picker_header" />
- 
-+  <!-- Button that opens the screen with details of an application error -->
-+  <java-symbol type="string" name="aerr_show_details" />
-+
-   <java-symbol type="dimen" name="status_bar_height_default" />
- 
-   <java-symbol type="string" name="default_card_name"/>
-diff --git a/services/core/java/com/android/server/am/AppErrors.java b/services/core/java/com/android/server/am/AppErrors.java
-index 061bcd740f6b..937b0eacff66 100644
---- a/services/core/java/com/android/server/am/AppErrors.java
-+++ b/services/core/java/com/android/server/am/AppErrors.java
-@@ -838,6 +838,7 @@ class AppErrors {
- 
-         ApplicationErrorReport report = new ApplicationErrorReport();
-         report.packageName = r.info.packageName;
-+        report.packageVersion = r.info.longVersionCode;
-         report.installerPackageName = errState.getErrorReportReceiver().getPackageName();
-         report.processName = r.processName;
-         report.time = timeMillis;

Patches/LineageOS-21.0/android_frameworks_base/0034-Allow_Disabling_NTP.patch

@@ -16,7 +16,7 @@ index 3adbd686cd2c..6221541473d3 100644
      @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
      public boolean forceRefresh() {
          synchronized (mRefreshLock) {
-+            final ContentResolver resolver = mContext.getContentResolver();
++            final ContentResolver resolver = getContext().getContentResolver();
 +
 +            final boolean networkPollTime = Settings.Global.getInt(resolver,
 +                    Settings.Global.AUTO_TIME, 1) != 0;

Scripts/LineageOS-20.0/Patch.sh

@@ -167,7 +167,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0022-Ignore_StatementService_AN
 #applyPatch "$DOS_PATCHES/android_frameworks_base/326692.patch"; #Skip screen on animation when wake and unlock via biometrics (jesec) #TODO: 20REBASE
 #applyPatch "$DOS_PATCHES/android_frameworks_base/0023-Skip_Screen_Animation.patch"; #SystemUI: Skip screen-on animation in all scenarios (kdrag0n) #XXX: breaks notification backdrop #TODO: 20REBASE
 applyPatch "$DOS_PATCHES/android_frameworks_base/0024-Burnin_Protection.patch"; #SystemUI: add burnIn protection (arter97)
-applyPatch "$DOS_PATCHES/android_frameworks_base/0026-Crash_Details.patch"; #Add an option to show the details of an application error to the user (GrapheneOS)
+#applyPatch "$DOS_PATCHES/android_frameworks_base/0026-Crash_Details.patch"; #Add an option to show the details of an application error to the user (GrapheneOS) #TODO: 21REBASE
 applyPatch "$DOS_PATCHES/android_frameworks_base/0027-Installer_Glitch.patch"; #Make sure PackageInstaller UI returns a result (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0028-Remove_Legacy_Package_Query.patch"; #Don't leak device-wide package list to apps when work profile is present (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0029-Strict_Package_Checks-1.patch"; #Disable package parser cache (GrapheneOS)