Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Dismiss docked stack if an activity is shown on top of the lock screen" into nyc-dev am: 5d6a218d9e am: d9125edb98

Browse Source 
am: 94d93dd38f

* commit '94d93dd38fbab0ff8f9a9ce397a522cf2fcd6429':
  Dismiss docked stack if an activity is shown on top of the lock screen

Change-Id: Iaaf1dc4cd6f4008bf4bc571bb70365d431ea30ed
This commit is contained in:
Wale Ogunwale
2016-05-06 18:54:56 +00:00
committed by android-build-merger
parent 2101140764 94d93dd38f
commit e87b575046
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/app/ActivityManagerNative.java
View File

@@ -1527,7 +1527,9 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
case SET_LOCK_SCREEN_SHOWN_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
setLockScreenShown(data.readInt() != 0);
final boolean showing = data.readInt() != 0;
final boolean occluded = data.readInt() != 0;
setLockScreenShown(showing, occluded);
reply.writeNoException();
return true;
}
@@ -4922,12 +4924,13 @@ class ActivityManagerProxy implements IActivityManager
reply.recycle();
return pfd;
}
public void setLockScreenShown(boolean shown) throws RemoteException
public void setLockScreenShown(boolean showing, boolean occluded) throws RemoteException
{
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor);
data.writeInt(shown ? 1 : 0);
data.writeInt(showing ? 1 : 0);
data.writeInt(occluded ? 1 : 0);
mRemote.transact(SET_LOCK_SCREEN_SHOWN_TRANSACTION, data, reply, 0);
reply.readException();
data.recycle();

2
core/java/android/app/IActivityManager.java
View File

@@ -331,7 +331,7 @@ public interface IActivityManager extends IInterface {
public void forceStopPackage(final String packageName, int userId) throws RemoteException;
// Note: probably don't want to allow applications access to these.
public void setLockScreenShown(boolean shown) throws RemoteException;
public void setLockScreenShown(boolean showing, boolean occluded) throws RemoteException;
public void unhandledBack() throws RemoteException;
public ParcelFileDescriptor openContentUri(Uri uri) throws RemoteException;