diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-06-02 08:54:47 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-06-02 08:54:47 -0700 |
| commit | 1bd7597b8cdaf39d1183077c463cb30596eb31b0 (patch) | |
| tree | 46dac341fbbf03488856ef6d6975ab124ac01874 | |
| parent | c8763858cfcae8be89c0f88df87bf9a3ad90ae64 (diff) | |
| parent | ef367529f9c7a538d74599b37b49ac309d0a8d8c (diff) | |
| download | frameworks_base-1bd7597b8cdaf39d1183077c463cb30596eb31b0.zip frameworks_base-1bd7597b8cdaf39d1183077c463cb30596eb31b0.tar.gz frameworks_base-1bd7597b8cdaf39d1183077c463cb30596eb31b0.tar.bz2 | |
merge from open-source master
Change-Id: I8333e295ba6b6ed8e7658ecf3fbf1ebea3537aeb
| -rw-r--r-- | core/java/android/app/Dialog.java | 2 | ||||
| -rw-r--r-- | core/java/android/widget/MediaController.java | 2 | ||||
| -rw-r--r-- | tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java index 0235599..da8c9e5 100644 --- a/core/java/android/app/Dialog.java +++ b/core/java/android/app/Dialog.java @@ -138,7 +138,7 @@ public class Dialog implements DialogInterface, Window.Callback, public Dialog(Context context, int theme) { mContext = new ContextThemeWrapper( context, theme == 0 ? com.android.internal.R.style.Theme_Dialog : theme); - mWindowManager = (WindowManager)context.getSystemService("window"); + mWindowManager = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE); Window w = PolicyManager.makeNewWindow(mContext); mWindow = w; w.setCallback(this); diff --git a/core/java/android/widget/MediaController.java b/core/java/android/widget/MediaController.java index c246c247..39b1377 100644 --- a/core/java/android/widget/MediaController.java +++ b/core/java/android/widget/MediaController.java @@ -123,7 +123,7 @@ public class MediaController extends FrameLayout { } private void initFloatingWindow() { - mWindowManager = (WindowManager)mContext.getSystemService("window"); + mWindowManager = (WindowManager)mContext.getSystemService(Context.WINDOW_SERVICE); mWindow = PolicyManager.makeNewWindow(mContext); mWindow.setWindowManager(mWindowManager, null, null); mWindow.requestFeature(Window.FEATURE_NO_TITLE); diff --git a/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java b/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java index e7a09d1..a6124bf 100644 --- a/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java +++ b/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java @@ -21,6 +21,7 @@ import android.app.PendingIntent; import android.widget.ArrayAdapter; import android.view.View; import android.widget.ListView; +import android.content.Context; import android.content.ContentResolver; import android.content.Intent; import android.app.Notification; @@ -60,7 +61,7 @@ public class NotificationTestList extends TestActivity private Test[] mTests = new Test[] { new Test("Off and sound") { public void run() { - PowerManager pm = (PowerManager)NotificationTestList.this.getSystemService("power"); + PowerManager pm = (PowerManager)NotificationTestList.this.getSystemService(Context.POWER_SERVICE); PowerManager.WakeLock wl = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "sound"); wl.acquire(); @@ -599,7 +600,7 @@ public class NotificationTestList extends TestActivity public void run() { PowerManager.WakeLock wl - = ((PowerManager)NotificationTestList.this.getSystemService("power")) + = ((PowerManager)NotificationTestList.this.getSystemService(Context.POWER_SERVICE)) .newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "crasher"); wl.acquire(); mHandler.postDelayed(new Runnable() { |