Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e13bb344 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Smartspace - Do not listen for user changes" into sc-dev am: 72493c6a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14468083

Change-Id: Idc9710c46f7fc91087a9bbf2e0acfc77d451175d
parents 4bfc30e4 72493c6a

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java

+0 −13
Original line number Original line Diff line number Diff line
@@ -25,7 +25,6 @@ import android.app.smartspace.SmartspaceConfig; 
import android.app.smartspace.SmartspaceManager;

import android.app.smartspace.SmartspaceManager;

import android.app.smartspace.SmartspaceSession;

import android.app.smartspace.SmartspaceSession;

import android.app.smartspace.SmartspaceTarget;

import android.app.smartspace.SmartspaceTarget;

import android.content.Context;

import android.content.Intent;

import android.content.Intent;

import android.content.pm.UserInfo;

import android.content.pm.UserInfo;

import android.content.res.Resources;

import android.content.res.Resources;
@@ -112,7 +111,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
    private boolean mShowSensitiveContentForCurrentUser;

    private boolean mShowSensitiveContentForCurrentUser;

    private boolean mShowSensitiveContentForManagedUser;

    private boolean mShowSensitiveContentForManagedUser;

    private UserHandle mManagedUserHandle;

    private UserHandle mManagedUserHandle;

    private UserTracker.Callback mUserTrackerCallback;





    /**

    /**

     * Listener for changes to the color palette.

     * Listener for changes to the color palette.
@@ -294,13 +292,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
                }

                }

            };

            };





            mUserTrackerCallback = new UserTracker.Callback() {

                public void onUserChanged(int newUser, Context userContext) {

                    reloadSmartspace();

                }

            };

            mUserTracker.addCallback(mUserTrackerCallback, mUiExecutor);



            getContext().getContentResolver().registerContentObserver(

            getContext().getContentResolver().registerContentObserver(

                    Settings.Secure.getUriFor(

                    Settings.Secure.getUriFor(

                            Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS),

                            Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS),
@@ -376,10 +367,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
        if (mSettingsObserver != null) {

        if (mSettingsObserver != null) {

            getContext().getContentResolver().unregisterContentObserver(mSettingsObserver);

            getContext().getContentResolver().unregisterContentObserver(mSettingsObserver);

        }

        }



        if (mUserTrackerCallback != null) {

            mUserTracker.removeCallback(mUserTrackerCallback);

        }

    }

    }





    /**

    /**