Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 25937 into eclair

Browse Source 
* changes:
  Change the broadcast intent for dock state changes from a sticky broadcast to a sticky ordered broadcast. This is so individual apps can override the default behavior and stop the related dock app from launching.
This commit is contained in:
Android (Google) Code Review
2009-09-20 00:24:44 -04:00
parent 927b86f3a7 1f6c7e6a2b
commit 2b1cfef19e
1 changed files with 48 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
services/java/com/android/server/DockObserver.java
View File

@@ -16,7 +16,9 @@
package com.android.server; package com.android.server;
import android.app.Activity;
import android.content.ActivityNotFoundException; import android.content.ActivityNotFoundException;
import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Handler; import android.os.Handler;
@@ -44,6 +46,43 @@ class DockObserver extends UEventObserver {
private final Context mContext; private final Context mContext;
private PowerManagerService mPowerManager; private PowerManagerService mPowerManager;
// The broadcast receiver which receives the result of the ordered broadcast sent when
// the dock state changes. The original ordered broadcast is sent with an initial result
// code of RESULT_OK. If any of the registered broadcast receivers changes this value, e.g.,
// to RESULT_CANCELED, then the intent to start a dock app will not be sent.
private final BroadcastReceiver mResultReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
if (getResultCode() != Activity.RESULT_OK) {
return;
}
// Launch a dock activity
String category;
switch (mDockState) {
case Intent.EXTRA_DOCK_STATE_CAR:
category = Intent.CATEGORY_CAR_DOCK;
break;
case Intent.EXTRA_DOCK_STATE_DESK:
category = Intent.CATEGORY_DESK_DOCK;
break;
default:
category = null;
break;
}
if (category != null) {
intent = new Intent(Intent.ACTION_MAIN);
intent.addCategory(category);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
try {
mContext.startActivity(intent);
} catch (ActivityNotFoundException e) {
Log.w(TAG, e.getCause());
}
}
}
};
public DockObserver(Context context, PowerManagerService pm) { public DockObserver(Context context, PowerManagerService pm) {
mContext = context; mContext = context;
@@ -111,31 +150,15 @@ class DockObserver extends UEventObserver {
mPowerManager.userActivityWithForce(SystemClock.uptimeMillis(), false, true); mPowerManager.userActivityWithForce(SystemClock.uptimeMillis(), false, true);
Intent intent = new Intent(Intent.ACTION_DOCK_EVENT); Intent intent = new Intent(Intent.ACTION_DOCK_EVENT);
intent.putExtra(Intent.EXTRA_DOCK_STATE, mDockState); intent.putExtra(Intent.EXTRA_DOCK_STATE, mDockState);
mContext.sendStickyBroadcast(intent);
// Send the ordered broadcast; the result receiver will receive after all
// Launch a dock activity // broadcasts have been sent. If any broadcast receiver changes the result
String category; // code from the initial value of RESULT_OK, then the result receiver will
switch (mDockState) { // not launch the corresponding dock application. This gives apps a chance
case Intent.EXTRA_DOCK_STATE_CAR: // to override the behavior and stay in their app even when the device is
category = Intent.CATEGORY_CAR_DOCK; // placed into a dock.
break; mContext.sendStickyOrderedBroadcast(
case Intent.EXTRA_DOCK_STATE_DESK: intent, mResultReceiver, null, Activity.RESULT_OK, null, null);
category = Intent.CATEGORY_DESK_DOCK;
break;
default:
category = null;
break;
}
if (category != null) {
intent = new Intent(Intent.ACTION_MAIN);
intent.addCategory(category);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
try {
mContext.startActivity(intent);
} catch (ActivityNotFoundException e) {
Log.w(TAG, e.getCause());
}
}
} }
} }
}; };