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

Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb

Browse Source
This commit is contained in:
Joe Onorato
2011-01-30 16:00:52 -08:00
committed by Android (Google) Code Review
parent 236b987214 ac0ee89bd9
commit 4de68baed4
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/view/View.java
View File

@ -1869,6 +1869,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
* This view's request for the visibility of the status bar.
* @hide
*/
@ViewDebug.ExportedProperty()
int mSystemUiVisibility;
/**

10
services/java/com/android/server/WindowManagerService.java
View File

@ -47,6 +47,7 @@ import com.android.server.am.BatteryStatsService;
import android.Manifest;
import android.app.ActivityManagerNative;
import android.app.IActivityManager;
import android.app.StatusBarManager;
import android.app.admin.DevicePolicyManager;
import android.content.BroadcastReceiver;
import android.content.ClipData;
@ -2758,6 +2759,15 @@ public class WindowManagerService extends IWindowManager.Stub
boolean displayed = false;
boolean inTouchMode;
boolean configChanged;
// if they don't have this permission, mask out the status bar bits
if (attrs != null) {
if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.STATUS_BAR)
!= PackageManager.PERMISSION_GRANTED) {
attrs.systemUiVisibility &= ~StatusBarManager.DISABLE_MASK;
attrs.subtreeSystemUiVisibility &= ~StatusBarManager.DISABLE_MASK;
}
}
long origId = Binder.clearCallingIdentity();
synchronized(mWindowMap) {