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

Merge "Properly handle situation when currentOpPackageName returns null." into rvc-dev am: 9ac716fc8b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11867441

Change-Id: I958250d37114932d7db384bf77fc3a4e742a2e1d
This commit is contained in:
TreeHugger Robot
2020-06-15 20:16:22 +00:00
committed by Automerger Merge Worker
parent 96659e4406 9ac716fc8b
commit 3679ed262e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/AppOpsManager.java
View File

@@ -261,8 +261,9 @@ public class AppOpsManager {
< SystemClock.elapsedRealtime()) { < SystemClock.elapsedRealtime()) {
String stackTrace = getFormattedStackTrace(); String stackTrace = getFormattedStackTrace();
try { try {
String packageName = ActivityThread.currentOpPackageName();
sConfig = getService().reportRuntimeAppOpAccessMessageAndGetConfig( sConfig = getService().reportRuntimeAppOpAccessMessageAndGetConfig(
ActivityThread.currentOpPackageName(), op, stackTrace); packageName == null ? "" : packageName, op, stackTrace);
} catch (RemoteException e) { } catch (RemoteException e) {
e.rethrowFromSystemServer(); e.rethrowFromSystemServer();
} }