summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Add get_authenticator_id function to emulator fingerprint HALbohu2015-05-021-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib129493c6a69daa62b5a7e5b470163e266aa5fc3
* | | | | | | Use wildcard when matching device path.Jeff Sharkey2015-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20341087 Change-Id: Ic5d504c0b9f4d30fead9fff442c85929c89164b3
* | | | | | | Add pre_enroll method to fingerprint hal in emulatorbohu2015-04-221-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to fix the crash due to the lack of this method bug 20452665 Change-Id: I9b3d79140e15abb1bc52cfde42ece7f875f152d6
* | | | | | | Fingerprint: Update processed to authenticatedSasha Levitskiy2015-04-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1bab6267cbf5b55a668a5cf53dfe58e3329a2946
* | | | | | | Fix build; Fix problems with SDK fingerprint emulation codeJim Miller2015-04-111-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix prototypes - Add new IDLE state - Fix potential memory corruption bug. Change-Id: If731c6123f3ccd4bb2055707d447a016100696a1
* | | | | | | Fix build: Remove LENS_POSITION from both HALv2 and HALv3Eino-Ville Talvala2015-04-102-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iffde8b14d3937808ce367d60d34fa638cea13497
* | | | | | | Merge "Merge commit '3bcf04b5befd26624505f1baeebf31c79df5a26f' into merge2"Etan Cohen2015-04-020-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge commit '3bcf04b5befd26624505f1baeebf31c79df5a26f' into merge2Etan Cohen2015-04-010-0/+0
| |\ \ \ \ \ \ \
| | * | | | | | | camera: Drop RAW_SENSOR, use RAW16 insteadMekala Natarajan2015-03-263-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I016831455ff2ef208ff5006f2860446245e2b965
| | * | | | | | | am 9f87f57d: (-s ours) am b04cfab3: (-s ours) am c3b67d31: Fix sdcard mount ↵bohu2015-03-180-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flag for goldfish device DO NOT MERGE automerge: 0783093 -s ours * commit '0783093e23af03e161182f2760a0ae16276e90aa': Fix sdcard mount flag for goldfish device DO NOT MERGE
| | | * | | | | | | am 9f87f57d: (-s ours) am b04cfab3: (-s ours) am c3b67d31: Fix sdcard mount ↵bohu2015-03-130-0/+0
| | |/| | | | | | | | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flag for goldfish device DO NOT MERGE * commit '9f87f57d58278b3837d44d96884dc63cbee501ad': Fix sdcard mount flag for goldfish device DO NOT MERGE
* | | | | | | | | Update fingerprint HAL to use authenticate() methodbohu2015-04-011-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia8c271b167fc00f9c6d518f60bd58d3a1604dd0b
* | | | | | | | | Updated external storage configuration.Jeff Sharkey2015-03-301-13/+4
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vold now manages external storage in a much more dynamic fashion, so we no longer need to define FUSE daemons or mount points. Bug: 19993667 Change-Id: I3405810222af7cdeb439f04bdd5410e49932ea3c
* | | | | | | | am 8e39c796: am dbfa611b: Merge "Fix inconsistant results for some cts tests."Bo Hu2015-03-272-2/+20
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit '8e39c79622b79f4b5faf53123acefa5c5bda5eed': Fix inconsistant results for some cts tests.
| * | | | | | | am dbfa611b: Merge "Fix inconsistant results for some cts tests."Bo Hu2015-03-272-2/+20
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dbfa611bc53481db88e20192491747a2c87702a3': Fix inconsistant results for some cts tests.
| | * \ \ \ \ \ \ Merge "Fix inconsistant results for some cts tests."Bo Hu2015-03-272-2/+20
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix inconsistant results for some cts tests.Douglas Leung2015-03-112-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes any cts test that uses the camera's startPreview function without the proper timing delay before stopping the preview. When we do a startPreview(), it will start a WorkerThread. If that thread don't get a chance to run, then when we try to stop the thread, the stop can fail and cause the current test to fail (thread not running) or subsequent tests to fail (thread already started). The following tests are known to fail randomly due to this timing problem: android.hardware.cts.CameraTest#testDisplayOrientation android.hardware.cts.CameraTest#testGetParameterDuringFocus android.hardware.cts.CameraTest#testJpegCallbackStartPreview android.hardware.cts.CameraTest#testRecordingHint android.hardware.cts.CameraTest#testLockUnlock android.hardware.cts.CameraTest#testPreviewCallback android.hardware.cts.CameraTest#testSetOneShotPreviewCallback android.media.cts.MediaRandomTest#testRecorderRandomAction Change-Id: Ifc20d93bc02cdc49161f54c083a32138574a8d39
* | | | | | | | | | am 9cf8ded9: am 2b763c9f: Merge "Checking parameters for glCreateShader in ↵David Turner2015-03-271-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guest" * commit '9cf8ded9783bbd05f8c4b3454164af4b5782a262': Checking parameters for glCreateShader in guest
| * | | | | | | | | am 2b763c9f: Merge "Checking parameters for glCreateShader in guest"David Turner2015-03-271-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2b763c9fec35bcab3689785ad808a4317772acae': Checking parameters for glCreateShader in guest
| | * | | | | | | | Merge "Checking parameters for glCreateShader in guest"David Turner2015-03-271-0/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Checking parameters for glCreateShader in guestTina Zhang2015-03-271-0/+2
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the guest part doesn't do enough to check each API's parameters. This may lead to conformance issues. Considering performance and conformance on multiple platform, it's better to add the parameter validation in guest part. Change-Id: Ic37c9bae5fba3c7e75a2095416fea41b8d1a949a Signed-off-by: Tina Zhang <tina.zhang@intel.com>
* | | | | | | | | | Add fingerprint HAL into goldfish devicebohu2015-03-242-0/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to provide minimal fingerprint support in SDK system images. It provides functions to enroll and process fingerprint. For fingerprint emulation to work, additionally, the emulator need to implement the fingerprint module that gets user inputs (touching fingerprint sensor and removing finger from it) and sends those inputs to the guest system. Change-Id: Ifc97b8a9bd5ffdcb465994f4a8f9004b4ce73f64
* | | | | | | | | | am f74017f9: (-s ours) am 9f87f57d: am b04cfab3: (-s ours) am c3b67d31: Fix ↵bohu2015-03-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sdcard mount flag for goldfish device DO NOT MERGE * commit 'f74017f9f04c057d14f42b106ef0b084d6d2d35d': Fix sdcard mount flag for goldfish device DO NOT MERGE
| * | | | | | | | | am 9f87f57d: am b04cfab3: (-s ours) am c3b67d31: Fix sdcard mount flag for ↵bohu2015-03-130-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | goldfish device DO NOT MERGE * commit '9f87f57d58278b3837d44d96884dc63cbee501ad': Fix sdcard mount flag for goldfish device DO NOT MERGE
| | * | | | | | | | am b04cfab3: (-s ours) am c3b67d31: Fix sdcard mount flag for goldfish ↵bohu2015-03-130-0/+0
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | / / / / | | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | device DO NOT MERGE * commit 'b04cfab35d21965dce041700bf3f46403b39fb68': Fix sdcard mount flag for goldfish device DO NOT MERGE
| | | * | | | | | am c3b67d31: Fix sdcard mount flag for goldfish device DO NOT MERGEbohu2015-03-131-1/+1
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'c3b67d31f05151252e0c6c39c909aab2a65abb4b': Fix sdcard mount flag for goldfish device DO NOT MERGE
| | | | * | | | | Fix sdcard mount flag for goldfish device DO NOT MERGEbohu2015-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the "noemulatedsd" flag to fstab.goldfish so that an app can be moved to sdcard (if the app allows). (cherry picked from commit 53640b54b09d2ded47e134c52a044cd720d2c9ee) Change-Id: I8301c11f37d5b3d31fae4bd68186d509195d460c
* | | | | | | | | am ccf0b5eb: am 39bd285e: Fix sdcard mount flag for goldfish devicebohu2015-03-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ccf0b5eb3b89fe2df560c95747e27beddee2ec40': Fix sdcard mount flag for goldfish device
| * | | | | | | | am 39bd285e: Fix sdcard mount flag for goldfish devicebohu2015-03-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '39bd285eb3d834cd074417507f5689ee4516adaa': Fix sdcard mount flag for goldfish device
| | * | | | | | | Fix sdcard mount flag for goldfish devicebohu2015-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the "noemulatedsd" flag to fstab.goldfish so that an app can be moved to sdcard (if the app allows). (cherry picked from commit 53640b54b09d2ded47e134c52a044cd720d2c9ee) Change-Id: I38e9989cd1fa3c00b04b168d5f8a09270528e07e
* | | | | | | | | am 357c3a8f: am b16bbf75: Merge "Fix sdcard mount flag for goldfish device"David Turner2015-03-111-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '357c3a8fd5ff502fd3dd311447faa7fdb4ba817e': Fix sdcard mount flag for goldfish device
| * | | | | | | | am b16bbf75: Merge "Fix sdcard mount flag for goldfish device"David Turner2015-03-111-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit 'b16bbf75b85604e85c4d8f21b2fbe36d5d9ec6da': Fix sdcard mount flag for goldfish device
| | * | | | | | | Merge "Fix sdcard mount flag for goldfish device"David Turner2015-03-111-1/+1
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | | * | | | | | Fix sdcard mount flag for goldfish devicebohu2015-03-101-1/+1
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the "noemulatedsd" flag to fstab.goldfish so that an app can be moved to sdcard (if the app allows). Change-Id: Iac835ad19fd1446c9af3bf7e1bcad742145f60bd
* | | | | | | | Remove one more RAW_SENSOR enumEino-Ville Talvala2015-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id5e0f5e7a02f7c2ab1442e8be65a019bf8cbe359
* | | | | | | | am dfa3366e: am 1700c4f3: am 33ae28bf: Merge "Fix implicit function ↵Elliott Hughes2015-02-212-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | declarations in goldfish." * commit 'dfa3366e83008c2c3853c8d16481f68d435b53fb': Fix implicit function declarations in goldfish.
| * | | | | | | am 1700c4f3: am 33ae28bf: Merge "Fix implicit function declarations in ↵Elliott Hughes2015-02-212-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | goldfish." * commit '1700c4f306e3fbace7ee482004bdc0378601a8ea': Fix implicit function declarations in goldfish.
| | * | | | | | am 33ae28bf: Merge "Fix implicit function declarations in goldfish."Elliott Hughes2015-02-212-0/+2
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '33ae28bf3d7a3ffd00cad80284be2ac33155a7f3': Fix implicit function declarations in goldfish.
| | | * \ \ \ \ \ Merge "Fix implicit function declarations in goldfish."Elliott Hughes2015-02-212-0/+2
| | | |\ \ \ \ \ \
| | | | * | | | | | Fix implicit function declarations in goldfish.Elliott Hughes2015-02-192-0/+2
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If737f7a756268fb301efc1bf2888ebf9ed409f58
* | | | | | | | | Merge "Replace HAL_PIXEL_FORMAT_RAW_SENSOR with RAW_16"Eino-Ville Talvala2015-02-203-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace HAL_PIXEL_FORMAT_RAW_SENSOR with RAW_16Eino-Ville Talvala2015-02-193-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iee70a27184d5ed35623814886487a5166c73567e
* | | | | | | | | | am 481bd07f: am 254093f7: am 35169dbb: am dfbcadfc: am 6e3ed47a: (-s ours) ↵bohu2015-02-180-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am aa028a3c: back port gles fix to api 18 * commit '481bd07f277a365b6dca003127c8278ae351a445': back port gles fix to api 18
| * | | | | | | | | am 254093f7: am 35169dbb: am dfbcadfc: am 6e3ed47a: (-s ours) am aa028a3c: ↵bohu2015-02-180-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | back port gles fix to api 18 * commit '254093f7271d879c252aedc46511668c5239f2fa': back port gles fix to api 18
| | * | | | | | | | am 35169dbb: am dfbcadfc: am 6e3ed47a: (-s ours) am aa028a3c: back port gles ↵bohu2015-02-170-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix to api 18 * commit '35169dbba182b1e10ea8e12b512a4875d97412e9': back port gles fix to api 18
| | | * | | | | | | am dfbcadfc: am 6e3ed47a: (-s ours) am aa028a3c: back port gles fix to api 18bohu2015-02-170-0/+0
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dfbcadfc750113cb01a767b67414a1c2041301a6': back port gles fix to api 18
| | | | * | | | | | am 6e3ed47a: (-s ours) am aa028a3c: back port gles fix to api 18bohu2015-02-130-0/+0
| | | | |\ \ \ \ \ \ | | | | | | |_|_|/ / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '6e3ed47ab0b06e09d4b8531e05805c4b3ea0e924': back port gles fix to api 18
| | | | | * | | | | am aa028a3c: back port gles fix to api 18bohu2015-02-1324-74/+276
| | | | | |\ \ \ \ \ | | | | | | | |_|_|/ | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | * commit 'aa028a3c593319d085b43f3fcc78b571524d6de2': back port gles fix to api 18
| | | | | | * | | | back port gles fix to api 18bohu2015-02-0324-74/+276
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following CLs are backported: 5a50ac8819525f851c677be88a466b14737dbb18 guest system gles fix: Enable screen capture with gpu on 717e625415c4398431b84851ba1b76d8c59ae9cf Add shader version to glGetString 32c30975ea654b9654ad9dade0d25b9856e63f1b Add parameters validation to glShaderSource() API b0c7cce25bf9323a359800a86c0c7609db2acea4 Fix eglDestroyContext and glTexImage2D 2fc65202c214640c55b52c29bbc9213170d0b533 handles glGetBooleanv when value is nonboolean beda8027439b9c20475b8a3d379823d09fca3abb Properly initialize GLClientState's m_states 84684ec571a1db94e32a67cb7d154ab562dd0d7f Unbind buffer when buffer is deleted 89b7aac84f8babab93ff5326ad492164d971c421 Handle empty data parameter in glTexSubImage2D_enc adb0f74f792ba7bca20257b9c0ea41ebda9bb229 Allow glGetProgramInfoLog_enc to have empty length b31166704ddb7751619cf0bbc4f2f4575c0ad3c4 Guard against negative buffer size 641f35af08a0a4c46586a592ff4e703e866d581a Guard against negative width and height 9d18698dd8da15937f80e5476d73400a011934be Handle empty buffer in QemuPipeStream::writeFully 40a674e0d0acac87aa25eb9de720dc2fb07d9e4f Fix emulator crashes on glDrawElements command 7fa2b92de2058a3556e5f38a135de415bb3d5e45 Merge "Use more appropriate type in cb_handle_t::validate." fe2c5beb964d2e2aecedb02b9cca592e0811d90b Use more appropriate type in cb_handle_t::validate. 376688e76694bf5b8672379c540b1bda059da682 Merge "ranchu: Fix goldfish_pipe definitions." e3e686593cc8bdaf3ca4f6fa0b33b62a6951d1d6 ranchu: Fix goldfish_pipe definitions. 7d3d0c99d2c82319e001289d1b9e091e5ff8f7aa Merge "ranchu: Add ARM64-specific root/ramdisk config files." d0fead3c53d6e450deb69aad72651e132b6cc072 ranchu: Add ARM64-specific root/ramdisk config files. 638ee524f83053613c47ddea22c4bf98a0175c2f Merge "Remove display initialization from eglGetProcAddress API" 7a2929cd6548693b581c17ba69308a49e03c56be Remove display initialization from eglGetProcAddress API 9b1e6c5a3ccd943b7158dce83387fbfcc1162d69 Merge "Make the size of "cb_handle_t" same for 32/64-bit" 7ea757df0311bfb7310a7a765dcec1b79f39f25d Merge "goldfish: camera: fix 64-bit warnings" 3725c7c982eac52ec64a625e82f306822452941c goldfish: camera: fix 64-bit warnings eed789f036cbcedf2fa96ae3e273c2234102d340 Merge "goldfish: Fix /cache partition type." f55ac4fc027ae3d97f4faaa6ccd65480f493dea7 goldfish: Fix /cache partition type. 690792a66c7fca6bf0aa17c2d5043ab86d145965 Merge "Revert "Revert "goldfish: cache image is not ext4. yet.""" 8853df9503e0edec6cac0e1e0840fa111d57a79a Revert "Revert "goldfish: cache image is not ext4. yet."" d8a6e67044ddcac7c53adbe6b871c33447110905 Merge "Revert "goldfish: cache image is not ext4. yet."" 5e2caf7883279113d6f5f4777122dc88262c34c6 Revert "goldfish: cache image is not ext4. yet." 3f62b50d45441ae077c958423e9e301acd5dcc11 Make the size of "cb_handle_t" same for 32/64-bit aec15d91ee48797f2b3c3fe61cca977900ebcd47 am 646f0b25: Merge "opengl: rcOpenColorBuffer must be synchronous" 646f0b25e63164950d1d99b9b8021be74c2321c6 Merge "opengl: rcOpenColorBuffer must be synchronous" c542f3d8fc89678574b2fa650395f3dfac991a20 opengl: rcOpenColorBuffer must be synchronous 6ccaeebd78dcb5e20e2c0e81cdc571fb74f9cfb7 am 2c6c08a2: Merge "Move goldfish from fdprintf to POSIX dprintf." 2c6c08a23d2f5f760753745be5b67fe5759dcc91 Merge "Move goldfish from fdprintf to POSIX dprintf." 0228f8a1cdf5b2391201333de73fabab6d2ca72f Move goldfish from fdprintf to POSIX dprintf. dbda557d4dcf022850ea4ab4f89e1c154e2aea04 am 5cb5779a: Merge "gralloc: don\'t initialize reserved_proc" 5cb5779ad0ad75a59bfb8ce42317a4ee18300281 Merge "gralloc: don't initialize reserved_proc" e46eea0b5bdef28f5c42e4d7764b030679479354 gralloc: don't initialize reserved_proc 67334d0b9d0da7595daf07a3e9bea6a55436e296 Merge commit 'd9dc763708823aa865983bb8dc37b5ecc5669620' into HEAD 7076e4647af737393baf020c13e81a090f4a9f26 Merge "Add 64-bit software GLES/EGL support in gralloc.goldfish module" 3f92be74c1e9b2314d4c0f8feaacf7bafce7dedc Add 64-bit software GLES/EGL support in gralloc.goldfish module 61a8f0bbc146a4050a885e1e7c314dfc4ab72779 Merge "Fix the Chrome app crash in emulator issue" bd93fee73b02d0b223b441c34a4f8e04eb57291d Merge "Support GLES acceleration in 64bit emulator on device side" a1de8e2f5e4c29341be01bae364a54d92d14c742 Fix the Chrome app crash in emulator issue 4f94a5f8b13a5fdd80988e77dd5d468b958b0117 Merge "Remove the useless folder and files in emulator GLES/EGL drivers" 31aad5c0a0de056114b6bb843a5c37d8de6e46e4 Remove the useless folder and files in emulator GLES/EGL drivers aedc716648071a1403f4ac92a380d1d4a5377052 Support GLES acceleration in 64bit emulator on device side d9dc763708823aa865983bb8dc37b5ecc5669620 am aedf829a: Merge "goldfish: cache image is not ext4. yet." aedf829a920c3100de5caa49b0dec02d66eed96b Merge "goldfish: cache image is not ext4. yet." a2543be45f35ab7ace3ecd92c99a3c72150622ec goldfish: cache image is not ext4. yet. 9dba558f4621d3d70a05c0a3d8e2c34b3883f866 am 48a76778: Merge "Remove #include <asm/page.h>." 644f53c8705586705c27b799e5b5f303118e8b3c am 155ca91c: Merge topic \'emu64\' 48a76778937abadf5cbd260696a29d737134d0d9 Merge "Remove #include <asm/page.h>." 1daf365476f888a5d9534607c8299a3b5160b4a7 Remove #include <asm/page.h>. 155ca91c1253bcb85a0eeec93ded6da07122d4ff Merge topic 'emu64' 324a0c43835b935721c938a2684874e0b5bf8311 Disable echo on all tty lines 8bb5f92dcd48dbbaa69ab15f97aca13d49b08599 ueventd.goldfish.rc: set system permissions for /dev/goldfish_pipe 5b31b113176dec8d7fcfb5650f3dd7b01baf605c am 48107fa1: Merge "device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH" 48107fa1dd354f8667b74f335c3f82f472b7d112 Merge "device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH" 5212e4a903d2654572b8bdde0bda3bdd6ecbee6e device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH 2061519f3e55ba1dac643cac34a4aa6f0f0dfeee am 44c72ca0: Merge "Vibra: Add the vibrator module for goldfish" 44c72ca0b92c75ffef5e691a24d5d06d6a3e7baa Merge "Vibra: Add the vibrator module for goldfish" 0f41b57f2aa2ffa8fd90ebd50c13c2dd0249ee0f Vibra: Add the vibrator module for goldfish ac534df6c39944a91f157819628db3d6f63b75f1 am 59922432: Merge commit \'f09bc5256e48a44eec9ca47ba838c12d0e89a198\' into HEAD 59922432be859a46eeb76650b24308505625da36 Merge commit 'f09bc5256e48a44eec9ca47ba838c12d0e89a198' into HEAD 144d2d5d683928f393a9567c443c8f5af13dfdd0 am b9a62053: Merge commit \'828bd482a1aeacf96d5f3a3e0701029d9f890c5f\' into HEAD b9a62053cf74025a43c8baa118d52729e38cc176 Merge commit '828bd482a1aeacf96d5f3a3e0701029d9f890c5f' into HEAD a648b35cca58d3d1608e1beb21028f91bd0b9df7 am 2befc3ed: Merge "Modify the build targets for goldfish from to include aosp*." 2befc3edc583afb43a4f6740f0af0534eac8e9d5 Merge "Modify the build targets for goldfish from to include aosp*." bc233492e3ce3af8cc23496ee58cd3dc1b74d0f0 Modify the build targets for goldfish from to include aosp*. f09bc5256e48a44eec9ca47ba838c12d0e89a198 am b9a7de1a: Merge "Delete buffer data when removing it from the SharedGroup namespace" b9a7de1a690bc638496e0550e6a9ebe859fc0315 Merge "Delete buffer data when removing it from the SharedGroup namespace" 8562d1b6e089254837da3ab2d272c65c3bb5d8c7 Delete buffer data when removing it from the SharedGroup namespace f8b99f123467cd6164d071237f5dbe703f9ea2d7 am 6b151ca8: Merge "Catch divide by zero case in drawCheckerBoard() function." 6b151ca8833aa7271e311436dad97588b71b7a38 Merge "Catch divide by zero case in drawCheckerBoard() function." d7cc5da79d828ec6cb21926be13265fc52715e2f am 84309165: Merge "Drop setting of in_qemu boolean and restorecon /sys/qemu_trace." 84309165ca52b7446e388c13127fd6e305833f24 Merge "Drop setting of in_qemu boolean and restorecon /sys/qemu_trace." 46bcb5f7a64ccd440d5a292c7afd2e2b5c2bee4f Drop setting of in_qemu boolean and restorecon /sys/qemu_trace. b0b6afb44269263afa080ecc643f2c4866adfb38 Catch divide by zero case in drawCheckerBoard() function. 828bd482a1aeacf96d5f3a3e0701029d9f890c5f am 2524d396: Update emulator to FUSE-wrap its SD card. 2524d39681566f4eca7afb7950e05ab642978263 Update emulator to FUSE-wrap its SD card. e8122dff1ef2de4d41835265a59d8960e7800fae camera3: Fix stream id types 3ad13188d4e7e873947040ec22a35d73efb76812 Camera2/3: Implement full-color NV21 output. 07da94023283a7be99fdde9b05e54d9204f7deff get rid of HAL pixelformats 5551 and 4444 a4c19be9274d8bb993f88a6a1cbd2ad92f4a48fa Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by default." ccb835ba267e927f7df759290bd46ac78712a3b2 Merge "Camera2/3: Update static metadata" 0049ee8925212a3a5ff095a8a66cab184adf8f1b Camera2/3: Update static metadata 8ff1e5f1e3e24baf311e6263b48f389c206f14ac am 8f9288ea: goldfish: use fstab.goldfish 8f9288eaf10b50d19038f5c7024616e147c64735 goldfish: use fstab.goldfish e96a7c7da79939c509a7517f2b2de37e840a6390 Added net.dns1 prop for emulator, as Android emulator ignores it by default. ff3a362fb9aca15285a95cad6baa08e961330e8e am bf34d172: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge bf34d1722ea1ebdf779837611220b5269bd35968 Reconcile with jb-mr2-zeroday-release - do not merge d9fcbd08b0413fedc8219237534ce31d6b7fd2f5 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev ad9dd4bfdfa9ab6ccfc4be14305b6ed8b9a0ab5a am 2c84e47e: am 07a4c8b4: Camera3: Fix default AE mode 2c84e47e3d0085b1222de94013c75c0328b02492 am 07a4c8b4: Camera3: Fix default AE mode Change-Id: Iadb2d609051a33595ce915e638e0e40f9a4841a4
* | | | | | | | | | am 955470ed: am 3bf12050: am 7f721057: (-s ours) resolved conflicts for ↵bohu2015-02-180-0/+0
|\| | | | | | | | | | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge of 52667f55 to klp-modular-dev * commit '955470ede6e6338b7b4749ebae275b87381dadde': Port back gles bug fixes and rotation fix
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 10:20:32 +0000