Merge /usr/local/google/home/ascull/ub-testdpc-oc-release/vendor/unbundled_google/packages/TestDPC into new-version

Author: AndrewScull

app/build.gradle

@@ -7,7 +7,7 @@ ext {
     // exactly 1 digit
     versionMinor = 0
     // exactly 2 digits
-    versionBuild = 04
+    versionBuild = 05
 }
 
 android {

app/src/main/AndroidManifest.xml

@@ -53,6 +53,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.INFO"/>
             </intent-filter>
         </activity-alias>
 

app/src/main/java/com/afwsamples/testdpc/PackageMonitorReceiver.java

@@ -1,8 +1,12 @@
 package com.afwsamples.testdpc;
 
+import android.app.Notification;
+import android.app.NotificationManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.support.v7.app.NotificationCompat;
+import android.support.v7.app.NotificationCompat.Builder;
 import android.text.TextUtils;
 
 import com.afwsamples.testdpc.common.NotificationUtil;
@@ -27,10 +31,16 @@ public void onReceive(Context context, Intent intent) {
             return;
         }
         String notificationBody = buildNotificationText(context, packageName, action);
-        NotificationUtil.showNotification(context,
-                R.string.package_changed_notification_title,
-                notificationBody,
-                PACKAGE_CHANGED_NOTIIFICATION_ID);
+        Notification notification = NotificationUtil.getNotificationBuilder(context)
+            .setSmallIcon(R.drawable.ic_launcher)
+            .setContentTitle(context.getString(R.string.package_changed_notification_title))
+            .setContentText(notificationBody)
+            .setStyle(new NotificationCompat.BigTextStyle().bigText(notificationBody))
+            .setDefaults(Notification.DEFAULT_LIGHTS)
+            .build();
+        NotificationManager notificationManager =
+            (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.notify(PACKAGE_CHANGED_NOTIIFICATION_ID, notification);
     }
 
     private String getPackageNameFromIntent(Intent intent) {

app/src/main/java/com/afwsamples/testdpc/policy/locktask/KioskModeActivity.java

@@ -35,6 +35,8 @@
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.v4.os.BuildCompat;
+import android.util.ArrayMap;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -75,6 +77,13 @@ public class KioskModeActivity extends Activity {
     public static final String LOCKED_APP_PACKAGE_LIST
             = "com.afwsamples.testdpc.policy.locktask.LOCKED_APP_PACKAGE_LIST";
 
+    private static final String[] KIOSK_USER_RESTRICTIONS = {
+            DISALLOW_SAFE_BOOT,
+            DISALLOW_FACTORY_RESET,
+            DISALLOW_ADD_USER,
+            DISALLOW_MOUNT_PHYSICAL_MEDIA,
+            DISALLOW_ADJUST_VOLUME };
+
     private ComponentName mAdminComponentName;
     private ArrayList<String> mKioskPackages;
     private DevicePolicyManager mDevicePolicyManager;
@@ -98,6 +107,7 @@ protected void onCreate(Bundle savedInstanceState) {
             }
             mKioskPackages.remove(getPackageName());
             mKioskPackages.add(getPackageName());
+
             setDefaultKioskPolicies(true);
         } else {
             // after a reboot there is no need to set the policies again
@@ -164,12 +174,17 @@ private void setUserRestriction(String restriction, boolean disallow) {
     }
 
     private void setDefaultKioskPolicies(boolean active) {
-        // set user restrictions
-        setUserRestriction(DISALLOW_SAFE_BOOT, active);
-        setUserRestriction(DISALLOW_FACTORY_RESET, active);
-        setUserRestriction(DISALLOW_ADD_USER, active);
-        setUserRestriction(DISALLOW_MOUNT_PHYSICAL_MEDIA, active);
-        setUserRestriction(DISALLOW_ADJUST_VOLUME, active);
+        // restore or save previous configuration
+        if (active) {
+            saveCurrentConfiguration();
+            setUserRestriction(DISALLOW_SAFE_BOOT, active);
+            setUserRestriction(DISALLOW_FACTORY_RESET, active);
+            setUserRestriction(DISALLOW_ADD_USER, active);
+            setUserRestriction(DISALLOW_MOUNT_PHYSICAL_MEDIA, active);
+            setUserRestriction(DISALLOW_ADJUST_VOLUME, active);
+        } else {
+            restorePreviousConfiguration();
+        }
 
         // disable keyguard and status bar
         mDevicePolicyManager.setKeyguardDisabled(mAdminComponentName, active);
@@ -198,6 +213,33 @@ private void setDefaultKioskPolicies(boolean active) {
         editor.commit();
     }
 
+    @TargetApi(Build.VERSION_CODES.N)
+    private void saveCurrentConfiguration() {
+        if (BuildCompat.isAtLeastN()) {
+            Bundle settingsBundle = mDevicePolicyManager.getUserRestrictions(mAdminComponentName);
+            SharedPreferences.Editor editor = getSharedPreferences(KIOSK_PREFERENCE_FILE,
+                    MODE_PRIVATE).edit();
+
+            for (String userRestriction : KIOSK_USER_RESTRICTIONS) {
+                boolean currentSettingValue = settingsBundle.getBoolean(userRestriction);
+                editor.putBoolean(userRestriction, currentSettingValue);
+            }
+            editor.commit();
+        }
+    }
+
+    private void restorePreviousConfiguration() {
+        if (BuildCompat.isAtLeastN()) {
+            SharedPreferences sharedPreferences = getSharedPreferences(KIOSK_PREFERENCE_FILE,
+                    MODE_PRIVATE);
+
+            for (String userRestriction : KIOSK_USER_RESTRICTIONS) {
+                boolean prevSettingValue = sharedPreferences.getBoolean(userRestriction, false);
+                setUserRestriction(userRestriction, prevSettingValue);
+            }
+        }
+    }
+
     private class KioskAppsArrayAdapter extends ArrayAdapter<String> implements
             AdapterView.OnItemClickListener {