OSDN Git Service
Yohei Yukawa [Fri, 23 Jun 2017 05:30:45 +0000 (22:30 -0700)]
Remove a redundant synchronized block
This CL removes a redundant synchronized block, which was accidentally
added in the previous CL [1] that simplified
TextServicesManagerService (TSMS) by using RemoteCallbackList<E>.
Since SpellCheckerBindGroup#removeListener() internally acquires the
lock on TSMS#mSpellCheckerMap, there is no need to acquire the same
lock in the caller.
This CL is just a mechanical clean-up. No behavior change is intended.
[1]: I38942765ed6bec6713757b1d5f325e7a633c2ba7
f982e75a262db16e60fd3565638d399315dba761
Bug:
35102403
Test: compile
Change-Id: I6d47e8cb6e301286bcb26922b74ee7cac2c5c1c5
TreeHugger Robot [Fri, 23 Jun 2017 03:43:48 +0000 (03:43 +0000)]
Merge "Media: Eliminate NPE from race conditions"
Wale Ogunwale [Fri, 23 Jun 2017 02:39:20 +0000 (02:39 +0000)]
Merge "Merge "Dump user id in dumpsys activity starter" into oc-dev am:
b55b842898 am:
13df994243" into oc-dr1-dev-plus-aosp
am:
99a313e323
Change-Id: I692dce1776052c07140c114d17ecd907b0d5ac6a
Wale Ogunwale [Fri, 23 Jun 2017 02:36:01 +0000 (02:36 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev am:
b55b842898 am:
e30da86a46
am:
9842dec610
Change-Id: I76813be6d41381ef616270a71df34ea2507639c6
Android Build Merger (Role) [Fri, 23 Jun 2017 02:29:25 +0000 (02:29 +0000)]
Merge "Merge "Dump user id in dumpsys activity starter" into oc-dev am:
b55b842898 am:
13df994243" into oc-dr1-dev-plus-aosp
Wale Ogunwale [Fri, 23 Jun 2017 02:27:28 +0000 (02:27 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev am:
b55b842898
am:
e30da86a46
Change-Id: Idad772522638c93a1d2a042aa374ec2cabf55167
Wale Ogunwale [Fri, 23 Jun 2017 02:27:23 +0000 (02:27 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev am:
b55b842898
am:
13df994243
Change-Id: Ia38529b06e7859884531f945fa32770017f11467
Wale Ogunwale [Fri, 23 Jun 2017 02:19:26 +0000 (02:19 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev
am:
b55b842898
Change-Id: I5b73df5e46d26d2008dba7a34345a0c37c099514
Wale Ogunwale [Fri, 23 Jun 2017 02:19:25 +0000 (02:19 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev
am:
b55b842898
Change-Id: I36a34d029f75195d4a865affef5257f1d4aa5d50
Badhri Jagan Sridharan [Fri, 23 Jun 2017 02:15:26 +0000 (02:15 +0000)]
Merge "Log call to setPortRoles" into oc-dr1-dev am:
025b07c38e
am:
4fd5aff33b
Change-Id: Idad8e4bc9afae725f52ca17f933a0fca28acfd0d
TreeHugger Robot [Fri, 23 Jun 2017 02:10:32 +0000 (02:10 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev
Badhri Jagan Sridharan [Fri, 23 Jun 2017 02:07:57 +0000 (02:07 +0000)]
Merge "Log call to setPortRoles" into oc-dr1-dev
am:
025b07c38e
Change-Id: Icd1d42fd0fb301f68dae38a242760035c1f6dfec
TreeHugger Robot [Fri, 23 Jun 2017 01:58:19 +0000 (01:58 +0000)]
Merge "Log call to setPortRoles" into oc-dr1-dev
Felipe Leme [Fri, 23 Jun 2017 00:57:32 +0000 (00:57 +0000)]
Merge "Improved documentation for AutofillService package: am:
2ef19c1d73 am:
91d763f1b5" into oc-dr1-dev-plus-aosp
am:
9ee91bfd67
Change-Id: I2137ed8f6bc60010666b2115e4f5a57cc8199ccd
Felipe Leme [Fri, 23 Jun 2017 00:53:20 +0000 (00:53 +0000)]
Improved documentation for AutofillService package: am:
2ef19c1d73 am:
472b4c834f
am:
9485ed3142
Change-Id: I8c0c4f2aa8f2c70cb1611c2afc1f93cc1e81dbc5
Android Build Merger (Role) [Fri, 23 Jun 2017 00:48:12 +0000 (00:48 +0000)]
Merge "Improved documentation for AutofillService package: am:
2ef19c1d73 am:
91d763f1b5" into oc-dr1-dev-plus-aosp
Felipe Leme [Fri, 23 Jun 2017 00:44:53 +0000 (00:44 +0000)]
Improved documentation for AutofillService package: am:
2ef19c1d73
am:
91d763f1b5
Change-Id: Iecf6e6d7f5461f944b1f3e23e9f97ccca5029983
Felipe Leme [Fri, 23 Jun 2017 00:44:47 +0000 (00:44 +0000)]
Improved documentation for AutofillService package: am:
2ef19c1d73
am:
472b4c834f
Change-Id: I9636c277b82569e6ffa684df26358a6a7c36d3c2
Felipe Leme [Fri, 23 Jun 2017 00:36:37 +0000 (00:36 +0000)]
Improved documentation for AutofillService package:
am:
2ef19c1d73
Change-Id: Iac283d34da149829a25313d0910f2564b347e332
Felipe Leme [Fri, 23 Jun 2017 00:36:35 +0000 (00:36 +0000)]
Improved documentation for AutofillService package:
am:
2ef19c1d73
Change-Id: I67d6649d4acb84ebb598c1ebceb3c3ed58cfd0c0
Charlie Wang [Fri, 23 Jun 2017 00:00:14 +0000 (00:00 +0000)]
Merge "Adding tron logging events for standalone headsets." into oc-dr1-dev am:
d43bc31eb7
am:
2e711b27f3
Change-Id: If5928a835b7849fdee2f9ca6c99fe1b98f5eaa59
Charlie Wang [Thu, 22 Jun 2017 23:47:55 +0000 (23:47 +0000)]
Merge "Adding tron logging events for standalone headsets." into oc-dr1-dev
am:
d43bc31eb7
Change-Id: I4a82f38e753d7ba61ec37b7ecd959e588eee21e3
Ying Xu [Thu, 22 Jun 2017 23:44:11 +0000 (23:44 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode." into oc-dr1-dev am:
9523a12b95 -s ours
am:
296b9d822a -s ours
Change-Id: I630886defc408edccc813ebc5a289f2df1185ab5
Wale Ogunwale [Thu, 22 Jun 2017 23:43:53 +0000 (16:43 -0700)]
Dump user id in dumpsys activity starter
To help with ANR debugging.
Test: adb shell dumpsys activity starter
Bug:
38121026
Change-Id: I96d530662e6a362b817df3ca8410cb173a2c0dd4
Badhri Jagan Sridharan [Thu, 22 Jun 2017 23:39:47 +0000 (16:39 -0700)]
Log call to setPortRoles
Came of bunch of bugs, for instance b/
62912250 where some app is
forcing the port role. Logging which package is doing this
Change-Id: I234db3292326d247c82723989b46160fcbd59c10
Charlie Wang [Thu, 22 Jun 2017 23:35:20 +0000 (23:35 +0000)]
Merge "Adding tron logging events for standalone headsets." into oc-dr1-dev
Ying Xu [Thu, 22 Jun 2017 23:29:50 +0000 (23:29 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode." into oc-dr1-dev
am:
9523a12b95 -s ours
Change-Id: I4b2f10eab109ef9e912fd0a6674fa3e7341b1e8d
Siddharth Ray [Thu, 22 Jun 2017 23:23:59 +0000 (23:23 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dr1-dev am:
424e517d5d
am:
ea0e205a89
Change-Id: I703fa0dbe43212422c577c4fa2083175d6fbb0aa
Ying Xu [Thu, 22 Jun 2017 23:19:57 +0000 (23:19 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode." into oc-dr1-dev
Stephen Chen [Thu, 22 Jun 2017 23:12:20 +0000 (23:12 +0000)]
Add strings for revamped Wi-Fi ONA notification. am:
2e8351b308
am:
20efc35c3a
Change-Id: I3b5a2cf4f81f2624ccb1455968de42fd862b827b
Tomasz Wasilczyk [Thu, 22 Jun 2017 23:07:39 +0000 (23:07 +0000)]
Merge "Rename Broadcast Radio service to avoid confusion with GSM radio."
Siddharth Ray [Thu, 22 Jun 2017 23:05:24 +0000 (23:05 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dr1-dev
am:
424e517d5d
Change-Id: I4d7c458c02e3de1d707c6314102bb8b00fe2bda6
Alan Leung [Thu, 22 Jun 2017 23:04:04 +0000 (23:04 +0000)]
Merge "Merge "ASM Priority Boost Tool" am:
8ff8dd16cc am:
8ac18ceb8a" into oc-dev-plus-aosp am:
643275b838
am:
94e68505c4 -s ours
Change-Id: I90f52e9ca4a2db85ae4baad413b7cd768ab05771
TreeHugger Robot [Thu, 22 Jun 2017 23:01:29 +0000 (23:01 +0000)]
Merge "Don't statically link libcrypto in frameworks."
TreeHugger Robot [Thu, 22 Jun 2017 22:59:41 +0000 (22:59 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dr1-dev
Android Build Merger (Role) [Thu, 22 Jun 2017 22:59:05 +0000 (22:59 +0000)]
Merge "Merge "Allow any app to dynamically install a split" into oc-dev am:
16503a8f7e am:
921fc1426f am:
c2cf09b7ea"
TreeHugger Robot [Thu, 22 Jun 2017 22:58:49 +0000 (22:58 +0000)]
Merge "Use RemoteCallbackList to implement TSMS#mListeners"
Todd Kennedy [Thu, 22 Jun 2017 22:58:09 +0000 (22:58 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev am:
16503a8f7e am:
921fc1426f
am:
c2cf09b7ea
Change-Id: Ia05c496ee04c3f47757b0e6126549d01f40eb066
Stephen Chen [Thu, 22 Jun 2017 22:56:27 +0000 (22:56 +0000)]
Add strings for revamped Wi-Fi ONA notification.
am:
2e8351b308
Change-Id: I0ceb50c182c3ea023167915d28cf04d79f75d8eb
Alan Leung [Thu, 22 Jun 2017 22:50:42 +0000 (22:50 +0000)]
Merge "Merge "ASM Priority Boost Tool" am:
8ff8dd16cc am:
8ac18ceb8a" into oc-dev-plus-aosp
am:
643275b838
Change-Id: Idb669d7b381f8291fb44dcc5a4d1824d118319d9
Todd Kennedy [Thu, 22 Jun 2017 22:48:44 +0000 (22:48 +0000)]
Merge "Merge "Allow any app to dynamically install a split" into oc-dev am:
16503a8f7e am:
20fad610b9" into oc-dr1-dev-plus-aosp
am:
bc5b5567d0
Change-Id: I9be704b2ad3f97df5ce7327675b459ffc84abafd
Todd Kennedy [Thu, 22 Jun 2017 22:47:18 +0000 (22:47 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev am:
16503a8f7e
am:
921fc1426f
Change-Id: I322d7d8b576e00ad10d85d462873c10cce712951
Rob Carr [Thu, 22 Jun 2017 22:45:47 +0000 (22:45 +0000)]
Merge "Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev am:
82b41e460c am:
9e391f9f86" into oc-dr1-dev-plus-aosp
am:
532ed66cc6
Change-Id: Ib33693399ba243a39fa4a7b3811d5c35b9c92a11
Rob Carr [Thu, 22 Jun 2017 22:41:39 +0000 (22:41 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev am:
82b41e460c am:
874b6402af
am:
9a8971fabb
Change-Id: Ida4fd8f112a7164fb79512d09eadd10da718c269
Stephen Chen [Wed, 7 Jun 2017 22:49:13 +0000 (15:49 -0700)]
Add strings for revamped Wi-Fi ONA notification.
Bug:
37357441
Test: n/a
Change-Id: Ib32581f044db9827a700be8af1864af15f6dbb3e
Jean-Michel Trivi [Thu, 22 Jun 2017 22:39:48 +0000 (22:39 +0000)]
Merge "Recording activity notification: client uid and package name"
Android Build Merger (Role) [Thu, 22 Jun 2017 22:37:54 +0000 (22:37 +0000)]
Merge "Merge "ASM Priority Boost Tool" am:
8ff8dd16cc am:
8ac18ceb8a" into oc-dev-plus-aosp
Android Build Merger (Role) [Thu, 22 Jun 2017 22:36:49 +0000 (22:36 +0000)]
Merge "Merge "Allow any app to dynamically install a split" into oc-dev am:
16503a8f7e am:
20fad610b9" into oc-dr1-dev-plus-aosp
Todd Kennedy [Thu, 22 Jun 2017 22:35:52 +0000 (22:35 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev am:
16503a8f7e
am:
20fad610b9
Change-Id: I6d6fd8f320fef01c2a89463ce0f72f0f880e1e45
Android Build Merger (Role) [Thu, 22 Jun 2017 22:34:52 +0000 (22:34 +0000)]
Merge "Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev am:
82b41e460c am:
9e391f9f86" into oc-dr1-dev-plus-aosp
Todd Kennedy [Thu, 22 Jun 2017 22:35:06 +0000 (22:35 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev
am:
16503a8f7e
Change-Id: I13cf0e00de235d0bbdb79aa553e04386c519975d
Alan Leung [Thu, 22 Jun 2017 22:34:29 +0000 (22:34 +0000)]
Merge "ASM Priority Boost Tool" am:
8ff8dd16cc
am:
8ac18ceb8a
Change-Id: I68f86f307368de6870a7d649118d1a0f8c744a88
Rob Carr [Thu, 22 Jun 2017 22:33:51 +0000 (22:33 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev am:
82b41e460c
am:
9e391f9f86
Change-Id: I8566d935ec735b360af54998599a8ce185fcf9ee
Rob Carr [Thu, 22 Jun 2017 22:32:07 +0000 (22:32 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev am:
82b41e460c
am:
874b6402af
Change-Id: I3db14694bc27e9fed16b5efec6aba99570b89675
TreeHugger Robot [Thu, 22 Jun 2017 22:28:02 +0000 (22:28 +0000)]
Merge "Stop loading other package's font by default."
Todd Kennedy [Thu, 22 Jun 2017 22:26:34 +0000 (22:26 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev
am:
16503a8f7e
Change-Id: Ia20de35097f3b5b139afc5ccee59d71584f59a3a
Felipe Leme [Mon, 5 Jun 2017 18:32:32 +0000 (11:32 -0700)]
Improved documentation for AutofillService package:
- Moved (and expanded) overall documentation from FillResponse to
AutofillService.
- Improved SaveInfo documentation.
- Improved FillRequest documentation.
- Improved Dataset documentation.
Bug:
37567048
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML
Change-Id: I157893deac06a5ed5e1cb7fd082da485f227b9ee
Alan Leung [Thu, 22 Jun 2017 22:24:51 +0000 (22:24 +0000)]
Merge "ASM Priority Boost Tool"
am:
8ff8dd16cc
Change-Id: Ifb62ee3132e984340e4457b543c4f84f7c45995a
Rob Carr [Thu, 22 Jun 2017 22:23:19 +0000 (22:23 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev
am:
82b41e460c
Change-Id: I47c8e096ccd513eb65fa9fd2a34fc75fa222a42c
Rajeev Kumar [Thu, 22 Jun 2017 22:22:47 +0000 (22:22 +0000)]
Merge "1. Replace use of java.util.HashMap with android.util.ArrayMap in SwipeHelper class 2. Make few instance variables final"
Rob Carr [Thu, 22 Jun 2017 22:19:45 +0000 (22:19 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev
am:
82b41e460c
Change-Id: I14f6fe76b3a24266432a8bc7286d1ae5da8f719d
Neil Fuller [Thu, 22 Jun 2017 22:14:18 +0000 (22:14 +0000)]
Merge "Fix code and test related to rules version check" am:
a3579d4b84 am:
c506ade205 am:
af32c3d234
am:
9b28a61fcf
Change-Id: Ia0e1e74364b9a72d9ec4e7058313c2c26f71d206
TreeHugger Robot [Thu, 22 Jun 2017 22:11:44 +0000 (22:11 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev
Treehugger Robot [Thu, 22 Jun 2017 22:10:56 +0000 (22:10 +0000)]
Merge "ASM Priority Boost Tool"
Shubang [Thu, 22 Jun 2017 22:09:38 +0000 (22:09 +0000)]
Merge "Merge "Change PIP notification icon" into oc-dev am:
9f3967fee1 am:
e9ede0548b" into oc-dr1-dev-plus-aosp
am:
f541405afe
Change-Id: Ic868b80e07c0585132f14f7c9dc2b490c811a9f6
Rob Carr [Thu, 22 Jun 2017 22:08:03 +0000 (22:08 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev
Shubang [Thu, 22 Jun 2017 22:05:49 +0000 (22:05 +0000)]
Merge "Change PIP notification icon" into oc-dev am:
9f3967fee1 am:
745bbf758d
am:
faf8b8a9ee
Change-Id: I71bcda9ff79c411eb1310e3c958b05272a3ef67b
Android Build Merger (Role) [Thu, 22 Jun 2017 22:02:10 +0000 (22:02 +0000)]
Merge "Merge "Add tintable icon support" into oc-dr1-dev am:
53d79aa8ea am:
2e7d53964d"
Soonil Nagarkar [Thu, 22 Jun 2017 22:01:39 +0000 (22:01 +0000)]
Merge "Move UID update code to location thread to prevent ANRs."
Maurice Lam [Thu, 22 Jun 2017 21:58:47 +0000 (21:58 +0000)]
Merge "Add tintable icon support" into oc-dr1-dev am:
53d79aa8ea
am:
2e7d53964d
Change-Id: Ic7cc8a0f4e6f2590ebe46dd337bd03ca4a5d51a1
Neil Fuller [Thu, 22 Jun 2017 21:56:18 +0000 (21:56 +0000)]
Merge "Fix code and test related to rules version check" am:
a3579d4b84 am:
c506ade205
am:
af32c3d234
Change-Id: I2dc13436ceb93eb620dcaaa6d141210dc57ea1fc
Android Build Merger (Role) [Thu, 22 Jun 2017 21:53:47 +0000 (21:53 +0000)]
Merge "Merge "Change PIP notification icon" into oc-dev am:
9f3967fee1 am:
e9ede0548b" into oc-dr1-dev-plus-aosp
Shubang [Thu, 22 Jun 2017 21:51:37 +0000 (21:51 +0000)]
Merge "Change PIP notification icon" into oc-dev am:
9f3967fee1
am:
e9ede0548b
Change-Id: Ifecd856ffeb53c3a7249caa58fdb98dff71f4b93
Shubang [Thu, 22 Jun 2017 21:51:34 +0000 (21:51 +0000)]
Merge "Change PIP notification icon" into oc-dev am:
9f3967fee1
am:
745bbf758d
Change-Id: I73fd01b193324ab9b4c1320e47ab8be1d77a3cc2
Neil Fuller [Thu, 22 Jun 2017 21:49:28 +0000 (21:49 +0000)]
Merge "Fix code and test related to rules version check" am:
a3579d4b84
am:
c506ade205
Change-Id: Ia72b94700d1a65de769beace27e699e62aedcd9f
Shubang [Thu, 22 Jun 2017 21:44:18 +0000 (21:44 +0000)]
Merge "Change PIP notification icon" into oc-dev
am:
9f3967fee1
Change-Id: I5c42cb241ef98bc5e70b03d460230e3ac2115240
Shubang [Thu, 22 Jun 2017 21:44:18 +0000 (21:44 +0000)]
Merge "Change PIP notification icon" into oc-dev
am:
9f3967fee1
Change-Id: I1f12ec16adaa173d90ffbb62c5a88387340e4042
Maurice Lam [Thu, 22 Jun 2017 21:44:10 +0000 (21:44 +0000)]
Merge "Add tintable icon support" into oc-dr1-dev
am:
53d79aa8ea
Change-Id: I11e1a99d8482871ac0c2fac0761f77d0a57f6938
Neil Fuller [Thu, 22 Jun 2017 21:37:48 +0000 (21:37 +0000)]
Merge "Fix code and test related to rules version check"
am:
a3579d4b84
Change-Id: I2021e64f04e0e55de21dcdc0a932ce535e6a7f9f
Guliz Tuncay [Wed, 14 Jun 2017 16:33:16 +0000 (09:33 -0700)]
Use RemoteCallbackList to implement TSMS#mListeners
Previously, TSMS extends IBinder.DeathRecipient to implement its own
death recipient class to keep track of disconnected service listeners.
Using RemoteCallbackList simplifies the implementation.
Fixes:
35102403
Test: Manually tested as follows.
1. Build and flash an OS image.
2. Complete the setup wizard (if any).
3. Make sure AOSP Keyboard (com.android.inputmethod.latin)
is installed.
4. adb shell settings put secure selected_spell_checker com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
5. Observe that there are no bindings to spell
checker service (SCS) by running
adb shell dumpsys textservices
6. Observe that there is no connection to SCS by running
adb shell dumpsys activity services com.android.inputmethod.latin
There should be no ConnectionRecord for
AndroidSpellCheckerService
7. Run a test program that has TextView and tap on one of the
TextViews and type some text.
8. Repeat steps 5 and 6 to observe there are now bindings and
connection to SCS.
9. Kill the app manually. Repeat steps 5 and 6 to see bindings
and connections are removed again.
10. Repeat 7 and 8.
11. Kill SCS
adb shell ps -A | grep com.android.inputmethod.latin | awk '{print $2}' | xargs adb shell kill -KILL
12. Repeat steps 5 and 6 to observe that the bindings and the
connection to SCS are preserved.
Change-Id: I38942765ed6bec6713757b1d5f325e7a633c2ba7
TreeHugger Robot [Thu, 22 Jun 2017 21:33:39 +0000 (21:33 +0000)]
Merge "Add tintable icon support" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 21:31:56 +0000 (21:31 +0000)]
Merge "Change PIP notification icon" into oc-dev
Android Build Merger (Role) [Thu, 22 Jun 2017 21:29:24 +0000 (21:29 +0000)]
Merge "Merge "Merge "Added more systrace points to window manager" into oc-dev am:
182d5ec2d2 am:
0e068632ef" into oc-dr1-dev-plus-aosp am:
83e3207c12"
Wale Ogunwale [Thu, 22 Jun 2017 21:28:09 +0000 (21:28 +0000)]
Merge "Merge "Added more systrace points to window manager" into oc-dev am:
182d5ec2d2 am:
0e068632ef" into oc-dr1-dev-plus-aosp
am:
83e3207c12
Change-Id: I11ecf8923cc3fe6c8b44a446086c267e50a89911
Android Build Merger (Role) [Thu, 22 Jun 2017 21:27:27 +0000 (21:27 +0000)]
Merge "Merge "Merge "Add a common call when wrapping an app." am:
12e0975963 am:
bb6cf84a40 am:
1d10ce12ff" into oc-dr1-dev-plus-aosp am:
68a974ef44"
Christopher Ferris [Thu, 22 Jun 2017 21:26:08 +0000 (21:26 +0000)]
Merge "Merge "Add a common call when wrapping an app." am:
12e0975963 am:
bb6cf84a40 am:
1d10ce12ff" into oc-dr1-dev-plus-aosp
am:
68a974ef44
Change-Id: I6f20da639b79e63fbafd71c7a365054493e86e45
Android Build Merger (Role) [Thu, 22 Jun 2017 21:25:19 +0000 (21:25 +0000)]
Merge "Merge "Merge "Ensure icon contrast on the shelf" into oc-dev am:
d0550a9b6c am:
206f1ef043" into oc-dr1-dev-plus-aosp am:
b5903659d8"
Lucas Dupin [Thu, 22 Jun 2017 21:23:58 +0000 (21:23 +0000)]
Merge "Merge "Ensure icon contrast on the shelf" into oc-dev am:
d0550a9b6c am:
206f1ef043" into oc-dr1-dev-plus-aosp
am:
b5903659d8
Change-Id: I42707bee7d8695021c2f3e41ad6e703b49f8a757
Treehugger Robot [Thu, 22 Jun 2017 21:23:52 +0000 (21:23 +0000)]
Merge "Fix code and test related to rules version check"
TreeHugger Robot [Thu, 22 Jun 2017 21:21:17 +0000 (21:21 +0000)]
Merge "Revert Early version of new volume"
Jason Monk [Thu, 22 Jun 2017 21:17:18 +0000 (21:17 +0000)]
Merge "Make default status bar padding 8dp" into oc-dr1-dev am:
5af936f31e
am:
1737fcd4bf
Change-Id: I3a80541dfd78e10b3b9d8c4f45d14cd8741e729f
Robert Sloan [Thu, 22 Jun 2017 21:11:59 +0000 (14:11 -0700)]
Don't statically link libcrypto in frameworks.
Test: CtsLibcoreTestCases, and BootTest.
Change-Id: I547bb838befa743d72d356c186ff3cd355736589
Conrad Chen [Tue, 13 Jun 2017 20:02:42 +0000 (13:02 -0700)]
Media: Eliminate NPE from race conditions
Race conditions may happen between
MediaSessionManager.SessionsChangedWrapper.release() and calling
onActiveSessionsChanged(), which might cause NPE. Copies member
variables as local variables to prevent that.
Test: cts-tradefed run cts -m MediaTest
Bug:
62841633
Change-Id: I69b6d155a1a5c475ab4bb317b60baa6f3a030e5a
Alan Leung [Sat, 13 May 2017 00:31:13 +0000 (17:31 -0700)]
ASM Priority Boost Tool
This tool is a replacement for the Jack plugin that allows injection
of static method calls before lock enter and exit.
A common use case would be to boost a thread's priority as soon as
it acquires a heavily contented lock and resetting the priority upon
release.
This tool is meant to be optionally invoked from /build/core/ rules
during the build process.
Test: JUnit Tests / resulting image on a bullhead.
Change-Id: If400414a0bf50f03768a1de2ebee42086a9d701f
Merged-In: If400414a0bf50f03768a1de2ebee42086a9d701f
(cherry picked from commit
93db63059ad5e9e1d59c8ce013559069d566ef4c)
Kevin Tang [Thu, 22 Jun 2017 20:56:29 +0000 (20:56 +0000)]
Merge "Merge "GnssLocationProvider: listening to conn lost event" into oc-dr1-dev am:
9564b4d168" into oc-dr1-dev-plus-aosp
am:
7904864fa5
Change-Id: I19f7da4ae70e4d9fd4a2de79d18020e70fb5fe7d
Jason Monk [Thu, 22 Jun 2017 20:53:11 +0000 (20:53 +0000)]
Merge "Fix ConcurrentModificationException from LocationController" into oc-dev am:
6791bee744 am:
9980bade09
am:
ce3775bbf7
Change-Id: I763b909dd371450f50ebe03bb20655bad23793da
Paul Duffin [Thu, 22 Jun 2017 20:50:34 +0000 (20:50 +0000)]
Merge "Merge "Ensure that android.test tests pass" am:
156775fea8 am:
34dc5a58b3 am:
e211119fea" into oc-dr1-dev-plus-aosp
am:
989b7db027
Change-Id: I1e3bcb0b3607464ab2267c14ff2e8dcd96a19f56
Erik Kline [Thu, 22 Jun 2017 20:47:45 +0000 (20:47 +0000)]
Merge "Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev am:
be7657b038 -s ours am:
78def25969 -s ours" into oc-dr1-dev-plus-aosp
am:
61f8509891 -s ours
Change-Id: I83caf660ba34cc6abeadac44272b76638f92c29a
Android Build Merger (Role) [Thu, 22 Jun 2017 20:44:57 +0000 (20:44 +0000)]
Merge "Merge "Added more systrace points to window manager" into oc-dev am:
182d5ec2d2 am:
0e068632ef" into oc-dr1-dev-plus-aosp
Wale Ogunwale [Thu, 22 Jun 2017 20:43:54 +0000 (20:43 +0000)]
Merge "Added more systrace points to window manager" into oc-dev am:
182d5ec2d2
am:
0e068632ef
Change-Id: I70d155d214a70fb451bb7468d91e782f0f6f4d49
OSDN Git Service
