summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "packages/apps/LegacyCamera: Set LOCAL_SDK_VERSION where possible." am:...android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devhansson2018-02-232-0/+2
|\
| * Merge "packages/apps/LegacyCamera: Set LOCAL_SDK_VERSION where possible." am:...hansson2018-02-232-0/+2
| |\
| | * Merge "packages/apps/LegacyCamera: Set LOCAL_SDK_VERSION where possible."hansson2018-02-232-0/+2
| | |\
| | | * Merge "packages/apps/LegacyCamera: Set LOCAL_SDK_VERSION where possible."android-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7hansson2018-02-232-0/+2
| | |/|
| | | * packages/apps/LegacyCamera: Set LOCAL_SDK_VERSION where possible.Anton Hansson2018-02-222-0/+2
| | |/
* | | Stop statically including legacy-android-testPaul Duffin2017-12-081-2/+2
* | | Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li2017-11-150-0/+0
|\| |
| * | Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li2017-11-140-0/+0
| |\|
| | * Merge commit '4ac8eeef637f1a9e28f65ff1d9ffb3b742a5030d' into HEADandroid-wear-8.0.0_r1Xin Li2017-11-130-0/+0
| | |\
* | | | Merge "Use -Werror in packages/apps/LegacyCamera/jni" am: b9ce062aa4 am: cc2b...Chih-hung Hsieh2017-11-034-2/+20
|\| | |
| * | | Merge "Use -Werror in packages/apps/LegacyCamera/jni" am: b9ce062aa4Chih-hung Hsieh2017-11-034-2/+20
| |\| | | | |/ | |/|
| | * Merge "Use -Werror in packages/apps/LegacyCamera/jni"Chih-hung Hsieh2017-11-034-2/+20
| | |\
| | | * Merge "Use -Werror in packages/apps/LegacyCamera/jni"android-o-mr1-iot-preview-6o-mr1-iot-preview-6Chih-hung Hsieh2017-11-034-2/+20
| | |/|
| | | * Use -Werror in packages/apps/LegacyCamera/jniChih-Hung Hsieh2017-11-024-2/+20
| | |/
* | | Merge "Fix use of uninitialized value" am: bc75301408 am: b717e128c1 am: 86eb...George Burgess IV2017-08-161-1/+1
|\| |
| * | Merge "Fix use of uninitialized value" am: bc75301408 am: b717e128c1 am: 86eb...George Burgess IV2017-08-161-1/+1
|/| | | |/
| * Merge "Fix use of uninitialized value" am: bc75301408 am: b717e128c1George Burgess IV2017-08-161-1/+1
| |\
| | * Merge "Fix use of uninitialized value" am: bc75301408George Burgess IV2017-08-161-1/+1
| | |\
| | | * Merge "Fix use of uninitialized value"android-o-mr1-preview-2android-o-mr1-preview-1George Burgess IV2017-08-161-1/+1
| | | |\
| | | | * Merge "Fix use of uninitialized value"Treehugger Robot2017-08-161-1/+1
| | | | |\
| | | | | * Fix use of uninitialized valueGeorge Burgess IV2017-07-121-1/+1
* | | | | | Merge "Fix a small bug in Log.h in LegacyCamera jni" am: a26fc3fd03 am: eb4ab...oreo-mr1-devZhizhou Yang2017-07-120-0/+0
|\| | | | |
| * | | | | Merge "Fix a small bug in Log.h in LegacyCamera jni" am: a26fc3fd03 am: eb4ab...Zhizhou Yang2017-07-120-0/+0
|/| | | | | | |/ / / /
| * / / / Merge "Fix a small bug in Log.h in LegacyCamera jni" am: a26fc3fd03Zhizhou Yang2017-07-120-0/+0
|/| | | | | |/ / /
| * / / Merge "Fix a small bug in Log.h in LegacyCamera jni"Zhizhou Yang2017-07-120-0/+0
|/| | | | |/ /
| * | Merge "Fix a small bug in Log.h in LegacyCamera jni"android-o-preview-4android-o-iot-preview-5o-iot-preview-5Treehugger Robot2017-07-121-1/+1
| |\ \ | | |/ | |/|
| | * Fix a small bug in Log.h in LegacyCamera jniZhizhou Yang2017-07-111-1/+1
| |/
* | Merge "Prepare for removal of legacy-test from default targets" am: a7094d8ed...android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r34android-8.0.0_r33android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devoreo-cts-releasePaul Duffin2017-01-181-0/+1
|\|
| * Merge "Prepare for removal of legacy-test from default targets" am: a7094d8ed...android-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4Paul Duffin2017-01-181-0/+1
| |\
| | * Merge "Prepare for removal of legacy-test from default targets" am: a7094d8ed1Paul Duffin2017-01-181-0/+1
| |/|
| | * Merge "Prepare for removal of legacy-test from default targets"Paul Duffin2017-01-181-0/+1
| |/|
| | * Merge "Prepare for removal of legacy-test from default targets"android-o-preview-1android-n-mr2-preview-2o-previewTreehugger Robot2017-01-181-0/+1
| |/|
| | * Prepare for removal of legacy-test from default targetsPaul Duffin2017-01-171-0/+1
| |/
* | Fixed header guard typoMichael Butler2016-08-291-1/+1
* | Merge \\\\"Fix misc-macro-parentheses warnings in LegacyCamera.\\\\" am: 0230...Chih-hung Hsieh2016-07-262-18/+18
|\|
| * Merge \\\"Fix misc-macro-parentheses warnings in LegacyCamera.\\\" am: 02301d...android-n-mr2-preview-1Chih-Hung Hsieh2016-07-262-18/+18
| |\
| | * Merge \\"Fix misc-macro-parentheses warnings in LegacyCamera.\\" am: 02301db045Chih-hung Hsieh2016-07-262-18/+18
| | |\
| | | * Merge \"Fix misc-macro-parentheses warnings in LegacyCamera.\"android-n-mr1-preview-2android-n-mr1-preview-1Chih-Hung Hsieh2016-07-262-18/+18
| | |/|
| | | * Merge "Fix misc-macro-parentheses warnings in LegacyCamera."Chih-hung Hsieh2016-07-262-18/+18
| | | |\
| | | | * Fix misc-macro-parentheses warnings in LegacyCamera.Chih-Hung Hsieh2016-06-292-18/+18
| | | |/
* | | | Merge "Fix misc-macro-parentheses warnings." am: d2cf3bda69 am: e3d129de20 am...Chih-Hung Hsieh2016-05-241-1/+1
|\| | |
| * | | Merge "Fix misc-macro-parentheses warnings." am: d2cf3bda69 am: e3d129de20Chih-Hung Hsieh2016-05-241-1/+1
| |\| |
| | * | Merge "Fix misc-macro-parentheses warnings." am: d2cf3bda69Chih-Hung Hsieh2016-05-241-1/+1
| | |\ \
| | | * | Merge "Fix misc-macro-parentheses warnings."Chih-Hung Hsieh2016-05-241-1/+1
| | | |\|
| | | | * Merge "Fix misc-macro-parentheses warnings."android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Treehugger Robot2016-05-241-1/+1
| | | |/|
| | | | * Fix misc-macro-parentheses warnings.Chih-Hung Hsieh2016-05-121-1/+1
| | | |/
* | | / Prevent camera app crashes on changing hw.camera.* settings am: 996546fcf4 am...Lingfeng Yang2016-05-031-2/+15
|\| | | | |_|/ |/| |
| * | Prevent camera app crashes on changing hw.camera.* settings am: 996546fcf4Lingfeng Yang2016-05-031-2/+15
|/| | | |/
| * Prevent camera app crashes on changing hw.camera.* settingsandroid-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-dr1-releaseLingfeng Yang2016-05-031-2/+15
|/|
| * Prevent camera app crashes on changing hw.camera.* settingsandroid-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r1nougat-releasenougat-mr0.5-releasenougat-devnougat-cts-releaseLingfeng Yang2016-04-271-2/+15
|/
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-08 18:18:04 +0000