summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseXin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: fa83e46b76 am: 85015412f2 -s ours am skip reason: subject contains skip directive Change-Id: I904cd61af0289c6183b7782baf1c0d1a072f8f2d
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: fa83e46b76 Change-Id: I62332493d289f64f2181b708c171dd06eb4f037a
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I876f2c8b537fffec2f8083272ce754f44a5ac89d
2019-09-10Merge "Force re-extraction if dex number is invalid" am: 6944597270 am: ↵Jon Noack
92d835c69a am: f772220347 am: ec3dd06219 Change-Id: I348856e44ba75b37ff12058355f632fb1d928cab
2019-09-10Merge "Force re-extraction if dex number is invalid" am: 6944597270 am: ↵Jon Noack
92d835c69a am: f772220347 Change-Id: I65727a6c04fd182cb7aad673fa789d8ef185a83b
2019-09-10Merge "Force re-extraction if dex number is invalid" am: 6944597270Jon Noack
am: 92d835c69a Change-Id: I64af8b1685552869d56de38c87fd1411e0a4738c
2019-09-10Merge "Force re-extraction if dex number is invalid"Jon Noack
am: 6944597270 Change-Id: I9f77a567605f365b23f8acc82023ed3fc7a44107
2019-09-10Merge "Force re-extraction if dex number is invalid"ndk-sysroot-r21Treehugger Robot
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 0c68d39470 -s ours am: 60659ce9be -s ours am: 1ee1330da8 -s ours am skip reason: change_id I0dcb6b2b9015a6545103a267584dbaf45fdf213a with SHA1 ca61a6269b is in history Change-Id: I91c89ab721ebd491bedf3badd196f35b9b258d59
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 0c68d39470 -s ours am: 60659ce9be -s ours am skip reason: change_id I0dcb6b2b9015a6545103a267584dbaf45fdf213a with SHA1 ca61a6269b is in history Change-Id: Idf17670c5262192b9a28fd20677c1c89babc9bb2
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 0c68d39470 -s ours am skip reason: change_id I0dcb6b2b9015a6545103a267584dbaf45fdf213a with SHA1 ca61a6269b is in history Change-Id: I013142a955daa6fe72be176ae08ee1e1aade7621
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: Idb0826c4b3bdcff735025d5f86cac298524a83fe Merged-In: I0dcb6b2b9015a6545103a267584dbaf45fdf213a
2019-09-06Force re-extraction if dex number is invalidJon Noack
The dex number is considered invalid if it is not found in SharedPreferences or the persisted value is less than 1. My only theory for how this could occur is SharedPreferences corruption. In this scenario prior to this change, MultiDex would think there were no secondary dex files to extract and the application would crash at runtime with ClassNotFoundException. Bug: 62483082 Change-Id: If3671b53b06bb2fb97a9dd82858a6f43b0e1dc1c Test: mmma -j frameworks/multidex
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
ca61a6269b -s ours am: 941ffca8d1 am: 8315089939 am: 2e18f638c3 -s ours am skip reason: subject contains skip directive Change-Id: I8bf258f739d1856f96c817d970343953179cffbb
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
ca61a6269b -s ours am: 941ffca8d1 am: 8315089939 Change-Id: Icfdeb3c656a582cbcde983402955354482e6e45a
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
ca61a6269b -s ours am: 941ffca8d1 Change-Id: I2fbe42307b9fd3fa0fb20ad9ed2b38009e605603
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into masterXin Li
am: ca61a6269b -s ours am skip reason: subject contains skip directive Change-Id: Ieb2f3225ba69dff0e1b8ffaaeaf87ab07968a7e7
2019-09-04DO NOT MERGE - Merge Android 10 into masterXin Li
Bug: 139893257 Change-Id: I0dcb6b2b9015a6545103a267584dbaf45fdf213a
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 600b0068b2 am: 838d00da64 -s ours am skip reason: subject contains skip directive Change-Id: I6b0ce56bb6133585bcd1bb9668294468bca3d5ba
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: 600b0068b2 Change-Id: Ie23e909d0a96a5ff8b5a9e27512f351217143eac
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: Ia823681c5104d6b1986330db6205eebb5af3f307
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: a7af9ae1f1 Change-Id: I13426d0d59e99d01f8396938f09f047fdb0b15b2
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I32794cff1264db70768464f8c9dc49422c99ea9a
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: Ifbae4d323a754181851a4eaa0313dcd45c8bfa19
2019-01-29Remove empty Android.mk file am: ab3fe997f4 am: 615d329223Sasha Smundak
am: 996322043e Change-Id: Ia52836d975d4710db6ab5506c87366dcfe644ab4
2019-01-28Remove empty Android.mk file am: ab3fe997f4Sasha Smundak
am: 615d329223 Change-Id: I69cb9d65a40fc6dbd832733e6783d2f961742ff8
2019-01-28Remove empty Android.mk fileSasha Smundak
am: ab3fe997f4 Change-Id: I538712ece44ec6f1477dd090c5b787f8eeef41ec
2019-01-25Remove empty Android.mk fileandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseSasha Smundak
See build/soong/README.md for more information. Change-Id: I13370970474c8398e8e2facd7c9e6e4a84211d0f Fixes: 122332710 Test: treehugger
2018-11-27Do not use regexps to parse simple version strings. am: 44d3900a5d am: ↵Mads Ager
1d9ec348fa am: ee97c923a8 Change-Id: I5886cb785caff9021a59f207f749d9c5bb206375
2018-11-27Do not use regexps to parse simple version strings. am: 44d3900a5dMads Ager
am: 1d9ec348fa Change-Id: I5d6c3a420887c5cd4653ac0c8fd9bebdaef1bea8
2018-11-27Do not use regexps to parse simple version strings.Mads Ager
am: 44d3900a5d Change-Id: I48e9b1b17285d760d7ae57228d3bb4fd680ed7a3
2018-11-27Do not use regexps to parse simple version strings.android-wear-8.0.0_r2android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-releaseMads Ager
This saves 5-10ms on a JellyBean Samsung Nexus S for the check to see whether the VM supports multidex natively. On a newer Samsung S7 phone it saves 0.5 ms. Test: manually tested on old and new devices. Bug: 74259172 Change-Id: Ic05645deb5b4b990d07c726aa0fdd5f0cfa5884b
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 9c7e15dfb8 -s ours am: dc54499a84 -s ours am: e56892fef3 -s ours Change-Id: I2515494cb905bc257c09d7e796eb358384a0f435
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 9c7e15dfb8 -s ours am: dc54499a84 -s ours Change-Id: Ife8e6ca7b61d14166ca18195513e23bc75edec7c
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 9c7e15dfb8 -s ours Change-Id: I27260eae384f7b2547f66a070a33ff206572a3cd
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsBill Yi
Change-Id: Ida4dda1d324b0a1b2268dbb64632f15e5bf6f3fc
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 4c24c2a390 -s ours am: e702bff674 -s ours Change-Id: I9632fff744a8a226304f0e195464811718cd5977
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 4c24c2a390 -s ours Change-Id: I886fd8255f8d14f24628abe8b259ced4f816079a
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I4199b6ed5886b0255d37fdb3408b34c953280def
2018-10-19Merge "Fix compatibility with Robolectric." am: 8845f3212e am: 5255f14314Brett Chabot
am: 15bbdce417 Change-Id: I73c74d4005470087040a49c9ec1b20e48041b32c
2018-10-19Merge "Fix compatibility with Robolectric." am: 8845f3212eBrett Chabot
am: 5255f14314 Change-Id: I696126dcfb4a9d0315c70f8f5dc3f1a1bbb7d66e
2018-10-19Merge "Fix compatibility with Robolectric."Brett Chabot
am: 8845f3212e Change-Id: I655d3a92182496448ef1a119859b213dfa940eec
2018-10-19Merge "Fix compatibility with Robolectric."Treehugger Robot
2018-10-18Fix compatibility with Robolectric.Brett Chabot
Robolectric at somepoint changed to return a valid Java ClassLoader from Context.getClassLoader(), breaking the check in MultiDex. Modify this check to ensure a valid Dex compatible classloader. Test: Added integration tests in Robolectric; m -j checkbuild Change-Id: I9df517e25460daa5fabfe8cba88cdc5d9bb16de2
2018-08-08Merge Android Pie into master am: eb24b3049f am: e3c17ce4b0 am: c358e4589fXin Li
am: cf68d9fb3a Change-Id: Iad7eb8bc32693a30116ad590d720dd01b2aa52fb
2018-08-07Merge Android Pie into master am: eb24b3049f am: e3c17ce4b0Xin Li
am: c358e4589f Change-Id: Ibfcb54e45db345099ca1a36d691a23d5ced8371a
2018-08-07Merge Android Pie into master am: eb24b3049fXin Li
am: e3c17ce4b0 Change-Id: If3a793437f4fe2c3bedfcf176dfca4d0fecbb463
2018-08-07Merge Android Pie into masterXin Li
am: eb24b3049f Change-Id: Ifa298fc125b0f0dad39381c920fd23b3e847ce5b
2018-08-06Merge Android Pie into masterandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseXin Li
Bug: 112104996 Change-Id: Iedd4a8fe7ef0233a4395c8c269b80b52b6a97acd
2018-08-01Merge "Fix ub-multidex gradle build, add docs"Alan Viverette
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 12:35:35 +0000