diff --git a/Patches/Common/apns-conf.xml b/Patches/Common/apns-conf.xml index 9101a466..e56c689e 100644 --- a/Patches/Common/apns-conf.xml +++ b/Patches/Common/apns-conf.xml @@ -415,6 +415,8 @@ + + diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout-a1.patch b/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout-a1.patch index 2fd59bf9..d1030d7e 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout-a1.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout-a1.patch @@ -10,10 +10,10 @@ in both callers of this method (both of which are "End session" buttons), making 1 file changed, 6 insertions(+) diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java -index f3fb5d90a166..87e826e946b5 100644 +index 4998c2b695e7..c6f1c14efdcb 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java -@@ -11164,6 +11164,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { +@@ -11168,6 +11168,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { Preconditions.checkCallAuthorization(canManageUsers(caller) || hasCallingOrSelfPermission(permission.INTERACT_ACROSS_USERS)); diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout.patch b/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout.patch index 467c6c99..64594c93 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout.patch @@ -23,10 +23,10 @@ index 0c69067ab131..ef3213b68bfe 100644 // one notification after enabling + one more after reboots static final int DEF_MAXIMUM_NETWORK_LOGGING_NOTIFICATIONS_SHOWN = 2; diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java -index e95f827ff6f1..f3fb5d90a166 100644 +index 10ab3fb67f47..4998c2b695e7 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java -@@ -16092,11 +16092,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { +@@ -16096,11 +16096,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { @Override public boolean isLogoutEnabled() { if (!mHasFeature) { diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0007-Always_Restict_Serial.patch b/Patches/LineageOS-20.0/android_frameworks_base/0007-Always_Restict_Serial.patch index b06581d0..e67d9360 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0007-Always_Restict_Serial.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0007-Always_Restict_Serial.patch @@ -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 3e43e711e7f5..c5eb18bf40ed 100644 +index f0dac2607a4e..aa64cbffda24 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java -@@ -4822,12 +4822,7 @@ public class ActivityManagerService extends IActivityManager.Stub +@@ -4850,12 +4850,7 @@ public class ActivityManagerService extends IActivityManager.Stub ProfilerInfo profilerInfo = mAppProfiler.setupProfilerInfoLocked(thread, app, instr); diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-1.patch b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-1.patch index df890185..d719f6a1 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-1.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-1.patch @@ -9,7 +9,7 @@ Ported from 12: b294a2ce1d0d185dbc438ac3c06c90386d5f5949 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java -index 554e2690b878..71b1b3ed0ca9 100644 +index 9ed5aa7158ab..79980a274dec 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java @@ -1409,7 +1409,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-10.patch b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-10.patch index d2d6058a..8e8a3ba9 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-10.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-10.patch @@ -9,7 +9,7 @@ Subject: [PATCH] srt permissions: don't auto-grant denied ones when 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java -index 17d35cee6e53..239a44b48483 100644 +index fedd0c3ceced..5406f0b7b201 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java @@ -1810,7 +1810,9 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-2.patch b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-2.patch index a87bbb07..9e6aeefd 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-2.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-2.patch @@ -24,10 +24,10 @@ index 487e57d114c9..306a105bd169 100644 field public static final String PHONE = "android.permission-group.PHONE"; field public static final String READ_MEDIA_AURAL = "android.permission-group.READ_MEDIA_AURAL"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml -index bbe31240f5f3..4bac265e5834 100644 +index bbc3a7369423..88d6863fe968 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml -@@ -2001,13 +2001,21 @@ +@@ -2002,13 +2002,21 @@ @@ -51,7 +51,7 @@ index bbe31240f5f3..4bac265e5834 100644 diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java -index 71b1b3ed0ca9..714bf540468c 100644 +index 79980a274dec..4918f3bf3e11 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java @@ -2524,7 +2524,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-3.patch b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-3.patch index 344e4232..4d017de5 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-3.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-3.patch @@ -33,10 +33,10 @@ index 306a105bd169..7297e731af40 100644 field public static final String READ_MEDIA_AURAL = "android.permission-group.READ_MEDIA_AURAL"; field public static final String READ_MEDIA_VISUAL = "android.permission-group.READ_MEDIA_VISUAL"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml -index 4bac265e5834..ab3a610cec14 100644 +index 88d6863fe968..c4837e504f58 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml -@@ -1762,6 +1762,18 @@ +@@ -1763,6 +1763,18 @@ android:protectionLevel="dangerous|instant" /> @@ -56,7 +56,7 @@ index 4bac265e5834..ab3a610cec14 100644 diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml -index 2eb74e9f98a8..0e5b6a9d2596 100644 +index 4c45fdc4de44..e0ca922bf686 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -934,6 +934,11 @@ @@ -71,7 +71,7 @@ index 2eb74e9f98a8..0e5b6a9d2596 100644 Network -@@ -1264,6 +1269,13 @@ +@@ -1269,6 +1274,13 @@ Allows the app to access body sensor data, such as heart rate, temperature, and blood oxygen percentage, while the app is in the background. @@ -86,7 +86,7 @@ index 2eb74e9f98a8..0e5b6a9d2596 100644 Read calendar events and details diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java -index 714bf540468c..17d35cee6e53 100644 +index 4918f3bf3e11..fedd0c3ceced 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java @@ -2524,7 +2524,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0014-Automatic_Reboot.patch b/Patches/LineageOS-20.0/android_frameworks_base/0014-Automatic_Reboot.patch index 6f78c4e1..12c7cb7c 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0014-Automatic_Reboot.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0014-Automatic_Reboot.patch @@ -13,10 +13,10 @@ Change-Id: If891bfbcc144c9336ba013260bad2b7c7a59c054 4 files changed, 47 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java -index ab49bd6828a9..ee42bf704cfd 100644 +index 4c80a5924eb9..726f5fc8d5f6 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java -@@ -17271,6 +17271,14 @@ public final class Settings { +@@ -17361,6 +17361,14 @@ public final class Settings { public static final String REVIEW_PERMISSIONS_NOTIFICATION_STATE = "review_permissions_notification_state"; @@ -32,22 +32,22 @@ index ab49bd6828a9..ee42bf704cfd 100644 * Settings migrated from Wear OS settings provider. * @hide diff --git a/data/etc/com.android.systemui.xml b/data/etc/com.android.systemui.xml -index e0e13f59b706..9c8c1834f728 100644 +index 6dcee6d8bd31..0b99786fb5df 100644 --- a/data/etc/com.android.systemui.xml +++ b/data/etc/com.android.systemui.xml -@@ -50,6 +50,7 @@ - +@@ -51,6 +51,7 @@ + + diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml -index a68c7ef298e5..428b0cee13b0 100644 +index 00ca44383089..b7fb28930a58 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml -@@ -336,6 +336,9 @@ +@@ -337,6 +337,9 @@ @@ -58,10 +58,10 @@ index a68c7ef298e5..428b0cee13b0 100644 diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java -index 3088e64a68ce..58d8957fdb31 100644 +index dbbd2a2846f5..e1e961317334 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java -@@ -201,6 +201,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, +@@ -206,6 +206,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, private final static String TAG = "KeyguardViewMediator"; @@ -70,7 +70,7 @@ index 3088e64a68ce..58d8957fdb31 100644 private static final String DELAYED_KEYGUARD_ACTION = "com.android.internal.policy.impl.PhoneWindowManager.DELAYED_KEYGUARD"; private static final String DELAYED_LOCK_PROFILE_ACTION = -@@ -348,6 +350,11 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, +@@ -355,6 +357,11 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, */ private int mDelayedProfileShowingSequence; @@ -82,7 +82,7 @@ index 3088e64a68ce..58d8957fdb31 100644 private final DismissCallbackRegistry mDismissCallbackRegistry; // the properties of the keyguard -@@ -1255,6 +1262,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, +@@ -1284,6 +1291,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, final IntentFilter delayedActionFilter = new IntentFilter(); delayedActionFilter.addAction(DELAYED_KEYGUARD_ACTION); delayedActionFilter.addAction(DELAYED_LOCK_PROFILE_ACTION); @@ -90,7 +90,7 @@ index 3088e64a68ce..58d8957fdb31 100644 delayedActionFilter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY); mContext.registerReceiver(mDelayedLockBroadcastReceiver, delayedActionFilter, SYSTEMUI_PERMISSION, null /* scheduler */, -@@ -1590,6 +1598,18 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, +@@ -1619,6 +1627,18 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, } } @@ -109,7 +109,7 @@ index 3088e64a68ce..58d8957fdb31 100644 private void doKeyguardForChildProfilesLocked() { UserManager um = UserManager.get(mContext); for (int profileId : um.getEnabledProfileIds(UserHandle.myUserId())) { -@@ -1607,6 +1627,10 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, +@@ -1636,6 +1656,10 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, mDelayedProfileShowingSequence++; } @@ -120,7 +120,7 @@ index 3088e64a68ce..58d8957fdb31 100644 /** * It will let us know when the device is waking up. */ -@@ -1947,6 +1971,10 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, +@@ -1987,6 +2011,10 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, if (DEBUG) Log.d(TAG, "doKeyguard: showing the lock screen"); showLocked(options); @@ -131,7 +131,7 @@ index 3088e64a68ce..58d8957fdb31 100644 } private void lockProfile(int userId) { -@@ -2131,6 +2159,12 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, +@@ -2171,6 +2199,12 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, } } } @@ -144,7 +144,7 @@ index 3088e64a68ce..58d8957fdb31 100644 } } }; -@@ -2706,6 +2740,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, +@@ -2771,6 +2805,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, mHideAnimationRun = false; adjustStatusBarLocked(); sendUserPresentBroadcast(); diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0015-Bluetooth_Timeout.patch b/Patches/LineageOS-20.0/android_frameworks_base/0015-Bluetooth_Timeout.patch index 6c51a384..0a8e1d24 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0015-Bluetooth_Timeout.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0015-Bluetooth_Timeout.patch @@ -12,10 +12,10 @@ Co-authored-by: Pratyush create mode 100644 services/core/java/com/android/server/ext/BluetoothAutoOff.java diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java -index 2ff66f32ed08..206e9454b3a0 100644 +index 463387531037..6692d09c17c4 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java -@@ -17285,6 +17285,12 @@ public final class Settings { +@@ -17375,6 +17375,12 @@ public final class Settings { */ public static final String WIFI_OFF_TIMEOUT = "wifi_off_timeout"; diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0015-WiFi_Timeout.patch b/Patches/LineageOS-20.0/android_frameworks_base/0015-WiFi_Timeout.patch index 798c98fb..c065c981 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0015-WiFi_Timeout.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0015-WiFi_Timeout.patch @@ -12,10 +12,10 @@ Co-authored-by: Pratyush create mode 100644 services/core/java/com/android/server/ext/WifiAutoOff.java diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java -index ee42bf704cfd..2ff66f32ed08 100644 +index 726f5fc8d5f6..463387531037 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java -@@ -17279,6 +17279,12 @@ public final class Settings { +@@ -17369,6 +17369,12 @@ public final class Settings { */ public static final String SETTINGS_REBOOT_AFTER_TIMEOUT = "settings_reboot_after_timeout"; diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0022-Ignore_StatementService_ANR.patch b/Patches/LineageOS-20.0/android_frameworks_base/0022-Ignore_StatementService_ANR.patch index ca0fc4fb..dbb11ab8 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0022-Ignore_StatementService_ANR.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0022-Ignore_StatementService_ANR.patch @@ -12,10 +12,10 @@ they get a message each time it tries again. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml -index 987426f56463..b7e126607b38 100644 +index 91dd9179c329..a01ec67630de 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml -@@ -3837,7 +3837,7 @@ +@@ -3890,7 +3890,7 @@ diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0024-Burnin_Protection.patch b/Patches/LineageOS-20.0/android_frameworks_base/0024-Burnin_Protection.patch index 13819aab..ac3b82d4 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0024-Burnin_Protection.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0024-Burnin_Protection.patch @@ -43,7 +43,7 @@ index e1998ce3d3ab..dc59ccd794f7 100644 + 1dp diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java -index 883903efb95f..2020910d88bf 100644 +index bca52070edc3..d3f614f32086 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java @@ -163,6 +163,13 @@ public class NavigationBarView extends FrameLayout implements TunerService.Tunab @@ -60,7 +60,7 @@ index 883903efb95f..2020910d88bf 100644 /** * Helper that is responsible for showing the right toast when a disallowed activity operation * occurred. In pinned mode, we show instructions on how to break out of this mode, whilst in -@@ -880,12 +887,31 @@ public class NavigationBarView extends FrameLayout implements TunerService.Tunab +@@ -888,12 +895,31 @@ public class NavigationBarView extends FrameLayout implements TunerService.Tunab mContextualButtonGroup.setButtonVisibility(R.id.accessibility_button, visible); } @@ -93,10 +93,10 @@ index 883903efb95f..2020910d88bf 100644 reloadNavIcons(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java -index 83755c6591be..4e2bb5424eb8 100644 +index 02d3d9313e36..ec8a7a4ffdd3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java -@@ -226,6 +226,7 @@ import com.android.systemui.statusbar.phone.dagger.StatusBarPhoneModule; +@@ -229,6 +229,7 @@ import com.android.systemui.statusbar.phone.dagger.StatusBarPhoneModule; import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController; import com.android.systemui.statusbar.policy.BatteryController; import com.android.systemui.statusbar.policy.BrightnessMirrorController; @@ -104,7 +104,7 @@ index 83755c6591be..4e2bb5424eb8 100644 import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener; import com.android.systemui.statusbar.policy.DeviceProvisionedController; -@@ -453,6 +454,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces, Tune +@@ -440,6 +441,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces, Tune @Nullable protected LockscreenWallpaper mLockscreenWallpaper; private final AutoHideController mAutoHideController; @@ -112,7 +112,7 @@ index 83755c6591be..4e2bb5424eb8 100644 private final Point mCurrentDisplaySize = new Point(); -@@ -1233,6 +1235,12 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces, Tune +@@ -1250,6 +1252,12 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces, Tune mNotificationPanelViewController.updatePanelExpansionAndVisibility(); setBouncerShowingForStatusBarComponents(mBouncerShowing); checkBarModes(); @@ -125,7 +125,7 @@ index 83755c6591be..4e2bb5424eb8 100644 }); initializer.initializeStatusBar(mCentralSurfacesComponent); -@@ -3488,6 +3496,9 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces, Tune +@@ -3507,6 +3515,9 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces, Tune updateNotificationPanelTouchState(); mNotificationShadeWindowViewController.cancelCurrentTouch(); @@ -135,7 +135,7 @@ index 83755c6591be..4e2bb5424eb8 100644 if (mLaunchCameraOnFinishedGoingToSleep) { mLaunchCameraOnFinishedGoingToSleep = false; -@@ -3593,6 +3604,9 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces, Tune +@@ -3649,6 +3660,9 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces, Tune } } updateScrimController(); @@ -146,7 +146,7 @@ index 83755c6591be..4e2bb5424eb8 100644 }; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java -index 5692024fb473..d06a4bab4004 100644 +index 753f75c1433b..77c23d189b28 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java @@ -19,6 +19,7 @@ package com.android.systemui.statusbar.phone; @@ -157,7 +157,7 @@ index 5692024fb473..d06a4bab4004 100644 import android.content.res.Configuration; import android.graphics.Rect; import android.inputmethodservice.InputMethodService; -@@ -63,6 +64,13 @@ public class PhoneStatusBarView extends FrameLayout implements Callbacks { +@@ -64,6 +65,13 @@ public class PhoneStatusBarView extends FrameLayout implements Callbacks { private final CommandQueue mCommandQueue; private final StatusBarContentInsetsProvider mContentInsetsProvider; @@ -171,7 +171,7 @@ index 5692024fb473..d06a4bab4004 100644 private DarkReceiver mBattery; private ClockController mClockController; private int mRotationOrientation = -1; -@@ -135,6 +143,18 @@ public class PhoneStatusBarView extends FrameLayout implements Callbacks { +@@ -137,6 +145,18 @@ public class PhoneStatusBarView extends FrameLayout implements Callbacks { mTouchEventHandler = handler; } @@ -190,7 +190,7 @@ index 5692024fb473..d06a4bab4004 100644 void init(StatusBarUserChipViewModel viewModel) { StatusBarUserSwitcherContainer container = findViewById(R.id.user_switcher_container); StatusBarUserChipViewBinder.bind(container, viewModel); -@@ -147,6 +167,13 @@ public class PhoneStatusBarView extends FrameLayout implements Callbacks { +@@ -149,6 +169,13 @@ public class PhoneStatusBarView extends FrameLayout implements Callbacks { mClockController = new ClockController(getContext(), this); mCutoutSpace = findViewById(R.id.cutout_space_view); diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0026-Crash_Details.patch b/Patches/LineageOS-20.0/android_frameworks_base/0026-Crash_Details.patch index 71158360..36cab594 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0026-Crash_Details.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0026-Crash_Details.patch @@ -110,10 +110,10 @@ index c3b149a1e295..a47b82018377 100644