diff options
author | Jeff Sharkey <jsharkey@android.com> | 2020-10-06 11:18:09 -0600 |
---|---|---|
committer | Jeff Sharkey <jsharkey@android.com> | 2020-10-06 11:18:09 -0600 |
commit | 2d2e07e2ff43a13bf039fa755e5069849b5a8c51 (patch) | |
tree | 19ac12f8732b1ed31cfef385391f24d2aa20c72e /telecomm/java/android/telecom/DefaultDialerManager.java | |
parent | a3e52bf4e492786d3937d8926ea447e310f6ec98 (diff) |
Tighten up Binder.clearCallingIdentity() usage.
The recently added AndroidFrameworkBinderIdentity Error Prone checker
examines code to ensure that any cleared identities are restored to
avoid obscure security vulnerabilities.
This change is a purely mechanical refactoring that adds the "final"
keyword to the cleared identity to ensure that it's not accidentally
modified before eventually being cleared. Here's the exact command
used to generate this CL:
$ find . -name "*.java" -exec sed -Ei \
's/ (long \w+ = .+?clearCallingIdentity)/ final \1/' \
{} \;
Bug: 155703208
Test: make
Exempt-From-Owner-Approval: trivial refactoring
Change-Id: I832c9d70c3dfcd8d669cf71939d97837becc973a
Diffstat (limited to 'telecomm/java/android/telecom/DefaultDialerManager.java')
-rw-r--r-- | telecomm/java/android/telecom/DefaultDialerManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/telecomm/java/android/telecom/DefaultDialerManager.java b/telecomm/java/android/telecom/DefaultDialerManager.java index 5b806a6e57da..1c070748400d 100644 --- a/telecomm/java/android/telecom/DefaultDialerManager.java +++ b/telecomm/java/android/telecom/DefaultDialerManager.java @@ -74,7 +74,7 @@ public class DefaultDialerManager { * */ public static boolean setDefaultDialerApplication(Context context, String packageName, int user) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { CompletableFuture<Void> future = new CompletableFuture<>(); Consumer<Boolean> callback = successful -> { @@ -128,7 +128,7 @@ public class DefaultDialerManager { * @hide * */ public static String getDefaultDialerApplication(Context context, int user) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { return CollectionUtils.firstOrNull(context.getSystemService(RoleManager.class) .getRoleHoldersAsUser(RoleManager.ROLE_DIALER, UserHandle.of(user))); |