Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 057539f1 authored by tmfang's avatar tmfang
Browse files

Fix App permission doesn't show summary 

Since AppPermissionsPreferenceController assigns
a fixed preference key in constructor, so it can't
be used by same controller in Privacy page.

So, we change contructor directly, let controller
read preference key from xml file.

- Also remove unused imports.

Test: visual
Bug: 116628158
Change-Id: I42d6e978e91f0a2fe796d290cb9f34db596aa1f4
parent d6cdafc0

src/com/android/settings/applications/AppPermissionsPreferenceController.java

+2 −3
Original line number Diff line number Diff line
@@ -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();

    }

src/com/android/settings/privacy/PrivacyDashboardFragment.java

+0 −2
Original line number Diff line number Diff line
@@ -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;

tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ public class AppPermissionsPreferenceControllerTest { 
        when(mPackageManager.queryPermissionsByGroup(anyString(), anyInt()))

                .thenReturn(permissions);



        mController = spy(new AppPermissionsPreferenceController(mContext));

        mController = spy(new AppPermissionsPreferenceController(mContext, "pref_key"));

    }



    @Test