From 42cce1e610bf3553a41e53622b7f376259ee5af8 Mon Sep 17 00:00:00 2001 From: roger xue Date: Tue, 28 Feb 2017 16:07:49 -0800 Subject: [PATCH] move PermissionsSummaryHelper into SettingsLib to share with car settings Bug: 34679894 Test: make RunSettingsRoboTests -j128 Change-Id: I53a3f3d8d2a05b33d2cff52a06236dd7d31dbe63 --- .../applications/InstalledAppDetails.java | 3 +- .../PermissionsSummaryHelper.java | 80 ------------------- 2 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 src/com/android/settings/applications/PermissionsSummaryHelper.java diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java index 581b0aff486..0669d28af96 100755 --- a/src/com/android/settings/applications/InstalledAppDetails.java +++ b/src/com/android/settings/applications/InstalledAppDetails.java @@ -81,7 +81,6 @@ import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; -import com.android.settings.applications.PermissionsSummaryHelper.PermissionsResultCallback; import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController; import com.android.settings.applications.defaultapps.DefaultEmergencyPreferenceController; import com.android.settings.applications.defaultapps.DefaultHomePreferenceController; @@ -102,6 +101,8 @@ import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; +import com.android.settingslib.applications.PermissionsSummaryHelper; +import com.android.settingslib.applications.PermissionsSummaryHelper.PermissionsResultCallback; import com.android.settingslib.net.ChartData; import com.android.settingslib.net.ChartDataLoader; diff --git a/src/com/android/settings/applications/PermissionsSummaryHelper.java b/src/com/android/settings/applications/PermissionsSummaryHelper.java deleted file mode 100644 index bac6b24b4d9..00000000000 --- a/src/com/android/settings/applications/PermissionsSummaryHelper.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.settings.applications; - -import android.annotation.NonNull; -import android.content.Context; -import android.content.pm.permission.RuntimePermissionPresentationInfo; -import android.content.pm.permission.RuntimePermissionPresenter; - -import java.text.Collator; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -public class PermissionsSummaryHelper { - - public static void getPermissionSummary(Context context, String pkg, - final PermissionsResultCallback callback) { - final RuntimePermissionPresenter presenter = - RuntimePermissionPresenter.getInstance(context); - presenter.getAppPermissions(pkg, new RuntimePermissionPresenter.OnResultCallback() { - @Override - public void onGetAppPermissions( - @NonNull List permissions) { - final int permissionCount = permissions.size(); - - int grantedStandardCount = 0; - int grantedAdditionalCount = 0; - int requestedCount = 0; - List grantedStandardLabels = new ArrayList<>(); - - for (int i = 0; i < permissionCount; i++) { - RuntimePermissionPresentationInfo permission = permissions.get(i); - requestedCount++; - if (permission.isGranted()) { - if (permission.isStandard()) { - grantedStandardLabels.add(permission.getLabel()); - grantedStandardCount++; - } else { - grantedAdditionalCount++; - } - } - } - - Collator collator = Collator.getInstance(); - collator.setStrength(Collator.PRIMARY); - Collections.sort(grantedStandardLabels, collator); - - callback.onPermissionSummaryResult(grantedStandardCount, requestedCount, - grantedAdditionalCount, grantedStandardLabels); - } - }, null); - } - - public static abstract class PermissionsResultCallback { - public void onAppWithPermissionsCountsResult(int standardGrantedPermissionAppCount, - int standardUsedPermissionAppCount) { - /* do nothing - stub */ - } - - public void onPermissionSummaryResult(int standardGrantedPermissionCount, - int requestedPermissionCount, int additionalGrantedPermissionCount, - List grantedGroupLabels) { - /* do nothing - stub */ - } - } -}