Tron metrics for special permissions
Added tron metrics for the following special permissions: Battery optimisation - APP_SPECIAL_PERMISSION_BATTERY_ALLOW - APP_SPECIAL_PERMISSION_BATTERY_DENY Device administrators - APP_SPECIAL_PERMISSION_ADMIN_ALLOW (when checked) - APP_SPECIAL_PERMISSION_ADMIN_DENY (when unchecked) Do not disturb access - APP_SPECIAL_PERMISSION_DND_ALLOW - APP_SPECIAL_PERMISSION_DND_DENY Daw over other apps - APP_SPECIAL_PERMISSION_APPDRAW_ALLOW - APP_SPECIAL_PERMISSION_APPDRAW_DENY VR helper services - APP_SPECIAL_PERMISSION_VRHELPER_ALLOW - APP_SPECIAL_PERMISSION_VRHELPER_DENY Modify system settings - APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_ALLOW - APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_DENY Notification access - APP_SPECIAL_PERMISSION_NOTIVIEW_ALLOW - APP_SPECIAL_PERMISSION_NOTIVIEW_DENY Premium SMS access - APP_SPECIAL_PERMISSION_PREMIUM_SMS_ALWAYS_ALLOW - APP_SPECIAL_PERMISSION_PREMIUM_SMS_ASK - APP_SPECIAL_PERMISSION_PREMIUM_SMS_DENY Unrestricted data access - APP_SPECIAL_PERMISSION_UNL_DATA_ALLOW - APP_SPECIAL_PERMISSION_UNL_DATA_DENY Usage access - APP_SPECIAL_PERMISSION_USAGE_VIEW_ALLOW - APP_SPECIAL_PERMISSION_USAGE_VIEW_DENY Test: Manual + make RunSettingsRoboTests Bug: 31008660 Change-Id: Id977e2c9f5aa811a2b0af036372b72c684621435
This commit is contained in:
@@ -31,10 +31,12 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener;
|
||||
import android.support.v7.preference.Preference.OnPreferenceClickListener;
|
||||
import android.util.Log;
|
||||
|
||||
import com.android.internal.annotations.VisibleForTesting;
|
||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
|
||||
import com.android.settings.applications.AppStateOverlayBridge.OverlayState;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
import com.android.settingslib.applications.ApplicationsState.AppEntry;
|
||||
|
||||
public class DrawOverlayDetails extends AppInfoWithHeader implements OnPreferenceChangeListener,
|
||||
@@ -121,11 +123,20 @@ public class DrawOverlayDetails extends AppInfoWithHeader implements OnPreferenc
|
||||
}
|
||||
|
||||
private void setCanDrawOverlay(boolean newState) {
|
||||
logSpecialPermissionChange(newState, mPackageName);
|
||||
mAppOpsManager.setMode(AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
|
||||
mPackageInfo.applicationInfo.uid, mPackageName, newState
|
||||
? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_ERRORED);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
void logSpecialPermissionChange(boolean newState, String packageName) {
|
||||
int logCategory = newState ? MetricsEvent.APP_SPECIAL_PERMISSION_APPDRAW_ALLOW
|
||||
: MetricsEvent.APP_SPECIAL_PERMISSION_APPDRAW_DENY;
|
||||
FeatureFactory.getFactory(getContext())
|
||||
.getMetricsFeatureProvider().action(getContext(), logCategory, packageName);
|
||||
}
|
||||
|
||||
private boolean canDrawOverlay(String pkgName) {
|
||||
int result = mAppOpsManager.noteOpNoThrow(AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
|
||||
mPackageInfo.applicationInfo.uid, pkgName);
|
||||
|
||||
@@ -24,13 +24,17 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
import android.support.v7.preference.PreferenceViewHolder;
|
||||
import android.view.View;
|
||||
|
||||
import com.android.internal.annotations.VisibleForTesting;
|
||||
import com.android.internal.logging.nano.MetricsProto;
|
||||
import com.android.internal.telephony.SmsUsageMonitor;
|
||||
import com.android.settings.DividerPreference;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.applications.AppStateBaseBridge.Callback;
|
||||
import com.android.settings.applications.AppStateSmsPremBridge.SmsState;
|
||||
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
|
||||
import com.android.settings.notification.EmptyTextSettings;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
import com.android.settingslib.applications.ApplicationsState;
|
||||
import com.android.settingslib.applications.ApplicationsState.AppEntry;
|
||||
import com.android.settingslib.applications.ApplicationsState.Callbacks;
|
||||
@@ -81,11 +85,33 @@ public class PremiumSmsAccess extends EmptyTextSettings implements Callback, Cal
|
||||
@Override
|
||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||
PremiumSmsPreference pref = (PremiumSmsPreference) preference;
|
||||
mSmsBackend.setSmsState(pref.mAppEntry.info.packageName,
|
||||
Integer.parseInt((String) newValue));
|
||||
int smsState = Integer.parseInt((String) newValue);
|
||||
logSpecialPermissionChange(smsState, pref.mAppEntry.info.packageName);
|
||||
mSmsBackend.setSmsState(pref.mAppEntry.info.packageName, smsState);
|
||||
return true;
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
void logSpecialPermissionChange(int smsState, String packageName) {
|
||||
int category = SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN;
|
||||
switch (smsState) {
|
||||
case SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ASK_USER:
|
||||
category = MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_PREMIUM_SMS_ASK;
|
||||
break;
|
||||
case SmsUsageMonitor.PREMIUM_SMS_PERMISSION_NEVER_ALLOW:
|
||||
category = MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_PREMIUM_SMS_DENY;
|
||||
break;
|
||||
case SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ALWAYS_ALLOW:
|
||||
category = MetricsProto.MetricsEvent.
|
||||
APP_SPECIAL_PERMISSION_PREMIUM_SMS_ALWAYS_ALLOW;
|
||||
break;
|
||||
}
|
||||
if (category != SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN) {
|
||||
FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider().action(
|
||||
getContext(), category, packageName);
|
||||
}
|
||||
}
|
||||
|
||||
private void updatePrefs(ArrayList<AppEntry> apps) {
|
||||
if (apps == null) return;
|
||||
setEmptyText(R.string.premium_sms_none);
|
||||
|
||||
@@ -33,9 +33,12 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener;
|
||||
import android.support.v7.preference.Preference.OnPreferenceClickListener;
|
||||
import android.util.Log;
|
||||
|
||||
import com.android.internal.annotations.VisibleForTesting;
|
||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.applications.AppStateUsageBridge.UsageState;
|
||||
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
|
||||
public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenceChangeListener,
|
||||
OnPreferenceClickListener {
|
||||
@@ -119,10 +122,19 @@ public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenc
|
||||
}
|
||||
|
||||
private void setHasAccess(boolean newState) {
|
||||
logSpecialPermissionChange(newState, mPackageName);
|
||||
mAppOpsManager.setMode(AppOpsManager.OP_GET_USAGE_STATS, mPackageInfo.applicationInfo.uid,
|
||||
mPackageName, newState ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_IGNORED);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
void logSpecialPermissionChange(boolean newState, String packageName) {
|
||||
int logCategory = newState ? MetricsEvent.APP_SPECIAL_PERMISSION_USAGE_VIEW_ALLOW
|
||||
: MetricsEvent.APP_SPECIAL_PERMISSION_USAGE_VIEW_DENY;
|
||||
FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider().action(getContext(),
|
||||
logCategory, packageName);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean refreshUi() {
|
||||
mUsageState = mUsageBridge.getUsageInfo(mPackageName,
|
||||
|
||||
@@ -15,11 +15,14 @@
|
||||
*/
|
||||
package com.android.settings.applications;
|
||||
|
||||
import android.content.ComponentName;
|
||||
import android.provider.Settings;
|
||||
import android.service.vr.VrListenerService;
|
||||
|
||||
import com.android.internal.annotations.VisibleForTesting;
|
||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
import com.android.settings.utils.ManagedServiceSettings;
|
||||
|
||||
public class VrListenerSettings extends ManagedServiceSettings {
|
||||
@@ -48,4 +51,18 @@ public class VrListenerSettings extends ManagedServiceSettings {
|
||||
public int getMetricsCategory() {
|
||||
return MetricsEvent.VR_MANAGE_LISTENERS;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean setEnabled(ComponentName service, String title, boolean enable) {
|
||||
logSpecialPermissionChange(enable, service.getPackageName());
|
||||
return super.setEnabled(service, title, enable);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
void logSpecialPermissionChange(boolean enable, String packageName) {
|
||||
int logCategory = enable ? MetricsEvent.APP_SPECIAL_PERMISSION_VRHELPER_ALLOW
|
||||
: MetricsEvent.APP_SPECIAL_PERMISSION_VRHELPER_DENY;
|
||||
FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider().action(getContext(),
|
||||
logCategory, packageName);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,6 +35,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
|
||||
import com.android.settings.applications.AppStateWriteSettingsBridge.WriteSettingsState;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
import com.android.settingslib.applications.ApplicationsState.AppEntry;
|
||||
|
||||
import java.util.List;
|
||||
@@ -117,11 +118,19 @@ public class WriteSettingsDetails extends AppInfoWithHeader implements OnPrefere
|
||||
}
|
||||
|
||||
private void setCanWriteSettings(boolean newState) {
|
||||
logSpecialPermissionChange(newState, mPackageName);
|
||||
mAppOpsManager.setMode(AppOpsManager.OP_WRITE_SETTINGS,
|
||||
mPackageInfo.applicationInfo.uid, mPackageName, newState
|
||||
? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_ERRORED);
|
||||
}
|
||||
|
||||
void logSpecialPermissionChange(boolean newState, String packageName) {
|
||||
int logCategory = newState ? MetricsEvent.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_ALLOW
|
||||
: MetricsEvent.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_DENY;
|
||||
FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider().action(getContext(),
|
||||
logCategory, packageName);
|
||||
}
|
||||
|
||||
private boolean canWriteSettings(String pkgName) {
|
||||
int result = mAppOpsManager.noteOpNoThrow(AppOpsManager.OP_WRITE_SETTINGS,
|
||||
mPackageInfo.applicationInfo.uid, pkgName);
|
||||
|
||||
Reference in New Issue
Block a user