From 7694146d74f04e15eaa0349d20e0fcb41bae7647 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Tue, 30 Apr 2019 18:43:48 -0700 Subject: [PATCH] Fix crash in Permission Controller approving bug reports (incident reports were working fine) Bug: 123955906 Test: atest GtsIncidentConfirmationTestCases Change-Id: I13eb0679f71c1b6470856fd612bc914b1c61c04c --- core/java/android/os/IncidentManager.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/java/android/os/IncidentManager.java b/core/java/android/os/IncidentManager.java index 08afe31f05dd6..1f61a3c47ff18 100644 --- a/core/java/android/os/IncidentManager.java +++ b/core/java/android/os/IncidentManager.java @@ -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) {