Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f35d487 authored by Andy Stadler's avatar Andy Stadler
Browse files

Fixes to DevicePolicyManager.setPasswordExpirationTimeout 

* Fix permissions problem in DevicePolicyManager
* Allow short timeouts (primarily for testing)
* Remove unused debugging code

Bug: 3212583
Change-Id: I3770b1c6f090363e8e8d65db92839cd53de05c45
parent d48124e0

core/java/android/app/admin/DevicePolicyManager.java

+0 −2
Original line number Diff line number Diff line
@@ -691,8 +691,6 @@ public class DevicePolicyManager { 
     *

     * <p>To disable password expiration, a value of 0 may be used for timeout.

     *

     * <p>Timeout must be at least 1 day or IllegalArgumentException will be thrown.

     *

     * <p>The calling device admin must have requested

     * {@link DeviceAdminInfo#USES_POLICY_EXPIRE_PASSWORD} to be able to call this

     * method; if it has not, a security exception will be thrown.

services/java/com/android/server/DevicePolicyManagerService.java

+16 −21
Original line number Diff line number Diff line
@@ -41,9 +41,8 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.content.pm.PackageManager.NameNotFoundException;

import android.net.ConnectivityManager;

import android.content.pm.ResolveInfo;

import android.os.Binder;

import android.os.Handler;

import android.os.IBinder;
@@ -55,9 +54,9 @@ import android.os.RemoteException; 
import android.os.ServiceManager;

import android.os.SystemClock;

import android.provider.Settings;

import android.util.Slog;

import android.util.PrintWriterPrinter;

import android.util.Printer;

import android.util.Slog;

import android.util.Xml;

import android.view.WindowManagerPolicy;
@@ -89,9 +88,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            = "com.android.server.ACTION_EXPIRED_PASSWORD_NOTIFICATION";



    private static final long MS_PER_DAY = 86400 * 1000;

    private static final long MS_PER_HOUR = 3600 * 1000;

    private static final long MS_PER_MINUTE = 60 * 1000;

    private static final long MIN_TIMEOUT = 86400 * 1000; // minimum expiration timeout is 1 day



    final Context mContext;

    final MyPackageMonitor mMonitor;
@@ -364,6 +360,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
    }



    class MyPackageMonitor extends PackageMonitor {

        @Override

        public void onSomePackagesChanged() {

            synchronized (DevicePolicyManagerService.this) {

                boolean removed = false;
@@ -410,13 +407,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        context.registerReceiver(mReceiver, filter);

    }



    static String countdownString(long time) {

        long days = time / MS_PER_DAY;

        long hours = (time / MS_PER_HOUR) % 24;

        long minutes = (time / MS_PER_MINUTE) % 60;

        return days + "d" + hours + "h" + minutes + "m";

    }



    protected void setExpirationAlarmCheckLocked(Context context) {

        final long expiration = getPasswordExpirationLocked(null);

        final long now = System.currentTimeMillis();
@@ -430,12 +420,17 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            alarmTime = now + MS_PER_DAY;

        }



        long token = Binder.clearCallingIdentity();

        try {

            AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);

            PendingIntent pi = PendingIntent.getBroadcast(context, REQUEST_EXPIRE_PASSWORD,

                    new Intent(ACTION_EXPIRED_PASSWORD_NOTIFICATION),

                    PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT);

            am.cancel(pi);

            am.set(AlarmManager.RTC, alarmTime, pi);

        } finally {

            Binder.restoreCallingIdentity(token);

        }

    }



    private IPowerManager getIPowerManager() {
@@ -993,8 +988,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            if (who == null) {

                throw new NullPointerException("ComponentName is null");

            }

            if (timeout != 0L && timeout < MIN_TIMEOUT) {

                throw new IllegalArgumentException("Timeout must be > " + MIN_TIMEOUT + "ms");

            if (timeout < 0) {

                throw new IllegalArgumentException("Timeout must be >= 0 ms");

            }

            ActiveAdmin ap = getActiveAdminForCallerLocked(who,

                    DeviceAdminInfo.USES_POLICY_EXPIRE_PASSWORD);