summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-18Merge "Revert "Remove legacy-test and legacy-android-test targets""temp-124234733-masterJakub Gielzak
am: 049c1589ee Change-Id: Ia84907bfa038954256bc791490a490dd338b33ce
2019-02-18Merge "Revert "Remove legacy-test and legacy-android-test targets""Jakub Gielzak
2019-02-18Revert "Remove legacy-test and legacy-android-test targets"Jakub Gielzak
This reverts commit 3b0be60307cc6063795f8cd32356745ee371e757. Reason for revert: Broken build Change-Id: I71270c7b47163ab7147029f2d3961d1848fdd9eb
2019-02-18Merge "Specify no resource_dirs for SystemUI"Anton Hansson
am: 347d6ff9f9 Change-Id: I0b752a641e5f74d7dac1017616553f464427e219
2019-02-18Merge "Specify no resource_dirs for SystemUI"Anton Hansson
2019-02-18Merge "Remove legacy-test and legacy-android-test targets"Paul Duffin
am: 14daedf747 Change-Id: I67e3a6d58324affcb9119002d4fb2be23e3121fc
2019-02-18Merge "Remove legacy-test and legacy-android-test targets"Paul Duffin
2019-02-18Merge "Add OWNERS for ExifInterface"Jin Seok Park
am: 996d37ea59 Change-Id: I24669310bf259344675110b2e4463894843e776b
2019-02-18Merge "Add OWNERS for ExifInterface"Jin Seok Park
2019-02-18Specify no resource_dirs for SystemUIAnton Hansson
The res directory is already included via the SystemUI-core library. The default for resource_dirs is ["res"] if it exists, so explicitly clear it to avoid depending on it twice. Bug: 124035856 Test: m SystemUI Change-Id: Ia1b06cd9eff4e614684efde34288cf9ebd895870
2019-02-17Merge "Replace TcpSocketInfo with TcpKeepalivePacketDataParcelable in ApfTest."Xiao Ma
am: e7e5a35b38 Change-Id: I555a4c49a92148a492172a4f2cec993428140cdc
2019-02-18Merge "Replace TcpSocketInfo with TcpKeepalivePacketDataParcelable in ApfTest."Xiao Ma
2019-02-18Add OWNERS for ExifInterfaceJin Seok Park
Adding specific owners for ExifInterface in order to make sure AndroidX code is changed when framework code is changed. Bug: 122276930 Test: N/A Change-Id: Icf0d74ad915d4b322a70c74762753411ad96bbb1
2019-02-17Merge "Rename NetworkStack package"Remi NGUYEN VAN
am: e4a40c77e1 Change-Id: I0acdbd8716b67241367c78b7c190b72086e2db4d
2019-02-18Merge "Rename NetworkStack package"Remi NGUYEN VAN
2019-02-15Merge "Check intent action in OMS.PackageReceiver for secure coding"Ryan Mitchell
am: e705e26703 Change-Id: Ic73dbe9bf5fe1f5b711ee24adbc72c1b066a63a4
2019-02-16Merge "Check intent action in OMS.PackageReceiver for secure coding"Ryan Mitchell
2019-02-15[automerger skipped] Merge "Fix the bad link due to typo"Stanley Tng
am: c0c27fbf49 -s ours am skip reason: change_id Ia06e1fffd814671289a1caebd5962aedc18a28d7 with SHA1 a44f2c075b is in history Change-Id: Ib00807a7f22c339551aa750459b4a7c0398618e4
2019-02-16Merge "Fix the bad link due to typo"Treehugger Robot
2019-02-15Merge "Sign networkstack with its own certificate"Remi NGUYEN VAN
am: fd2d7dc685 Change-Id: I24ddb16d7a163ad6141b4f6c46e5dda9f249a906
2019-02-16Merge "Sign networkstack with its own certificate"Remi NGUYEN VAN
2019-02-16Merge "Fix the incorrect javadoc links" into stage-aosp-masterTreeHugger Robot
2019-02-15Merge "Fix framework and NetworkStack classes conflicts"Remi NGUYEN VAN
am: 3f23efdd13 Change-Id: I8c207040c42a3d02b8383e13a4f839c250788f58
2019-02-15Merge "zygote: use async signal safe log to record child process death"Elliott Hughes
am: 2555ed5bca Change-Id: I9734da9897528cfc3b6c4b45d56eb6454ec435c8
2019-02-16Merge "Fix framework and NetworkStack classes conflicts"Remi NGUYEN VAN
2019-02-16Merge "zygote: use async signal safe log to record child process death"Elliott Hughes
2019-02-16Fix the bad link due to typoStanley Tng
Replaces the link with the new API name, createInsecureL2capChannel. Bug: 70683224 Test: Compile Change-Id: I9580d90722f8b0c0146a902bb5fcace4ef58d421 Merged-In: Ia06e1fffd814671289a1caebd5962aedc18a28d7
2019-02-15Fix the incorrect javadoc linksNan Zhang
A lot of unresolved link errors showing up after go/ag/5172152. Test: m -j docs with -lerror enabled Bug: b/116163454 Change-Id: I74d1f75e0f00015410a63e13103c28a9c84b4fe0
2019-02-15Merge "HLS seeking: call readAt() on new thread"Dichen Zhang
am: f9d7df6f78 Change-Id: Idf8a6341cdb8a2bf9478aa523e8066d96089e598
2019-02-15Merge "HLS seeking: call readAt() on new thread"Dichen Zhang
2019-02-15Merge "Populate 'hasKnownUserIntentEmergency'"Shuo Qian
am: 59d8275546 Change-Id: If7167ecae8c4de2cfb3a8032beb350fe1e327f32
2019-02-15Merge "Adding framework check for 3DES key size"Max Bires
am: a24d025212 Change-Id: Id71784688902c0fc1d490b1fd8321fae134166b5
2019-02-15Merge "Populate 'hasKnownUserIntentEmergency'"Shuo Qian
2019-02-15Merge "Adding framework check for 3DES key size"Treehugger Robot
2019-02-15Merge "No-op flag to keep tests working in this branch."Jeff Sharkey
am: 2144164526 Change-Id: I7723ff61f7c0f6f5f0bf560b2baa16ffda85dffb
2019-02-15Merge "Move RCS table creation flag to contract class"Leland Miller
am: 0c8bc10ab2 Change-Id: I81f0a24320171fee4d20b661c08d8144e84df181
2019-02-15Merge "No-op flag to keep tests working in this branch."Jeff Sharkey
2019-02-15Merge "Add new file to owners"Todd Kennedy
am: eda6f2401f Change-Id: I7e8296b1af33739ce906e53efd586ed7d6d98cca
2019-02-15Merge "Fix loop iteration bug."Christian Wailes
am: 1a74681173 Change-Id: I0f01f27d328b242cf8c102bbfe70324d9d263ce9
2019-02-15Merge "Move RCS table creation flag to contract class"Leland Miller
2019-02-15Merge "Add new file to owners"Todd Kennedy
2019-02-15Merge "Fix loop iteration bug."Christian Wailes
2019-02-15No-op flag to keep tests working in this branch.Jeff Sharkey
Bug: 124507818 Test: manual Change-Id: I65ae1a55c420690e68f833674d4d09452a826302 Merged-In: I7973b123cf4fc08e8ce2b05bd4c23fa41b1cdcdf
2019-02-15Add new file to ownersTodd Kennedy
Test: None Change-Id: I69f415929785845ede8f2d1341f4b70f97b4f480
2019-02-15Merge "Update VPN capabilities when its underlying network set is null."Varun Anand
am: e3ae238f4a Change-Id: Id4560d201a40f5e1b1617819991da99d86379dbe
2019-02-15Merge "Update VPN capabilities when its underlying network set is null."Treehugger Robot
2019-02-15Merge "Move NetworkStack to services.net"Remi NGUYEN VAN
am: 762f9f0c24 Change-Id: Iab45985aedb8069ad50fd2913ef6e828989cdd0d
2019-02-15Merge "Move NetworkStack to services.net"Remi NGUYEN VAN
2019-02-15Replace TcpSocketInfo with TcpKeepalivePacketDataParcelable in ApfTest.Xiao Ma
Test: atest NetworkStackTests Change-Id: I95fde70c07b398a2a2f734f35165870284a3959c
2019-02-15Remove legacy-test and legacy-android-test targetsPaul Duffin
Fixes up the android.test.legacy target to stop using sources directly now that the issue with android.test.runner-minus-junit not being able to be built against the SDK has been resolved. Also, fixes a couple of comments. Bug: 63127064 Test: make checkbuild Change-Id: If38fa0d87b36343896e97efb2269ac070810db84
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 16:15:38 +0000