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

Add matchesCallFilter function to NotificationManager.

Browse Source 
This method takes a URI for a phone number that's calling and returns a boolean indicating whether the call would be allowed to interrupt the user. It's a light wrapper around the pre-existing (hidden) matchesCallFilter call that takes a Bundle with the same information.

Bug: 192592755
Test: atest NotificationManagerTest

Change-Id: I6e819b28b0f5047f005258bfd6044c6670628789
This commit is contained in:
Yuri Lin
2021-09-28 17:11:03 -04:00
parent a3391604c0
commit 026456ecce
7 changed files with 82 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -6255,6 +6255,7 @@ package android.app {
method public android.app.NotificationManager.Policy getNotificationPolicy();
method public boolean isNotificationListenerAccessGranted(android.content.ComponentName);
method public boolean isNotificationPolicyAccessGranted();
method @WorkerThread public boolean matchesCallFilter(@NonNull android.net.Uri);
method public void notify(int, android.app.Notification);
method public void notify(String, int, android.app.Notification);
method public void notifyAsPackage(@NonNull String, @Nullable String, int, @NonNull android.app.Notification);

2
core/api/test-current.txt
View File

@@ -303,10 +303,10 @@ package android.app {
public class NotificationManager {
method public void allowAssistantAdjustment(String);
method public void cleanUpCallersAfter(long);
method public void disallowAssistantAdjustment(String);
method public android.content.ComponentName getEffectsSuppressor();
method public boolean isNotificationPolicyAccessGrantedForPackage(@NonNull String);
method public boolean matchesCallFilter(android.os.Bundle);
method @RequiresPermission(android.Manifest.permission.MANAGE_NOTIFICATION_LISTENERS) public void setNotificationListenerAccessGranted(@NonNull android.content.ComponentName, boolean, boolean);
method @RequiresPermission(android.Manifest.permission.MANAGE_TOAST_RATE_LIMITING) public void setToastRateLimitingEnabled(boolean);
method public void updateNotificationChannel(@NonNull String, int, @NonNull android.app.NotificationChannel);

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

@@ -175,6 +175,7 @@ interface INotificationManager
ComponentName getEffectsSuppressor();
boolean matchesCallFilter(in Bundle extras);
void cleanUpCallersAfter(long timeThreshold);
boolean isSystemConditionProviderEnabled(String path);
boolean isNotificationListenerAccessGranted(in ComponentName listener);

55
core/java/android/app/NotificationManager.java
View File

@@ -25,6 +25,7 @@ import android.annotation.SuppressLint;
import android.annotation.SystemApi;
import android.annotation.SystemService;
import android.annotation.TestApi;
import android.annotation.WorkerThread;
import android.app.Notification.Builder;
import android.compat.annotation.UnsupportedAppUsage;
import android.content.ComponentName;
@@ -1079,7 +1080,6 @@ public class NotificationManager {
/**
* @hide
*/
@TestApi
public boolean matchesCallFilter(Bundle extras) {
INotificationManager service = getService();
try {
@@ -1089,6 +1089,19 @@ public class NotificationManager {
}
}
/**
* @hide
*/
@TestApi
public void cleanUpCallersAfter(long timeThreshold) {
INotificationManager service = getService();
try {
service.cleanUpCallersAfter(timeThreshold);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
/**
* @hide
*/
@@ -2544,6 +2557,46 @@ public class NotificationManager {
}
}
/**
* Returns whether a call from the provided URI is permitted to notify the user.
* <p>
* A true return value indicates one of the following: Do Not Disturb is not currently active;
* or the caller is a repeat caller and the current policy allows interruptions from repeat
* callers; or the caller is in the user's set of contacts whose calls are allowed to interrupt
* Do Not Disturb.
* </p>
* <p>
* If Do Not Disturb is enabled and either no interruptions or only alarms are allowed, this
* method will return false regardless of input.
* </p>
* <p>
* The provided URI must meet the requirements for a URI associated with a
* {@link Person}: it may be the {@code String} representation of a
* {@link android.provider.ContactsContract.Contacts#CONTENT_LOOKUP_URI}, or a
* <code>mailto:</code> or <code>tel:</code> schema URI matching an entry in the
* Contacts database. See also {@link Person.Builder#setUri} and
* {@link android.provider.ContactsContract.Contacts#CONTENT_LOOKUP_URI}
* for more information.
* </p>
* <p>
* NOTE: This method calls into Contacts, which may take some time, and should not be called
* on the main thread.
* </p>
*
* @param uri A URI representing a caller. Must not be null.
* @return A boolean indicating whether a call from the URI provided would be allowed to
* interrupt the user given the current filter.
*/
@WorkerThread
public boolean matchesCallFilter(@NonNull Uri uri) {
Bundle extras = new Bundle();
ArrayList<Person> pList = new ArrayList<>();
pList.add(new Person.Builder().setUri(uri.toString()).build());
extras.putParcelableArrayList(Notification.EXTRA_PEOPLE_LIST, pList);
return matchesCallFilter(extras);
}
/** @hide */
public static int zenModeToInterruptionFilter(int zen) {
switch (zen) {

7
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -5022,7 +5022,6 @@ public class NotificationManagerService extends SystemService {
@Override
public boolean matchesCallFilter(Bundle extras) {
enforceSystemOrSystemUI("INotificationManager.matchesCallFilter");
return mZenModeHelper.matchesCallFilter(
Binder.getCallingUserHandle(),
extras,
@@ -5031,6 +5030,12 @@ public class NotificationManagerService extends SystemService {
MATCHES_CALL_FILTER_TIMEOUT_AFFINITY);
}
@Override
public void cleanUpCallersAfter(long timeThreshold) {
enforceSystemOrSystemUI("INotificationManager.cleanUpCallersAfter");
mZenModeHelper.cleanUpCallersAfter(timeThreshold);
}
@Override
public boolean isSystemConditionProviderEnabled(String path) {
enforceSystemOrSystemUI("INotificationManager.isSystemConditionProviderEnabled");

15
services/core/java/com/android/server/notification/ZenModeFiltering.java
View File

@@ -311,6 +311,10 @@ public class ZenModeFiltering {
}
}
protected void cleanUpCallersAfter(long timeThreshold) {
REPEAT_CALLERS.cleanUpCallsAfter(timeThreshold);
}
private static class RepeatCallers {
// Person : time
private final ArrayMap<String, Long> mCalls = new ArrayMap<>();
@@ -346,6 +350,17 @@ public class ZenModeFiltering {
}
}
// Clean up all calls that occurred after the given time.
// Used only for tests, to clean up after testing.
private synchronized void cleanUpCallsAfter(long timeThreshold) {
for (int i = mCalls.size() - 1; i >= 0; i--) {
final long time = mCalls.valueAt(i);
if (time > timeThreshold) {
mCalls.removeAt(i);
}
}
}
private void setThresholdMinutes(Context context) {
if (mThresholdMinutes <= 0) {
mThresholdMinutes = context.getResources().getInteger(com.android.internal.R.integer

4
services/core/java/com/android/server/notification/ZenModeHelper.java
View File

@@ -188,6 +188,10 @@ public class ZenModeHelper {
mFiltering.recordCall(record);
}
protected void cleanUpCallersAfter(long timeThreshold) {
mFiltering.cleanUpCallersAfter(timeThreshold);
}
public boolean shouldIntercept(NotificationRecord record) {
synchronized (mConfig) {
return mFiltering.shouldIntercept(mZenMode, mConsolidatedPolicy, record);