OSDN Git Service
Connor O'Brien [Wed, 29 Mar 2017 20:37:00 +0000 (20:37 +0000)]
Merge "Recover cleanly from power HAL service crashes"
Etan Cohen [Wed, 29 Mar 2017 20:31:37 +0000 (20:31 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration" into oc-dev am:
2ce80c839e -s ours
am:
4e158866f8 -s ours
Change-Id: I4e056cfa17e44bcbbcc017208588effa398fa36f
Android Build Merger (Role) [Wed, 29 Mar 2017 20:29:36 +0000 (20:29 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration am:
f6d243b6be -s ours am:
0d72393b87 -s ours"
Etan Cohen [Wed, 29 Mar 2017 20:28:54 +0000 (20:28 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration" into oc-dev
am:
2ce80c839e -s ours
Change-Id: Ic63f823621d8570b08a281820b5ce82e483aca0f
Etan Cohen [Wed, 29 Mar 2017 20:28:22 +0000 (20:28 +0000)]
[AWARE] Remove Publish/Subscribe Count configuration am:
f6d243b6be -s ours
am:
0d72393b87 -s ours
Change-Id: If1aa1a96998bf1e55780a597dcb43280bc3832fb
TreeHugger Robot [Wed, 29 Mar 2017 20:27:51 +0000 (20:27 +0000)]
Merge "Add a Skeleton IpSecService"
Etan Cohen [Wed, 29 Mar 2017 20:22:03 +0000 (20:22 +0000)]
[AWARE] Remove Publish/Subscribe Count configuration
am:
f6d243b6be -s ours
Change-Id: I01b9ae8c2f06458ea6615abb5ce2c848675ed3f5
Etan Cohen [Wed, 29 Mar 2017 20:14:59 +0000 (20:14 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration" into oc-dev
Jason Monk [Wed, 29 Mar 2017 20:14:08 +0000 (20:14 +0000)]
Merge "Make sure TileServices get onTileRemoved on reset" into oc-dev am:
c463bed8db
am:
72626d2dc2
Change-Id: I53aee8573abab7d59db1eaaf9692e73a4374389d
Jason Monk [Wed, 29 Mar 2017 20:09:31 +0000 (20:09 +0000)]
Merge "Make sure TileServices get onTileRemoved on reset" into oc-dev
am:
c463bed8db
Change-Id: I647f7ddf075d436c727990d16f6035dcb8adc483
Oliver Woodman [Wed, 29 Mar 2017 20:09:20 +0000 (20:09 +0000)]
Merge "Avoid unnecessary object allocation in CryptoInfo.set"
TreeHugger Robot [Wed, 29 Mar 2017 20:03:59 +0000 (20:03 +0000)]
Merge "Make sure TileServices get onTileRemoved on reset" into oc-dev
Winson Chung [Wed, 29 Mar 2017 20:03:45 +0000 (20:03 +0000)]
Merge "Removing duplicate string in Recents." into oc-dev am:
c16142239f
am:
ce3e3f2a13
Change-Id: I9fb5f8781c1ef6d08150c51d6d250025ec653851
Winson Chung [Wed, 29 Mar 2017 20:02:44 +0000 (20:02 +0000)]
Merge "Dismiss the PiP if user changes setting while PiP is open." into oc-dev am:
477b1b0361
am:
68b9f45a43
Change-Id: I57a5b1651128706cfd398336b7674f54527db9ec
Winson Chung [Wed, 29 Mar 2017 19:56:55 +0000 (19:56 +0000)]
Merge "Removing duplicate string in Recents." into oc-dev
am:
c16142239f
Change-Id: I7274af1f1b6670478b3bb2a848e39a42ddff639b
TreeHugger Robot [Wed, 29 Mar 2017 19:51:53 +0000 (19:51 +0000)]
Merge "Removing duplicate string in Recents." into oc-dev
Peter Qiu [Wed, 29 Mar 2017 19:50:00 +0000 (19:50 +0000)]
Merge "wifi: document UnsupportedOperationException for Passpoint related APIs" into oc-dev am:
ef4b501c6d
am:
fc1529783a
Change-Id: Iae545a8df58bbf94a5ece7ae037e15b0be3f7fea
Peter Qiu [Wed, 29 Mar 2017 19:45:13 +0000 (19:45 +0000)]
Merge "wifi: update passpoint to Passpoint in comments" into oc-dev am:
10180bb47b
am:
856a66a4b3
Change-Id: I6927c63806db1208c3f1c6c51ffdbe1bb2e8585a
Winson Chung [Wed, 29 Mar 2017 19:43:53 +0000 (19:43 +0000)]
Merge "Dismiss the PiP if user changes setting while PiP is open." into oc-dev
am:
477b1b0361
Change-Id: I61139a578125ab1fdff0855b2f491667bae8acf0
TreeHugger Robot [Wed, 29 Mar 2017 19:40:53 +0000 (19:40 +0000)]
Merge "Dismiss the PiP if user changes setting while PiP is open." into oc-dev
Fyodor Kupolov [Wed, 29 Mar 2017 19:40:37 +0000 (19:40 +0000)]
Merge "Only use cacheLock when it's needed" into oc-dev am:
202dc5e18d
am:
9c330676e0
Change-Id: Ie867827ab7c634e1168f38750243d4dafebfec94
Peter Qiu [Wed, 29 Mar 2017 19:39:32 +0000 (19:39 +0000)]
Merge "wifi: document UnsupportedOperationException for Passpoint related APIs" into oc-dev
am:
ef4b501c6d
Change-Id: I98889dda85de076a8ae326784699475a0571359e
Peter Qiu [Wed, 29 Mar 2017 19:38:30 +0000 (19:38 +0000)]
Merge "wifi: update passpoint to Passpoint in comments" into oc-dev
am:
10180bb47b
Change-Id: Id54111d31f2ffa6937b1d10010f0ca49c86c4a7e
TreeHugger Robot [Wed, 29 Mar 2017 19:38:25 +0000 (19:38 +0000)]
Merge "Move displaying mag bounds into surface transation"
Fyodor Kupolov [Wed, 29 Mar 2017 19:36:12 +0000 (19:36 +0000)]
Merge "Only use cacheLock when it's needed" into oc-dev
am:
202dc5e18d
Change-Id: I4c0fc21b3cc7e73a2852f4baf976027d33cdf930
Kevin Chyn [Wed, 29 Mar 2017 19:35:05 +0000 (19:35 +0000)]
Merge "Revert "finished implementation of fingerprintservice enumerate"" into oc-dev am:
943b19ece7
am:
14ce7b4d89
Change-Id: I8e7595b2ebd23b34067eb553625e02b1c05fef1d
TreeHugger Robot [Wed, 29 Mar 2017 19:34:05 +0000 (19:34 +0000)]
Merge "wifi: document UnsupportedOperationException for Passpoint related APIs" into oc-dev
Abodunrinwa Toki [Wed, 29 Mar 2017 19:33:57 +0000 (19:33 +0000)]
Merge "TextClassifier: Switch model based on locale" into oc-dev am:
dd83c2006b
am:
17710aeafa
Change-Id: Ic62bdfe913f01a22e7ddb2fa69cbc1db1162a9a5
Winson Chung [Wed, 29 Mar 2017 19:33:04 +0000 (19:33 +0000)]
Merge "Removing PiP notification channel." into oc-dev am:
9c847fdc7e
am:
65320e0391
Change-Id: I3078fe1efa3eb8f6264270ca54e0b45324589867
TreeHugger Robot [Wed, 29 Mar 2017 19:31:37 +0000 (19:31 +0000)]
Merge "wifi: update passpoint to Passpoint in comments" into oc-dev
Kevin Chyn [Wed, 29 Mar 2017 19:30:38 +0000 (19:30 +0000)]
Merge "Revert "finished implementation of fingerprintservice enumerate"" into oc-dev
am:
943b19ece7
Change-Id: I6c149cfe43e26d00488f79be80e2101af511f262
Seigo Nonaka [Wed, 29 Mar 2017 19:29:20 +0000 (19:29 +0000)]
Merge "Do not use many FDs in FontManagerService." into oc-dev am:
5301d9e6d3
am:
e94849497c
Change-Id: I0ebac38a63ff06dccf4aa75f9a97f7360e8f7323
TreeHugger Robot [Wed, 29 Mar 2017 19:27:10 +0000 (19:27 +0000)]
Merge "Only use cacheLock when it's needed" into oc-dev
Kevin Chyn [Wed, 29 Mar 2017 19:25:08 +0000 (19:25 +0000)]
Merge "Revert "finished implementation of fingerprintservice enumerate"" into oc-dev
Abodunrinwa Toki [Wed, 29 Mar 2017 19:23:26 +0000 (19:23 +0000)]
Merge "TextClassifier: Switch model based on locale" into oc-dev
am:
dd83c2006b
Change-Id: Id27eb72e8932effb95047281f2a6f9b9d6686eda
Winson Chung [Wed, 29 Mar 2017 19:22:24 +0000 (19:22 +0000)]
Merge "Removing PiP notification channel." into oc-dev
am:
9c847fdc7e
Change-Id: I8fca9bb8ff5fa10830aabd79b012894def31abde
Evan Rosky [Wed, 29 Mar 2017 19:22:03 +0000 (19:22 +0000)]
Merge "Expose initial focus feature flag for testing"
TreeHugger Robot [Wed, 29 Mar 2017 19:17:31 +0000 (19:17 +0000)]
Merge "TextClassifier: Switch model based on locale" into oc-dev
Seigo Nonaka [Wed, 29 Mar 2017 19:16:02 +0000 (19:16 +0000)]
Merge "Do not use many FDs in FontManagerService." into oc-dev
am:
5301d9e6d3
Change-Id: I0e9a47acb6739be29293f5acad5d9dfb5e026775
TreeHugger Robot [Wed, 29 Mar 2017 19:13:07 +0000 (19:13 +0000)]
Merge "Removing PiP notification channel." into oc-dev
TreeHugger Robot [Wed, 29 Mar 2017 19:11:33 +0000 (19:11 +0000)]
Merge "Do not use many FDs in FontManagerService." into oc-dev
Koji Fukui [Wed, 29 Mar 2017 19:06:51 +0000 (19:06 +0000)]
Merge "Ignore toast request of pinning if request interval is too short" am:
1fcacf7736 am:
19e2bcd2a7 am:
ae6cfc1b07
am:
822e87a8c6
Change-Id: Ia635f3339394dabbf88d103ce783cb76e89ef39c
Koji Fukui [Wed, 29 Mar 2017 19:03:17 +0000 (19:03 +0000)]
Merge "Ignore toast request of pinning if request interval is too short" am:
1fcacf7736 am:
19e2bcd2a7
am:
ae6cfc1b07
Change-Id: I7e8aee8e4f02f3adbd41ce4f9d84cf83013451a7
Tima Vaisburd [Wed, 29 Mar 2017 18:58:47 +0000 (18:58 +0000)]
Merge "TextClassifier: add API to WebView" into oc-dev am:
e4776416d4
am:
976164b533
Change-Id: Ice3ef592c6a714c272ff5a93c1146d24737ff168
Tima Vaisburd [Wed, 29 Mar 2017 18:55:54 +0000 (18:55 +0000)]
Merge "TextClassifier: add API to WebView" into oc-dev
am:
e4776416d4
Change-Id: I674152d0f3d1565e2281cb0dd2351a707efa1b52
Koji Fukui [Wed, 29 Mar 2017 18:55:37 +0000 (18:55 +0000)]
Merge "Ignore toast request of pinning if request interval is too short" am:
1fcacf7736
am:
19e2bcd2a7
Change-Id: Ic11d7a0daf867a6ad2a78ce4a150b0b2555f5706
Mukesh Agrawal [Wed, 29 Mar 2017 18:55:28 +0000 (18:55 +0000)]
Merge "Merge changes I5c16c650,I3151fb6b am:
55efea25f3 am:
ad2684ca3d am:
6b29b1c256" into oc-dev-plus-aosp
am:
f463559a9a
Change-Id: If043f8624a7e6e0b66ab18ecbddd539736032002
Connor O'Brien [Tue, 28 Feb 2017 00:41:35 +0000 (16:41 -0800)]
Recover cleanly from power HAL service crashes
Currently if the binderized power HAL service crashes, services that
call the HAL will crash as well. To fix this:
- Before calling power HAL functions, check that the handle to the
power HAL service is still valid, and reload using getService() if
necessary.
- When a call to a power HAL function fails, log the failure and mark
the handle as invalid.
Bug:
35728909
Test: adb shell kill -9 $(adb shell pidof android.hardware.power@1.0-service)
Change-Id: Id2dd1a6507b9f5044d928483cdb6b736c701f8ba
Signed-off-by: Connor O'Brien <connoro@google.com>
Jakub Pawlowski [Wed, 29 Mar 2017 18:51:15 +0000 (18:51 +0000)]
Merge "Merge "Bluetooth: fix comment wording" am:
6ba7c54a51 am:
eeedda1453 am:
ba2222aabb" into oc-dev-plus-aosp
am:
b676a1b8fa
Change-Id: I59ac931dcdd39f2557f39fcbc3d5dcd56ad5407d
Tima Vaisburd [Wed, 29 Mar 2017 18:50:04 +0000 (18:50 +0000)]
Merge "TextClassifier: add API to WebView" into oc-dev
Koji Fukui [Wed, 29 Mar 2017 18:49:47 +0000 (18:49 +0000)]
Merge "Ignore toast request of pinning if request interval is too short"
am:
1fcacf7736
Change-Id: I2814c128db0f9eb42d1f35236ed57e35ad6c417c
Kevin Chyn [Wed, 29 Mar 2017 18:29:37 +0000 (11:29 -0700)]
Revert "finished implementation of fingerprintservice enumerate"
This reverts commit
f8ff36c47f9f8d60cf825e6b43eb75d1eae81df5.
Test: manual
Change-Id: Ib7a887ad2b185d83174d171832cd9c3bc87939c0
Android Build Merger (Role) [Wed, 29 Mar 2017 18:45:12 +0000 (18:45 +0000)]
Merge "Merge changes I5c16c650,I3151fb6b am:
55efea25f3 am:
ad2684ca3d am:
6b29b1c256" into oc-dev-plus-aosp
Philip P. Moltmann [Wed, 29 Mar 2017 18:44:25 +0000 (18:44 +0000)]
Merge "Fix bad Java docs in View.java" into oc-dev am:
94696c5ac5
am:
a81040a335
Change-Id: I9d7a2bb51c42cfe53d8c80c449c60110669d95af
Treehugger Robot [Wed, 29 Mar 2017 18:41:53 +0000 (18:41 +0000)]
Merge "Ignore toast request of pinning if request interval is too short"
Mukesh Agrawal [Wed, 29 Mar 2017 18:41:16 +0000 (18:41 +0000)]
Merge changes I5c16c650,I3151fb6b am:
55efea25f3 am:
ad2684ca3d
am:
6b29b1c256
Change-Id: I08019c46a433b5ea64a561d374df445d50400d45
Android Build Merger (Role) [Wed, 29 Mar 2017 18:40:34 +0000 (18:40 +0000)]
Merge "Merge "Bluetooth: fix comment wording" am:
6ba7c54a51 am:
eeedda1453 am:
ba2222aabb" into oc-dev-plus-aosp
Jakub Pawlowski [Wed, 29 Mar 2017 18:39:44 +0000 (18:39 +0000)]
Merge "Bluetooth: fix comment wording" am:
6ba7c54a51 am:
eeedda1453
am:
ba2222aabb
Change-Id: I6a1cbac244e5f262bfda523abd165cef20b7e7b2
Philip P. Moltmann [Wed, 29 Mar 2017 18:39:32 +0000 (18:39 +0000)]
Merge "Fix bad Java docs in View.java" into oc-dev
am:
94696c5ac5
Change-Id: If280cda4e47d42eef997a46bb83ca9e1ff31aa6a
Tianjie Xu [Wed, 29 Mar 2017 18:39:25 +0000 (18:39 +0000)]
Merge "Report the temperature during an OTA update" am:
47c7e7f41a am:
022682a721 am:
998c554463
am:
d580a85b20
Change-Id: I4dea5a6e33c1ea9e7ec7ed77fa4a6a6ac099fb29
Nathan Harold [Thu, 2 Mar 2017 02:55:06 +0000 (18:55 -0800)]
Add a Skeleton IpSecService
-Add IpSecService with the necessary glue to connect to netd
-Add code to retrieve IpSecService from System Server
Bug:
34811227
Test: Service boots (and dumpsys works), more via b/
34811227
Change-Id: I4cdcb643421141202f77a0e2f87a37012de0cd92
Mukesh Agrawal [Wed, 29 Mar 2017 18:35:37 +0000 (18:35 +0000)]
Merge changes I5c16c650,I3151fb6b am:
55efea25f3
am:
ad2684ca3d
Change-Id: Ia0d1205b09b4770a4df46604d947c7be7aca8fb5
Jakub Pawlowski [Wed, 29 Mar 2017 18:34:40 +0000 (18:34 +0000)]
Merge "Bluetooth: fix comment wording" am:
6ba7c54a51
am:
eeedda1453
Change-Id: Ib0cdcf77d471c814651a157fc79c818f99923250
Tianjie Xu [Wed, 29 Mar 2017 18:34:14 +0000 (18:34 +0000)]
Merge "Report the temperature during an OTA update" am:
47c7e7f41a am:
022682a721
am:
998c554463
Change-Id: I12a0f4c5fb768bdaa3a4baa4fa5bd7964b80110e
TreeHugger Robot [Wed, 29 Mar 2017 18:33:07 +0000 (18:33 +0000)]
Merge "Fix bad Java docs in View.java" into oc-dev
Tianjie Xu [Wed, 29 Mar 2017 18:30:05 +0000 (18:30 +0000)]
Merge "Report the temperature during an OTA update" am:
47c7e7f41a
am:
022682a721
Change-Id: Idb0514f5c83232c0e66b90cc7cd40d026d1cceb0
Mukesh Agrawal [Wed, 29 Mar 2017 18:30:00 +0000 (18:30 +0000)]
Merge changes I5c16c650,I3151fb6b
am:
55efea25f3
Change-Id: Ifaaae29780d905ffe9f82645d6d17dad478ba6a9
Winson Chung [Wed, 29 Mar 2017 18:29:24 +0000 (18:29 +0000)]
Merge "Prevent invisible PiP menu activity from having touch focus." into oc-dev am:
bd0fdb19fd
am:
012eb8cb16
Change-Id: I85cf39001b98f5f896c71cb35ed8bcdaf20d239c
Jakub Pawlowski [Wed, 29 Mar 2017 18:28:44 +0000 (18:28 +0000)]
Merge "Bluetooth: fix comment wording"
am:
6ba7c54a51
Change-Id: I745973b35e5d756072bff1d0958470dc0f55f6ca
Tianjie Xu [Wed, 29 Mar 2017 18:25:11 +0000 (18:25 +0000)]
Merge "Report the temperature during an OTA update"
am:
47c7e7f41a
Change-Id: I3238939bd9535571de1532f34ca137eb3fec9dc2
Winson Chung [Wed, 29 Mar 2017 18:24:02 +0000 (18:24 +0000)]
Merge "Prevent invisible PiP menu activity from having touch focus." into oc-dev
am:
bd0fdb19fd
Change-Id: I58c3b9a2d90028b0fae8064b10b82f0822482b98
Tomasz Wasilczyk [Wed, 29 Mar 2017 18:23:43 +0000 (18:23 +0000)]
Merge "Add digital radio flags to ProgramInfo API."
Mukesh Agrawal [Wed, 29 Mar 2017 18:20:35 +0000 (18:20 +0000)]
Merge changes I5c16c650,I3151fb6b
* changes:
StateMachine: make toString() terser
utiltests: add script to run tests
Treehugger Robot [Wed, 29 Mar 2017 18:20:22 +0000 (18:20 +0000)]
Merge "Bluetooth: fix comment wording"
Winson Chung [Wed, 29 Mar 2017 18:18:08 +0000 (18:18 +0000)]
Merge "Prevent invisible PiP menu activity from having touch focus." into oc-dev
Tianjie Xu [Wed, 29 Mar 2017 18:16:44 +0000 (18:16 +0000)]
Merge "Report the temperature during an OTA update"
Philip P. Moltmann [Wed, 29 Mar 2017 18:13:09 +0000 (18:13 +0000)]
Merge "Do not allow printing until preview is updated" into oc-dev am:
fb1e49a5c4
am:
a59f5d24c1
Change-Id: Ib70625363d6271c98f3e63615279c56b23671d6c
Oliver Woodman [Wed, 29 Mar 2017 17:06:46 +0000 (18:06 +0100)]
Avoid unnecessary object allocation in CryptoInfo.set
This is causing a large number of unnecessary small object allocations
during encrypted playbacks, which presumably all need to be GC'd.
I wasn't sure whether the zero pattern should be static; that might
be objectionable in the platform (unsure?), since it would live
forever from the point of the class being classloaded. It doesn't
make much/any difference in practice in any case.
Test: Safe refactoring CL.
Change-Id: I9ee5fe284b0f854d672d83b97fc51116b0416f91
Philip P. Moltmann [Wed, 29 Mar 2017 18:05:43 +0000 (18:05 +0000)]
Merge "Do not allow printing until preview is updated" into oc-dev
am:
fb1e49a5c4
Change-Id: I5a2ccb79c8ca87c5eae31cc51ec2d45354cc1c2a
Phil Weaver [Wed, 29 Mar 2017 18:00:39 +0000 (18:00 +0000)]
Merge "Fix problem with ListView accessibility focus" into oc-dev am:
36bceefafa
am:
2321e2a3e3
Change-Id: I3220e5f60b22bbca3fea47a2e8e59bcf453fc610
TreeHugger Robot [Wed, 29 Mar 2017 17:58:55 +0000 (17:58 +0000)]
Merge "Do not allow printing until preview is updated" into oc-dev
Phil Weaver [Wed, 29 Mar 2017 17:55:19 +0000 (17:55 +0000)]
Merge "Fix problem with ListView accessibility focus" into oc-dev
am:
36bceefafa
Change-Id: I868f3d17778d00a2a45cb95694e45fcf857942e4
Jean-Michel Trivi [Wed, 29 Mar 2017 17:53:56 +0000 (17:53 +0000)]
Merge "AudioAttributes: make getVolumeControlStream() non static" into oc-dev am:
bf6b4efa6d
am:
4c51b4470c
Change-Id: Ibdf82f804c29a786173584833f1796ed399bea3b
Jean-Michel Trivi [Wed, 29 Mar 2017 17:48:23 +0000 (17:48 +0000)]
Merge "AudioAttributes: make getVolumeControlStream() non static" into oc-dev
am:
bf6b4efa6d
Change-Id: I8b53195f226757907631bd0b709d698624613734
TreeHugger Robot [Wed, 29 Mar 2017 17:47:08 +0000 (17:47 +0000)]
Merge "Fix problem with ListView accessibility focus" into oc-dev
Doris Ling [Wed, 29 Mar 2017 17:46:29 +0000 (17:46 +0000)]
Merge "Reserve space for preference icon." into oc-dev am:
ddb280b1ac
am:
21bb27f716
Change-Id: I8dc434a901a2c4cb75a12dd79dd7f55cbba1ae35
Etan Cohen [Wed, 29 Mar 2017 17:45:04 +0000 (17:45 +0000)]
Merge "[AWARE] Fix unit tests" into oc-dev am:
6fd057cf58 -s ours
am:
bf0022d192 -s ours
Change-Id: I8e4751dc0b3696d5755814389abb0dfded3bb042
Doris Ling [Wed, 29 Mar 2017 17:40:45 +0000 (17:40 +0000)]
Merge "Reserve space for preference icon." into oc-dev
am:
ddb280b1ac
Change-Id: I18d2e90badb48f972dd6fd627c890062a2887324
TreeHugger Robot [Wed, 29 Mar 2017 17:39:57 +0000 (17:39 +0000)]
Merge "AudioAttributes: make getVolumeControlStream() non static" into oc-dev
Etan Cohen [Wed, 29 Mar 2017 17:39:04 +0000 (17:39 +0000)]
Merge "[AWARE] Fix unit tests" into oc-dev
am:
6fd057cf58 -s ours
Change-Id: I01ae199e6cc506fbc358bac796c0d59fb47e9998
TreeHugger Robot [Wed, 29 Mar 2017 17:34:03 +0000 (17:34 +0000)]
Merge "Reserve space for preference icon." into oc-dev
Phil Weaver [Tue, 28 Mar 2017 15:35:38 +0000 (08:35 -0700)]
Move displaying mag bounds into surface transation
Bug:
30960346
Test: Manually enabled magnification and explored
Change-Id: Ida16979ecf0263b1c1288aa92385af29928f2d9e
Etan Cohen [Wed, 29 Mar 2017 17:32:13 +0000 (17:32 +0000)]
Merge "[AWARE] Fix unit tests" into oc-dev
Peter Qiu [Wed, 22 Mar 2017 01:42:55 +0000 (18:42 -0700)]
wifi: update passpoint to Passpoint in comments
Per API Council, we should use the trademark name Passpoint
instead of passpoint in the code comments.
Bug:
35854283
Test: make -j32
Change-Id: Iea6697191a936d1d779c0ea50cd19c134bc7df02
Winson Chung [Thu, 23 Mar 2017 22:17:01 +0000 (15:17 -0700)]
Prevent invisible PiP menu activity from having touch focus.
- Mark the decor view as invisible when the the PiP menu activity is
hidden. We don't call Activity.setVisible() as that alters other
internal states that affect the system's understanding of whether
the activity will draw or not.
Bug:
36225602
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: I6b1ed7098e1f0ff427f0655c45e566ca60979623
(cherry picked from commit
8c8ba19e0d3214f28dccec91549df9c3cd64ae10)
Winson Chung [Wed, 29 Mar 2017 04:03:52 +0000 (21:03 -0700)]
Dismiss the PiP if user changes setting while PiP is open.
Bug:
36070720
Test: Open PiP, launch setting, disable PiP for package
Change-Id: Ia193b079d6ae27fc5fb5b1e8950cf42dfdd28450
Fyodor Kupolov [Wed, 29 Mar 2017 02:11:17 +0000 (19:11 -0700)]
Only use cacheLock when it's needed
When reading from cache, we can avoid synchronization on dbLock if we
only read from cache (no db access).
When doing updates to db and cache, we should hold cacheLock only when
updating the cache.
This change improves locking in the following methods:
- getAccountVisibilityFromCache
- saveAuthTokenToDatabase
- getAccountsFromCacheLocked no longer allows outside locking. The
method was renamed to getAccountsFromCache and now self-manages locks
- writeAuthTokenIntoCacheLocked
- readAuthTokenInternal
Test: AccountManagerServiceTest
Bug:
36485175
Bug:
35262596
Change-Id: I9aca45c31716c4f0e0fd9f07859e88a7f5ba6922
Etan Cohen [Wed, 29 Mar 2017 17:24:53 +0000 (17:24 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration" am:
5d81b9d67d am:
9bc8e05da2 am:
342a27e7f7
am:
b36a9e0eb5
Change-Id: I0c4f93b03a73e169da7250b1cf7e5cc1269d4f07
Peter Qiu [Mon, 27 Mar 2017 22:19:22 +0000 (15:19 -0700)]
wifi: document UnsupportedOperationException for Passpoint related APIs
An UnsupportedOperationException will be thrown for Passpoint related
API calls if Passpoint is not enabled on the device (build config
config_wifi_hotspot2_enabled is set to false).
Bug: None
Test: None
Change-Id: Id0ba1f7b80091d55a839fa3eee36baf9b45b7f5f
Etan Cohen [Wed, 29 Mar 2017 17:19:50 +0000 (17:19 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration" am:
5d81b9d67d am:
9bc8e05da2
am:
342a27e7f7
Change-Id: I5b4d9ea932373e8dd82e846d2c31995b23329fff
OSDN Git Service
