diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-06-02 09:03:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-02 09:03:04 -0700 |
| commit | b705eea70245dae69d16e18d63b3ee38e1d0c5c3 (patch) | |
| tree | ac300b9ef5e3d98c5d98e47dca199fe001ea1921 | |
| parent | 59c82376e573d35f1bad7a35ccd3fe6df85f4342 (diff) | |
| parent | 1bd7597b8cdaf39d1183077c463cb30596eb31b0 (diff) | |
| download | frameworks_base-b705eea70245dae69d16e18d63b3ee38e1d0c5c3.zip frameworks_base-b705eea70245dae69d16e18d63b3ee38e1d0c5c3.tar.gz frameworks_base-b705eea70245dae69d16e18d63b3ee38e1d0c5c3.tar.bz2 | |
am 1bd7597b: merge from open-source master
Merge commit '1bd7597b8cdaf39d1183077c463cb30596eb31b0' into kraken
* commit '1bd7597b8cdaf39d1183077c463cb30596eb31b0':
Replaced raw string arguments for Context.getSystemService() with final Context variables
| -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() { |