| commit | 162ac93355cb029c8b3e4d5dfbfde92f1c17b4fa | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Oct 29 19:49:07 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 29 19:49:07 2020 +0000 |
| tree | 87aa9654d0bf8677f2b86f23b3bc03573e273484 | |
| parent | 6e506c34f70aea7e0d2e1c2dce3886fc1b13466d [diff] | |
| parent | 8f96e74b58126f3e3ca472689b12cd1a0bd5f3ae [diff] |
Merge "Add trackingBug to SharedMemory.getFd()" am: 7b9e2bd143 am: 3e65b3750b am: d08754f4ac am: 8f96e74b58 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479878 Change-Id: I9fb5292a98cf89203c67106a1319a54569b4a92f
diff --git a/core/java/android/os/SharedMemory.java b/core/java/android/os/SharedMemory.java index 7512352..136e3de 100644 --- a/core/java/android/os/SharedMemory.java +++ b/core/java/android/os/SharedMemory.java
@@ -158,7 +158,7 @@ * * @hide Exposed for native ASharedMemory_dupFromJava() */ - @UnsupportedAppUsage + @UnsupportedAppUsage(trackingBug = 171971817) public int getFd() { return mFileDescriptor.getInt$(); }