aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeiyong Lin <lpy@google.com>2023-05-18 16:19:48 +0000
committerPeiyong Lin <lpy@google.com>2023-05-18 17:50:17 +0000
commitca5faf1724eedc6ddfab3422b6419f39a42f34c9 (patch)
tree1916425604cd5a8d965586137d7b5a575737861d
parentc1c1321475803928958e2dfccc339b02560ff13b (diff)
downloadangle-ca5faf1724eedc6ddfab3422b6419f39a42f34c9.tar.gz
Revert "Defer photos and other apps"
This reverts commit c50de9bfe5334e3080294c4c7ef4ee22e26726b4. Reason for revert: Remove deferred list functionality now that the shape of ANGLE shipping form is binaries. Applications on the list are broken with ANGLE due to the lack of YUV support, this is currently being worked on. Bug: 280450222 Change-Id: Iec82a35998adaeccb6d44f5bf1b4da073562de16 Test: atest CtsAngleIntegrationHostTestCases
-rw-r--r--src/android_system_settings/assets/a4a_rules.json6
-rw-r--r--src/android_system_settings/src/com/android/angle/common/MainFragment.java5
2 files changed, 0 insertions, 11 deletions
diff --git a/src/android_system_settings/assets/a4a_rules.json b/src/android_system_settings/assets/a4a_rules.json
index cff73f7ff9..a18fbaa2ab 100644
--- a/src/android_system_settings/assets/a4a_rules.json
+++ b/src/android_system_settings/assets/a4a_rules.json
@@ -9,15 +9,9 @@
"UseANGLE": false,
"Applications": [
{
- "AppName": "com.google.android.apps.photos"
- },
- {
"AppName": "com.google.android.GoogleCamera"
},
{
- "AppName": "com.google.android.GoogleCameraEng"
- },
- {
"AppName": "com.google.android.videos"
},
{
diff --git a/src/android_system_settings/src/com/android/angle/common/MainFragment.java b/src/android_system_settings/src/com/android/angle/common/MainFragment.java
index 677f456ac8..ca58349c94 100644
--- a/src/android_system_settings/src/com/android/angle/common/MainFragment.java
+++ b/src/android_system_settings/src/com/android/angle/common/MainFragment.java
@@ -215,13 +215,8 @@ public class MainFragment extends PreferenceFragment implements OnSharedPreferen
packageInfo.packageName.equals("com.android.chrome") ||
packageInfo.packageName.equals("com.google.android.gm") ||
packageInfo.packageName.equals("com.google.android.GoogleCamera") ||
- packageInfo.packageName.equals("com.google.android.GoogleCameraEng") ||
- packageInfo.packageName.equals("com.google.android.apps.chromecast.app") ||
- packageInfo.packageName.equals("com.google.android.apps.magazines") ||
packageInfo.packageName.equals("com.google.android.apps.maps") ||
packageInfo.packageName.equals("com.google.android.apps.messaging") ||
- packageInfo.packageName.equals("com.google.android.apps.photos") ||
- packageInfo.packageName.equals("com.google.android.apps.photosgo") ||
packageInfo.packageName.equals("com.google.android.videos") ||
packageInfo.packageName.equals("com.google.android.youtube")))
{