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

Fix App permission doesn't show summary

Browse Source 
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
This commit is contained in:
tmfang
2018-11-14 15:57:11 +08:00
parent d6cdafc0d7
commit 057539f186
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/applications/AppPermissionsPreferenceController.java
View File

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

2
src/com/android/settings/privacy/PrivacyDashboardFragment.java
View File

@@ -23,8 +23,6 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider; 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 com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList; import java.util.ArrayList;

2
tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java
View File

@@ -143,7 +143,7 @@ public class AppPermissionsPreferenceControllerTest {
when(mPackageManager.queryPermissionsByGroup(anyString(), anyInt())) when(mPackageManager.queryPermissionsByGroup(anyString(), anyInt()))
.thenReturn(permissions); .thenReturn(permissions);
mController = spy(new AppPermissionsPreferenceController(mContext)); mController = spy(new AppPermissionsPreferenceController(mContext, "pref_key"));
} }
@Test @Test