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

Commit 9ac716fc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Properly handle situation when currentOpPackageName returns null." into rvc-dev

parents 721a3ac8 9edce64e

core/java/android/app/AppOpsManager.java

+2 −1
Original line number Diff line number Diff line
@@ -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();

                        }