drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1

Browse Source
This commit is contained in:
Jim Miller
2012-01-18 16:44:52 -08:00
committed by Android (Google) Code Review
parent db2e716359 93c518e4f8
commit 230a709285
6 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/view/IWindowManager.aidl
View File

@ -229,4 +229,9 @@ interface IWindowManager
* Device has a software navigation bar (separate from the status bar).
*/
boolean hasNavigationBar();
/**
* Lock the device immediately.
*/
void lockNow();
}

5
core/java/android/view/WindowManagerPolicy.java
View File

@ -1027,6 +1027,11 @@ public interface WindowManagerPolicy {
*/
public boolean hasNavigationBar();
/**
* Lock the device now.
*/
public void lockNow();
/**
* Print the WindowManagerPolicy's state into the given stream.
*

6
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@ -3488,6 +3488,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
};
public void lockNow() {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null);
mHandler.removeCallbacks(mScreenLockTimeout);
mHandler.post(mScreenLockTimeout);
}
private void updateLockScreenTimeout() {
synchronized (mScreenLockTimeout) {
boolean enable = (mAllowLockscreenWhenOn && mScreenOnEarly && mKeyguardMediator.isSecure());

13
services/java/com/android/server/DevicePolicyManagerService.java
View File

@ -60,6 +60,7 @@ import android.util.PrintWriterPrinter;
import android.util.Printer;
import android.util.Slog;
import android.util.Xml;
import android.view.IWindowManager;
import android.view.WindowManagerPolicy;
import java.io.File;
@ -96,6 +97,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
final PowerManager.WakeLock mWakeLock;
IPowerManager mIPowerManager;
IWindowManager mIWindowManager;
int mActivePasswordQuality = DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
int mActivePasswordLength = 0;
@ -506,6 +508,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
return mIPowerManager;
}
private IWindowManager getWindowManager() {
if (mIWindowManager == null) {
IBinder b = ServiceManager.getService(Context.WINDOW_SERVICE);
mIWindowManager = IWindowManager.Stub.asInterface(b);
}
return mIWindowManager;
}
ActiveAdmin getActiveAdminUncheckedLocked(ComponentName who) {
ActiveAdmin admin = mAdminMap.get(who);
if (admin != null
@ -1649,8 +1659,11 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
DeviceAdminInfo.USES_POLICY_FORCE_LOCK);
long ident = Binder.clearCallingIdentity();
try {
// Power off the display
mIPowerManager.goToSleepWithReason(SystemClock.uptimeMillis(),
WindowManagerPolicy.OFF_BECAUSE_OF_ADMIN);
// Ensure the device is locked
getWindowManager().lockNow();
} catch (RemoteException e) {
} finally {
Binder.restoreCallingIdentity(ident);

4
services/java/com/android/server/wm/WindowManagerService.java
View File

@ -9415,6 +9415,10 @@ public class WindowManagerService extends IWindowManager.Stub
return mPolicy.hasNavigationBar();
}
public void lockNow() {
mPolicy.lockNow();
}
void dumpInput(FileDescriptor fd, PrintWriter pw, boolean dumpAll) {
pw.println("WINDOW MANAGER INPUT (dumpsys window input)");
mInputManager.dump(pw);

4
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java
View File

@ -471,4 +471,8 @@ public class BridgeWindowManager implements IWindowManager {
public boolean hasNavigationBar() {
return false; // should this return something else?
}
public void lockNow() {
// TODO Auto-generated method stub
}
}