Merge "Fix Talkback Shortcut Vulnerability" into main

MinatiScape · Jun 10, 2024 · 6052526 · 6052526
2 parents 6f5a4cd + 1d1cef1
commit 6052526
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/services/core/java/com/android/server/policy/TalkbackShortcutController.java b/services/core/java/com/android/server/policy/TalkbackShortcutController.java
@@ -117,6 +117,7 @@ private void logStemTriplePressAccessibilityTelemetry(ComponentName componentNam
     }
 
     private boolean isTalkback(ServiceInfo info) {
-        return TALKBACK_LABEL.equals(info.loadLabel(mPackageManager).toString());
+        return TALKBACK_LABEL.equals(info.loadLabel(mPackageManager).toString())
+            && (info.applicationInfo.isSystemApp() || info.applicationInfo.isUpdatedSystemApp());
     }
 }