Skip to content

Commit 40904b8

Browse files
committed
Remove duplicated kernel structures.
The kernel v6.12 header update added these structures, so remove them from the local header. Test: binderDriverInterfaceTest passes. Change-Id: I5545b7061e4c8f3a4b6f0fe1a71a451aaf69d7da
1 parent 23351c2 commit 40904b8

1 file changed

Lines changed: 0 additions & 30 deletions

File tree

libs/binder/binder_module.h

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -32,34 +32,4 @@
3232
#include <linux/android/binder.h>
3333
#include <sys/ioctl.h>
3434

35-
struct binder_frozen_state_info {
36-
binder_uintptr_t cookie;
37-
__u32 is_frozen;
38-
};
39-
40-
#ifndef BR_FROZEN_BINDER
41-
// Temporary definition of BR_FROZEN_BINDER until UAPI binder.h includes it.
42-
#define BR_FROZEN_BINDER _IOR('r', 21, struct binder_frozen_state_info)
43-
#endif // BR_FROZEN_BINDER
44-
45-
#ifndef BR_CLEAR_FREEZE_NOTIFICATION_DONE
46-
// Temporary definition of BR_CLEAR_FREEZE_NOTIFICATION_DONE until UAPI binder.h includes it.
47-
#define BR_CLEAR_FREEZE_NOTIFICATION_DONE _IOR('r', 22, binder_uintptr_t)
48-
#endif // BR_CLEAR_FREEZE_NOTIFICATION_DONE
49-
50-
#ifndef BC_REQUEST_FREEZE_NOTIFICATION
51-
// Temporary definition of BC_REQUEST_FREEZE_NOTIFICATION until UAPI binder.h includes it.
52-
#define BC_REQUEST_FREEZE_NOTIFICATION _IOW('c', 19, struct binder_handle_cookie)
53-
#endif // BC_REQUEST_FREEZE_NOTIFICATION
54-
55-
#ifndef BC_CLEAR_FREEZE_NOTIFICATION
56-
// Temporary definition of BC_CLEAR_FREEZE_NOTIFICATION until UAPI binder.h includes it.
57-
#define BC_CLEAR_FREEZE_NOTIFICATION _IOW('c', 20, struct binder_handle_cookie)
58-
#endif // BC_CLEAR_FREEZE_NOTIFICATION
59-
60-
#ifndef BC_FREEZE_NOTIFICATION_DONE
61-
// Temporary definition of BC_FREEZE_NOTIFICATION_DONE until UAPI binder.h includes it.
62-
#define BC_FREEZE_NOTIFICATION_DONE _IOW('c', 21, binder_uintptr_t)
63-
#endif // BC_FREEZE_NOTIFICATION_DONE
64-
6535
#endif // _BINDER_MODULE_H_

0 commit comments

Comments
 (0)