summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-06-10Merge "Use suffixes instead of stems in the definition of module `app_process`."temp-PPRL.190605.003Roland Levillain
am: 9c2eef9841 Change-Id: I121b48ca7c657bc524bc9c4bcf250a675f027e3a
2019-06-10Merge "Use suffixes instead of stems in the definition of module `app_process`."Roland Levillain
2019-06-09Merge "notifyUserMobileDataStateChangedForPhoneId does not set ↵SongFerngWang
mUserMobileDataState." am: 74cdfecc5d Change-Id: I42a294404ae715f998f3b0db90e79602629ef9dc
2019-06-10Merge "notifyUserMobileDataStateChangedForPhoneId does not set ↵Treehugger Robot
mUserMobileDataState."
2019-06-10notifyUserMobileDataStateChangedForPhoneId does not set mUserMobileDataState.SongFerngWang
It is wrong array. The correct array is mUserMobileDataState. Bug: 128510330 Test: build pass Merged-In: I5db6329ce4699cca8d79a827c36f7f61a4fa8f92 Change-Id: I5db6329ce4699cca8d79a827c36f7f61a4fa8f92
2019-06-09Merge changes I399d3e37,Ia3fdd80c,Iad90c7a4Remi NGUYEN VAN
am: 870c267b6c Change-Id: I1df4d64ef2c56a1f8f7fb6b5dfd6de1eab2e157b
2019-06-10Merge changes I399d3e37,Ia3fdd80c,Iad90c7a4Remi NGUYEN VAN
* changes: Remove DeviceConfig usage from NetworkStackClient Simplify crash conditions in NetworkStackClient Proper handling of NetworkStack crash
2019-06-08Merge "Fix the potential NullPointerException."Xiao Ma
am: 4b5c8e1076 Change-Id: If2b68e47eacb1faf9ce50161322ccbed9c8253c8
2019-06-08Merge "Fix the potential NullPointerException."Xiao Ma
2019-06-07Merge "Supported data enabled override for different scenarios"Jack Yu
am: 8959a121ce Change-Id: Ic607bd5ad608c75002a71010f73fa3c672c5b51a
2019-06-07Merge "Supported data enabled override for different scenarios"Jack Yu
2019-06-07Supported data enabled override for different scenariosJack Yu
Added override rules support for always allowing mms and internet data during voice call. Test: Manual + unit tests Bug: 132113695 Merged-In: I2266d7f428901ccbba6bf538a7c7696e6566b96c Change-Id: I2266d7f428901ccbba6bf538a7c7696e6566b96c (cherry picked from commit 0d26d718b3e8b1747953696cb1a05a4f1dd5be88)
2019-06-07Merge "Update services/backup OWNERS to be current B&R team"Al Sutton
am: bdc8e00211 Change-Id: I278f27e80f466e7bd270af103a6a27ccbea94f86
2019-06-07Merge "Update services/backup OWNERS to be current B&R team"android-o-mr1-iot-release-1.0.13Al Sutton
2019-06-07Merge "incident report args: add setter stubs & constant aliases"Ryan Savitski
am: cdcd19f560 Change-Id: I6edc89437a161a191e5ea1bd775fbbc9c0fcc59b
2019-06-07Merge "incident report args: add setter stubs & constant aliases"Ryan Savitski
2019-06-07incident report args: add setter stubs & constant aliasesRyan Savitski
Bug: 130543265 Merged-In: Ieaf5b3b4d67168e2a99ff54e6392c77d8372ed4e Change-Id: I855002050bf8a9f43b997060b1990f26eec597c7
2019-06-07Fix the potential NullPointerException.Xiao Ma
The networkAttributesParcelable retrieved from IpMemoryStore might be null, it might cause crash with NullPointerException when attepmting to read from the field on a null object reference. Bug: 122710829 Test: atest FrameworksNetTests NetworkStackTests Change-Id: Id7527199424e55f1e14836e81a5d1965d13013a2
2019-06-07Use suffixes instead of stems in the definition of module `app_process`.Roland Levillain
Test: Device boot test Change-Id: Ibbf888383b4fe3204b71978243267765092d51c6
2019-06-07Update services/backup OWNERS to be current B&R teamAl Sutton
Change-Id: Ic5e0c5a1f5e9a3f87647187f0f63d61a2b7a19b2 Merged-In: I42c27dfc0f3f792c46fe60e0f6807e51a2c3f21e Merged-In: I03d72ecec447304866d96e2f0908acbc2a1796b6 Merged-In: I69f6419055be4adc974041d78a1517ded7e5c57b Test: build/make/tools/checkowners.py -c -v OWNERS Bug: 134730213
2019-06-07Merge "Don't use a high-priority notification on auto-join."Lorenzo Colitti
am: 49c91d93c9 Change-Id: I42c712c21c545c61300c7e740b4851e33a029cad
2019-06-07[automerger skipped] Merge "Reconcile binder JNI with earlier changes, ↵Martijn Coenen
removing lock." am: c4a564a10a -s ours am skip reason: change_id I4e06b3f93e30ed1c7868ec9e018709a7e796e441 with SHA1 c1493b283b is in history Change-Id: I7b4bc1e7295383e9afa31210aff3c1bae6728831
2019-06-07Merge "Don't use a high-priority notification on auto-join."Lorenzo Colitti
2019-06-07Merge "Reconcile binder JNI with earlier changes, removing lock."Martijn Coenen
2019-06-07Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into ↵TreeHugger Robot
stage-aosp-master" into stage-aosp-master
2019-06-07Remove DeviceConfig usage from NetworkStackClientRemi NGUYEN VAN
DeviceConfig API is not yet submitted. Use Settings.Global instead, to still allow writing tests against AOSP code (a test would try to use adb shell device_config, and fallback to adb shell settings). This is not merged anywhere else, the merged-in is here to ensure this does not end up in branches that use DeviceConfig. This change should be lost when AOSP is updated. Test: flashed, force-crashed NetworkStack with different setting values: observe rate-limited crash Bug: 133725814 Merged-In: I423ca6ebb328f49b170baae0da9b8409a6429fcb Change-Id: I399d3e37f1faaecb8a30428c1989fac8821379d8
2019-06-07Don't use a high-priority notification on auto-join.Lorenzo Colitti
If the device connects to a network automatically and not through user action, a high-priority notification is intrusive and is inconsistent with other networking notifications, which are usually only high priority if the network is manually selected. Bug: 130766237 Test: see next CL in patch series Change-Id: I8824f2d1a0efeb6cb75e430ef5159ebce0018779
2019-06-06Merge "Fix kotlinc warnings in EasterEgg."Haibo Huang
am: d913216e27 Change-Id: Ib0128b40a8087096765b7268eaf2591973feb993
2019-06-06Merge "Add comments to frozen AIDL API files"Remi NGUYEN VAN
am: 714b313903 Change-Id: Ic7ef8bc0b2f22508e06ca56c4b030b2f12cde7ea
2019-06-07Merge "Fix kotlinc warnings in EasterEgg."Haibo Huang
2019-06-07Fix kotlinc warnings in EasterEgg.Aurimas Liutikas
- Remove unused parameters / method - Wrap uses nullable bitmap with "?.let {" and sadly !! as it is in fact theoretically possible that bitmap becomes null due to a call from a different thread. - Run ktlint autofix up. Bug: 112638508 Test: make -j EasterEgg Change-Id: Idab21176ec9e4e61751a87c4aeafe3966ed10a8c Merged-In: Idab21176ec9e4e61751a87c4aeafe3966ed10a8c
2019-06-07Merge "Add comments to frozen AIDL API files"Remi NGUYEN VAN
2019-06-06Merge "Extend the service configuration for the binding service."Jack Yu
am: 7145807316 Change-Id: I1526021cf49f873159b66eeddf2cc39ad71655eb
2019-06-06Merge "Extend the service configuration for the binding service."Jack Yu
2019-06-06Merge "Allow the unsupportedappusage-annotation to be used for device variants"Paul Duffin
am: a1df2cb009 Change-Id: Iad647ca2e8ef9bec7faf4804fedcd11fe2cbfddb
2019-06-06Merge "Allow the unsupportedappusage-annotation to be used for device variants"Treehugger Robot
2019-06-06Merge "Delete ByteStringUtils: it is no longer used"Neil Fuller
am: a677e4d5a0 Change-Id: I6adb8c70f67a49bc256014fabbaedabdb3b42f54
2019-06-06Merge "Delete ByteStringUtils: it is no longer used"Treehugger Robot
2019-06-06Allow the unsupportedappusage-annotation to be used for device variantsPaul Duffin
Some modules, e.g. libphonenumber-platform, depend on core platform API solely for accessing the dalvik.annotation.compat.UnsupportedAppUsage annotation. Building device variants of unsupportedappusage-annotation will allow those modules to switch to core_current. Bug: 134379140 Test: m droid Change-Id: I1634b8ffd2a28c2663defd2a4a4e40d78b174d91
2019-06-06Add comments to frozen AIDL API filesRemi NGUYEN VAN
Generated by re-freezing the API with the new aidl_interface code, and replacing the previous API with the new files. This only adds comments. Test: comments only, builds Bug: 134452637 Change-Id: I6b3072e91170c97818c5fdb688d06fc612991ea1
2019-06-06Reconcile binder JNI with earlier changes, removing lock.Martijn Coenen
Change Idbacb6ad14c43aff8030d70b5e17427b86e92d6e introduced synchronization of the sProxyMap in Java, removing the need for serialization (and having a native lock). But for some reason, we did not remove it in AOSP. Bug: 132922399 Test: builds Change-Id: Ib2dc64a7716a1e4798b998e54fac298eb40a7c1d Merged-In: I4e06b3f93e30ed1c7868ec9e018709a7e796e441
2019-06-05Merge "Always prompt for limited connectivity."Lorenzo Colitti
am: 2bba8e7b60 Change-Id: I127bbd3594ce8aa44a0d7e1573a62dd16b8ea170
2019-06-06Merge "Always prompt for limited connectivity."Lorenzo Colitti
2019-06-05Merge "Match src paths with aidl package name"Dan Willemsen
am: fe283df7ab Change-Id: I0f3063be39a47f7cab34241632b7694c178adb33
2019-06-05Merge "Clarify license terms for Romain Guy's artwork."Bob Badour
am: 9f56d51018 Change-Id: I9bbe74a2151bf959febcf3d7b5c2b48ef8afd8c3
2019-06-06Always prompt for limited connectivity.Lorenzo Colitti
Bug: 130766237 Test: See subsequent CL in same patch series. Change-Id: I45b4a7ba2e21c0be868939d8c7bb78891d69c48b
2019-06-06Merge "Match src paths with aidl package name"Treehugger Robot
2019-06-06Merge "Clarify license terms for Romain Guy's artwork."Treehugger Robot
2019-06-05Clarify license terms for Romain Guy's artwork.Bob Badour
As discussed with Romain Guy in the email thread, the Apache 2.0 license applies to the affected .jpg files now and retroactively from the time of import. 'wallpaper_goldengate.jpg' and 'wallpaper_goldengate_scale.jpg' were altered using the exiftool: exiftool -WebStatement=http://www.apache.org/licenses/LICENSE-2.0 Each of the other images was altered using the exiftool: exiftool -URL=http://www.apache.org/licenses/LICENSE-2.0 \ -WebStatement=http://www.apache.org/licenses/LICENSE-2.0 \ -UsageTerms='Apache License Version 2.0' Change-Id: I52a032fc6aa6373d2fb0ea941e041ea72764268c
2019-06-05Match src paths with aidl package nameDan Willemsen
In order for the build system to track updates to the header files during incremental builds, always specify the src files using the same path as the package for C++ compilations. Bug: 112114177 Test: treehugger Change-Id: I97493c90c888678ce6c5fb56c9c83516b7e2fb2f
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 23:47:11 +0000