Upstream 3.0.9 source

Author: AndrewScull

app/build.gradle

@@ -7,7 +7,7 @@ ext {
     // exactly 1 digit
     versionMinor = 0
     // exactly 2 digits
-    versionBuild = 8
+    versionBuild = 9
 }
 
 android {
@@ -58,7 +58,7 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:preference-v14:24+'
+    compile 'com.android.support:preference-v14:24.0.0'
     compile 'com.android.support:recyclerview-v7:24.+'
     compile "com.android.support:support-v13:24.+"
     compile 'com.google.android.gms:play-services-safetynet:+'

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

@@ -31,6 +31,7 @@
 import android.view.View;
 import android.widget.EditText;
 import android.widget.RadioGroup;
+import android.widget.Toast;
 
 import com.android.setupwizardlib.SetupWizardLayout;
 import com.android.setupwizardlib.view.NavigationBar;
@@ -58,6 +59,8 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_add_account);
         SetupWizardLayout layout = (SetupWizardLayout) findViewById(R.id.setup_wizard_layout);
         layout.getNavigationBar().setNavigationBarListener(this);
+        NavigationBar navigationBar = layout.getNavigationBar();
+        navigationBar.getBackButton().setEnabled(false);
 
         Bundle extras = getIntent().getExtras();
         if (extras != null) {
@@ -92,6 +95,9 @@ public void run(AccountManagerFuture<Bundle> accountManagerFuture) {
                         } catch (OperationCanceledException | AuthenticatorException
                                 | IOException e) {
                             Log.e(TAG, "addAccount - failed", e);
+                            Toast.makeText(AddAccountActivity.this,
+                                    R.string.fail_to_add_account, Toast.LENGTH_LONG).show();
+                            return;
                         }
                         Log.d(TAG, "addAccount - isAccountAdded: " + isAccountAdded
                                 + ", accountNameAdded: " + accountNameAdded);
@@ -134,7 +140,5 @@ public void onClick(DialogInterface dialogInterface, int i) {
     }
 
     @Override
-    public void onNavigateBack() {
-        onBackPressed();
-    }
+    public void onNavigateBack() {}
 }

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

@@ -16,13 +16,17 @@
 
 package com.afwsamples.testdpc;
 
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE;
+import static android.app.admin.DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED;
+import static com.afwsamples.testdpc.policy.PolicyManagementFragment.OVERRIDE_KEY_SELECTION_KEY;
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.annotation.TargetApi;
-import android.app.admin.DevicePolicyManager;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
+import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -40,24 +44,27 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import com.afwsamples.testdpc.common.Util;
 import com.afwsamples.testdpc.common.LaunchIntentUtil;
 import com.afwsamples.testdpc.common.Util;
 import com.afwsamples.testdpc.cosu.EnableCosuActivity;
 
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
-import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE;
-import static android.app.admin.DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED;
-import static com.afwsamples.testdpc.policy.PolicyManagementFragment.OVERRIDE_KEY_SELECTION_KEY;
-
 /**
  * Handles events related to the managed profile.
  */
@@ -67,6 +74,11 @@ public class DeviceAdminReceiver extends android.app.admin.DeviceAdminReceiver {
     public static final String ACTION_PASSWORD_REQUIREMENTS_CHANGED =
             "com.afwsamples.testdpc.policy.PASSWORD_REQUIREMENTS_CHANGED";
 
+    private static final String LOGS_DIR = "logs";
+
+    private static final String FAILED_PASSWORD_LOG_FILE =
+            "failed_pw_attempts_timestamps.log";
+
     private static final int CHANGE_PASSWORD_NOTIFICATION_ID = 101;
     private static final int PASSWORD_FAILED_NOTIFICATION_ID = 102;
 
@@ -297,8 +309,14 @@ private boolean isRuntimePermission(PackageManager packageManager, String permis
     @TargetApi(Build.VERSION_CODES.M)
     @Override
     public void onSystemUpdatePending(Context context, Intent intent, long receivedTime) {
-        Toast.makeText(context, "System update received at: " + receivedTime,
-                Toast.LENGTH_LONG).show();
+        if (receivedTime != -1) {
+            DateFormat sdf = new SimpleDateFormat("hh:mm:ss dd/MM/yyyy");
+            String timeString = sdf.format(new Date(receivedTime));
+            Toast.makeText(context, "System update received at: " + timeString,
+                    Toast.LENGTH_LONG).show();
+        } else {
+            // No system update is currently available on this device.
+        }
     }
 
     @TargetApi(Build.VERSION_CODES.M)
@@ -360,6 +378,17 @@ public void onPasswordFailed(Context context, Intent intent) {
 
         String title = context.getResources().getQuantityString(
                 R.plurals.password_failed_attempts_title, attempts, attempts);
+
+        ArrayList<Date> previousFailedAttempts = getFailedPasswordAttempts(context);
+        Date date = new Date();
+        previousFailedAttempts.add(date);
+        Collections.sort(previousFailedAttempts, Collections.<Date>reverseOrder());
+        try {
+            saveFailedPasswordAttempts(context, previousFailedAttempts);
+        } catch (IOException e) {
+            Log.e(TAG, "Unable to save failed password attempts", e);
+        }
+
         String content = maxAttempts == 0
                 ? context.getString(R.string.password_failed_no_limit_set)
                 : context.getResources().getQuantityString(
@@ -373,11 +402,78 @@ public void onPasswordFailed(Context context, Intent intent) {
                 .setContentIntent(PendingIntent.getActivity(context, /* requestCode */ -1,
                         new Intent(DevicePolicyManager.ACTION_SET_NEW_PASSWORD), /* flags */ 0));
 
+        Notification.InboxStyle inboxStyle = new Notification.InboxStyle();
+        inboxStyle.setBigContentTitle(title);
+
+        final DateFormat dateFormat = SimpleDateFormat.getDateTimeInstance();
+        for(Date d : previousFailedAttempts) {
+            inboxStyle.addLine(dateFormat.format(d));
+        }
+        warn.setStyle(inboxStyle);
+
         NotificationManager nm = (NotificationManager)
                 context.getSystemService(Context.NOTIFICATION_SERVICE);
         nm.notify(PASSWORD_FAILED_NOTIFICATION_ID, warn.getNotification());
     }
 
+    private static File logFile(Context context) {
+        File parent = context.getDir(LOGS_DIR, Context.MODE_PRIVATE);
+        return new File(parent, FAILED_PASSWORD_LOG_FILE);
+    }
+
+    private static ArrayList<Date> getFailedPasswordAttempts(Context context) {
+        File logFile = logFile(context);
+        ArrayList<Date> result = new ArrayList<Date>();
+
+        if(!logFile.exists()) {
+            return result;
+        }
+
+        FileInputStream fis = null;
+        try {
+            fis = new FileInputStream(logFile);
+            BufferedReader br = new BufferedReader(new InputStreamReader(fis));
+
+            String line = null;
+            while ((line = br.readLine()) != null && line.length() > 0) {
+                result.add(new Date(Long.parseLong(line)));
+            }
+
+            br.close();
+        } catch (IOException e) {
+            Log.e(TAG, "Unable to read failed password attempts", e);
+        } finally {
+            if(fis != null) {
+                try {
+                    fis.close();
+                } catch (IOException e) {
+                    Log.e(TAG, "Unable to close failed password attempts log file", e);
+                }
+            }
+        }
+
+        return result;
+    }
+
+    private static void saveFailedPasswordAttempts(Context context, ArrayList<Date> attempts)
+            throws IOException {
+        File logFile = logFile(context);
+
+        if(!logFile.exists()) {
+            logFile.createNewFile();
+        }
+
+        FileOutputStream fos = new FileOutputStream(logFile);
+        BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(fos));
+
+        for(Date date : attempts) {
+            bw.write(Long.toString(date.getTime()));
+            bw.newLine();
+        }
+
+        bw.close();
+    }
+
     @Override
     public void onPasswordChanged(Context context, Intent intent) {
         updatePasswordQualityNotification(context);

app/src/main/java/com/afwsamples/testdpc/common/ProfileOrParentFragment.java

@@ -169,6 +169,10 @@ public void onCreate(Bundle savedInstanceState) {
         mProfileOwner = mDevicePolicyManager.isProfileOwnerApp(getActivity().getPackageName());
         mDeviceOwner = mDevicePolicyManager.isDeviceOwnerApp(getActivity().getPackageName());
 
+        if (mParentInstance) {
+            mDevicePolicyManager = mDevicePolicyManager.getParentProfileInstance(mAdminComponent);
+        }
+
         // Put at last to make sure all initializations above are done before subclass's
         // onCreatePreferences is called.
         super.onCreate(savedInstanceState);
@@ -177,7 +181,6 @@ public void onCreate(Bundle savedInstanceState) {
         // This needs to be called after super.onCreate because preference manager is set up
         // inside super.onCreate.
         if (mParentInstance) {
-            mDevicePolicyManager = mDevicePolicyManager.getParentProfileInstance(mAdminComponent);
             final PreferenceManager pm = getPreferenceManager();
             pm.setSharedPreferencesName(pm.getSharedPreferencesName() + TAG_PARENT);
         }

app/src/main/java/com/afwsamples/testdpc/common/RestrictionManagerCompat.java

@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2016 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.afwsamples.testdpc.common;
+
+import android.annotation.TargetApi;
+import android.content.RestrictionEntry;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Ported from {@link android.content.RestrictionsManager}.
+ */
+public class RestrictionManagerCompat {
+    private static final String TAG = "RestrictionManager";
+
+    /**
+     * Converts a list of restrictions to the corresponding bundle, using the following mapping:
+     * <table>
+     *     <tr><th>RestrictionEntry</th><th>Bundle</th></tr>
+     *     <tr><td>{@link RestrictionEntry#TYPE_BOOLEAN}</td><td>{@link Bundle#putBoolean}</td></tr>
+     *     <tr><td>{@link RestrictionEntry#TYPE_CHOICE},
+     *     {@link RestrictionEntry#TYPE_MULTI_SELECT}</td>
+     *     <td>{@link Bundle#putStringArray}</td></tr>
+     *     <tr><td>{@link RestrictionEntry#TYPE_INTEGER}</td><td>{@link Bundle#putInt}</td></tr>
+     *     <tr><td>{@link RestrictionEntry#TYPE_STRING}</td><td>{@link Bundle#putString}</td></tr>
+     *     <tr><td>{@link RestrictionEntry#TYPE_BUNDLE}</td><td>{@link Bundle#putBundle}</td></tr>
+     *     <tr><td>{@link RestrictionEntry#TYPE_BUNDLE_ARRAY}</td>
+     *     <td>{@link Bundle#putParcelableArray}</td></tr>
+     * </table>
+     * TYPE_BUNDLE and TYPE_BUNDLE_ARRAY are supported from api level 23 onwards.
+     * @param entries list of restrictions
+     */
+    public static Bundle convertRestrictionsToBundle(List<RestrictionEntry> entries) {
+        final Bundle bundle = new Bundle();
+        for (RestrictionEntry entry : entries) {
+            addRestrictionToBundle(bundle, entry);
+        }
+        return bundle;
+    }
+
+    private static Bundle addRestrictionToBundle(Bundle bundle, RestrictionEntry entry) {
+        switch (entry.getType()) {
+            case RestrictionEntry.TYPE_BOOLEAN:
+                bundle.putBoolean(entry.getKey(), entry.getSelectedState());
+                break;
+            case RestrictionEntry.TYPE_CHOICE:
+            case RestrictionEntry.TYPE_MULTI_SELECT:
+                bundle.putStringArray(entry.getKey(), entry.getAllSelectedStrings());
+                break;
+            case RestrictionEntry.TYPE_INTEGER:
+                bundle.putInt(entry.getKey(), entry.getIntValue());
+                break;
+            case RestrictionEntry.TYPE_STRING:
+            case RestrictionEntry.TYPE_NULL:
+                bundle.putString(entry.getKey(), entry.getSelectedString());
+                break;
+            case RestrictionEntry.TYPE_BUNDLE:
+                addBundleRestrictionToBundle(bundle, entry);
+                break;
+            case RestrictionEntry.TYPE_BUNDLE_ARRAY:
+                addBundleArrayRestrictionToBundle(bundle, entry);
+                break;
+            default:
+                throw new IllegalArgumentException(
+                        "Unsupported restrictionEntry type: " + entry.getType());
+        }
+        return bundle;
+    }
+
+    @TargetApi(Build.VERSION_CODES.M)
+    private static void addBundleRestrictionToBundle(Bundle bundle, RestrictionEntry entry) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            RestrictionEntry[] restrictions = entry.getRestrictions();
+            Bundle childBundle = convertRestrictionsToBundle(Arrays.asList(restrictions));
+            bundle.putBundle(entry.getKey(), childBundle);
+        } else {
+            Log.w(TAG, "addBundleRestrictionToBundle is called in pre-M");
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.M)
+    private static void addBundleArrayRestrictionToBundle(Bundle bundle, RestrictionEntry entry) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            RestrictionEntry[] bundleRestrictionArray = entry.getRestrictions();
+            Bundle[] bundleArray = new Bundle[bundleRestrictionArray.length];
+            for (int i = 0; i < bundleRestrictionArray.length; i++) {
+                RestrictionEntry[] bundleRestrictions =
+                        bundleRestrictionArray[i].getRestrictions();
+                if (bundleRestrictions == null) {
+                    // Non-bundle entry found in bundle array.
+                    Log.w(TAG, "addRestrictionToBundle: " +
+                            "Non-bundle entry found in bundle array");
+                    bundleArray[i] = new Bundle();
+                } else {
+                    bundleArray[i] = convertRestrictionsToBundle(Arrays.asList(
+                            bundleRestrictions));
+                }
+            }
+            bundle.putParcelableArray(entry.getKey(), bundleArray);
+        } else {
+            Log.w(TAG, "addBundleArrayRestrictionToBundle is called in pre-M");
+        }
+    }
+}