LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve multi-user broadcasts.

Browse Source 
You can now use ALL and CURRENT when sending broadcasts, to specify
where the broadcast goes.

Sticky broadcasts are now correctly separated per user, and registered
receivers are filtered based on the requested target user.

New Context APIs for more kinds of sending broadcasts as users.

Updating a bunch of system code that sends broadcasts to explicitly
specify which user the broadcast goes to.

Made a single version of the code for interpreting the requested
target user ID that all entries to activity manager (start activity,
send broadcast, start service) use.

Change-Id: Ie29f02dd5242ef8c8fa56c54593a315cd2574e1c
This commit is contained in:
Dianne Hackborn
2012-08-29 18:32:08 -07:00
parent 0ad0d13d5a
commit 2298689dc1
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/java/com/android/server/ConnectivityService.java
View File

@@ -81,6 +81,7 @@ import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
import android.security.Credentials; import android.security.Credentials;
import android.security.KeyStore; import android.security.KeyStore;
@@ -1851,7 +1852,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
Intent intent = new Intent(ConnectivityManager.ACTION_DATA_ACTIVITY_CHANGE); Intent intent = new Intent(ConnectivityManager.ACTION_DATA_ACTIVITY_CHANGE);
intent.putExtra(ConnectivityManager.EXTRA_DEVICE_TYPE, deviceType); intent.putExtra(ConnectivityManager.EXTRA_DEVICE_TYPE, deviceType);
intent.putExtra(ConnectivityManager.EXTRA_IS_ACTIVE, active); intent.putExtra(ConnectivityManager.EXTRA_IS_ACTIVE, active);
mContext.sendOrderedBroadcast(intent, RECEIVE_DATA_ACTIVITY_CHANGE); mContext.sendOrderedBroadcastAsUser(intent, UserHandle.ALL,
RECEIVE_DATA_ACTIVITY_CHANGE, null, null, 0, null, null);
} }
/** /**
@@ -1925,7 +1927,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
log("sendStickyBroadcast: action=" + intent.getAction()); log("sendStickyBroadcast: action=" + intent.getAction());
} }
mContext.sendStickyBroadcast(intent); mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);
} }
} }
@@ -1946,7 +1948,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
synchronized(this) { synchronized(this) {
mSystemReady = true; mSystemReady = true;
if (mInitialBroadcast != null) { if (mInitialBroadcast != null) {
mContext.sendStickyBroadcast(mInitialBroadcast); mContext.sendStickyBroadcastAsUser(mInitialBroadcast, UserHandle.ALL);
mInitialBroadcast = null; mInitialBroadcast = null;
} }
} }
@@ -2465,7 +2467,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
* Connectivity events can happen before boot has completed ... * Connectivity events can happen before boot has completed ...
*/ */
intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
mContext.sendBroadcast(intent); mContext.sendBroadcastAsUser(intent, UserHandle.ALL);
} }
// Caller must grab mDnsLock. // Caller must grab mDnsLock.
@@ -3110,7 +3112,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING | intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING |
Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
intent.putExtra(Proxy.EXTRA_PROXY_INFO, proxy); intent.putExtra(Proxy.EXTRA_PROXY_INFO, proxy);
mContext.sendStickyBroadcast(intent); mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);
} }
private static class SettingsObserver extends ContentObserver { private static class SettingsObserver extends ContentObserver {