PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix crash when there is no emergencybroadcast app on device" into oc-dev am: 4f5b13f97a

Browse Source 
am: 779548122b

Change-Id: Ie1f2b075461dc0546cb1cfe2149cbda6254a33af
This commit is contained in:
Fan Zhang
2017-05-06 02:48:38 +00:00
committed by android-build-merger
parent 16db0413f1 779548122b
commit db6380973a
4 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
View File

@@ -26,6 +26,7 @@ import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.notification.EmergencyBroadcastPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import java.util.ArrayList;
@@ -72,6 +73,8 @@ public class AppAndNotificationDashboardFragment extends DashboardFragment {
private static List<PreferenceController> buildPreferenceControllers(Context context,
Application app, Fragment host) {
final List<PreferenceController> controllers = new ArrayList<>();
controllers.add(new EmergencyBroadcastPreferenceController(context,
"app_and_notif_cell_broadcast_settings"));
controllers.add(new SpecialAppAccessPreferenceController(context));
controllers.add(new AppPermissionsPreferenceController(context));
controllers.add(new RecentAppsPreferenceController(context, app, host));