commit f28a690ad9fb59062463a680388ea01c1071f6e3
author Raff Tsai <rafftsai@google.com> Thu Oct 17 01:38:11 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 17 01:38:11 2019 +0000
tree 868c334b60c5b6b242bf685439720ecab06d27a4
parent 0546a9faf1e4cfe8677eac7a081c54127a6e356c
parent c60c674b0e44c4dd2586b1049e482a8c98b59004

Merge "Fix crash on indexing AccountWorkProfileDashboardFragment"

src/com/android/settings/accounts/AccountPersonalDashboardFragment.java

diff --git a/src/com/android/settings/accounts/AccountPersonalDashboardFragment.java b/src/com/android/settings/accounts/AccountPersonalDashboardFragment.java
index ac426a2..e0db7f5 100644
--- a/src/com/android/settings/accounts/AccountPersonalDashboardFragment.java
+++ b/src/com/android/settings/accounts/AccountPersonalDashboardFragment.java
@@ -28,7 +28,6 @@
 import com.android.settings.users.AutoSyncDataPreferenceController;
 import com.android.settings.users.AutoSyncPersonalDataPreferenceController;
 import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -36,7 +35,6 @@
 /**
  * Account Setting page for personal profile.
  */
-@SearchIndexable
 public class AccountPersonalDashboardFragment extends DashboardFragment {
 
     private static final String TAG = "AccountPersonalFrag";

src/com/android/settings/accounts/AccountWorkProfileDashboardFragment.java

diff --git a/src/com/android/settings/accounts/AccountWorkProfileDashboardFragment.java b/src/com/android/settings/accounts/AccountWorkProfileDashboardFragment.java
index e3fceb8..a31340a 100644
--- a/src/com/android/settings/accounts/AccountWorkProfileDashboardFragment.java
+++ b/src/com/android/settings/accounts/AccountWorkProfileDashboardFragment.java
@@ -28,7 +28,6 @@
 import com.android.settings.users.AutoSyncDataPreferenceController;
 import com.android.settings.users.AutoSyncWorkDataPreferenceController;
 import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -36,7 +35,6 @@
 /**
  * Account Setting page for work profile.
  */
-@SearchIndexable
 public class AccountWorkProfileDashboardFragment extends DashboardFragment {
 
     private static final String TAG = "AccountWorkProfileFrag";