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

Commit 13be9d72 authored by Joe Onorato's avatar Joe Onorato
Browse files

Merge commit 'refs/changes/63/7273563/1' of... 

Merge commit 'refs/changes/63/7273563/1' of sso://googleplex-android/platform/frameworks/base into merge

Bug: none (merge)
Test: treehugger
Change-Id: I0ed9286cac75c2c106e3c93e96a940af9e7b3504
parents a8e9e453 7694146d

core/java/android/os/IncidentManager.java

+7 −7
Original line number Diff line number Diff line
@@ -519,6 +519,13 @@ public class IncidentManager { 
            android.Manifest.permission.PACKAGE_USAGE_STATS

    })

    public @Nullable IncidentReport getIncidentReport(Uri uri) {

        final String id = uri.getQueryParameter(URI_PARAM_REPORT_ID);

        if (id == null) {

            // If there's no report id, it's a bug report, so we can't return the incident

            // report.

            return null;

        }



        final String pkg = uri.getQueryParameter(URI_PARAM_CALLING_PACKAGE);

        if (pkg == null) {

            throw new RuntimeException("Invalid URI: No "
@@ -531,13 +538,6 @@ public class IncidentManager { 
                    + URI_PARAM_RECEIVER_CLASS + " parameter. " + uri);

        }



        final String id = uri.getQueryParameter(URI_PARAM_REPORT_ID);

        if (cls == null) {

            // If there's no report id, it's a bug report, so we can't return the incident

            // report.

            return null;

        }

    

        try {

            return getCompanionServiceLocked().getIncidentReport(pkg, cls, id);

        } catch (RemoteException ex) {