Merge "Ensure Audio Sources View is 48dp" into main
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 2707b45..aa0b9b8 100755
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -3038,7 +3038,7 @@
mPreferencesHelper.getNotificationChannel(pkg, uid, channel.getId(), true);
mPreferencesHelper.updateNotificationChannel(pkg, uid, channel, true,
- Binder.getCallingUid(), isCallerIsSystemOrSystemUi());
+ Binder.getCallingUid(), isCallerSystemOrSystemUi());
if (mPreferencesHelper.onlyHasDefaultChannel(pkg, uid)) {
mPermissionHelper.setNotificationPermission(pkg, UserHandle.getUserId(uid),
channel.getImportance() != IMPORTANCE_NONE, true);
@@ -3086,7 +3086,7 @@
final NotificationChannelGroup preUpdate =
mPreferencesHelper.getNotificationChannelGroup(group.getId(), pkg, uid);
mPreferencesHelper.createNotificationChannelGroup(pkg, uid, group,
- fromApp, Binder.getCallingUid(), isCallerIsSystemOrSystemUi());
+ fromApp, Binder.getCallingUid(), isCallerSystemOrSystemUi());
if (!fromApp) {
maybeNotifyChannelGroupOwner(pkg, uid, preUpdate, group);
}
@@ -3516,7 +3516,7 @@
}
checkCallerIsSameApp(pkg);
- final boolean isSystemToast = isCallerIsSystemOrSystemUi()
+ final boolean isSystemToast = isCallerSystemOrSystemUi()
|| PackageManagerService.PLATFORM_PACKAGE_NAME.equals(pkg);
boolean isAppRenderedToast = (callback != null);
if (!checkCanEnqueueToast(pkg, callingUid, displayId, isAppRenderedToast,
@@ -4083,7 +4083,7 @@
channel, true /* fromTargetApp */,
mConditionProviders.isPackageOrComponentAllowed(
pkg, UserHandle.getUserId(uid)), Binder.getCallingUid(),
- isCallerIsSystemOrSystemUi());
+ isCallerSystemOrSystemUi());
if (needsPolicyFileChange) {
mListeners.notifyNotificationChannelChanged(pkg,
UserHandle.getUserHandleForUid(uid),
@@ -4164,7 +4164,7 @@
String targetPkg, String channelId, boolean returnParentIfNoConversationChannel,
String conversationId) {
if (canNotifyAsPackage(callingPkg, targetPkg, userId)
- || isCallerIsSystemOrSysemUiOrShell()) {
+ || isCallerSystemOrSystemUiOrShell()) {
int targetUid = -1;
try {
targetUid = mPackageManagerClient.getPackageUidAsUser(targetPkg, userId);
@@ -4219,7 +4219,7 @@
public void deleteNotificationChannel(String pkg, String channelId) {
checkCallerIsSystemOrSameApp(pkg);
final int callingUid = Binder.getCallingUid();
- final boolean isSystemOrSystemUi = isCallerIsSystemOrSystemUi();
+ final boolean isSystemOrSystemUi = isCallerSystemOrSystemUi();
final int callingUser = UserHandle.getUserId(callingUid);
if (NotificationChannel.DEFAULT_CHANNEL_ID.equals(channelId)) {
throw new IllegalArgumentException("Cannot delete default channel");
@@ -4263,7 +4263,7 @@
checkCallerIsSystemOrSameApp(pkg);
final int callingUid = Binder.getCallingUid();
- final boolean isSystemOrSystemUi = isCallerIsSystemOrSystemUi();
+ final boolean isSystemOrSystemUi = isCallerSystemOrSystemUi();
NotificationChannelGroup groupToDelete =
mPreferencesHelper.getNotificationChannelGroupWithChannels(
pkg, callingUid, groupId, false);
@@ -5206,7 +5206,7 @@
public void requestInterruptionFilterFromListener(INotificationListener token,
int interruptionFilter) throws RemoteException {
final int callingUid = Binder.getCallingUid();
- final boolean isSystemOrSystemUi = isCallerIsSystemOrSystemUi();
+ final boolean isSystemOrSystemUi = isCallerSystemOrSystemUi();
final long identity = Binder.clearCallingIdentity();
try {
synchronized (mNotificationLock) {
@@ -5253,7 +5253,7 @@
public void setZenMode(int mode, Uri conditionId, String reason) throws RemoteException {
enforceSystemOrSystemUI("INotificationManager.setZenMode");
final int callingUid = Binder.getCallingUid();
- final boolean isSystemOrSystemUi = isCallerIsSystemOrSystemUi();
+ final boolean isSystemOrSystemUi = isCallerSystemOrSystemUi();
final long identity = Binder.clearCallingIdentity();
try {
mZenModeHelper.setManualZenMode(mode, conditionId, null, reason, callingUid,
@@ -5316,7 +5316,7 @@
return mZenModeHelper.addAutomaticZenRule(rulePkg, automaticZenRule,
"addAutomaticZenRule", Binder.getCallingUid(),
// TODO: b/308670715: Distinguish FROM_APP from FROM_USER
- isCallerIsSystemOrSystemUi() ? ZenModeHelper.FROM_SYSTEM_OR_SYSTEMUI
+ isCallerSystemOrSystemUi() ? ZenModeHelper.FROM_SYSTEM_OR_SYSTEMUI
: ZenModeHelper.FROM_APP);
}
@@ -5336,7 +5336,7 @@
return mZenModeHelper.updateAutomaticZenRule(id, automaticZenRule,
"updateAutomaticZenRule", Binder.getCallingUid(),
// TODO: b/308670715: Distinguish FROM_APP from FROM_USER
- isCallerIsSystemOrSystemUi() ? ZenModeHelper.FROM_SYSTEM_OR_SYSTEMUI
+ isCallerSystemOrSystemUi() ? ZenModeHelper.FROM_SYSTEM_OR_SYSTEMUI
: ZenModeHelper.FROM_APP);
}
@@ -5347,7 +5347,7 @@
enforcePolicyAccess(Binder.getCallingUid(), "removeAutomaticZenRule");
return mZenModeHelper.removeAutomaticZenRule(id, "removeAutomaticZenRule",
- Binder.getCallingUid(), isCallerIsSystemOrSystemUi());
+ Binder.getCallingUid(), isCallerSystemOrSystemUi());
}
@Override
@@ -5357,7 +5357,7 @@
return mZenModeHelper.removeAutomaticZenRules(packageName,
packageName + "|removeAutomaticZenRules", Binder.getCallingUid(),
- isCallerIsSystemOrSystemUi());
+ isCallerSystemOrSystemUi());
}
@Override
@@ -5376,7 +5376,7 @@
enforcePolicyAccess(Binder.getCallingUid(), "setAutomaticZenRuleState");
mZenModeHelper.setAutomaticZenRuleState(id, condition, Binder.getCallingUid(),
- isCallerIsSystemOrSystemUi());
+ isCallerSystemOrSystemUi());
}
@Override
@@ -5385,7 +5385,7 @@
final int zen = NotificationManager.zenModeFromInterruptionFilter(filter, -1);
if (zen == -1) throw new IllegalArgumentException("Invalid filter: " + filter);
final int callingUid = Binder.getCallingUid();
- final boolean isSystemOrSystemUi = isCallerIsSystemOrSystemUi();
+ final boolean isSystemOrSystemUi = isCallerSystemOrSystemUi();
if (android.app.Flags.modesApi() && !canManageGlobalZenPolicy(pkg, callingUid)) {
mZenModeHelper.applyGlobalZenModeAsImplicitZenRule(pkg, callingUid, zen);
@@ -5480,7 +5480,7 @@
() -> CompatChanges.isChangeEnabled(MANAGE_GLOBAL_ZEN_VIA_IMPLICIT_RULES,
callingUid));
return !isCompatChangeEnabled
- || isCallerIsSystemOrSystemUi()
+ || isCallerSystemOrSystemUi()
|| hasCompanionDevice(callingPkg, UserHandle.getUserId(callingUid),
AssociationRequest.DEVICE_PROFILE_WATCH);
}
@@ -5711,7 +5711,7 @@
public void setNotificationPolicy(String pkg, Policy policy) {
enforcePolicyAccess(pkg, "setNotificationPolicy");
int callingUid = Binder.getCallingUid();
- boolean isSystemOrSystemUi = isCallerIsSystemOrSystemUi();
+ boolean isSystemOrSystemUi = isCallerSystemOrSystemUi();
boolean shouldApplyAsImplicitRule = android.app.Flags.modesApi()
&& !canManageGlobalZenPolicy(pkg, callingUid);
@@ -7113,7 +7113,7 @@
}
mPreferencesHelper.updateNotificationChannel(
pkg, notificationUid, channel, false, callingUid,
- isCallerIsSystemOrSystemUi());
+ isCallerSystemOrSystemUi());
r.updateNotificationChannel(channel);
} else if (!channel.isUserVisibleTaskShown() && !TextUtils.isEmpty(channelId)
&& !NotificationChannel.DEFAULT_CHANNEL_ID.equals(channelId)) {
@@ -10433,7 +10433,7 @@
}
@VisibleForTesting
- protected boolean isCallerIsSystemOrSystemUi() {
+ protected boolean isCallerSystemOrSystemUi() {
if (isCallerSystemOrPhone()) {
return true;
}
@@ -10441,12 +10441,12 @@
== PERMISSION_GRANTED;
}
- private boolean isCallerIsSystemOrSysemUiOrShell() {
+ private boolean isCallerSystemOrSystemUiOrShell() {
int callingUid = Binder.getCallingUid();
if (callingUid == Process.SHELL_UID || callingUid == Process.ROOT_UID) {
return true;
}
- return isCallerIsSystemOrSystemUi();
+ return isCallerSystemOrSystemUi();
}
private void checkCallerIsSystemOrShell() {
diff --git a/services/tests/uiservicestests/src/com/android/server/notification/TestableNotificationManagerService.java b/services/tests/uiservicestests/src/com/android/server/notification/TestableNotificationManagerService.java
index 8f30f41..6976ec3 100644
--- a/services/tests/uiservicestests/src/com/android/server/notification/TestableNotificationManagerService.java
+++ b/services/tests/uiservicestests/src/com/android/server/notification/TestableNotificationManagerService.java
@@ -82,7 +82,7 @@
}
@Override
- protected boolean isCallerIsSystemOrSystemUi() {
+ protected boolean isCallerSystemOrSystemUi() {
countSystemChecks++;
return isSystemUid || isSystemAppId;
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
index d8a9a28..2007f68 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
@@ -757,7 +757,6 @@
startingApp.getWindowFrames().setInsetsChanged(true);
startingApp.updateResizingWindowIfNeeded();
assertTrue(startingApp.isDrawn());
- assertFalse(startingApp.getOrientationChanging());
}
@SetupWindows(addWindows = W_ABOVE_ACTIVITY)