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

Added logs to trace device provisioning and QS not expanding

Browse Source 
Test: build
Bug: 123740529
Bug: 129405675
Change-Id: Ieb7ffb0c339ba3e7cf5a5a458cb8ffc4cbeb2535
This commit is contained in:
Fabian Kozynski
2019-03-27 13:33:15 -04:00
parent 6f59ef8a37
commit e907774824
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
View File

@@ -433,6 +433,9 @@ public class StatusBar extends SystemUI implements DemoMode,
public void onUserSetupChanged() {
final boolean userSetup = mDeviceProvisionedController.isUserSetup(
mDeviceProvisionedController.getCurrentUser());
// STOPSHIP(kozynski, b/129405675) Remove log
Log.d(TAG, "mUserSetupObserver - DeviceProvisionedListener called for user "
+ mDeviceProvisionedController.getCurrentUser());
if (MULTIUSER_DEBUG) {
Log.d(TAG, String.format("User setup changed: userSetup=%s mUserSetup=%s",
userSetup, mUserSetup));
@@ -1293,13 +1296,16 @@ public class StatusBar extends SystemUI implements DemoMode,
* the user intends to use the lock screen user switcher, QS in not needed.
*/
private void updateQsExpansionEnabled() {
mNotificationPanel.setQsExpansionEnabled(mDeviceProvisionedController.isDeviceProvisioned()
final boolean expandEnabled = mDeviceProvisionedController.isDeviceProvisioned()
&& (mUserSetup || mUserSwitcherController == null
|| !mUserSwitcherController.isSimpleUserSwitcher())
&& ((mDisabled2 & StatusBarManager.DISABLE2_NOTIFICATION_SHADE) == 0)
&& ((mDisabled2 & StatusBarManager.DISABLE2_QUICK_SETTINGS) == 0)
&& !mDozing
&& !ONLY_CORE_APPS);
&& !ONLY_CORE_APPS;
mNotificationPanel.setQsExpansionEnabled(expandEnabled);
// STOPSHIP(kozynski, b/129405675) Remove log
Log.d(TAG, "updateQsExpansionEnabled - QS Expand enabled: " + expandEnabled);
}
public void addQsTile(ComponentName tile) {

6
packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceProvisionedControllerImpl.java
View File

@@ -21,9 +21,10 @@ import android.content.ContentResolver;
import android.content.Context;
import android.database.ContentObserver;
import android.net.Uri;
import android.os.Handler;
import android.provider.Settings.Global;
import android.provider.Settings.Secure;
import android.os.Handler;
import android.util.Log;
import com.android.systemui.settings.CurrentUserTracker;
@@ -39,6 +40,7 @@ import javax.inject.Singleton;
public class DeviceProvisionedControllerImpl extends CurrentUserTracker implements
DeviceProvisionedController {
private static final String TAG = DeviceProvisionedControllerImpl.class.getSimpleName();
private final ArrayList<DeviceProvisionedListener> mListeners = new ArrayList<>();
private final ContentResolver mContentResolver;
private final Context mContext;
@@ -59,6 +61,8 @@ public class DeviceProvisionedControllerImpl extends CurrentUserTracker implemen
mSettingsObserver = new ContentObserver(mainHandler) {
@Override
public void onChange(boolean selfChange, Uri uri, int userId) {
// STOPSHIP(kozynski, b/129405675) Remove log
Log.d(TAG, "Setting change: " + uri);
if (mUserSetupUri.equals(uri)) {
notifySetupChanged();
} else {