diff options
14 files changed, 21 insertions, 23 deletions
diff --git a/core/java/android/net/NetworkScoreManager.java b/core/java/android/net/NetworkScoreManager.java index a939ccee4ca7..3f36d65e577c 100644 --- a/core/java/android/net/NetworkScoreManager.java +++ b/core/java/android/net/NetworkScoreManager.java @@ -245,7 +245,8 @@ public class NetworkScoreManager { intent.putExtra(EXTRA_NETWORKS_TO_SCORE, networks); // A scorer should never become active if its package doesn't hold SCORE_NETWORKS, but // ensure the package still holds it to be extra safe. - mContext.sendBroadcastAsUser(intent, UserHandle.OWNER, Manifest.permission.SCORE_NETWORKS); + // TODO: http://b/23422763 + mContext.sendBroadcastAsUser(intent, UserHandle.SYSTEM, Manifest.permission.SCORE_NETWORKS); return true; } diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java index 8c544f44f244..41de579201a5 100644 --- a/core/java/android/os/RecoverySystem.java +++ b/core/java/android/os/RecoverySystem.java @@ -410,7 +410,7 @@ public class RecoverySystem { Intent intent = new Intent("android.intent.action.MASTER_CLEAR_NOTIFICATION"); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); - context.sendOrderedBroadcastAsUser(intent, UserHandle.OWNER, + context.sendOrderedBroadcastAsUser(intent, UserHandle.SYSTEM, android.Manifest.permission.MASTER_CLEAR, new BroadcastReceiver() { @Override diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java index 1d71346b575b..e12e3a571880 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java @@ -166,7 +166,7 @@ public class SettingsHelper { .putExtra(Intent.EXTRA_SETTING_NAME, name) .putExtra(Intent.EXTRA_SETTING_NEW_VALUE, value) .putExtra(Intent.EXTRA_SETTING_PREVIOUS_VALUE, oldValue); - context.sendBroadcastAsUser(intent, UserHandle.OWNER, null); + context.sendBroadcastAsUser(intent, UserHandle.SYSTEM, null); } } } diff --git a/packages/SystemUI/src/com/android/systemui/media/RingtonePlayer.java b/packages/SystemUI/src/com/android/systemui/media/RingtonePlayer.java index 7f68e290f3a0..f39f3026f26b 100644 --- a/packages/SystemUI/src/com/android/systemui/media/RingtonePlayer.java +++ b/packages/SystemUI/src/com/android/systemui/media/RingtonePlayer.java @@ -160,7 +160,7 @@ public class RingtonePlayer extends SystemUI { throw new SecurityException("Async playback only available from system UID."); } if (UserHandle.ALL.equals(user)) { - user = UserHandle.OWNER; + user = UserHandle.SYSTEM; } mAsyncPlayer.play(getContextForUser(user), uri, looping, aa); } diff --git a/services/core/java/com/android/server/DeviceIdleController.java b/services/core/java/com/android/server/DeviceIdleController.java index 2f4ad3ff0e29..0c6eb40f5b08 100644 --- a/services/core/java/com/android/server/DeviceIdleController.java +++ b/services/core/java/com/android/server/DeviceIdleController.java @@ -1523,13 +1523,13 @@ public class DeviceIdleController extends SystemService private void reportPowerSaveWhitelistChangedLocked() { Intent intent = new Intent(PowerManager.ACTION_POWER_SAVE_WHITELIST_CHANGED); intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); - getContext().sendBroadcastAsUser(intent, UserHandle.OWNER); + getContext().sendBroadcastAsUser(intent, UserHandle.SYSTEM); } private void reportTempWhitelistChangedLocked() { Intent intent = new Intent(PowerManager.ACTION_POWER_SAVE_TEMP_WHITELIST_CHANGED); intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); - getContext().sendBroadcastAsUser(intent, UserHandle.OWNER); + getContext().sendBroadcastAsUser(intent, UserHandle.SYSTEM); } void readConfigFileLocked() { diff --git a/services/core/java/com/android/server/DropBoxManagerService.java b/services/core/java/com/android/server/DropBoxManagerService.java index b9db89ecae64..245448748766 100644 --- a/services/core/java/com/android/server/DropBoxManagerService.java +++ b/services/core/java/com/android/server/DropBoxManagerService.java @@ -170,7 +170,7 @@ public final class DropBoxManagerService extends SystemService { @Override public void handleMessage(Message msg) { if (msg.what == MSG_SEND_BROADCAST) { - getContext().sendBroadcastAsUser((Intent)msg.obj, UserHandle.OWNER, + getContext().sendBroadcastAsUser((Intent)msg.obj, UserHandle.SYSTEM, android.Manifest.permission.READ_LOGS); } } @@ -488,7 +488,7 @@ public final class DropBoxManagerService extends SystemService { /////////////////////////////////////////////////////////////////////////// - /** Chronologically sorted list of {@link #EntryFile} */ + /** Chronologically sorted list of {@link EntryFile} */ private static final class FileList implements Comparable<FileList> { public int blocks = 0; public final TreeSet<EntryFile> contents = new TreeSet<EntryFile>(); @@ -613,7 +613,7 @@ public final class DropBoxManagerService extends SystemService { /** * Creates a EntryFile object with only a timestamp for comparison purposes. - * @param timestampMillis to compare with. + * @param millis to compare with. */ public EntryFile(long millis) { this.tag = null; diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java index 540f8cb8557c..c3d32c2a870b 100644 --- a/services/core/java/com/android/server/MountService.java +++ b/services/core/java/com/android/server/MountService.java @@ -2981,7 +2981,7 @@ class MountService extends IMountService.Stub Intent service = new Intent().setComponent(DEFAULT_CONTAINER_COMPONENT); if (mContext.bindServiceAsUser(service, mDefContainerConn, Context.BIND_AUTO_CREATE, - UserHandle.OWNER)) { + UserHandle.SYSTEM)) { mBound = true; return true; } @@ -3014,7 +3014,6 @@ class MountService extends IMountService.Stub Slog.w(TAG, "Failed to invoke remote methods on default container service. Giving up"); mObbActionHandler.sendEmptyMessage(OBB_MCS_UNBIND); handleError(); - return; } else { handleExecute(); if (DEBUG_OBB) @@ -3176,8 +3175,6 @@ class MountService extends IMountService.Stub waitForReady(); warnOnNotMounted(); - final ObbInfo obbInfo = getObbInfo(); - final ObbState existingState; synchronized (mObbMounts) { existingState = mObbPathToStateMap.get(mObbState.rawPath); diff --git a/services/core/java/com/android/server/NetworkScoreService.java b/services/core/java/com/android/server/NetworkScoreService.java index b05a6908aee5..b984e1938758 100644 --- a/services/core/java/com/android/server/NetworkScoreService.java +++ b/services/core/java/com/android/server/NetworkScoreService.java @@ -133,8 +133,8 @@ public class NetworkScoreService extends INetworkScoreService.Stub { filter.addDataSchemeSpecificPart(scorer.mPackageName, PatternMatcher.PATTERN_LITERAL); mReceiver = new ScorerChangedReceiver(scorer.mPackageName); - // TODO: Need to update when we support per-user scorers. - mContext.registerReceiverAsUser(mReceiver, UserHandle.OWNER, filter, null, null); + // TODO: Need to update when we support per-user scorers. http://b/23422763 + mContext.registerReceiverAsUser(mReceiver, UserHandle.SYSTEM, filter, null, null); if (Log.isLoggable(TAG, Log.VERBOSE)) { Log.v(TAG, "Registered receiver for " + scorer.mPackageName); } diff --git a/services/core/java/com/android/server/location/GeofenceProxy.java b/services/core/java/com/android/server/location/GeofenceProxy.java index d1bb8db221f4..b3a001022556 100644 --- a/services/core/java/com/android/server/location/GeofenceProxy.java +++ b/services/core/java/com/android/server/location/GeofenceProxy.java @@ -94,7 +94,7 @@ public final class GeofenceProxy { private void bindHardwareGeofence() { mContext.bindServiceAsUser(new Intent(mContext, GeofenceHardwareService.class), - mServiceConnection, Context.BIND_AUTO_CREATE, UserHandle.OWNER); + mServiceConnection, Context.BIND_AUTO_CREATE, UserHandle.SYSTEM); } private ServiceConnection mServiceConnection = new ServiceConnection() { diff --git a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java index 7ae3c79e0fe5..c0dfbcbb01ab 100644 --- a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java +++ b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java @@ -129,7 +129,7 @@ public class KeyguardServiceDelegate { intent.setComponent(keyguardComponent); if (!context.bindServiceAsUser(intent, mKeyguardConnection, - Context.BIND_AUTO_CREATE, UserHandle.OWNER)) { + Context.BIND_AUTO_CREATE, UserHandle.SYSTEM)) { Log.v(TAG, "*** Keyguard: can't bind to " + keyguardComponent); mKeyguardState.showing = false; mKeyguardState.showingAndNotOccluded = false; diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java index 87dc6c4c3e72..11a16394a502 100644 --- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java +++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java @@ -305,9 +305,8 @@ public class StatusBarManagerService extends IStatusBarService.Stub { throw new SecurityException("invalid status bar icon slot: " + slot); } - StatusBarIcon icon = new StatusBarIcon(iconPackage, UserHandle.OWNER, iconId, - iconLevel, 0, - contentDescription); + StatusBarIcon icon = new StatusBarIcon(iconPackage, UserHandle.SYSTEM, iconId, + iconLevel, 0, contentDescription); //Slog.d(TAG, "setIcon slot=" + slot + " index=" + index + " icon=" + icon); mIcons.setIcon(index, icon); diff --git a/services/core/java/com/android/server/telecom/TelecomLoaderService.java b/services/core/java/com/android/server/telecom/TelecomLoaderService.java index f4bd61fa39cd..6c5452a3cb2e 100644 --- a/services/core/java/com/android/server/telecom/TelecomLoaderService.java +++ b/services/core/java/com/android/server/telecom/TelecomLoaderService.java @@ -188,7 +188,7 @@ public class TelecomLoaderService extends SystemService { | Context.BIND_AUTO_CREATE; // Bind to Telecom and register the service - if (mContext.bindServiceAsUser(intent, serviceConnection, flags, UserHandle.OWNER)) { + if (mContext.bindServiceAsUser(intent, serviceConnection, flags, UserHandle.SYSTEM)) { mServiceConnection = serviceConnection; } } diff --git a/services/usb/java/com/android/server/usb/UsbSettingsManager.java b/services/usb/java/com/android/server/usb/UsbSettingsManager.java index 2cf42f09111d..154cbd30d836 100644 --- a/services/usb/java/com/android/server/usb/UsbSettingsManager.java +++ b/services/usb/java/com/android/server/usb/UsbSettingsManager.java @@ -517,7 +517,7 @@ class UsbSettingsManager { com.android.internal.R.bool.config_disableUsbPermissionDialogs); synchronized (mLock) { - if (UserHandle.OWNER.equals(user)) { + if (UserHandle.SYSTEM.equals(user)) { upgradeSingleUserLocked(); } readSettingsLocked(); diff --git a/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java b/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java index 5fbfe8ace7e1..ceb3993e1705 100644 --- a/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java +++ b/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java @@ -57,6 +57,7 @@ import android.content.pm.UserInfo; import android.content.res.Configuration; import android.util.Log; + public class ActivityTestMain extends Activity { static final String TAG = "ActivityTest"; @@ -315,7 +316,7 @@ public class ActivityTestMain extends Activity { Log.i(TAG, "Service disconnected " + name); } }; - if (bindServiceAsUser(intent, conn, Context.BIND_AUTO_CREATE, UserHandle.OWNER)) { + if (bindServiceAsUser(intent, conn, Context.BIND_AUTO_CREATE, UserHandle.SYSTEM)) { mConnections.add(conn); } else { Toast.makeText(ActivityTestMain.this, "Failed to bind", |