Merge "Add AppStatesService to TestDPC." into ub-testdpc-qt

Author: TreeHugger Robot

app/build.gradle

@@ -125,6 +125,7 @@ private void stripTestOnlyForBuild(flavor, buildType) {
 }
 
 dependencies {
+    implementation 'androidx.enterprise:enterprise-feedback:1.0.0-alpha01'
     implementation 'com.android.support:multidex:1.0.1'
     implementation 'com.android.support:preference-v14:28.0.0-SNAPSHOT'
     implementation 'com.android.support:recyclerview-v7:28.0.0-SNAPSHOT'

app/src/main/AndroidManifest.xml

@@ -197,6 +197,12 @@
             </intent-filter>
         </service>
 
+        <service android:name=".feedback.AppStatesService">
+          <intent-filter>
+            <action android:name="androidx.enterprise.feedback.action.APP_STATES" />
+          </intent-filter>
+        </service>
+
     </application>
 
 </manifest>

app/src/main/java/com/afwsamples/testdpc/feedback/AppStatesService.java

@@ -0,0 +1,85 @@
+package com.afwsamples.testdpc.feedback;
+
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.os.Build;
+import android.support.v4.app.NotificationCompat;
+import android.support.v4.app.NotificationManagerCompat;
+import android.support.v7.preference.PreferenceManager;
+import android.util.Log;
+import androidx.enterprise.feedback.KeyedAppState;
+import androidx.enterprise.feedback.KeyedAppStatesService;
+import androidx.enterprise.feedback.ReceivedKeyedAppState;
+import com.afwsamples.testdpc.R;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Receive {@link KeyedAppState} instances and show them as a notification.
+ *
+ * <p>Also logs received keyed app states using the tag "KeyedAppStates".
+ */
+public class AppStatesService extends KeyedAppStatesService {
+
+  private static final String CHANNEL_ID = "KeyedAppStates";
+  private static final String CHANNEL_NAME = "Keyed App States";
+
+  private int nextNotificationId = 0;
+  private Map<String, Integer> idMapping = new HashMap<>();
+
+  @Override
+  public void onReceive(Collection<ReceivedKeyedAppState> states, boolean requestSync) {
+    boolean shouldNotify =
+        PreferenceManager.getDefaultSharedPreferences(this)
+            .getBoolean(getString(R.string.app_feedback_notifications), false);
+
+    if (!shouldNotify) {
+      return;
+    }
+
+    createNotificationChannel();
+
+    for (ReceivedKeyedAppState state : states) {
+      showNotification(state, requestSync);
+    }
+  }
+
+  private void showNotification(ReceivedKeyedAppState state, boolean requestSync) {
+    Log.i("KeyedAppStates",
+        state.timestamp() + " " +
+            state.packageName() + ":" +
+            state.key() + "=" +
+            state.data() + " (" +
+            state.message() + ")" + (requestSync ? " - SYNC REQUESTED" : ""));
+
+    NotificationCompat.Builder notificationBuilder =
+        new NotificationCompat.Builder(this, CHANNEL_ID)
+            .setSmallIcon(R.drawable.arrow_down)
+            .setContentTitle(state.packageName() + ":" + state.key())
+            .setContentText(state.timestamp() + " " +
+                state.data() +
+                " (" + state.message() +")" +
+                (requestSync ? "\nSYNC REQUESTED" : ""));
+    NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this);
+    notificationManager.notify(getIdForState(state), notificationBuilder.build());
+  }
+
+  private void createNotificationChannel() {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      NotificationChannel channel =
+          new NotificationChannel(CHANNEL_ID, CHANNEL_NAME, NotificationManager.IMPORTANCE_DEFAULT);
+      NotificationManager notificationManager = getSystemService(NotificationManager.class);
+      notificationManager.createNotificationChannel(channel);
+    }
+  }
+
+  private int getIdForState(ReceivedKeyedAppState state) {
+    String key = state.packageName() + ":" + state.key();
+
+    if (!idMapping.containsKey(key)) {
+      idMapping.put(key, nextNotificationId++);
+    }
+    return idMapping.get(key);
+  }
+}

app/src/main/java/com/afwsamples/testdpc/policy/PolicyManagementFragment.java

@@ -41,6 +41,7 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
@@ -66,6 +67,7 @@
 import android.support.v7.preference.EditTextPreference;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceManager;
 import android.telephony.TelephonyManager;
 import android.text.InputType;
 import android.text.TextUtils;
@@ -270,6 +272,7 @@ public class PolicyManagementFragment extends BaseSearchablePolicyPreferenceFrag
     private static final String DISABLE_SCREEN_CAPTURE_KEY = "disable_screen_capture";
     private static final String DISABLE_STATUS_BAR = "disable_status_bar";
     private static final String ENABLE_BACKUP_SERVICE = "enable_backup_service";
+    private static final String APP_FEEDBACK_NOTIFICATIONS = "app_feedback_notifications";
     private static final String ENABLE_SECURITY_LOGGING = "enable_security_logging";
     private static final String ENABLE_NETWORK_LOGGING = "enable_network_logging";
     private static final String ENABLE_SYSTEM_APPS_BY_INTENT_KEY = "enable_system_apps_by_intent";
@@ -458,6 +461,8 @@ public class PolicyManagementFragment extends BaseSearchablePolicyPreferenceFrag
 
     private DpcSwitchPreference mAutoBrightnessPreference;
 
+    private DpcSwitchPreference mEnableAppFeedbackNotificationsPreference;
+
     private GetAccessibilityServicesTask mGetAccessibilityServicesTask = null;
     private GetInputMethodsTask mGetInputMethodsTask = null;
     private GetNotificationListenersTask mGetNotificationListenersTask = null;
@@ -600,6 +605,9 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         findPreference(REMOVE_ACCOUNT_KEY).setOnPreferenceClickListener(this);
         findPreference(BLOCK_UNINSTALLATION_BY_PKG_KEY).setOnPreferenceClickListener(this);
         findPreference(BLOCK_UNINSTALLATION_LIST_KEY).setOnPreferenceClickListener(this);
+        findPreference(APP_FEEDBACK_NOTIFICATIONS).setOnPreferenceChangeListener(this);
+        mEnableAppFeedbackNotificationsPreference =
+            (DpcSwitchPreference) findPreference(APP_FEEDBACK_NOTIFICATIONS);
         findPreference(ENABLE_SYSTEM_APPS_KEY).setOnPreferenceClickListener(this);
         findPreference(ENABLE_SYSTEM_APPS_BY_PACKAGE_NAME_KEY).setOnPreferenceClickListener(this);
         findPreference(ENABLE_SYSTEM_APPS_BY_INTENT_KEY).setOnPreferenceClickListener(this);
@@ -687,6 +695,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         constrainSpecialCasePreferences();
 
         maybeDisableLockTaskPreferences();
+        loadAppFeedbackNotifications();
         loadAppStatus();
         loadSecurityPatch();
         loadIsEphemeralUserUi();
@@ -1331,6 +1340,14 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                     Integer.parseInt((String) newValue));
                 startActivity(intent);
                 return true;
+            case APP_FEEDBACK_NOTIFICATIONS:
+                SharedPreferences.Editor editor =
+                    PreferenceManager.getDefaultSharedPreferences(getContext()).edit();
+                editor.putBoolean(
+                    getString(
+                        R.string.app_feedback_notifications), newValue.equals(true));
+                editor.commit();
+                return true;
         }
         return false;
     }
@@ -2085,6 +2102,13 @@ public void onClick(DialogInterface dialogInterface, int i) {
                 .show();
     }
 
+    @TargetApi(Build.VERSION_CODES.M)
+    private void loadAppFeedbackNotifications() {
+        mEnableAppFeedbackNotificationsPreference.setChecked(
+            PreferenceManager.getDefaultSharedPreferences(getContext())
+                .getBoolean(getString(R.string.app_feedback_notifications), false));
+    }
+
     private void loadAppStatus() {
         final @StringRes int appStatusStringId;
         if (mDevicePolicyManager.isProfileOwnerApp(mPackageName)) {

app/src/main/res/values/strings.xml

@@ -548,6 +548,10 @@
     <string name="plus">+</string>
     <string name="app_restrictions_managing_package">App restrictions manager</string>
 
+    <!-- Strings for app feedback -->
+    <!-- [CHAR LIMIT=40] Settings label. A user can toggle this setting to turn on notifications for app feedback. -->
+    <string name="app_feedback_notifications">App feedback notifications</string>
+
     <!-- Strings for metered data restriction -->
     <string name="metered_data_restriction">Disable metered data</string>
     <string name="update_pkgs">Update</string>

app/src/main/res/xml/device_policy_header.xml

@@ -178,6 +178,11 @@
             android:title="@string/metered_data_restriction"
             testdpc:admin="deviceOwner|profileOwner"
             testdpc:minSdkVersion="P" />
+        <com.afwsamples.testdpc.common.preference.DpcSwitchPreference
+            android:key="app_feedback_notifications"
+            android:title="@string/app_feedback_notifications"
+            testdpc:admin="deviceOwner|profileOwner"
+            testdpc:minSdkVersion="N" />
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/delegation_title">