diff options
| author | 2018-03-03 00:13:40 +0000 | |
|---|---|---|
| committer | 2018-03-03 00:13:40 +0000 | |
| commit | e87a8a9e02bad7ae9ca9ccef2ef07ebcb69acc8a (patch) | |
| tree | 7d7e8ad6a2c9d41bb81088fc41d60f90948e159a | |
| parent | b9774cbe9dc0833a257e3efde166e9b91f55aa73 (diff) | |
| parent | 1b1d346b3547809f410a62ec2cdbd3a6ff21127a (diff) | |
Merge "Creating new user correctly connects to the system OverviewProxy"
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/OverviewProxyService.java | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java index 3c666e4b11cc..041af0e47119 100644 --- a/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java +++ b/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java @@ -36,6 +36,7 @@ import android.view.SurfaceControl; import com.android.systemui.OverviewProxyService.OverviewProxyListener; import com.android.systemui.recents.events.EventBus; import com.android.systemui.recents.events.activity.DockedFirstAnimationFrameEvent; +import com.android.systemui.recents.misc.SystemServicesProxy; import com.android.systemui.shared.recents.IOverviewProxy; import com.android.systemui.shared.recents.ISystemUiProxy; import com.android.systemui.shared.system.GraphicBufferCompat; @@ -201,15 +202,18 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis mConnectionBackoffAttempts = 0; mLauncherComponentName = ComponentName .unflattenFromString(context.getString(R.string.config_overviewServiceComponent)); - mDeviceProvisionedController.addCallback(mDeviceProvisionedCallback); // Listen for the package update changes. - IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED); - filter.addDataScheme("package"); - filter.addDataSchemeSpecificPart(mLauncherComponentName.getPackageName(), - PatternMatcher.PATTERN_LITERAL); - filter.addAction(Intent.ACTION_PACKAGE_CHANGED); - mContext.registerReceiver(mLauncherAddedReceiver, filter); + if (SystemServicesProxy.getInstance(context) + .isSystemUser(mDeviceProvisionedController.getCurrentUser())) { + mDeviceProvisionedController.addCallback(mDeviceProvisionedCallback); + IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED); + filter.addDataScheme("package"); + filter.addDataSchemeSpecificPart(mLauncherComponentName.getPackageName(), + PatternMatcher.PATTERN_LITERAL); + filter.addAction(Intent.ACTION_PACKAGE_CHANGED); + mContext.registerReceiver(mLauncherAddedReceiver, filter); + } } public void startConnectionToCurrentUser() { |