summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-08-06Merge changes from topic "offlinesdk-docs"temp_p_mergeNan Zhang
am: 003f49cf0c Change-Id: Ie2869c671faab24bfc4f426261e4d079d0f3b5de
2018-08-06[automerger skipped] Add offline/online-sdk-docs in Soong.Nan Zhang
am: c3ce78d660 -s ours Change-Id: I99c66f005135ec2efde8096a3007b3321c90fa59
2018-08-06Merge "Depend on a module instead of real dir for ↵Nan Zhang
metalava_merge_annotations_dirs" am: f8e12c51d4 Change-Id: Ice53109de35716bbdee921d595f015f16f559b3f
2018-08-07Merge changes from topic "offlinesdk-docs"Nan Zhang
* changes: Add more libs for framework docs generation Add offline/online-sdk-docs in Soong.
2018-08-06Merge "Depend on a module instead of real dir for ↵Nan Zhang
metalava_merge_annotations_dirs"
2018-08-06Merge "Remove public API methods from hiddenapi-light-greylist.txt"David Brazdil
am: 88994b26cc Change-Id: I7fe411b34d2adc509418a83de3262b784a8739d3
2018-08-06Merge "Remove public API methods from hiddenapi-light-greylist.txt"David Brazdil
2018-08-06Merge "Fix the system_error while calling thread::join() in ↵rleix
NativeCallbackThread." am: 56104e6fb8 Change-Id: Idc11c245841a45882ddb90849c35e98d678947cc
2018-08-06[automerger skipped] Merge "Clean up MediaMetadataRetriever use"Hans Boehm
am: 9c7e9034ab -s ours Change-Id: I47228bd8692fe343c8b86da583c48990d720a2d4
2018-08-06Merge "Fix the system_error while calling thread::join() in ↵Treehugger Robot
NativeCallbackThread."
2018-08-06Fix the system_error while calling thread::join() in NativeCallbackThread.rleix
system_server crashed because the system_error "resource_deadlock_would_occur" occurred while calling thread::join(). It is caused by the value of thread is same with the calling thread. Correct it using std::this_thread::get_id() to check whether it is the same thread with the calling thread. Bug: 70603039 Test step: Step 1 : Flash DUT and boot it. Step 2 : Connect with PC via USB. Step 3 : Run the following adb command and check the DUT:  adb shell su ps -A | grep broadcastradio kill xxx(the process id of android.hardware.broadcastradio@intel-service) Change-Id: Ia21282c4cc631a0788496081b1821be28929fae6 Signed-off-by: Lei,RayX <rayx.lei@intel.com>
2018-08-06Merge "Clarify which methods return connected sockets"Adam Vartanian
am: bce398bfd3 Change-Id: Idb4fb49af7a2e2e9a7a9cdb0681803628e7ed269
2018-08-06Merge "Clean up MediaMetadataRetriever use"Hans Boehm
2018-08-06Merge "Add libcore as owners of relevant android/net files"Adam Vartanian
am: 24f3809258 Change-Id: I43cebb427d67f9dddbc76e1c284ceb8835d541c4
2018-08-06Merge "Add @UnsupportedAppUsage annotations"Mathew Inwood
am: 44091cdb47 Change-Id: I1dfae6f3d8ba8d5ff63f378c71f9670199a3adc3
2018-08-06Merge "Add @UnsupportedAppUsage annotations"Mathew Inwood
am: f336c03135 Change-Id: Iae7c937caa23432a3851137f6234d0de19a3ed0c
2018-08-06Merge "Add @UnsupportedAppUsage annotations"Mathew Inwood
am: 3d05f769a3 Change-Id: Id21c0f5dee82e2f2174d795763420bfed806a17b
2018-08-06Merge "Add utils to convert Inet4Address <-> int"Remi NGUYEN VAN
am: 5caebe3415 Change-Id: I347d23f4682eca623e3b10f72bc9000b1c5954a3
2018-08-06resolve merge conflicts of 606d3975b23ec725085f8ae16ba4074fd05a556a to ↵Mathew Inwood
stage-aosp-master Bug: None Test: I solemnly swear I tested this conflict resolution. Merged-In: Iaed1cd6bc7419597510bfc1ab30a169f75e4ae3f Merged-In: I681c1e97d0929cfb1d357b2243ecb210d18f9e87 Change-Id: I01782459e2b02f065671da640d675b898b4727fe
2018-08-06Merge "Clarify which methods return connected sockets"Treehugger Robot
2018-08-06Merge "Add libcore as owners of relevant android/net files"Treehugger Robot
2018-08-06Merge "Add @UnsupportedAppUsage annotations"Treehugger Robot
2018-08-06Merge "Add @UnsupportedAppUsage annotations"Treehugger Robot
2018-08-06Merge "Add @UnsupportedAppUsage annotations"Treehugger Robot
2018-08-06Add libcore as owners of relevant android/net filesAdam Vartanian
Test: build/make/tools/checkowners.py frameworks/base/core/java/android/net/OWNERS frameworks/base/core/java/android/net/http/OWNERS Change-Id: Iebef4381693d6cfadd437ed9e08a7f02bc96e6b7
2018-08-06Merge "Add @UnsupportedAppUsage annotations"Mathew Inwood
am: b40b37910d Change-Id: Ic3de9e4c6d17687d4a1f64c02026e5c0711e8fd1
2018-08-06Add @UnsupportedAppUsage annotationsMathew Inwood
For packages: android.renderscript This is an automatically generated CL. See go/UnsupportedAppUsage for more details. Exempted-From-Owner-Approval: Mechanical changes to the codebase which have been approved by Android API council and announced on android-eng@ Bug: 110868826 Test: m Change-Id: I016f6e720e79c48afe44f4690b5dd99fc81ae780 Merged-In: I1aa8ebca448547031b426a7b305c5c3d6fcf2652
2018-08-06Add @UnsupportedAppUsage annotationsMathew Inwood
For packages: android.filterfw android.filterfw.core android.filterfw.format android.filterfw.geometry android.filterfw.io This is an automatically generated CL. See go/UnsupportedAppUsage for more details. Exempted-From-Owner-Approval: Mechanical changes to the codebase which have been approved by Android API council and announced on android-eng@ Bug: 110868826 Test: m Merged-In: I6110238f11ab2a81cf84d0fbadf924bc25ab9374 Change-Id: I3dc7c93ae9fcfd0e9a1bc3e6ccc678a77e9c4709
2018-08-06resolve merge conflicts of d609a403426118498ea17ec4ca3bc4ab9d4d057b to ↵Mathew Inwood
stage-aosp-master Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I0049d94802b5e6801789e733847be4cfdabb0040
2018-08-06Merge "Add utils to convert Inet4Address <-> int"Remi NGUYEN VAN
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot
2018-08-04Import translations. DO NOT MERGEBill Yi
Change-Id: Id444e0f794482ec1126d8c37842b3301c64f601f Auto-generated-cl: translation import
2018-08-04Import translations. DO NOT MERGEBill Yi
Change-Id: I3183c39b7e7dde75b962d23f5fdafc8e284d6b4c Auto-generated-cl: translation import
2018-08-04Import translations. DO NOT MERGEBill Yi
Change-Id: I44070d387a2390be36be4dd40da84dfb1bc4b2ea Auto-generated-cl: translation import
2018-08-04Import translations. DO NOT MERGEBill Yi
Change-Id: I182bf58f1a2dc24a8c11928301a361734a3660c4 Auto-generated-cl: translation import
2018-08-04Import translations. DO NOT MERGEBill Yi
Change-Id: I14c08f6f215dcb6edf1e5ffe62248c0302a9c82d Auto-generated-cl: translation import
2018-08-04Import translations. DO NOT MERGEBill Yi
Change-Id: I900df95e8d246820015342735914d380819bcbab Auto-generated-cl: translation import
2018-08-04Import translations. DO NOT MERGEBill Yi
Change-Id: Idd4c8a69c7eb2fd594ca54eeef9b259390ec367b Auto-generated-cl: translation import
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 23:09:29 +0000