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

Commit b6231c90 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "inputflinger: Use #pragma once instead of explicit define guards"

parents 7076bebd 4810866e

services/inputflinger/BlockingQueue.h

+1 −4
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
 * limitations under the License.

 */



#ifndef _UI_INPUT_BLOCKING_QUEUE_H

#define _UI_INPUT_BLOCKING_QUEUE_H

#pragma once



#include "android-base/thread_annotations.h"

#include <condition_variable>
@@ -106,6 +105,4 @@ private: 
    std::vector<T> mQueue GUARDED_BY(mLock);

};





} // namespace android
 
#endif

services/inputflinger/InputManager.h

+1 −4
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
 * limitations under the License.

 */



#ifndef _UI_INPUT_MANAGER_H

#define _UI_INPUT_MANAGER_H

#pragma once



/**

 * Native input manager.
@@ -130,5 +129,3 @@ private: 
};



} // namespace android
 


#endif // _UI_INPUT_MANAGER_H

services/inputflinger/InputProcessor.h

+1 −3
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
 * limitations under the License.

 */



#ifndef _UI_INPUT_CLASSIFIER_H

#define _UI_INPUT_CLASSIFIER_H

#pragma once



#include <android-base/thread_annotations.h>

#include <future>
@@ -288,4 +287,3 @@ private: 
};



} // namespace android
 
#endif

services/inputflinger/dispatcher/AnrTracker.h

+1 −4
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
 * limitations under the License.

 */



#ifndef _UI_INPUT_INPUTDISPATCHER_ANRTRACKER_H

#define _UI_INPUT_INPUTDISPATCHER_ANRTRACKER_H

#pragma once



#include <binder/IBinder.h>

#include <utils/Timers.h>
@@ -56,5 +55,3 @@ private: 
};



} // namespace android::inputdispatcher
 


#endif // _UI_INPUT_INPUTDISPATCHER_ANRTRACKER_H

services/inputflinger/dispatcher/CancelationOptions.h

+1 −4
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
 * limitations under the License.

 */



#ifndef _UI_INPUT_INPUTDISPATCHER_CANCELLATIONOPTIONS_H

#define _UI_INPUT_INPUTDISPATCHER_CANCELLATIONOPTIONS_H

#pragma once



#include <utils/BitSet.h>

#include <optional>
@@ -55,5 +54,3 @@ struct CancelationOptions { 


} // namespace inputdispatcher

} // namespace android
 


#endif // _UI_INPUT_INPUTDISPATCHER_CANCELLATIONOPTIONS_H