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

Merge "Wait 100 ms for assistant response before posting."

Browse Source
This commit is contained in:
Julia Reynolds
2017-01-06 01:30:44 +00:00
committed by Android (Google) Code Review
parent 80239f6cc3 4b82f6ddb0
commit d791bbcf81
4 changed files with 178 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/app/INotificationManager.aidl
View File

@@ -92,6 +92,7 @@ interface INotificationManager
void setOnNotificationPostedTrimFromListener(in INotificationListener token, int trim);
void setInterruptionFilter(String pkg, int interruptionFilter);
void applyEnqueuedAdjustmentFromAssistant(in INotificationListener token, in Adjustment adjustment);
void applyAdjustmentFromAssistant(in INotificationListener token, in Adjustment adjustment);
void applyAdjustmentsFromAssistant(in INotificationListener token, in List<Adjustment> adjustments);
void createNotificationChannelFromAssistant(in INotificationListener token, String pkg, in NotificationChannel channel);

9
core/java/android/service/notification/NotificationAssistantService.java
View File

@@ -210,7 +210,14 @@ public abstract class NotificationAssistantService extends NotificationListenerS
args.recycle();
Adjustment adjustment = onNotificationEnqueued(sbn, importance, user);
if (adjustment != null) {
adjustNotification(adjustment);
if (!isBound()) return;
try {
getNotificationInterface().applyEnqueuedAdjustmentFromAssistant(
mWrapper, adjustment);
} catch (android.os.RemoteException ex) {
Log.v(TAG, "Unable to contact notification manager", ex);
throw ex.rethrowFromSystemServer();
}
}
} break;
}