Merge "P is for PAINT."
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index d548889..ec7980c 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7303,7 +7303,7 @@
* see and assist with all of the user's notifications.
*
* @deprecated Use
- * {@link NotificationManager#isNotificationListenerAccessGranted(ComponentName)}.
+ * {@link NotificationManager#isNotificationAssistantAccessGranted(ComponentName)}.
* @hide
*/
@Deprecated
@@ -7319,7 +7319,7 @@
*
* @hide
* @deprecated Use
- * {@link NotificationManager#isNotificationAssistantAccessGranted(ComponentName)}.
+ * {@link NotificationManager#isNotificationListenerAccessGranted(ComponentName)}.
*/
@Deprecated
public static final String ENABLED_NOTIFICATION_LISTENERS = "enabled_notification_listeners";
diff --git a/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java b/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java
index 955f64a..75c2533 100644
--- a/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java
+++ b/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java
@@ -381,7 +381,7 @@
// Create a lookup of local zone IDs.
final List<String> zoneIds = lookupTimeZoneIdsByCountry(locale.getCountry());
- localZoneIds = new HashSet<>(zoneIds);
+ localZoneIds = zoneIds != null ? new HashSet<>(zoneIds) : new HashSet<>();
}
@VisibleForTesting
diff --git a/packages/SystemUI/OWNERS b/packages/SystemUI/OWNERS
index e217ace..47f2cdc 100644
--- a/packages/SystemUI/OWNERS
+++ b/packages/SystemUI/OWNERS
@@ -14,6 +14,7 @@
jaggies@google.com
jjaggi@google.com
juliacr@google.com
+kchyn@google.com
madym@google.com
ngmatthew@google.com
roosa@google.com
diff --git a/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java
index 9fc71c8..1e5b77e 100644
--- a/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java
+++ b/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java
@@ -65,7 +65,7 @@
public static final String TAG_OPS = "OverviewProxyService";
public static final boolean DEBUG_OVERVIEW_PROXY = false;
- private static final long BACKOFF_MILLIS = 5000;
+ private static final long BACKOFF_MILLIS = 1000;
private static final long DEFERRED_CALLBACK_MILLIS = 5000;
private final Context mContext;
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 98c554d..f74216a 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -2507,11 +2507,12 @@
if (DEBUG_INPUT_METHOD && updateImeTarget) Slog.v(TAG_WM,
"Proposed new IME target: " + target);
- // Now, a special case -- if the last target's window is in the process of exiting, and the
- // new target is home, keep on the last target to avoid flicker. Home is a special case
- // since its above other stacks in the ordering list, but layed out below the others.
- if (curTarget != null && curTarget.isDisplayedLw() && curTarget.isClosing()
- && (target == null || target.isActivityTypeHome())) {
+ // Now, a special case -- if the last target's window is in the process of exiting, but
+ // not removed, and the new target is home, keep on the last target to avoid flicker.
+ // Home is a special case since its above other stacks in the ordering list, but layed
+ // out below the others.
+ if (curTarget != null && !curTarget.mRemoved && curTarget.isDisplayedLw()
+ && curTarget.isClosing() && (target == null || target.isActivityTypeHome())) {
if (DEBUG_INPUT_METHOD) Slog.v(TAG_WM, "New target is home while current target is "
+ "closing, not changing");
return curTarget;