Snap for 5987146 from 8682b5b066ec00dfc1f03914c7c73b2d6c0bc9e9 to qt-qpr2-release (ab85c71b) · Commits · e / os / android_frameworks_base

core/proto/android/app/settings_enums.proto

+5 −0

Original line number	Diff line number	Diff line
		@@ -2406,4 +2406,9 @@ enum PageId {
		// CATEGORY: SETTINGS
		// OS: Q
		SETTINGS_AWARE_DISPLAY = 1750;

		// OPEN: Settings > System > Input & Gesture > tap gesture
		// CATEGORY: SETTINGS
		// OS: Q
		SETTINGS_GESTURE_TAP = 1751;
		}

services/core/java/com/android/server/notification/NotificationManagerService.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -902,8 +902,22 @@ public class NotificationManagerService extends SystemService {
		@Override
		public void onNotificationError(int callingUid, int callingPid, String pkg, String tag,
		int id, int uid, int initialPid, String message, int userId) {
		final boolean fgService;
		synchronized (mNotificationLock) {
		NotificationRecord r = findNotificationLocked(pkg, tag, id, userId);
		fgService = r != null && (r.getNotification().flags & FLAG_FOREGROUND_SERVICE) != 0;
		}
		cancelNotification(callingUid, callingPid, pkg, tag, id, 0, 0, false, userId,
		REASON_ERROR, null);
		if (fgService) {
		// Still crash for foreground services, preventing the not-crash behaviour abused
		// by apps to give us a garbage notification and silently start a fg service.
		Binder.withCleanCallingIdentity(
		() -> mAm.crashApplication(uid, initialPid, pkg, -1,
		"Bad notification(tag=" + tag + ", id=" + id + ") posted from package "
		+ pkg + ", crashing app(uid=" + uid + ", pid=" + initialPid + "): "
		+ message));
		}
		}

		@Override

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

+30 −13

Original line number	Diff line number	Diff line
		@@ -1237,6 +1237,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
		saveSettingsLocked(mWallpaper.userId);
		}
		FgThread.getHandler().removeCallbacks(mResetRunnable);
		mContext.getMainThreadHandler().removeCallbacks(this::tryToRebind);
		}
		}
		}
		@@ -1279,6 +1280,34 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
		}
		}

		private void tryToRebind() {
		synchronized (mLock) {
		if (mWallpaper.wallpaperUpdating) {
		return;
		}
		final ComponentName wpService = mWallpaper.wallpaperComponent;
		// The broadcast of package update could be delayed after service disconnected. Try
		// to re-bind the service for 10 seconds.
		if (bindWallpaperComponentLocked(
		wpService, true, false, mWallpaper, null)) {
		mWallpaper.connection.scheduleTimeoutLocked();
		} else if (SystemClock.uptimeMillis() - mWallpaper.lastDiedTime
		< WALLPAPER_RECONNECT_TIMEOUT_MS) {
		// Bind fail without timeout, schedule rebind
		Slog.w(TAG, "Rebind fail! Try again later");
		mContext.getMainThreadHandler().postDelayed(this::tryToRebind, 1000);
		} else {
		// Timeout
		Slog.w(TAG, "Reverting to built-in wallpaper!");
		clearWallpaperLocked(true, FLAG_SYSTEM, mWallpaper.userId, null);
		final String flattened = wpService.flattenToString();
		EventLog.writeEvent(EventLogTags.WP_WALLPAPER_CRASHED,
		flattened.substring(0, Math.min(flattened.length(),
		MAX_WALLPAPER_COMPONENT_LOG_LENGTH)));
		}
		}
		}

		private void processDisconnect(final ServiceConnection connection) {
		synchronized (mLock) {
		// The wallpaper disappeared. If this isn't a system-default one, track
		@@ -1302,21 +1331,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
		clearWallpaperLocked(true, FLAG_SYSTEM, mWallpaper.userId, null);
		} else {
		mWallpaper.lastDiedTime = SystemClock.uptimeMillis();

		clearWallpaperComponentLocked(mWallpaper);
		if (bindWallpaperComponentLocked(
		wpService, false, false, mWallpaper, null)) {
		mWallpaper.connection.scheduleTimeoutLocked();
		} else {
		Slog.w(TAG, "Reverting to built-in wallpaper!");
		clearWallpaperLocked(true, FLAG_SYSTEM, mWallpaper.userId, null);
		tryToRebind();
		}
		}
		final String flattened = wpService.flattenToString();
		EventLog.writeEvent(EventLogTags.WP_WALLPAPER_CRASHED,
		flattened.substring(0, Math.min(flattened.length(),
		MAX_WALLPAPER_COMPONENT_LOG_LENGTH)));
		}
		} else {
		if (DEBUG_LIVE) {
		Slog.i(TAG, "Wallpaper changed during disconnect tracking; ignoring");