Merge "Fix App permission doesn't show summary"

This commit is contained in:
TreeHugger Robot
2018-11-15 04:10:40 +00:00
committed by Android (Google) Code Review
3 changed files with 3 additions and 6 deletions

View File

@@ -33,7 +33,6 @@ import java.util.Set;
public class AppPermissionsPreferenceController extends BasePreferenceController {
private static final String TAG = "AppPermissionPrefCtrl";
private static final String KEY_APP_PERMISSION_GROUPS = "manage_perms";
private static final String[] PERMISSION_GROUPS = new String[]{
"android.permission-group.LOCATION",
"android.permission-group.MICROPHONE",
@@ -46,8 +45,8 @@ public class AppPermissionsPreferenceController extends BasePreferenceController
private final PackageManager mPackageManager;
public AppPermissionsPreferenceController(Context context) {
super(context, KEY_APP_PERMISSION_GROUPS);
public AppPermissionsPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
mPackageManager = context.getPackageManager();
}

View File

@@ -23,8 +23,6 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.security.ShowPasswordPreferenceController;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;