OSDN Git Service
Jorim Jaggi [Thu, 21 Jun 2018 16:26:09 +0000 (09:26 -0700)]
Merge "Fix issue with manual touch dispatch" into pi-dev
am:
0fb45603fe
Change-Id: I977188732a3866fc84adf3e1ef1b6d65ee4ea410
TreeHugger Robot [Thu, 21 Jun 2018 16:10:35 +0000 (16:10 +0000)]
Merge "Fix issue with manual touch dispatch" into pi-dev
David Brazdil [Thu, 21 Jun 2018 06:15:50 +0000 (23:15 -0700)]
[automerger skipped] Merge "Stabilize hidden API lists" into pi-dev
am:
80167ec0c7 -s ours
Change-Id: I655be3bcd7d3f4fee796d08bdeb380d28f83e097
TreeHugger Robot [Thu, 21 Jun 2018 06:07:22 +0000 (06:07 +0000)]
Merge "Stabilize hidden API lists" into pi-dev
Nicolas Geoffray [Thu, 21 Jun 2018 05:33:07 +0000 (22:33 -0700)]
Merge "More light grey APIs." into pi-dev
am:
eec75058ba
Change-Id: I1d81f2c2aad1276690cbf5207b8b4ace2e4679c6
TreeHugger Robot [Thu, 21 Jun 2018 05:21:01 +0000 (05:21 +0000)]
Merge "More light grey APIs." into pi-dev
Chalard Jean [Thu, 21 Jun 2018 04:52:15 +0000 (21:52 -0700)]
Merge "Add StackedLinkProperties test case" am:
faf31f8638
am:
946957bc32
Change-Id: Idebb0fc4279a059bddecffc563bdf3ddf394002c
Dan Zhang [Thu, 21 Jun 2018 04:46:18 +0000 (21:46 -0700)]
Merge "Fix <UCP>[Power] toggled the power status" am:
b3eeb859f7
am:
26f781db62
Change-Id: Id37f64d7f63a0ca86353fdee18379309e4359810
Chalard Jean [Thu, 21 Jun 2018 04:23:17 +0000 (21:23 -0700)]
Merge "Add StackedLinkProperties test case"
am:
faf31f8638
Change-Id: I33d75bf593708317dca4ba6cec035b7f035cfa86
John Reck [Thu, 21 Jun 2018 04:21:16 +0000 (21:21 -0700)]
[automerger skipped] Merge "Fix PixelCopyTest failure in CTS" am:
b773556215 -s ours
am:
bd31702374 -s ours
Change-Id: Icf428422f68b5ee4ccaba207ed8eda20411918b9
Dan Zhang [Thu, 21 Jun 2018 04:18:07 +0000 (21:18 -0700)]
Merge "Fix <UCP>[Power] toggled the power status"
am:
b3eeb859f7
Change-Id: I7f56ece79f0eb10cc27d5c62d1c8300933b1c23b
John Reck [Thu, 21 Jun 2018 04:10:33 +0000 (21:10 -0700)]
[automerger skipped] Merge "Fix PixelCopyTest failure in CTS"
am:
b773556215 -s ours
Change-Id: I6d5d15e89dcf03c8002452018b1e8922890d2814
Chalard Jean [Thu, 21 Jun 2018 03:39:15 +0000 (03:39 +0000)]
Merge "Add StackedLinkProperties test case"
Dan Zhang [Thu, 21 Jun 2018 02:41:59 +0000 (02:41 +0000)]
Merge "Fix <UCP>[Power] toggled the power status"
John Reck [Thu, 21 Jun 2018 00:48:44 +0000 (00:48 +0000)]
Merge "Fix PixelCopyTest failure in CTS"
Romain Guy [Wed, 1 Nov 2017 16:50:28 +0000 (09:50 -0700)]
Fix PixelCopyTest failure in CTS
This feature needs support for renderable float textures, but the checks
were only guaranteeing support for float texture reads.
Bug:
68754504
Test: CtsViewTestCases
Change-Id: I0ce4a81cb8e09c10a5f1e65234685767a24ef8c4
Merged-In: I0ce4a81cb8e09c10a5f1e65234685767a24ef8c4
(cherry picked from commit
8472ac67fd1d815022874f5addace0c4334ae9f6)
(cherry picked from commit
8dc7f8275e5ba9004d219d7d7d990e91fc702095)
Marco Nelissen [Wed, 20 Jun 2018 22:28:32 +0000 (15:28 -0700)]
Merge "Fix race condition in MediaHTTPConnection" into pi-dev
am:
d7c87b74d9
Change-Id: I65de507c2b98b81a25141994baba38831aea9142
Marco Nelissen [Wed, 20 Jun 2018 22:14:33 +0000 (22:14 +0000)]
Merge "Fix race condition in MediaHTTPConnection" into pi-dev
Nicolas Geoffray [Wed, 13 Jun 2018 20:22:06 +0000 (21:22 +0100)]
More light grey APIs.
bug:
110157261
bug:
110065832
bug:
110179435
bug:
110174713
bug:
110191494
bug:
110282922
bug:
110289776
bug:
110314356
bug:
110340642
bug:
110382035
Bug:
110444248
Bug:
110447432
bug:
110378707
Test: m
Change-Id: I5d7c0f9d471eab22e23cc335f03cebecb642f871
Julia Reynolds [Wed, 20 Jun 2018 21:16:31 +0000 (14:16 -0700)]
Don't throw uri exceptions for user chosen sounds
am:
89945c5a22
Change-Id: I727de67d610818b4dc29a685446d0a1e7c975518
Brad Ebinger [Wed, 20 Jun 2018 18:48:48 +0000 (11:48 -0700)]
[automerger skipped] Merge "Clean up old Context references in ImsConfig" am:
a54d5e31e3 -s ours
am:
cacc29957a -s ours
Change-Id: I312b17cfe872dc4888ecb7b66d7430783123dd91
Brad Ebinger [Wed, 20 Jun 2018 17:45:28 +0000 (10:45 -0700)]
[automerger skipped] Merge "Clean up old Context references in ImsConfig"
am:
a54d5e31e3 -s ours
Change-Id: Iab246476747293816b72ef6755ce2c875638179f
Julia Reynolds [Wed, 13 Jun 2018 14:45:21 +0000 (10:45 -0400)]
Don't throw uri exceptions for user chosen sounds
Bug:
109889733
Test: runtest systemui-notification
Change-Id: I5ed599deca83f97899affce44e3ed8fbcacae366
(cherry picked from commit
218871ee3ffffea964658be327ffd06e1e3eed61)
Brad Ebinger [Wed, 20 Jun 2018 16:43:58 +0000 (16:43 +0000)]
Merge "Clean up old Context references in ImsConfig"
Beverly [Wed, 20 Jun 2018 15:51:48 +0000 (08:51 -0700)]
resolve merge conflicts
am:
1382d8d50e
Change-Id: I959a997d7ad57755421f90ee89cc2d7ba3cc7f0a
Marco Nelissen [Tue, 19 Jun 2018 19:38:23 +0000 (12:38 -0700)]
Fix race condition in MediaHTTPConnection
getSize() and getMIMEType() rely on seekTo() having completed.
If seekTo() was called on a different thread, for example because
NuCachedSource2 was doing reads on a background thread, getSize()
could return -1 if it was called after connection was established,
but before the response had been parsed.
Bug:
110230427
Test: manual
Change-Id: I469b47e025f1c7a7ef3123d3347668f0541e6f2d
Beverly [Wed, 20 Jun 2018 13:25:51 +0000 (09:25 -0400)]
resolve merge conflicts
resolve merge conflicts of
d9b0bdcbc41e9e57a2fea5424a580c52272852cd
to stage-aosp-master
Bug: none
Test: n/a
Change-Id: I97a0b4dd0736561e5575b1344f37a25847e4703e
Jorim Jaggi [Tue, 19 Jun 2018 15:27:08 +0000 (17:27 +0200)]
Fix issue with manual touch dispatch
Need to dispatch it to the view that guards against the disabled
flags.
Change-Id: I0082ef24ed6aa06631f475cc33a0cf3f5f138911
Merged-In: I0082ef24ed6aa06631f475cc33a0cf3f5f138911
Fixes:
110228458
Test: Expand above notch from SUW
Martijn Coenen [Wed, 20 Jun 2018 08:55:02 +0000 (01:55 -0700)]
Merge "Clean up RemoteCallbackList when we're done with it." into pi-dev
am:
bbe6ee065d
Change-Id: Ic7bd40f2a1fe95eae275dbd0580d7acd283ffca7
Erik Kline [Wed, 20 Jun 2018 08:14:14 +0000 (01:14 -0700)]
Merge "Prefer default Internet network for upstream tethering." into pi-dev
am:
1e1635a45e
Change-Id: I9cddf1fb7aa3b8d56bf048c563556244e74808c2
TreeHugger Robot [Wed, 20 Jun 2018 07:47:35 +0000 (07:47 +0000)]
Merge "Clean up RemoteCallbackList when we're done with it." into pi-dev
TreeHugger Robot [Wed, 20 Jun 2018 04:28:50 +0000 (04:28 +0000)]
Merge "Prefer default Internet network for upstream tethering." into pi-dev
Brad Ebinger [Tue, 19 Jun 2018 23:13:53 +0000 (16:13 -0700)]
Merge "Revert isResolvingImsBinding ITelephony interface" into pi-dev
am:
4cc443ae2e
Change-Id: I9c8cc1c4401590865f33fa13402152287063cecf
Brad Ebinger [Tue, 19 Jun 2018 22:36:52 +0000 (22:36 +0000)]
Merge "Revert isResolvingImsBinding ITelephony interface" into pi-dev
Treehugger Robot [Tue, 19 Jun 2018 22:20:24 +0000 (22:20 +0000)]
Merge "Allow apps to queue multiple toast messages."
Yu-Han Yang [Tue, 19 Jun 2018 21:26:35 +0000 (14:26 -0700)]
Merge "Enable REQUEST_LOCATION from GNSS HAL" into pi-dev
am:
6eb9ce63b8
Change-Id: Ie75c6c150450afd21a88736ec9d29d7dd17fdb87
Yu-Han Yang [Tue, 19 Jun 2018 21:08:48 +0000 (21:08 +0000)]
Merge "Enable REQUEST_LOCATION from GNSS HAL" into pi-dev
Shuzhen Wang [Tue, 19 Jun 2018 20:36:06 +0000 (13:36 -0700)]
Merge "Camera: codegen doc update" into pi-dev
am:
941189bf28
Change-Id: Ic66b738d058eb25d015365e933086c0a6d820511
Colin Cross [Tue, 19 Jun 2018 20:20:48 +0000 (13:20 -0700)]
Merge "Don't override targetVers with minCode" am:
3b0eba4499
am:
234a906ee1
Change-Id: Ie0eaed7be80819484a41bca5a0bd396138f5870f
Shuzhen Wang [Tue, 19 Jun 2018 20:19:38 +0000 (20:19 +0000)]
Merge "Camera: codegen doc update" into pi-dev
Colin Cross [Tue, 19 Jun 2018 20:10:23 +0000 (13:10 -0700)]
Merge "Don't override targetVers with minCode"
am:
3b0eba4499
Change-Id: Ied3eb76b2b996500c540965d970fc9cc05fccbd9
Brad Ebinger [Thu, 14 Jun 2018 00:11:50 +0000 (17:11 -0700)]
Revert isResolvingImsBinding ITelephony interface
Reverting the only user of this interface.
Bug:
109762920
Test: GTS/Unit tests for ImsService
Change-Id: Id2e1ac2e4fbbcb7f019e79568f21ee56c94b6c1f
Merged-In: Id2e1ac2e4fbbcb7f019e79568f21ee56c94b6c1f
nharold [Tue, 19 Jun 2018 18:46:18 +0000 (11:46 -0700)]
[automerger skipped] Merge "Use Uppercase instead of Lowercase for PLMN Decode" am:
e61215cab1
am:
df00ad1a4b -s ours
Change-Id: Iaca1e63e9f9f5606c388f2bf4c1180145d0abb5e
nharold [Tue, 19 Jun 2018 18:39:07 +0000 (11:39 -0700)]
Merge "Use Uppercase instead of Lowercase for PLMN Decode"
am:
e61215cab1
Change-Id: I8c75abbd7574072e9b6c501b5fabf61bf2148592
Colin Cross [Tue, 19 Jun 2018 18:14:39 +0000 (18:14 +0000)]
Merge "Don't override targetVers with minCode"
nharold [Tue, 19 Jun 2018 17:16:11 +0000 (17:16 +0000)]
Merge "Use Uppercase instead of Lowercase for PLMN Decode"
Beverly Tai [Mon, 11 Jun 2018 14:50:36 +0000 (14:50 +0000)]
Allow apps to queue multiple toast messages.
This reverts commit
4ee785b698211b5ccce104e226b073ffbb12df55.
Test: manual
Bug:
70864097
Reason for revert: Apps should use the same toast for same message
Change-Id: I1dfacef240f9b6548ff30a45da1d843047bf4e90
Erik Kline [Thu, 14 Jun 2018 08:36:40 +0000 (17:36 +0900)]
Prefer default Internet network for upstream tethering.
Rather than use the crufty config.xml list of upstream transport types,
use ConnectivityService's notion of the default network for the upstream.
In cases where a DUN network is required and the default network is
currently a mobile network, look for a DUN network (code in Tethering
is currently responsible for requesting one).
Test: as follows
- built, flashed, booted
- runtest frameworks-net
- tethered via mobile, joined captive portal network, maintained
laptop access via mobile until captive passed (then used wifi)
- disabled client mode wifi, disabled mobile data, plugged in
ethernet adapter, observed connectivity via ethernet
Bug:
32163131
Bug:
62648872
Bug:
63282480
Bug:
109786760
Bug:
110118584
Bug:
110260419
Change-Id: I925b75994e31df8046f3ef9916a2457b4210485e
junyulai [Wed, 13 Jun 2018 07:00:37 +0000 (15:00 +0800)]
Add StackedLinkProperties test case
Change access level of getNetworkAgentInfoForNetwork in ConnectivityService to get
better testability. And add test case to verify clat state transition and make sure
linkProperties are updated correctly.
Bug:
80261579,
109913107
Test: runtest frameworks-net -c com.android.server.ConnectivityServiceTest \
-m testStackedLinkProperties
Change-Id: I72fce594d74bd349f65557edca03640e1b86317c
Jack Yu [Tue, 19 Jun 2018 01:57:57 +0000 (18:57 -0700)]
Merge "Fixed the incorrect permission for data/network service binding" am:
a9bf7a8810
am:
65c04cd491
Change-Id: I67a28d628e14798dc8d31a20536f2248c8cc0b8f
Jack Yu [Tue, 19 Jun 2018 01:49:09 +0000 (18:49 -0700)]
Merge "Fixed the incorrect permission for data/network service binding"
am:
a9bf7a8810
Change-Id: Ic3c463d7e7755efcb048e84c338ffbe256475874
Treehugger Robot [Tue, 19 Jun 2018 00:36:38 +0000 (00:36 +0000)]
Merge "Fixed the incorrect permission for data/network service binding"
Yin-Chia Yeh [Fri, 15 Jun 2018 22:37:08 +0000 (15:37 -0700)]
Camera: codegen doc update
Test: N/A. Doc update
Bug:
109666939
Change-Id: I2bd176a7f5ada755c8a79201d142a98131e2e82c
Colin Cross [Mon, 18 Jun 2018 20:29:08 +0000 (13:29 -0700)]
Merge "Fix ManifestMerger issues" into stage-aosp-master
am:
669c4d7ae7
Change-Id: I54eb99fde659f6c1651ae34c49d6cd81ba198e93
TreeHugger Robot [Mon, 18 Jun 2018 20:15:00 +0000 (20:15 +0000)]
Merge "Fix ManifestMerger issues" into stage-aosp-master
Colin Cross [Mon, 18 Jun 2018 18:47:45 +0000 (11:47 -0700)]
Don't override targetVers with minCode
If a package contains minSdkVersion="Q" targetSdkVersion="25",
targetCode will be initialized to "Q" when reading minCode,
but targetVers will be set to "25". targetCode overrides
targetVers, so this results in the computed targetSdkVersion
being "Q". If minSdkVersion were instead "28", the computed
targetSdkVersion would be "Q".
Make the computed targetSdkVersion consistent by leaving
targetCode and targetVers unset while parsing minSdkVersion,
and then setting them to minCode and minVers if there is
no targetSdkVersion attribute.
Bug:
110167203
Bug:
110353795
Test: install DeviceHealthChecks, verify targetSdk=25
Change-Id: I9547e9b4720543f0c892cbf4de92888c8eead44f
Nan Zhang [Mon, 18 Jun 2018 19:37:13 +0000 (12:37 -0700)]
Merge "Enabled annotations for Metalava based api-stubs." am:
79d3bf6e54
am:
0da95a5d64
Change-Id: Ie3385442c0bf28a1da52cb2d687ed45921604f80
Nan Zhang [Mon, 18 Jun 2018 19:13:35 +0000 (12:13 -0700)]
Merge "Enabled annotations for Metalava based api-stubs."
am:
79d3bf6e54
Change-Id: I8b91e2259ce3b15313d5d4b822bf77696a6ebd5b
felkachang [Mon, 18 Jun 2018 19:07:53 +0000 (12:07 -0700)]
Merge "Fix NotificaitonPanelView x-axis shift with IME" into pi-dev
am:
1b65af27d8
Change-Id: I7236f5d24afc376709b43b032af328732aab963c
Nathan Harold [Thu, 7 Jun 2018 23:00:22 +0000 (16:00 -0700)]
Use Uppercase instead of Lowercase for PLMN Decode
A change to IccUtils converted from using lowercase
to uppercase and broke the PLMN trimming logic.
This resolves bugs where the platform may report
5-digit PLMNs with an invalid trailing 'F' character.
This fixes an issue introduced by aosp/575243, which
impacts the Manual Network Selection menu and
the public API.
Bug:
79561854
Test: compilation
Merged-In: I5ea7867cd9c11fe4454188fd1f30bf58b2911712
Change-Id: I5ea7867cd9c11fe4454188fd1f30bf58b2911712
(cherry picked from commit
b70fbc85f7496dd1b43ed70f0c480184ba5e9585)
TreeHugger Robot [Mon, 18 Jun 2018 18:42:47 +0000 (18:42 +0000)]
Merge "Fix NotificaitonPanelView x-axis shift with IME" into pi-dev
Lucas Dupin [Mon, 18 Jun 2018 18:17:44 +0000 (11:17 -0700)]
Merge "Fade to black without showing system wallpaper" into pi-dev
am:
0e52664b0c
Change-Id: I7aeb34e75245f5bc9974110d9847efd03445acbd
Lucas Dupin [Mon, 18 Jun 2018 18:08:41 +0000 (18:08 +0000)]
Merge "Fade to black without showing system wallpaper" into pi-dev
Selim Cinek [Mon, 18 Jun 2018 17:45:00 +0000 (10:45 -0700)]
Merge "Fixed an issue where the contentHeight was wrong" into pi-dev
am:
ed9df0d176
Change-Id: I7f9778580993a4762895839136209d307fdc765a
felkachang [Mon, 11 Jun 2018 07:56:15 +0000 (15:56 +0800)]
Fix NotificaitonPanelView x-axis shift with IME
IME will trigger the fitSystemWindow. And, there is a difference of
the parameter insets between IME and no IME. The insets.right and
insets.left report 0 without IME but positive number with IME
because IME is a type of system window and trigger fitSystemWindow
and then take the cutout as part of system window.
StatusBarWindowView handle the following condition
cutout > 0 && cutout == systemWindowInset and make its children not
layout on the safe inset both of cut out and system window. In order
to handle that cut out become system window, to take the maximum of
cut out and system window to make sure that the safe inset is
decided in StatusBarWindowView and its view decent only care about
the corner cut out.
Because StatusBarWindowView make both of PhoneStatusBarView's parent
and NotificationPanelView to have the margin for both of cutout and
system window, the counting of the padding and panel translation of
the HeadsUpStatusBarView need to do the relative changes.
Change-Id: Iafdc6a85e0e7d360b1bfc1e820f6e0779c32753f
Fix:
79957419
Fix:
109945733
Fix:
109865908
Test: atest SystemUITests
Selim Cinek [Mon, 18 Jun 2018 17:32:20 +0000 (17:32 +0000)]
Merge "Fixed an issue where the contentHeight was wrong" into pi-dev
Lucas Dupin [Mon, 18 Jun 2018 17:09:35 +0000 (10:09 -0700)]
Merge "Pulse animation synchronization" into pi-dev
am:
32066387e1
Change-Id: I8c3737cff95213b63fbee10195c6a246829b2843
TreeHugger Robot [Mon, 18 Jun 2018 16:57:24 +0000 (16:57 +0000)]
Merge "Pulse animation synchronization" into pi-dev
Treehugger Robot [Mon, 18 Jun 2018 16:55:28 +0000 (16:55 +0000)]
Merge "Enabled annotations for Metalava based api-stubs."
Lucas Dupin [Mon, 11 Jun 2018 23:18:15 +0000 (16:18 -0700)]
Fade to black without showing system wallpaper
When on the lock screen, and going to AOD animated, user would
temporarily see the system wallpaper. That's not what we want,
we want to fade from semi-transparent black to black, on top
of the backdrop - lock screen wallpaper or media art.
Test: press power on the lock screen when playing media
Test: press power on the lock screen after dismissing media
Test: unlock from AOD
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
Fixes:
80575770
Change-Id: I6796e844add889ff86be0cd2052db7c5d5073039
Jorim Jaggi [Mon, 18 Jun 2018 16:09:43 +0000 (09:09 -0700)]
Merge "DO NOT MERGE Fix crash in case of no overlays" into pi-dev
am:
e8a1e7a423
Change-Id: I160e9cab3b4ebd4d5a39443b8ea3990a7943d102
Jorim Jaggi [Mon, 18 Jun 2018 15:52:09 +0000 (15:52 +0000)]
Merge "DO NOT MERGE Fix crash in case of no overlays" into pi-dev
Jorim Jaggi [Mon, 18 Jun 2018 15:38:51 +0000 (08:38 -0700)]
Merge "Prevent showing windows while animating to avoid color mode switch" into pi-dev
am:
58150a7e6e
Change-Id: I02e61ad1e4759433fa39cb8d16e8926382d415f8
Jorim Jaggi [Mon, 18 Jun 2018 15:25:03 +0000 (15:25 +0000)]
Merge "Prevent showing windows while animating to avoid color mode switch" into pi-dev
David Brazdil [Fri, 15 Jun 2018 13:05:42 +0000 (14:05 +0100)]
Stabilize hidden API lists
Hidden API lists are auto-generated using a combination of Doclava
/Makefile rules and manually curated lists. As OEMs make their own
changes to the framework, they might arrive at slightly different
lists. This is not desirable as the entire ecosystem should enforce
the same rules. This patch adds the files generated by Doclava to
the code base, which will stabilize the lists for everyone.
The problem is exacerbated by the fact that the Doclava-generated
private-dex.txt contains only classes explored by Doclava. This can
change rather unexpectedly as OEMs make changes and start/stop using
internal classes otherwise only used in unexplored code. If the file
is extended, they might start blacklisting new APIs. If the file
shrinks, they might start whitelisting APIs they should restrict
access to and have trouble passing CTS.
(Avoid merging out of pi trees)
Test: m ; check that produced lists have not changed
Bug:
109824927
Merged-In: I0e9653d9cd7e4b748870bacb6fbcecae535ebb2a
Change-Id: I1463a06d6510e7051a64d5d516f4c589638ca11c
Jorim Jaggi [Fri, 8 Jun 2018 13:25:35 +0000 (15:25 +0200)]
Prevent showing windows while animating to avoid color mode switch
If we switch the color mode during a transition, it's pretty much
guaranteed that SF is going to jank. To work around that, we
disallow showing the real content while an activity with a
non-standard-color mode is animating.
Test: Reopen photos, observe no jank
Bug:
79878256
Change-Id: Id27db483844d9424ccfb9afdebd31325eae0cdd8
Jorim Jaggi [Mon, 18 Jun 2018 12:24:11 +0000 (14:24 +0200)]
DO NOT MERGE Fix crash in case of no overlays
Fixes:
110330180
Test: Rotate a device without overlays/cutout
Change-Id: Ib0701e26893489fcee0de6aaec26901aef0b8348
Ahmed ElArabawy [Mon, 18 Jun 2018 12:40:36 +0000 (05:40 -0700)]
Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev
am:
ef4a56f9e4
Change-Id: I360dc4b35d2b6acf956fd442299df330d54cbb5d
Ahmed ElArabawy [Mon, 18 Jun 2018 12:26:40 +0000 (12:26 +0000)]
Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev
Chalard Jean [Mon, 18 Jun 2018 11:07:09 +0000 (04:07 -0700)]
Merge changes I4b1bca8b,Idb7d2f28,I4825e632 am:
84d4e535ae
am:
ea044ca373
Change-Id: Iea011d1dc5df03b58fcbb9dcbd4833b20cb5b5a8
Chalard Jean [Mon, 18 Jun 2018 10:06:05 +0000 (03:06 -0700)]
Merge changes I4b1bca8b,Idb7d2f28,I4825e632
am:
84d4e535ae
Change-Id: I7278ffe7ca8e25b040d6bce7fb880ccf0984f6ee
Chalard Jean [Mon, 18 Jun 2018 09:00:40 +0000 (09:00 +0000)]
Merge changes I4b1bca8b,Idb7d2f28,I4825e632
* changes:
[PT09] Add javadoc comments to all ProxyTracker methods/members.
[PT08] Move setDefaultProxy to ProxyTracker
[PT07] Small cleanup of setGlobalProxy
Andreas Gampe [Mon, 18 Jun 2018 08:28:52 +0000 (01:28 -0700)]
Merge "Apf: Avoid constant overflow" am:
5b99659943
am:
4afe1f957b
Change-Id: Id2e62fe7d34d88633ae9cd4c9a01c6a5a1eed838
Andreas Gampe [Mon, 18 Jun 2018 08:20:28 +0000 (01:20 -0700)]
Merge "Apf: Avoid constant overflow"
am:
5b99659943
Change-Id: Iacf849e3739f24cd430e6210a2e6a1c67ae0614f
Bill Yi [Mon, 18 Jun 2018 07:39:33 +0000 (00:39 -0700)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev am:
3c047ea7fa am:
3cca4e7b06 am:
d4a1791bd7
am:
42fb737d13
Change-Id: I11dcf3e181aaa1c425eb47bc66a1d754804ed1a2
Bill Yi [Mon, 18 Jun 2018 07:30:00 +0000 (00:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23 am:
437da4c13d -s ours am:
f57c14b641 -s ours am:
bc1dc5c368 -s ours
am:
8d70303da7 -s ours
Change-Id: I37882b0f82989f3d257a3f206fa9d3867713e57e
Bill Yi [Mon, 18 Jun 2018 07:23:36 +0000 (00:23 -0700)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev am:
3c047ea7fa am:
3cca4e7b06
am:
d4a1791bd7
Change-Id: I165a9d006345b6624877fc3b453ceb2b0baa83fb
Bill Yi [Mon, 18 Jun 2018 07:15:09 +0000 (00:15 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23 am:
437da4c13d -s ours am:
f57c14b641 -s ours
am:
bc1dc5c368 -s ours
Change-Id: Ied727ed9887bc299b944611f1caed5896d8e81ce
Bill Yi [Mon, 18 Jun 2018 07:09:08 +0000 (00:09 -0700)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev am:
3c047ea7fa
am:
3cca4e7b06
Change-Id: Ifaa547b16411e79759647dd9cc53ea76526f5e5d
Bill Yi [Mon, 18 Jun 2018 07:02:54 +0000 (00:02 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23 am:
437da4c13d -s ours
am:
f57c14b641 -s ours
Change-Id: Id5433baa969e08bd0253cb921bdaa541a1eaad3a
Bill Yi [Mon, 18 Jun 2018 06:55:44 +0000 (23:55 -0700)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev
am:
3c047ea7fa
Change-Id: Ie97567da2988d921748f9b4ca86f658a5222f43b
Bill Yi [Mon, 18 Jun 2018 06:53:27 +0000 (23:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23
am:
437da4c13d -s ours
Change-Id: I8227403ab7fa849fcc096d3a0acfa583843abf3b
Bill Yi [Mon, 18 Jun 2018 06:50:41 +0000 (23:50 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cbc81e618d skipped:
693ad9800b am:
cb1a10f5b6 -s ours am:
d996012ef5 -s ours am:
97ee183747 -s ours
am:
15123e0230 -s ours
Change-Id: I1f7790c7a09b36424a524fa3010dd2b6fe43fc1e
Bill Yi [Mon, 18 Jun 2018 06:33:25 +0000 (23:33 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cbc81e618d skipped:
693ad9800b am:
cb1a10f5b6 -s ours am:
d996012ef5 -s ours
am:
97ee183747 -s ours
Change-Id: I606378e5028548c5189a9fe554a868512112578c
TreeHugger Robot [Mon, 18 Jun 2018 06:27:04 +0000 (06:27 +0000)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4
Import translations. DO NOT MERGE
Bill Yi [Mon, 18 Jun 2018 06:26:21 +0000 (23:26 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cbc81e618d skipped:
693ad9800b am:
cb1a10f5b6 -s ours
am:
d996012ef5 -s ours
Change-Id: Idcb8df6ed5993f00170408e685080aa525f291e1
Bill Yi [Mon, 18 Jun 2018 06:18:56 +0000 (23:18 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cbc81e618d skipped:
693ad9800b
am:
cb1a10f5b6 -s ours
Change-Id: Ib5adcfbe4afabfee3e391ec528272f210b408a10
Treehugger Robot [Mon, 18 Jun 2018 06:16:23 +0000 (06:16 +0000)]
Merge "Apf: Avoid constant overflow"
Android Build Merger (Role) [Sun, 17 Jun 2018 12:14:12 +0000 (12:14 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23
Change-Id: Iae0ad51f828f91b8211e0671900f2ffa1265c655
Android Build Merger (Role) [Sun, 17 Jun 2018 12:14:05 +0000 (12:14 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4
Change-Id: I3f93da28223af89a03736689e7f35a723b864ff5