Snap for 4994968 from dc0aaf9c3c26c8e0e5ac03caf1e4e90b0a18bd0e to qt-release (746ee774) · Commits · e / os / platform_frameworks_native

cmds/installd/dexopt.cpp

+2 −5

Original line number	Diff line number	Diff line
		@@ -1692,15 +1692,12 @@ static bool process_secondary_dexoptanalyzer_result(const std::string& dex_path,
		*dexopt_needed_out = NO_DEXOPT_NEEDED; return true;
		case 1: // dexoptanalyzer: dex2oat_from_scratch
		*dexopt_needed_out = DEX2OAT_FROM_SCRATCH; return true;
		case 5: // dexoptanalyzer: dex2oat_for_bootimage_odex
		case 4: // dexoptanalyzer: dex2oat_for_bootimage_odex
		*dexopt_needed_out = -DEX2OAT_FOR_BOOT_IMAGE; return true;
		case 6: // dexoptanalyzer: dex2oat_for_filter_odex
		case 5: // dexoptanalyzer: dex2oat_for_filter_odex
		*dexopt_needed_out = -DEX2OAT_FOR_FILTER; return true;
		case 7: // dexoptanalyzer: dex2oat_for_relocation_odex
		*dexopt_needed_out = -DEX2OAT_FOR_RELOCATION; return true;
		case 2: // dexoptanalyzer: dex2oat_for_bootimage_oat
		case 3: // dexoptanalyzer: dex2oat_for_filter_oat
		case 4: // dexoptanalyzer: dex2oat_for_relocation_oat
		*error_msg = StringPrintf("Dexoptanalyzer return the status of an oat file."
		" Expected odex file status for secondary dex %s"
		" : dexoptanalyzer result=%d",

cmds/installd/dexopt.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ static constexpr int NO_DEXOPT_NEEDED = 0;
		static constexpr int DEX2OAT_FROM_SCRATCH = 1;
		static constexpr int DEX2OAT_FOR_BOOT_IMAGE = 2;
		static constexpr int DEX2OAT_FOR_FILTER = 3;
		static constexpr int DEX2OAT_FOR_RELOCATION = 4;

		// Clear the reference profile identified by the given profile name.
		bool clear_primary_reference_profile(const std::string& pkgname, const std::string& profile_name);

include/input/DisplayViewport.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -39,13 +39,13 @@ struct DisplayViewport {
		int32_t physicalBottom;
		int32_t deviceWidth;
		int32_t deviceHeight;
		String8 uniqueId;
		std::string uniqueId;

		DisplayViewport() :
		displayId(ADISPLAY_ID_NONE), orientation(DISPLAY_ORIENTATION_0),
		logicalLeft(0), logicalTop(0), logicalRight(0), logicalBottom(0),
		physicalLeft(0), physicalTop(0), physicalRight(0), physicalBottom(0),
		deviceWidth(0), deviceHeight(0) {
		deviceWidth(0), deviceHeight(0), uniqueId() {
		}

		bool operator==(const DisplayViewport& other) const {

include/input/Input.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@
		#include <utils/BitSet.h>
		#include <utils/KeyedVector.h>
		#include <utils/RefBase.h>
		#include <utils/String8.h>
		#include <utils/Timers.h>
		#include <utils/Vector.h>
		#include <stdint.h>

include/input/InputDevice.h

+12 −12

Original line number	Diff line number	Diff line
		@@ -31,9 +31,9 @@ struct InputDeviceIdentifier {
		}

		// Information provided by the kernel.
		String8 name;
		String8 location;
		String8 uniqueId;
		std::string name;
		std::string location;
		std::string uniqueId;
		uint16_t bus;
		uint16_t vendor;
		uint16_t product;
		@@ -45,7 +45,7 @@ struct InputDeviceIdentifier {
		// It is hashed from whatever kernel provided information is available.
		// Ideally, the way this value is computed should not change between Android releases
		// because that would invalidate persistent settings that rely on it.
		String8 descriptor;
		std::string descriptor;

		// A value added to uniquely identify a device in the absence of a unique id. This
		// is intended to be a minimum way to distinguish from other active devices and may
		@@ -73,16 +73,16 @@ public:
		};

		void initialize(int32_t id, int32_t generation, int32_t controllerNumber,
		const InputDeviceIdentifier& identifier, const String8& alias, bool isExternal,
		const InputDeviceIdentifier& identifier, const std::string& alias, bool isExternal,
		bool hasMic);

		inline int32_t getId() const { return mId; }
		inline int32_t getControllerNumber() const { return mControllerNumber; }
		inline int32_t getGeneration() const { return mGeneration; }
		inline const InputDeviceIdentifier& getIdentifier() const { return mIdentifier; }
		inline const String8& getAlias() const { return mAlias; }
		inline const String8& getDisplayName() const {
		return mAlias.isEmpty() ? mIdentifier.name : mAlias;
		inline const std::string& getAlias() const { return mAlias; }
		inline const std::string& getDisplayName() const {
		return mAlias.empty() ? mIdentifier.name : mAlias;
		}
		inline bool isExternal() const { return mIsExternal; }
		inline bool hasMic() const { return mHasMic; }
		@@ -121,7 +121,7 @@ private:
		int32_t mGeneration;
		int32_t mControllerNumber;
		InputDeviceIdentifier mIdentifier;
		String8 mAlias;
		std::string mAlias;
		bool mIsExternal;
		bool mHasMic;
		uint32_t mSources;
		@@ -149,7 +149,7 @@ enum InputDeviceConfigurationFileType {
		*
		* Returns an empty string if not found.
		*/
		extern String8 getInputDeviceConfigurationFilePathByDeviceIdentifier(
		extern std::string getInputDeviceConfigurationFilePathByDeviceIdentifier(
		const InputDeviceIdentifier& deviceIdentifier,
		InputDeviceConfigurationFileType type);

		@@ -162,8 +162,8 @@ extern String8 getInputDeviceConfigurationFilePathByDeviceIdentifier(
		*
		* Returns an empty string if not found.
		*/
		extern String8 getInputDeviceConfigurationFilePathByName(
		const String8& name, InputDeviceConfigurationFileType type);
		extern std::string getInputDeviceConfigurationFilePathByName(
		const std::string& name, InputDeviceConfigurationFileType type);

		} // namespace android