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

Commit 119a0467 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

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
parent d89f4d6e

service/java/com/android/server/bluetooth/BluetoothManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
            Slog.d(TAG, "Persisting Bluetooth Setting: " + value);

        }

        // waive WRITE_SECURE_SETTINGS permission check

        long callingIdentity = Binder.clearCallingIdentity();

        final long callingIdentity = Binder.clearCallingIdentity();

        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.BLUETOOTH_ON, value);

        Binder.restoreCallingIdentity(callingIdentity);

    }
@@ -2378,7 +2378,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
        int foregroundUser;

        int callingUser = UserHandle.getCallingUserId();

        int callingUid = Binder.getCallingUid();

        long callingIdentity = Binder.clearCallingIdentity();

        final long callingIdentity = Binder.clearCallingIdentity();

        UserManager um = (UserManager) mContext.getSystemService(Context.USER_SERVICE);

        UserInfo ui = um.getProfileParent(callingUser);

        int parentUser = (ui != null) ? ui.id : UserHandle.USER_NULL;
@@ -2605,7 +2605,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
    }



    private boolean isBluetoothDisallowed() {

        long callingIdentity = Binder.clearCallingIdentity();

        final long callingIdentity = Binder.clearCallingIdentity();

        try {

            return mContext.getSystemService(UserManager.class)

                    .hasUserRestriction(UserManager.DISALLOW_BLUETOOTH, UserHandle.SYSTEM);