Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fdeefc3 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Tests for matchesCallFilter"

parents b22db9be 87621943

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ package android.app { 


  public class NotificationManager {

    method public android.content.ComponentName getEffectsSuppressor();

    method public boolean matchesCallFilter(android.os.Bundle);

  }



  public final class PictureInPictureParams implements android.os.Parcelable {

core/java/android/app/NotificationManager.java

+1 −0
Original line number Diff line number Diff line
@@ -828,6 +828,7 @@ public class NotificationManager { 
    /**

     * @hide

     */

    @TestApi

    public boolean matchesCallFilter(Bundle extras) {

        INotificationManager service = getService();

        try {

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -329,6 +329,7 @@ applications that come with the platform 
        <permission name="android.permission.USE_RESERVED_DISK"/>

        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>

        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>

        <permission name="android.permission.STATUS_BAR_SERVICE"/>

        <permission name="android.permission.REQUEST_INCIDENT_REPORT_APPROVAL"/>

    </privapp-permissions>

packages/Shell/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ 
    <uses-permission android:name="android.permission.SET_TIME_ZONE" />

    <uses-permission android:name="android.permission.DISABLE_HIDDEN_API_CHECKS" />

    <uses-permission android:name="android.permission.MANAGE_ROLE_HOLDERS" />

    <uses-permission android:name="android.permission.STATUS_BAR_SERVICE" />

    <!-- Permission needed to rename bugreport notifications (so they're not shown as Shell) -->

    <uses-permission android:name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME" />

    <!-- Permission needed to hold a wakelock in dumpstate.cpp (drop_root_user()) -->