Merge "Tron metrics for special permissions"

This commit is contained in:
TreeHugger Robot
2017-01-18 20:27:44 +00:00
committed by Android (Google) Code Review
21 changed files with 772 additions and 4 deletions

View File

@@ -29,9 +29,12 @@ import android.provider.Settings;
import android.service.notification.NotificationListenerService;
import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.utils.ManagedServiceSettings;
public class NotificationAccessSettings extends ManagedServiceSettings {
@@ -68,6 +71,7 @@ public class NotificationAccessSettings extends ManagedServiceSettings {
}
protected boolean setEnabled(ComponentName service, String title, boolean enable) {
logSpecialPermissionChange(enable, service.getPackageName());
if (!enable) {
if (!mServiceListing.isEnabled(service)) {
return true; // already disabled
@@ -82,6 +86,14 @@ public class NotificationAccessSettings extends ManagedServiceSettings {
}
}
@VisibleForTesting
void logSpecialPermissionChange(boolean enable, String packageName) {
int logCategory = enable ? MetricsEvent.APP_SPECIAL_PERMISSION_NOTIVIEW_ALLOW
: MetricsEvent.APP_SPECIAL_PERMISSION_NOTIVIEW_DENY;
FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider().action(getContext(),
logCategory, packageName);
}
private static void disable(final Context context, final NotificationAccessSettings parent,
final ComponentName cn) {
parent.mServiceListing.setEnabled(cn, false);

View File

@@ -44,9 +44,11 @@ import android.util.ArraySet;
import android.view.View;
import android.widget.Toast;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.overlay.FeatureFactory;
import java.util.ArrayList;
import java.util.Collections;
@@ -171,6 +173,7 @@ public class ZenAccessSettings extends EmptyTextSettings {
}
private static void setAccess(final Context context, final String pkg, final boolean access) {
logSpecialPermissionChange(access, pkg, context);
AsyncTask.execute(new Runnable() {
@Override
public void run() {
@@ -180,6 +183,15 @@ public class ZenAccessSettings extends EmptyTextSettings {
});
}
@VisibleForTesting
static void logSpecialPermissionChange(boolean enable, String packageName, Context context) {
int logCategory = enable ? MetricsEvent.APP_SPECIAL_PERMISSION_DND_ALLOW
: MetricsEvent.APP_SPECIAL_PERMISSION_DND_DENY;
FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context,
logCategory, packageName);
}
private static void deleteRules(final Context context, final String pkg) {
AsyncTask.execute(new Runnable() {
@Override