diff options
| author | Joe Onorato <joeo@google.com> | 2011-01-30 16:00:52 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-30 16:00:52 -0800 |
| commit | 4de68baed4bf18b33dc38f89f25410d3d5edfecf (patch) | |
| tree | c9ad4cd8efefce840dec5daec3342d3a62373e6c /services | |
| parent | 236b9872140599d1856d48e53b8e109e506fd88f (diff) | |
| parent | ac0ee89bd985c024870fefca9a3422c4585b62d4 (diff) | |
| download | frameworks_base-4de68baed4bf18b33dc38f89f25410d3d5edfecf.zip frameworks_base-4de68baed4bf18b33dc38f89f25410d3d5edfecf.tar.gz frameworks_base-4de68baed4bf18b33dc38f89f25410d3d5edfecf.tar.bz2 | |
Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/WindowManagerService.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java index 779e0ad..7c79b8a 100644 --- a/services/java/com/android/server/WindowManagerService.java +++ b/services/java/com/android/server/WindowManagerService.java @@ -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) { |