From 9edce64ef22607e18669a8b906e46a588d90aaef Mon Sep 17 00:00:00 2001
From: Stanislav Zholnin <zholnin@google.com>
Date: Mon, 15 Jun 2020 17:28:33 +0100
Subject: [PATCH] Properly handle situation when currentOpPackageName returns
 null.

Fixes: 158309330
Test: adb shell content query --uri content://com.android.contacts/data --projection  contact_id:raw_contact_id:_id:display_name:last_time_used:data1:account_type:mimetype
Change-Id: I6c5d0c4fef150ba45721d474ac0f83778d543467
---
 core/java/android/app/AppOpsManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java
index ddc57474a0274..e620f1641acdd 100644
--- a/core/java/android/app/AppOpsManager.java
+++ b/core/java/android/app/AppOpsManager.java
@@ -261,8 +261,9 @@ public class AppOpsManager {
                             < SystemClock.elapsedRealtime()) {
                         String stackTrace = getFormattedStackTrace();
                         try {
+                            String packageName = ActivityThread.currentOpPackageName();
                             sConfig = getService().reportRuntimeAppOpAccessMessageAndGetConfig(
-                                    ActivityThread.currentOpPackageName(), op, stackTrace);
+                                    packageName == null ? "" : packageName, op, stackTrace);
                         } catch (RemoteException e) {
                             e.rethrowFromSystemServer();
                         }