— a/android12/device/mediateksample/tb8791p1_64/vnd_tb8791p1_64.mk
+++ b/android12/device/mediateksample/tb8791p1_64/vnd_tb8791p1_64.mk
@@ -29,7 +29,7 @@ ifeq ((TARGETBUILDVARIANT),eng)KERNELDEFCONFIG?=tb8791p164debugdefconfigendififeq((TARGET_BUILD_VARIANT), eng)
KERNEL_DEFCONFIG ?= tb8791p1_64_debug_defconfig
endif
ifeq ((TARGETBUILDVARIANT),eng)KERNELDEFCONFIG?=tb8791p164debugdefconfigendififeq((TARGET_BUILD_VARIANT), user)
-KERNEL_DEFCONFIG ?= tb8791p1_64_defconfig
+KERNEL_DEFCONFIG ?= tb8791p1_64_defconfig userdebug.config
endif
ifeq ($(TARGET_BUILD_VARIANT), userdebug)
KERNEL_DEFCONFIG ?= tb8791p1_64_defconfig userdebug.config
diff --git a/android13/frameworks/base/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/android13/frameworks/base/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
old mode 100644
new mode 100755
index 165f25d89ce…1b424725f6a
— a/android13/frameworks/base/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/android13/frameworks/base/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -5707,19 +5707,19 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
if (!Build.isBuildConsistent()) {
Slog.e(TAG, "Build fingerprint is not consistent, warning user");
-
mUiHandler.post(() -> {
-
if (mShowDialogs) {
-
AlertDialog d = new BaseErrorDialog(mUiContext);
-
d.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR);
-
d.setCancelable(false);
-
d.setTitle(mUiContext.getText(R.string.android_system_label));
-
d.setMessage(mUiContext.getText(R.string.system_error_manufacturer));
-
d.setButton(DialogInterface.BUTTON_POSITIVE,
-
mUiContext.getText(R.string.ok),
-
mUiHandler.obtainMessage(DISMISS_DIALOG_UI_MSG, d));
-
d.show();
-
}
-
});
+// mUiHandler.post(() -> {
+// if (mShowDialogs) {
+// AlertDialog d = new BaseErrorDialog(mUiContext);
+// d.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR);
+// d.setCancelable(false);
+// d.setTitle(mUiContext.getText(R.string.android_system_label));
+// d.setMessage(mUiContext.getText(R.string.system_error_manufacturer));
+// d.setButton(DialogInterface.BUTTON_POSITIVE,
+// mUiContext.getText(R.string.ok),
+// mUiHandler.obtainMessage(DISMISS_DIALOG_UI_MSG, d));
+// d.show();
+// }
+// });
}
}
}