summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-05-08Merge "Update to follow the new google benchmark API"temp_b_131756210_stage-aosp-masterHaibo Huang
am: d22ba181d0 Change-Id: Ie5065ff193bfe187683e729d589138c24f4f2fac
2019-05-08Merge "Update to follow the new google benchmark API"Haibo Huang
2019-05-08Merge "Add IPsec tunnel mode feature flag"Benedict Wong
am: 86f2f55b86 Change-Id: I495ff2bfe4f60dfd77176bcd331816667ccd9c36
2019-05-08Merge "Add IPsec tunnel mode feature flag"Benedict Wong
2019-05-08Update to follow the new google benchmark APIHaibo Huang
Test: build Change-Id: Icc25b81e9b863c35c02c9673518fa4d30e9ae321
2019-05-07Merge "Extend NetworkDnsEventReported and add new DnsCallReported to log ↵Frank Li
per-query information" am: 8ff4a5a5b5 Change-Id: I16ada24faf991dc95326c9c56df9daa3a07519ba
2019-05-07Add IPsec tunnel mode feature flagBenedict Wong
This patch adds a feature flag for IPsec Tunnel Mode. This implies VTI (with output-mark updating), or XFRM-I in the kernels. Bug: 117183273 Test: Compiles Change-Id: I6dd0e429cc0bd100f2ef1140a6651f6ef5294c79 Merged-In: I6dd0e429cc0bd100f2ef1140a6651f6ef5294c79 (cherry picked from commit dc92c69b087d5fbecff76ef1e739ae415312734d)
2019-05-08Merge "Extend NetworkDnsEventReported and add new DnsCallReported to log ↵Frank Li
per-query information"
2019-05-07Merge "Update getCardId doc with details"Jordan Liu
am: a0a72ec485 Change-Id: Ic6c014f7b086fad8b7fa131366839e35ebbd7dd1
2019-05-07Merge "Update getCardId doc with details"Jordan Liu
2019-05-07Merge "Fix incorrect parsing of UVC interface descriptor"Kamen Kirov
am: 74458cbdf0 Change-Id: Ie1359f65e2ad72c1567cd426f8eebfc24b053f46
2019-05-07Merge "Fix incorrect parsing of UVC interface descriptor"Treehugger Robot
2019-05-07Merge "Sorting and merge Emergency number better"Shuo Qian
am: 70ed8dba68 Change-Id: Ic04771d79d96affb99876fe92a9768937ea93885
2019-05-07Merge "Sorting and merge Emergency number better"android-o-mr1-iot-release-1.0.12oreo-mr1-iot-releaseShuo Qian
2019-05-07Sorting and merge Emergency number bettersqian
Apply more parameters to sort Emergency number list, it is important to keep two lists Collection-equal to each other if they have the same contents. Otherwise, it will introduce more unnecessary updates in EmergencyNumberTracker and it may confuse users. Test: atest EmergencyNumberTest Bug: 131922424 Change-Id: I64a43886d4000b261ea703b081e6278b0307805f Merged-In: I64a43886d4000b261ea703b081e6278b0307805f (cherry picked from commit a1f21a5c2cd4cdc14f4cbf7cd0fc0de6e4911c02)
2019-05-07Merge "Update path to audio files"Anton Hansson
am: 5c47b52b93 Change-Id: Iee4977f78ae5b5c17f6dfee198d49aede92012a7
2019-05-07Merge "Update path to audio files"Anton Hansson
2019-05-06Merge "Track libziparchive API change."Elliott Hughes
am: 32581e1dd2 Change-Id: I498a0197bb6aab88217a4c796fd5bed7c1802e33
2019-05-06Merge "Track libziparchive API change."Elliott Hughes
2019-05-06Update getCardId doc with detailsJordan Liu
getCardId() returns the EID in some cases and ICCID in others. Add comments explaining exactly when it returns what. Test: no change in behavior Bug: 131423779 Change-Id: Id0cbae3affdf4c034b2435bf77371ae1355d3cfa
2019-05-06Merge "Rollback SHELL UID check for CarrierConfigLoader"Brad Ebinger
am: bdb61f3cf2 Change-Id: Idd55627f0e81b99d56c2a2d8fffa1d04a49ad76f
2019-05-06Merge "Rollback SHELL UID check for CarrierConfigLoader"Brad Ebinger
2019-05-06Rollback SHELL UID check for CarrierConfigLoaderBrad Ebinger
When a test calls adoptShellPermissionIdentity before calling a command, it doesn't adopt the shell UID, only the permissions. So, we can not use Binder#getCallingIdentity to determine it the API is being called as part of a test. For now, we must only use MODIFY_PHONE_STATE until a better pattern is established. Test: Manual Bug: 131185660 Merged-In: I607b7c9afe1c384a41ce12b92ae43747b2ee1bc3 Change-Id: I59d32a2e36950b2485e1a46a25e3724928676219
2019-05-05Merge "Fix binder leakage when turning off Bluetooth"Ugo Yu
am: 50269bef43 Change-Id: I17b81361793054f21723f8cab00b3c6fb2a2b615
2019-05-06Merge "Fix binder leakage when turning off Bluetooth"Treehugger Robot
2019-05-03Track libziparchive API change.Elliott Hughes
Bug: http://b/129068177 Test: treehugger Change-Id: I88f49a06db416a7c6ec8afe87cc9cca825eb5ccb
2019-05-03Merge "Whitelist 30075 for Switzerland"Hall Liu
am: 5333210fef Change-Id: Ic1a780d757af7cb3170fc9154b535611152d4467
2019-05-03Merge "Whitelist 30075 for Switzerland"Hall Liu
2019-05-03Merge "Remove JapaneseCalendar.CURRENT_ERA from Android public SDK"vichang
am: 5d84cbd007 Change-Id: I671d25b15283a252489286dbb0a9105332d97ce7
2019-05-03Merge "Remove JapaneseCalendar.CURRENT_ERA from Android public SDK"vichang
2019-05-03Merge "Convert packages/Shell/**/Android.mk file to Android.bp"Sasha Smundak
am: 355f9f77a9 Change-Id: I7c869c798b4836485daee9113b83100fc36ee862
2019-05-03Merge "Convert packages/Shell/**/Android.mk file to Android.bp"Treehugger Robot
2019-05-03Update path to audio filesJeiFeng Lee
The path to these audio files was changed in r.android.com/862589. Update the configuration to read from the new path, too. Bug: 131864467 Test: hear sound when locking/unlocking aosp_blueline Change-Id: Ie0d69de6333a08d3e645829e13a707f83cb05e01 Merged-In: Ie0d69de6333a08d3e645829e13a707f83cb05e01
2019-05-03Remove JapaneseCalendar.CURRENT_ERA from Android public SDKVictor Chang
JapaneseCalendar.CURRENT_ERA is final static int, and the developer may mis-use and could have wrong expectation on this API, since 1. New emperor in Japan could result in a new era, but old Android device still provides an outdated "current" era. 2. Developer may expect its value depending on system time. However, given it's a static final int, Android could intiailize the value at boot with an incorrect time, and thus results in incorrect era. Thus, on Android, The value is always hard-coded. Bug: 131893534 Test: make Change-Id: I16ea841975dd8e913409c884123003f842c55bb8
2019-05-03Extend NetworkDnsEventReported and add new DnsCallReported to log per-query ↵lifr
information NetworkDnsEventReported -The message represents the entire lookup operation, which may result one or more queries to the recursive DNS resolvers. DnsCallReported - Those DNS queries are individually logged in DnsCallReported to enable computing error rates and network latency and timeouts broken up by query type, transport, network interface, etc Test: make statsd_testdrive ./out/host/linux-x86/bin/statsd_testdrive 116 => pass Bug: 129253665 Change-Id: Ib75affea5d849437a293affbe294732153511d97 Merged-In: Ib75affea5d849437a293affbe294732153511d97
2019-05-02Convert packages/Shell/**/Android.mk file to Android.bpSasha Smundak
See build/soong/README.md for more information. Bug: 122332340 Test: atest ShellTests (same errors as baseline) Change-Id: I63b777342359e0b42ccd554b7d056c7431178380
2019-05-02Merge "Pass in external packageName"Youming Ye
am: 1764f6a49e Change-Id: I39d486e0c8819452d219d487745aa5ced85c93af
2019-05-03Merge "Pass in external packageName"Treehugger Robot
2019-05-02Pass in external packageNameYouming Ye
Use external packageName when ActivityThread couldn't get calling package due to calling identity cleaned. Bug: 131287254 Test: Manual Change-Id: Icec3ad7193bc5988799188a7a1e68aebc0dc109d
2019-05-02Merge "Add calling package parameter to IRcs methods"Leland Miller
am: 017d7b585d Change-Id: I8ad891352f0003ea8524780080d0fd53222219e1
2019-05-02Merge "Add calling package parameter to IRcs methods"Treehugger Robot
2019-05-02Merge "Move to libunwindstack from libunwind."Elliott Hughes
am: 11c50e37dc Change-Id: I6962b3f156302a64c6c5bd89c1de417ef125ba02
2019-05-02Merge "Move to libunwindstack from libunwind."Elliott Hughes
2019-05-02Merge "Added riddlehsu@, louischang@, and erosky@ to WM OWNERS file"Siarhei Vishniakou
am: 0fcdf04370 Change-Id: I4c32f14dbca07fe48861cacee8e36ae16eb60887
2019-05-02Merge "Added riddlehsu@, louischang@, and erosky@ to WM OWNERS file"Treehugger Robot
2019-05-02Merge "AddRestrictCause"Youming Ye
am: 7044350d98 Change-Id: Ia91efd83dd1461a4680e29e66163b3658a5791f3
2019-05-02Move to libunwindstack from libunwind.Christopher Ferris
This already matches internal master. Test: Builds. Change-Id: I1f9b886668569dd03a2a073f6d79f4fb959a2d32
2019-05-02Merge "AddRestrictCause"Treehugger Robot
2019-05-02Added riddlehsu@, louischang@, and erosky@ to WM OWNERS fileSiarhei Vishniakou
With great power comes great responsibility. Test: none Bug: none Change-Id: Ibea2b226bac196bb340395426f0abdacbcff9495
2019-05-02Merge "Inline calls to MimeUtils."Tobias Thierer
am: 304132e995 Change-Id: Id40e722a539fd5212abac6ff1ed76e6ff0a6bff9