summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jared Duke <jdduke@google.com> 2023-11-18 16:56:53 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-11-18 16:56:53 +0000
commit1b1e7e5e16216e6bf4d0b37a45fda46bd642aa3d (patch)
treec478069d661e6ddbff5556c548e21aae8dad2869
parent1fe5d8c4e4f065f6cd5adc7c96db2a7828f1ab9f (diff)
parentfe13d8ecfbe21548ddbdb1c6a19f2152822ef9ab (diff)
Merge "Optimize AppOpsManager.getFormattedStackTrace" into main
-rw-r--r--core/java/android/app/AppOpsManager.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java
index b74b075c9f62..c5e132fc0c4b 100644
--- a/core/java/android/app/AppOpsManager.java
+++ b/core/java/android/app/AppOpsManager.java
@@ -9927,10 +9927,11 @@ public class AppOpsManager {
if (i != firstInteresting) {
sb.append('\n');
}
- if (!sFullLog && sb.length() + trace[i].toString().length() > 600) {
+ final String traceString = trace[i].toString();
+ if (!sFullLog && sb.length() + traceString.length() > 600) {
break;
}
- sb.append(trace[i]);
+ sb.append(traceString);
}
return sb.toString();