Skip to content

Commit

Permalink
feat: Sync with latest td source
Browse files Browse the repository at this point in the history
- android_14.0.0_r17 ci-20231220

Signed-off-by: naz664 <[email protected]>
  • Loading branch information
naz664 committed Dec 22, 2023
1 parent f52bcf2 commit ec80f20
Show file tree
Hide file tree
Showing 8 changed files with 1,217 additions and 226 deletions.
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
From 6caeae5b4ae8eb82d2885851d59b80ce1bf28aa5 Mon Sep 17 00:00:00 2001
From 9ffd420f636627528e51daaf3700232d01c1ec2d Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <[email protected]>
Date: Sun, 5 Apr 2020 16:32:46 +0200
Subject: [PATCH 11/45] Always allow overriding the number of work profiles
Subject: [PATCH 1/5] Always allow overriding the number of work profiles

Change-Id: I6eb09aa71663c6fbe7563e3038bffcabdba0ff6a
---
.../java/com/android/server/pm/UserManagerService.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index d2929aef8a63..af0a221bd3e3 100644
index a5a99f920dbe..66c0cb954e13 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -7346,12 +7346,8 @@ public class UserManagerService extends IUserManager.Stub {
*/
private static int getMaxUsersOfTypePerParent(UserTypeDetails userTypeDetails) {
final int defaultMax = userTypeDetails.getMaxAllowedPerParent();
@@ -7353,12 +7353,8 @@ public class UserManagerService extends IUserManager.Stub {
// Allow at least MULTIPLE_WORK_PROFILES_MAX managed profiles when property is set.
return Math.max(defaultMax, MULTIPLE_WORK_PROFILES_MAX);
}
- if (!Build.IS_DEBUGGABLE) {
- return defaultMax;
- } else {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
From 2cea79507bc6fc0d5a1def23b94aa789d2f26c67 Mon Sep 17 00:00:00 2001
From e4be8158318e9d334274973c37748e68d67e4acf Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <[email protected]>
Date: Wed, 14 Dec 2022 17:21:00 -0500
Subject: [PATCH 30/45] Call Samsung's ISehSysInputDev to report screen state
to touchscreen driver
Subject: [PATCH 2/5] Call Samsung's ISehSysInputDev to report screen state to
touchscreen driver

This fixes touchscreen not waking up on Galaxy F23
---
services/core/Android.bp | 1 +
.../server/display/LocalDisplayAdapter.java | 32 +++++++++++++++++++
2 files changed, 33 insertions(+)
.../server/display/LocalDisplayAdapter.java | 31 +++++++++++++++++++
2 files changed, 32 insertions(+)

diff --git a/services/core/Android.bp b/services/core/Android.bp
index f8d19ec9903d..735959270c11 100644
index 9669cc9acbd0..ef2996b61733 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -186,6 +186,7 @@ java_library_static {
"com.android.sysprop.watchdog",
"ImmutabilityAnnotation",
@@ -189,6 +189,7 @@ java_library_static {
"securebox",
"vendor.aospa.biometrics.face",
"vendor.aac.hardware.richtap.vibrator",
+ "vendor.samsung.hardware.sysinput-V1.2-java", // HIDL
],
javac_shard_size: 50,
javacflags: [
diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
index 89d865e5ae39..9f2793a16a28 100644
index 89d865e5ae39..14770c096122 100644
--- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
@@ -33,6 +33,7 @@ import android.os.Trace;
Expand Down Expand Up @@ -52,7 +52,7 @@ index 89d865e5ae39..9f2793a16a28 100644

LocalDisplayDevice(IBinder displayToken, long physicalDisplayId,
SurfaceControl.StaticDisplayInfo staticDisplayInfo,
@@ -825,17 +830,44 @@ final class LocalDisplayAdapter extends DisplayAdapter {
@@ -825,17 +830,43 @@ final class LocalDisplayAdapter extends DisplayAdapter {
}
mSidekickActive = false;
}
Expand All @@ -66,7 +66,6 @@ index 89d865e5ae39..9f2793a16a28 100644
Trace.traceBegin(Trace.TRACE_TAG_POWER, "setDisplayState("
+ "id=" + physicalDisplayId
+ ", state=" + Display.stateToString(state) + ")");
+
+ if (samsungSysinput != null) {
+ try {
+ Log.d("PHH", "setTspEnable 1, " + state + ", true");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From a501d218943c17e76bb36d09083a133228eaf186 Mon Sep 17 00:00:00 2001
From cdae3827364c750f352db295d96f01cd5f94c0e0 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <[email protected]>
Date: Sat, 17 Jun 2023 08:31:55 -0400
Subject: [PATCH 32/45] Add Mediatek power hints on touch
Subject: [PATCH 3/5] Add Mediatek power hints on touch

Mediatek has multiple HALs (which existed concurrently), so it is a bit
of a mess.
Expand All @@ -23,17 +23,17 @@ smoother.
Change-Id: I9f1eac5a20b98920a5d0c8204fe4d165ba069f5a
---
services/core/Android.bp | 4 +-
.../com/android/server/wm/DisplayPolicy.java | 49 +++++++++++++++++++
2 files changed, 52 insertions(+), 1 deletion(-)
.../com/android/server/wm/DisplayPolicy.java | 50 +++++++++++++++++++
2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/services/core/Android.bp b/services/core/Android.bp
index 735959270c11..05782235ea1c 100644
index ef2996b61733..b07639ff923b 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -186,7 +186,9 @@ java_library_static {
"com.android.sysprop.watchdog",
"ImmutabilityAnnotation",
@@ -189,7 +189,9 @@ java_library_static {
"securebox",
"vendor.aospa.biometrics.face",
"vendor.aac.hardware.richtap.vibrator",
- "vendor.samsung.hardware.sysinput-V1.2-java", // HIDL
+ // HIDL
+ "vendor.mediatek.hardware.mtkpower-V1.1-java",
Expand All @@ -42,10 +42,10 @@ index 735959270c11..05782235ea1c 100644
javac_shard_size: 50,
javacflags: [
diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
index 4a740f4fdd2f..6aefe7bf8de9 100644
index fcc8a439f77d..279c6585d5eb 100644
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -213,6 +213,9 @@ public class DisplayPolicy {
@@ -218,6 +218,9 @@ public class DisplayPolicy {
*/
private boolean mRemoteInsetsControllerControlsSystemBars;

Expand All @@ -55,11 +55,11 @@ index 4a740f4fdd2f..6aefe7bf8de9 100644
StatusBarManagerInternal getStatusBarManagerInternal() {
synchronized (mServiceAcquireLock) {
if (mStatusBarManagerInternal == null) {
@@ -420,6 +423,19 @@ public class DisplayPolicy {
mScreenOnEarly = true;
@@ -446,6 +449,20 @@ public class DisplayPolicy {
mScreenOnFully = true;
}
+ try {

+ try {
+ mMtkPerf = vendor.mediatek.hardware.mtkpower.V1_1.IMtkPerf.getService();
+ } catch(Throwable t) {
+ android.util.Log.d("PHH-Power", "Retrieving mtkpower 1.0", t);
Expand All @@ -72,10 +72,11 @@ index 4a740f4fdd2f..6aefe7bf8de9 100644
+ android.util.Log.d("PHH-Power", "Retrieving mtkpower 1.0", t);
+ mOldMtkPerf = null;
+ }
+
final Looper looper = UiThread.getHandler().getLooper();
mHandler = new PolicyHandler(looper);
@@ -504,6 +520,17 @@ public class DisplayPolicy {
// TODO(b/181821798) Migrate SystemGesturesPointerEventListener to use window context.
@@ -529,6 +546,17 @@ public class DisplayPolicy {
mService.mPowerManagerInternal.setPowerBoost(
Boost.INTERACTION, duration);
}
Expand All @@ -93,7 +94,7 @@ index 4a740f4fdd2f..6aefe7bf8de9 100644
}

@Override
@@ -522,6 +549,28 @@ public class DisplayPolicy {
@@ -573,6 +601,28 @@ public class DisplayPolicy {
if (listener != null) {
listener.onTouchStart();
}
Expand Down

This file was deleted.

Loading

0 comments on commit ec80f20

Please sign in to comment.