diff options
| author | Jim Miller <jaggies@google.com> | 2011-10-17 18:06:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-17 18:06:08 -0700 |
| commit | 138f6fa4391cbaa65a5fafb99687058629d6d7c9 (patch) | |
| tree | da34292c8257ed527830fda7ba02d4ed3acffdc3 /core | |
| parent | 08eaa9de7637a634f65d943582583699855ef20c (diff) | |
| parent | 9a7e4ce72a1f97832e71386ad023439ed9b179bd (diff) | |
| download | frameworks_base-138f6fa4391cbaa65a5fafb99687058629d6d7c9.zip frameworks_base-138f6fa4391cbaa65a5fafb99687058629d6d7c9.tar.gz frameworks_base-138f6fa4391cbaa65a5fafb99687058629d6d7c9.tar.bz2 | |
am 9a7e4ce7: Merge "Fix 5466678: use new setSystemUiVisibility() API to enable clock in statusbar" into ics-mr0
* commit '9a7e4ce72a1f97832e71386ad023439ed9b179bd':
Fix 5466678: use new setSystemUiVisibility() API to enable clock in statusbar
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/StatusBarManager.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java index c5ee48d..7863102 100644 --- a/core/java/android/app/StatusBarManager.java +++ b/core/java/android/app/StatusBarManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ - + package android.app; import android.content.Context; @@ -71,7 +71,9 @@ public class StatusBarManager { */ public void disable(int what) { try { - mService.disable(what, mToken, mContext.getPackageName()); + if (mService != null) { + mService.disable(what, mToken, mContext.getPackageName()); + } } catch (RemoteException ex) { // system process is dead anyway. throw new RuntimeException(ex); |