Slightly improve compatibility with apps that want GSF

38a5ca05e9

Signed-off-by: Tad <tad@spotco.us>

Patches/Common/android_frameworks_base/0008-No_Crash_GSF.patch

@@ -0,0 +1,29 @@
+From 38a5ca05e940687863d014518fa2cc87ed49aff6 Mon Sep 17 00:00:00 2001
+From: Dmitry Muhomor <muhomor.dmitry@gmail.com>
+Date: Sun, 26 Mar 2023 20:42:17 +0300
+Subject: [PATCH] don't crash apps that depend on missing Gservices provider
+
+This allows apps that have minor dependency on GSF/GmsCore (EuiccSupportPixel, Google Camera etc)
+to work without having any of GSF, GmsCore, Play Store installed.
+
+Gservices provider is currently hosted by GSF, soon to be hosted by GmsCore.
+---
+ core/java/android/content/ContentResolver.java | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java
+index c3fecd347fea..20797f32ffe5 100644
+--- a/core/java/android/content/ContentResolver.java
++++ b/core/java/android/content/ContentResolver.java
+@@ -2755,6 +2755,11 @@ public final void registerContentObserver(Uri uri, boolean notifyForDescendents,
+                     observer.getContentObserver(), userHandle, mTargetSdkVersion);
+         } catch (RemoteException e) {
+             throw e.rethrowFromSystemServer();
++        } catch (SecurityException se) {
++            if ("com.google.android.gsf.gservices".equals(uri.getAuthority())) {
++                return;
++            }
++            throw se;
+         }
+     }
+ 

Patches/LineageOS-17.1/android_frameworks_base/352555.patch

@@ -0,0 +1,140 @@
+From ddd21af86421d0ef013ccc992bbbe3bd1a8b62ce Mon Sep 17 00:00:00 2001
+From: Alexander Grund <flamefire89@gmail.com>
+Date: Sun, 26 Mar 2023 17:36:03 +0200
+Subject: [PATCH] Revert "[RESTRICT AUTOMERGE] Trim the activity info of
+ another uid if no privilege"
+
+This reverts commit bff14ff38a014fc3059c6bfe8a16aec9f5447554.
+
+Reason for revert: apps crashed due to the top activity info trimmed
+
+Bug: 264269392 263434196 263438172
+Change-Id: I078080b14b7cf7c6e605739f22f40f86802d3950
+(cherry picked from commit 5caf2dde3d264966e1ba0dd3e18a0524858157ba)
+Merged-In: I078080b14b7cf7c6e605739f22f40f86802d3950
+---
+ .../com/android/server/wm/AppTaskImpl.java    |  3 +-
+ .../com/android/server/wm/RecentTasks.java    |  7 ++--
+ .../com/android/server/wm/RunningTasks.java   |  8 ++---
+ .../com/android/server/wm/TaskRecord.java     | 34 -------------------
+ 4 files changed, 5 insertions(+), 47 deletions(-)
+
+diff --git a/services/core/java/com/android/server/wm/AppTaskImpl.java b/services/core/java/com/android/server/wm/AppTaskImpl.java
+index 900b59e0a8a2d..1eb7455135c78 100644
+--- a/services/core/java/com/android/server/wm/AppTaskImpl.java
++++ b/services/core/java/com/android/server/wm/AppTaskImpl.java
+@@ -84,8 +84,7 @@ public ActivityManager.RecentTaskInfo getTaskInfo() {
+                 if (tr == null) {
+                     throw new IllegalArgumentException("Unable to find task ID " + mTaskId);
+                 }
+-                return mService.getRecentTasks().createRecentTaskInfo(tr,
+-                        true /* getTasksAllowed */);
++                return mService.getRecentTasks().createRecentTaskInfo(tr);
+             } finally {
+                 Binder.restoreCallingIdentity(origId);
+             }
+diff --git a/services/core/java/com/android/server/wm/RecentTasks.java b/services/core/java/com/android/server/wm/RecentTasks.java
+index 56367f42886d6..541a8bbc88656 100644
+--- a/services/core/java/com/android/server/wm/RecentTasks.java
++++ b/services/core/java/com/android/server/wm/RecentTasks.java
+@@ -944,7 +944,7 @@ private ArrayList<ActivityManager.RecentTaskInfo> getRecentTasksImpl(int maxNum,
+                 continue;
+             }
+ 
+-            final ActivityManager.RecentTaskInfo rti = createRecentTaskInfo(tr, getTasksAllowed);
++            final ActivityManager.RecentTaskInfo rti = createRecentTaskInfo(tr);
+             if (!getDetailedTasks) {
+                 rti.baseIntent.replaceExtras((Bundle) null);
+             }
+@@ -1715,15 +1715,12 @@ void dump(PrintWriter pw, boolean dumpAll, String dumpPackage) {
+     /**
+      * Creates a new RecentTaskInfo from a TaskRecord.
+      */
+-    ActivityManager.RecentTaskInfo createRecentTaskInfo(TaskRecord tr, boolean getTasksAllowed) {
++    ActivityManager.RecentTaskInfo createRecentTaskInfo(TaskRecord tr) {
+         ActivityManager.RecentTaskInfo rti = new ActivityManager.RecentTaskInfo();
+         tr.fillTaskInfo(rti);
+         // Fill in some deprecated values
+         rti.id = rti.isRunning ? rti.taskId : INVALID_TASK_ID;
+         rti.persistentId = rti.taskId;
+-        if (!getTasksAllowed) {
+-            TaskRecord.trimIneffectiveInfo(tr, rti);
+-        }
+         return rti;
+     }
+ 
+diff --git a/services/core/java/com/android/server/wm/RunningTasks.java b/services/core/java/com/android/server/wm/RunningTasks.java
+index 3c2e36cf245de..81a85476c53a4 100644
+--- a/services/core/java/com/android/server/wm/RunningTasks.java
++++ b/services/core/java/com/android/server/wm/RunningTasks.java
+@@ -69,7 +69,7 @@ void getTasks(int maxNum, List<RunningTaskInfo> list, @ActivityType int ignoreAc
+             }
+ 
+             final TaskRecord task = iter.next();
+-            list.add(createRunningTaskInfo(task, allowed));
++            list.add(createRunningTaskInfo(task));
+             maxNum--;
+         }
+     }
+@@ -77,15 +77,11 @@ void getTasks(int maxNum, List<RunningTaskInfo> list, @ActivityType int ignoreAc
+     /**
+      * Constructs a {@link RunningTaskInfo} from a given {@param task}.
+      */
+-    private RunningTaskInfo createRunningTaskInfo(TaskRecord task, boolean allowed) {
++    private RunningTaskInfo createRunningTaskInfo(TaskRecord task) {
+         final RunningTaskInfo rti = new RunningTaskInfo();
+         task.fillTaskInfo(rti);
+         // Fill in some deprecated values
+         rti.id = rti.taskId;
+-
+-        if (!allowed) {
+-            TaskRecord.trimIneffectiveInfo(task, rti);
+-        }
+         return rti;
+     }
+ }
+diff --git a/services/core/java/com/android/server/wm/TaskRecord.java b/services/core/java/com/android/server/wm/TaskRecord.java
+index 9de4c8121e4d0..361f66e3106ae 100644
+--- a/services/core/java/com/android/server/wm/TaskRecord.java
++++ b/services/core/java/com/android/server/wm/TaskRecord.java
+@@ -2436,40 +2436,6 @@ void fillTaskInfo(TaskInfo info) {
+         info.configuration.setTo(getConfiguration());
+     }
+ 
+-    /**
+-     * Removes the activity info if the activity belongs to a different uid, which is
+-     * different from the app that hosts the task.
+-     */
+-    static void trimIneffectiveInfo(TaskRecord task, TaskInfo info) {
+-        int topActivityUid = task.effectiveUid;
+-        for (int i = task.mActivities.size() - 1; i >= 0; --i) {
+-            final ActivityRecord r = task.mActivities.get(i);
+-            if (r.finishing || r.isState(ActivityState.INITIALIZING)) {
+-                continue;
+-            }
+-            topActivityUid = r.info.applicationInfo.uid;
+-            break;
+-        }
+-
+-        if (task.effectiveUid != topActivityUid) {
+-            info.topActivity = null;
+-        }
+-
+-        int baseActivityUid = task.effectiveUid;
+-        for (int i = 0; i < task.mActivities.size(); ++i) {
+-            final ActivityRecord r = task.mActivities.get(i);
+-            if (r.finishing) {
+-                continue;
+-            }
+-            baseActivityUid = r.info.applicationInfo.uid;
+-            break;
+-        }
+-
+-        if (task.effectiveUid != baseActivityUid) {
+-            info.baseActivity = null;
+-        }
+-    }
+-
+     /**
+      * Returns a  {@link TaskInfo} with information from this task.
+      */

Patches/LineageOS-20.0/android_packages_modules_Wifi/344228.patch

@@ -0,0 +1,67 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Stefan Assmann <sassmann@kpanic.de>
+Date: Mon, 11 Mar 2019 17:09:49 +0100
+Subject: [PATCH] wifi: resurrect mWifiLinkLayerStatsSupported counter
+
+On devices with broken/not implemented LinkLayerStats
+the counter mWifiLinkLayerStatsSupported prevents the following error
+messages from appearing every 3 seconds.
+
+03-08 10:43:02.616   389   389 E WifiHAL : wifi_get_link_stats: requestResponse Error:-3
+03-08 10:43:02.617  2030  2206 E WifiVendorHal: getWifiLinkLayerStats(l.937) failed {.code = ERROR_NOT_SUPPORTED, .description = }
+
+This partially reverts commit 1ba5b5858ffc04acbd317dc1f6789f1777d375e6.
+
+Change-Id: I840f9d1304bf0a31e7a6b65db00a37dc3651e4b8
+Signed-off-by: penglezos <panagiotisegl@gmail.com>
+---
+ .../android/server/wifi/ClientModeImpl.java   | 26 +++++++++----------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java
+index 931374bccb..f1bf970ef4 100644
+--- a/service/java/com/android/server/wifi/ClientModeImpl.java
++++ b/service/java/com/android/server/wifi/ClientModeImpl.java
+@@ -345,6 +345,8 @@ public class ClientModeImpl extends StateMachine implements ClientMode {
+     private DetailedState mNetworkAgentState;
+     private final SupplicantStateTracker mSupplicantStateTracker;
+ 
++    private int mWifiLinkLayerStatsSupported = 4; // Temporary disable
++
+     // Indicates that framework is attempting to roam, set true on CMD_START_ROAM, set false when
+     // wifi connects or fails to connect
+     private boolean mIsAutoRoaming = false;
+@@ -1409,22 +1411,20 @@ public class ClientModeImpl extends StateMachine implements ClientMode {
+             loge("getWifiLinkLayerStats called without an interface");
+             return null;
+         }
+-        mLastLinkLayerStatsUpdate = mClock.getWallClockMillis();
+         WifiLinkLayerStats stats = null;
+-        if (isPrimary()) {
++        mLastLinkLayerStatsUpdate = mClock.getWallClockMillis();
++        if (mWifiLinkLayerStatsSupported > 0) {
+             stats = mWifiNative.getWifiLinkLayerStats(mInterfaceName);
+-        } else {
+-            if (mVerboseLoggingEnabled) {
+-                Log.w(getTag(), "Can't getWifiLinkLayerStats on secondary iface");
++            if (stats == null) {
++                mWifiLinkLayerStatsSupported -= 1;
++            } else {
++                mOnTime = stats.on_time;
++                mTxTime = stats.tx_time;
++                mRxTime = stats.rx_time;
++                mRunningBeaconCount = stats.beacon_rx;
++                mWifiInfo.updatePacketRates(stats, mLastLinkLayerStatsUpdate);
+             }
+-        }
+-        if (stats != null) {
+-            mOnTime = stats.on_time;
+-            mTxTime = stats.tx_time;
+-            mRxTime = stats.rx_time;
+-            mRunningBeaconCount = stats.beacon_rx;
+-            mWifiInfo.updatePacketRates(stats, mLastLinkLayerStatsUpdate);
+-        } else {
++        } else { // LinkLayerStats are broken or unsupported
+             long mTxPkts = mFacade.getTxPackets(mInterfaceName);
+             long mRxPkts = mFacade.getRxPackets(mInterfaceName);
+             mWifiInfo.updatePacketRates(mTxPkts, mRxPkts, mLastLinkLayerStatsUpdate);

Scripts/LineageOS-16.0/Patch.sh

@@ -177,6 +177,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0013-Network_Permission-1.patch
 applyPatch "$DOS_PATCHES/android_frameworks_base/0013-Network_Permission-2.patch"; #Add a NETWORK permission group for INTERNET (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0013-Sensors_Permission.patch"; #Add special runtime permission for other sensors (GrapheneOS)
 if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_base/0014-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0008-No_Crash_GSF.patch"; #Don't crash apps that depend on missing Gservices provider  (GrapheneOS)
 sed -i 's/DEFAULT_MAX_FILES = 1000;/DEFAULT_MAX_FILES = 0;/' services/core/java/com/android/server/DropBoxManagerService.java; #Disable DropBox internal logging service
 sed -i 's/DEFAULT_MAX_FILES_LOWRAM = 300;/DEFAULT_MAX_FILES_LOWRAM = 0;/' services/core/java/com/android/server/DropBoxManagerService.java;
 sed -i 's/(notif.needNotify)/(true)/' location/java/com/android/internal/location/GpsNetInitiatedHandler.java; #Notify the user if their location is requested via SUPL

Scripts/LineageOS-17.1/Patch.sh

@@ -143,6 +143,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/351413-backport.patch"; #R_asb_
 applyPatch "$DOS_PATCHES/android_frameworks_base/351414-backport.patch"; #R_asb_2023-03 Revoke dev perm if app is upgrading to post 23 and perm has pre23 flag #XXX
 applyPatch "$DOS_PATCHES/android_frameworks_base/351415.patch"; #R_asb_2023-03 Reconcile WorkSource parcel and unparcel code.
 applyPatch "$DOS_PATCHES/android_frameworks_base/351436.patch"; #R_asb_2023-03 Revert "Ensure that only SysUI can override pending intent launch flags"
+applyPatch "$DOS_PATCHES/android_frameworks_base/352555.patch"; #Q_asb_2023-03 Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"
 #applyPatch "$DOS_PATCHES/android_frameworks_base/272645.patch"; #ten-bt-sbc-hd-dualchannel: Add CHANNEL_MODE_DUAL_CHANNEL constant (ValdikSS)
 #applyPatch "$DOS_PATCHES/android_frameworks_base/272646-forwardport.patch"; #ten-bt-sbc-hd-dualchannel: Add Dual Channel into Bluetooth Audio Channel Mode developer options menu (ValdikSS)
 #applyPatch "$DOS_PATCHES/android_frameworks_base/272647.patch"; #ten-bt-sbc-hd-dualchannel: Allow SBC as HD audio codec in Bluetooth device configuration (ValdikSS)
@@ -186,6 +187,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0019-Random_MAC.patch"; #Add op
 applyPatch "$DOS_PATCHES/android_frameworks_base/0020-SUPL_Toggle.patch"; #Add a setting for forcibly disabling SUPL (GrapheneOS)
 applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0006-Do-not-throw-in-setAppOnInterfaceLocked.patch"; #Fix random reboots on broken kernels when an app has data restricted XXX: ugly (DivestOS)
 applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0007-ABI_Warning.patch"; #Warn when running activity from 32 bit app on ARM64 devices. (AOSP)
+applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0008-No_Crash_GSF.patch"; #Don't crash apps that depend on missing Gservices provider  (GrapheneOS)
 sed -i 's/DEFAULT_MAX_FILES = 1000;/DEFAULT_MAX_FILES = 0;/' services/core/java/com/android/server/DropBoxManagerService.java; #Disable DropBox internal logging service
 sed -i 's/DEFAULT_MAX_FILES_LOWRAM = 300;/DEFAULT_MAX_FILES_LOWRAM = 0;/' services/core/java/com/android/server/DropBoxManagerService.java;
 sed -i 's/(notif.needNotify)/(true)/' location/java/com/android/internal/location/GpsNetInitiatedHandler.java; #Notify the user if their location is requested via SUPL

Scripts/LineageOS-18.1/Patch.sh

@@ -166,6 +166,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0022-Allow_Disabling_NTP.patch"
 applyPatch "$DOS_PATCHES/android_frameworks_base/0023-System_JobScheduler_Allowance.patch"; #DeviceIdleJobsController: don't ignore whitelisted system apps (GrapheneOS)
 applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0006-Do-not-throw-in-setAppOnInterfaceLocked.patch"; #Fix random reboots on broken kernels when an app has data restricted XXX: ugly (DivestOS)
 applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0007-ABI_Warning.patch"; #Warn when running activity from 32 bit app on ARM64 devices. (AOSP)
+applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0008-No_Crash_GSF.patch"; #Don't crash apps that depend on missing Gservices provider  (GrapheneOS)
 hardenLocationConf services/core/java/com/android/server/location/gps_debug.conf; #Harden the default GPS config
 sed -i 's/DEFAULT_USE_COMPACTION = false;/DEFAULT_USE_COMPACTION = true;/' services/core/java/com/android/server/am/CachedAppOptimizer.java; #Enable app compaction by default (GrapheneOS)
 sed -i 's/DEFAULT_USE_FREEZER = false;/DEFAULT_USE_FREEZER = true;/' services/core/java/com/android/server/am/CachedAppOptimizer.java; #Enable app freezer by default (GrapheneOS)

Scripts/LineageOS-19.1/Patch.sh

@@ -175,6 +175,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0028-SUPL_Toggle.patch"; #Add a
 applyPatch "$DOS_PATCHES/android_frameworks_base/0029-Allow_Disabling_NTP.patch"; #Dont ping ntp server when nitz time update is toggled off (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0030-System_JobScheduler_Allowance.patch"; #DeviceIdleJobsController: don't ignore whitelisted system apps (GrapheneOS)
 applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0007-ABI_Warning.patch"; #Warn when running activity from 32 bit app on ARM64 devices. (AOSP)
+applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0008-No_Crash_GSF.patch"; #Don't crash apps that depend on missing Gservices provider  (GrapheneOS)
 hardenLocationConf services/core/java/com/android/server/location/gnss/gps_debug.conf; #Harden the default GPS config
 sed -i 's/DEFAULT_USE_COMPACTION = false;/DEFAULT_USE_COMPACTION = true;/' services/core/java/com/android/server/am/CachedAppOptimizer.java; #Enable app compaction by default (GrapheneOS)
 sed -i 's/DEFAULT_MAX_FILES = 1000;/DEFAULT_MAX_FILES = 0;/' services/core/java/com/android/server/DropBoxManagerService.java; #Disable DropBox internal logging service

Scripts/LineageOS-20.0/Patch.sh

@@ -185,6 +185,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0032-SUPL_Toggle.patch"; #Add a
 applyPatch "$DOS_PATCHES/android_frameworks_base/0033-Ugly_Orbot_Workaround.patch"; #Always add Briar and Tor Browser to Orbot's lockdown allowlist (CalyxOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0034-Allow_Disabling_NTP.patch"; #Dont ping ntp server when nitz time update is toggled off (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0035-System_JobScheduler_Allowance.patch"; #DeviceIdleJobsController: don't ignore whitelisted system apps (GrapheneOS)
+applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0008-No_Crash_GSF.patch"; #Don't crash apps that depend on missing Gservices provider  (GrapheneOS)
 hardenLocationConf services/core/java/com/android/server/location/gnss/gps_debug.conf; #Harden the default GPS config
 sed -i 's/DEFAULT_USE_COMPACTION = false;/DEFAULT_USE_COMPACTION = true;/' services/core/java/com/android/server/am/CachedAppOptimizer.java; #Enable app compaction by default (GrapheneOS)
 sed -i 's/DEFAULT_MAX_FILES = 1000;/DEFAULT_MAX_FILES = 0;/' services/core/java/com/android/server/DropBoxManagerService.java; #Disable DropBox internal logging service
@@ -354,6 +355,7 @@ applyPatch "$DOS_PATCHES/android_packages_modules_Permission/0006-Location_Indic
 fi;
 
 if enterAndClear "packages/modules/Wifi"; then
+applyPatch "$DOS_PATCHES/android_packages_modules_Wifi/344228.patch"; #wifi: resurrect mWifiLinkLayerStatsSupported counter (sassmann)
 applyPatch "$DOS_PATCHES/android_packages_modules_Wifi/0001-Random_MAC.patch"; #Add support for always generating new random MAC (GrapheneOS)
 fi;