diff options
| author | 2019-02-05 09:41:42 -0500 | |
|---|---|---|
| committer | 2019-02-05 09:48:22 -0500 | |
| commit | afd5002232a9577dedb6484d3d85a11f1dc95a3c (patch) | |
| tree | 8af7f62c57a07dc4a47df0b7278f9cd6facfe04d | |
| parent | 1ec11dbda282e02b3f1db03a454d0e9db91a6b0e (diff) | |
Prevents blank Ongoing Privacy Dialog
Test: manual
Bug: 123343369
Change-Id: I9bc8e1a7174e9e45c8c548c7f13e76fbe411579b
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java index 2d64ecd99c88..74e82b270aa0 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java @@ -67,6 +67,7 @@ import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.plugins.DarkIconDispatcher.DarkReceiver; import com.android.systemui.privacy.OngoingPrivacyChip; import com.android.systemui.privacy.OngoingPrivacyDialog; +import com.android.systemui.privacy.PrivacyDialogBuilder; import com.android.systemui.privacy.PrivacyItem; import com.android.systemui.privacy.PrivacyItemController; import com.android.systemui.qs.QSDetail.Callback; @@ -534,10 +535,12 @@ public class QuickStatusBarHeader extends RelativeLayout implements mActivityStarter.postStartActivityDismissingKeyguard(new Intent( AlarmClock.ACTION_SHOW_ALARMS),0); } else if (v == mPrivacyChip) { + // Makes sure that the builder is grabbed as soon as the chip is pressed + PrivacyDialogBuilder builder = mPrivacyChip.getBuilder(); + if (builder.getAppsAndTypes().size() == 0) return; Handler mUiHandler = new Handler(Looper.getMainLooper()); mUiHandler.post(() -> { - Dialog mDialog = new OngoingPrivacyDialog(mContext, - mPrivacyChip.getBuilder()).createDialog(); + Dialog mDialog = new OngoingPrivacyDialog(mContext, builder).createDialog(); mDialog.getWindow().setType( WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG); SystemUIDialog.setShowForAllUsers(mDialog, true); |