OSDN Git Service
Tony Mak [Wed, 29 Mar 2017 23:24:58 +0000 (23:24 +0000)]
Merge "Whitelist ManagedProvisioning from bg check" into oc-dev am:
fc1dd04b0b
am:
742d336461
Change-Id: I5b325c62cc442b1f94d0770ca9ac8100045211ad
Tony Mak [Wed, 29 Mar 2017 23:21:23 +0000 (23:21 +0000)]
Merge "Whitelist ManagedProvisioning from bg check" into oc-dev
am:
fc1dd04b0b
Change-Id: I69b3c9fed0cc52b7a500f05a2ca8cd9fe3d0cc36
TreeHugger Robot [Wed, 29 Mar 2017 23:12:38 +0000 (23:12 +0000)]
Merge "Whitelist ManagedProvisioning from bg check" into oc-dev
Pavlin Radoslavov [Wed, 29 Mar 2017 23:04:01 +0000 (23:04 +0000)]
Merge "Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am:
3c7fce3579 am:
25105f6561 am:
dfc1264eff" into oc-dev-plus-aosp
am:
7035d9a920
Change-Id: I97a0ca52a8e1d2dbccb9ff2263eec62772358df6
Jason Monk [Wed, 29 Mar 2017 23:00:30 +0000 (23:00 +0000)]
Merge "Fix battery warning color lookup" into oc-dev am:
834c260e98
am:
cedc7dfc2e
Change-Id: I544b92f15cc490845b24e429354f45bec8b45bc4
Peter Qiu [Wed, 29 Mar 2017 22:59:34 +0000 (22:59 +0000)]
Merge "wifi: add test for tracking Passpoint AP on devices with Passpoint disabled" into oc-dev am:
f1cc8b82b3
am:
a5b0d84ea7
Change-Id: I8e4a22a715e07f47473465db9acdbf81aaba2b58
Android Build Merger (Role) [Wed, 29 Mar 2017 22:59:08 +0000 (22:59 +0000)]
Merge "Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am:
3c7fce3579 am:
25105f6561 am:
dfc1264eff" into oc-dev-plus-aosp
Pavlin Radoslavov [Wed, 29 Mar 2017 22:57:22 +0000 (22:57 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am:
3c7fce3579 am:
25105f6561
am:
dfc1264eff
Change-Id: I09fd2e135ff0410b08ce197f98a4f58b14c9b7c6
Maurice Lam [Wed, 29 Mar 2017 22:56:52 +0000 (22:56 +0000)]
Merge "Add custom view support to Tiles"
Jason Monk [Wed, 29 Mar 2017 22:56:24 +0000 (22:56 +0000)]
Merge "Fix battery warning color lookup" into oc-dev
am:
834c260e98
Change-Id: Ic29ab89382f4d44e0777d3440ebbe7581a367220
Peter Qiu [Wed, 29 Mar 2017 22:55:31 +0000 (22:55 +0000)]
Merge "wifi: add test for tracking Passpoint AP on devices with Passpoint disabled" into oc-dev
am:
f1cc8b82b3
Change-Id: Id1e32596121a5aef347d6e9bc4c2402a22acc207
Pavlin Radoslavov [Wed, 29 Mar 2017 22:51:41 +0000 (22:51 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am:
3c7fce3579
am:
25105f6561
Change-Id: I67601df54e55171e3d559b71258d99ad1e0a8c5d
TreeHugger Robot [Wed, 29 Mar 2017 22:50:28 +0000 (22:50 +0000)]
Merge "Fix battery warning color lookup" into oc-dev
TreeHugger Robot [Wed, 29 Mar 2017 22:49:59 +0000 (22:49 +0000)]
Merge "wifi: add test for tracking Passpoint AP on devices with Passpoint disabled" into oc-dev
Pavlin Radoslavov [Wed, 29 Mar 2017 22:47:28 +0000 (22:47 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()"
am:
3c7fce3579
Change-Id: Ic8483107e72a61e8b07f26f343e36254fe57cfd9
Treehugger Robot [Wed, 29 Mar 2017 22:41:13 +0000 (22:41 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()"
Yifan Hong [Wed, 29 Mar 2017 22:28:18 +0000 (22:28 +0000)]
Merge "Add HidlSupport.java for utility methods for HIDL." into oc-dev am:
ee40a2652c
am:
fb3066af0a
Change-Id: Ie4c79ce58903456e745b579533fc84f4daf7fc78
Yifan Hong [Wed, 29 Mar 2017 22:24:52 +0000 (22:24 +0000)]
Merge "Add HidlSupport.java for utility methods for HIDL." into oc-dev
am:
ee40a2652c
Change-Id: I565135074b206a3ae6f1783f4de799b57593e7c6
TreeHugger Robot [Wed, 29 Mar 2017 22:20:28 +0000 (22:20 +0000)]
Merge "Add HidlSupport.java for utility methods for HIDL." into oc-dev
Phil Weaver [Wed, 29 Mar 2017 21:36:19 +0000 (21:36 +0000)]
Merge "Move displaying mag bounds into surface transation" into oc-dev am:
6f3bc05868
am:
d859a67fa9
Change-Id: I165b974d3994d33ed863660ae6222b861f7cc3e0
Phil Weaver [Wed, 29 Mar 2017 21:32:19 +0000 (21:32 +0000)]
Merge "Move displaying mag bounds into surface transation" into oc-dev
am:
6f3bc05868
Change-Id: I1240a4c21d712d1c04793897c5c50ef93edfc618
TreeHugger Robot [Wed, 29 Mar 2017 21:25:02 +0000 (21:25 +0000)]
Merge "Move displaying mag bounds into surface transation" into oc-dev
Daniel Nishi [Wed, 29 Mar 2017 21:13:04 +0000 (21:13 +0000)]
Merge "Add support for movies & tv apps querying."
Jaekyun Seok [Wed, 29 Mar 2017 21:01:55 +0000 (21:01 +0000)]
Merge "Enable static RROs by default" into oc-dev am:
22ea35187f
am:
bfc81099f9
Change-Id: I1b033f8b5f28bbd253b80d7e116155e73ee4845c
Jaekyun Seok [Wed, 29 Mar 2017 20:58:12 +0000 (20:58 +0000)]
Merge "Enable static RROs by default" into oc-dev
am:
22ea35187f
Change-Id: I0a00621eb8cb54bd89c938539d8a2d7baee46833
TreeHugger Robot [Wed, 29 Mar 2017 20:54:00 +0000 (20:54 +0000)]
Merge "Revert "AOD: Wake up fully on gestures by default""
TreeHugger Robot [Wed, 29 Mar 2017 20:48:53 +0000 (20:48 +0000)]
Merge "Enable static RROs by default" into oc-dev
TreeHugger Robot [Wed, 29 Mar 2017 20:46:32 +0000 (20:46 +0000)]
Merge "AOD: prevent clicking shelf when dark"
Tony Mak [Wed, 29 Mar 2017 14:53:07 +0000 (15:53 +0100)]
Whitelist ManagedProvisioning from bg check
Notice that app put in this list is also exempted from doze.
Also, this only exempts us from the service restriction, but not the broadcast one.
Test: adb shell am make-uid-idle --user 0 com.android.managedprovisioning
&& adb shell am broadcast -a android.intent.action.PRE_BOOT_COMPLETED -n com.android.managedprovisioning/com.android.managedprovisioning.ota.PreBootListener
Observe there is no crash
Change-Id: Ic0a943a9b66c909a6727f9411af519a8c6cf0157
Fix:
36705375
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"
Yifan Hong [Mon, 27 Mar 2017 20:02:34 +0000 (13:02 -0700)]
Add HidlSupport.java for utility methods for HIDL.
The old .equals code uses Objects.deepEquals,
which does not handle for, e.g. ArrayList<byte[]>.
Create our own recursive HidlSupport.deepEquals
and deepHashCode method to handle these edge cases.
Bug:
36454147
Test: hidl_test_java
Change-Id: I56dc48985486b561263c260cf43aa90f30d581d0
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
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
(cherry picked from commit
251db070c5bc6f2859ef05e5456cc9079afc8224)
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"
Jason Monk [Wed, 29 Mar 2017 19:21:36 +0000 (15:21 -0400)]
Fix battery warning color lookup
Test: visual
Change-Id: Ia3db18f27d83c079b19fc555387e1f7be8963298
Fixes:
36552063
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
OSDN Git Service
