OSDN Git Service
Erik Wolsheimer [Thu, 1 Jun 2017 07:29:13 +0000 (07:29 +0000)]
Merge "Support multi-window on low-memory watches." into oc-dev
am:
c6372cceb1
Change-Id: I77921a68a231dd3504f06a726af4f1b7903ac44d
TreeHugger Robot [Thu, 1 Jun 2017 07:19:41 +0000 (07:19 +0000)]
Merge "Support multi-window on low-memory watches." into oc-dev
Android Build Merger (Role) [Thu, 1 Jun 2017 07:17:44 +0000 (07:17 +0000)]
Merge "Merge "HFP: Allow SCO audio to be forcibly connected" am:
93d7c84726 am:
10cb6f3b4c am:
0998ec224c" into oc-dev-plus-aosp
Jack He [Thu, 1 Jun 2017 07:15:13 +0000 (07:15 +0000)]
Merge "HFP: Allow SCO audio to be forcibly connected" am:
93d7c84726 am:
10cb6f3b4c
am:
0998ec224c
Change-Id: I35533ed7e2b8f8deff741cb3296156e9ccf5e076
Tyler Gunn [Thu, 1 Jun 2017 07:14:29 +0000 (07:14 +0000)]
Merge "Ensure null/empty phone number does not crash international number check." into oc-dev
am:
0f542b48fb
Change-Id: I6b534dbb9253ad66c850c8d55a8e4b0b619ac64e
Jack He [Thu, 1 Jun 2017 07:08:40 +0000 (07:08 +0000)]
Merge "HFP: Allow SCO audio to be forcibly connected" am:
93d7c84726
am:
10cb6f3b4c
Change-Id: I9bd2db9f92866c1e4f62b09fcfd5ad02edcd4e8e
TreeHugger Robot [Thu, 1 Jun 2017 07:07:18 +0000 (07:07 +0000)]
Merge "Ensure null/empty phone number does not crash international number check." into oc-dev
Jack He [Thu, 1 Jun 2017 07:00:47 +0000 (07:00 +0000)]
Merge "HFP: Allow SCO audio to be forcibly connected"
am:
93d7c84726
Change-Id: I5f0ad1581dd76a8c95dcc52702b0462adc786528
Treehugger Robot [Thu, 1 Jun 2017 06:53:25 +0000 (06:53 +0000)]
Merge "HFP: Allow SCO audio to be forcibly connected"
John Reck [Thu, 1 Jun 2017 06:17:58 +0000 (06:17 +0000)]
Merge "Fix dequeus outside of frame drawing" into oc-dev
am:
944b0c73a4
Change-Id: Id9152a19194e1817f83a33b14a6cdccaa84dfeb7
TreeHugger Robot [Thu, 1 Jun 2017 06:11:28 +0000 (06:11 +0000)]
Merge "Fix dequeus outside of frame drawing" into oc-dev
Jack Yu [Thu, 1 Jun 2017 05:53:47 +0000 (05:53 +0000)]
Merge "Added video calling data usage per-uid support" am:
36fdb346f2 am:
2f74c02826
am:
ce10610a9c
Change-Id: I0a068e0eb7e833ad28611cf2be1a8bc18d99830a
Doris Liu [Thu, 1 Jun 2017 00:57:49 +0000 (00:57 +0000)]
Merge "Ensure start delay is properly scaled with duration scale" into oc-dev
am:
9057f846ac
Change-Id: I124f898f6514a80a0a21682f9f9c21b282e05dde
Doris Liu [Thu, 1 Jun 2017 00:52:57 +0000 (00:52 +0000)]
Merge "Ensure start delay is properly scaled with duration scale" into oc-dev
Adam Lesinski [Wed, 31 May 2017 22:42:08 +0000 (22:42 +0000)]
Merge "BatteryStats: Acquire network stats without BatteryStatsImpl lock" into oc-dev
am:
ceb24e88cb
Change-Id: I7e42ea6c56007f6f52fa237eb58adcdb1f5a6800
Jack He [Wed, 10 May 2017 00:16:01 +0000 (17:16 -0700)]
HFP: Allow SCO audio to be forcibly connected
* Normally, Android only allows SCO audio to be connected in several
allowed cases (e.g. in call, in ringing, in virtual call state, etc)
* Sometimes, it is necessary to force a SCO audio connection (e.g.
during PTS test)
* This change adds setForceScoAudio(boolean) hidden, system only method
to allow such behaviour
Bug:
38040125
Test: PTS HFP tests
Change-Id: I28f295c98da5bebb837c2a5423c7acde81af73f7
Adam Lesinski [Wed, 31 May 2017 22:36:55 +0000 (22:36 +0000)]
Merge "BatteryStats: Acquire network stats without BatteryStatsImpl lock" into oc-dev
Peter Qiu [Wed, 31 May 2017 22:35:11 +0000 (22:35 +0000)]
Merge "hotspot2: add/update javadoc for Passpoint APIs" into oc-dev
am:
8837aff18b
Change-Id: I1659c6bd9ac5f5420eae1ffded9c0d257e8436c6
TreeHugger Robot [Wed, 31 May 2017 22:28:59 +0000 (22:28 +0000)]
Merge "hotspot2: add/update javadoc for Passpoint APIs" into oc-dev
Erik Wolsheimer [Wed, 31 May 2017 21:59:57 +0000 (14:59 -0700)]
Support multi-window on low-memory watches.
On watches, multi-window is used to present essential system UI, and thus it
must be supported regardless of device memory characteristics.
Bug:
37482466
Test: Manually, on a watch
Change-Id: I7929a090b7fd46de019d237ce771c82a6d7fd3f3
Bryce Lee [Wed, 31 May 2017 21:58:03 +0000 (21:58 +0000)]
Merge "Revert "Handle not having main window in createThumbnailAppAnimator."" into oc-dev
am:
646038a3c3
Change-Id: I9f6b1b84261d39d2db578011b78c52a516b54bab
Jack Yu [Wed, 31 May 2017 21:52:05 +0000 (21:52 +0000)]
Merge "Added video calling data usage per-uid support" am:
36fdb346f2
am:
2f74c02826
Change-Id: Ia81f03a076901d545972fc3cbe7a18d20ea6df2a
Bryce Lee [Wed, 31 May 2017 21:46:15 +0000 (21:46 +0000)]
Merge "Revert "Handle not having main window in createThumbnailAppAnimator."" into oc-dev
Jack Yu [Wed, 31 May 2017 21:44:13 +0000 (21:44 +0000)]
Merge "Added video calling data usage per-uid support"
am:
36fdb346f2
Change-Id: I3901efbfafcfab7e076b669f0313dce860e97072
Tyler Gunn [Wed, 31 May 2017 21:35:39 +0000 (14:35 -0700)]
Ensure null/empty phone number does not crash international number check.
Add empty/null check for isInternationalNumber.
Test: Added unit tests.
Bug:
62162029
Change-Id: I779a1f78cbbe11adeefeca7fc83cfc1cfa431c61
Treehugger Robot [Wed, 31 May 2017 21:33:55 +0000 (21:33 +0000)]
Merge "Added video calling data usage per-uid support"
Bryce Lee [Wed, 31 May 2017 21:22:33 +0000 (21:22 +0000)]
Revert "Handle not having main window in createThumbnailAppAnimator."
This reverts commit
6db4d15d726b8830ad56766352a79fe0417cb9c2.
Bug:
62096254
Reason for revert: Breaking the build due to test references to class
Change-Id: I6021c802d04a3a55a19f54fc94389957c8152ed9
Hyunyoung Song [Wed, 31 May 2017 21:17:47 +0000 (21:17 +0000)]
Merge "Do not add unnecessary prefix to dumpsys activity provider [NAME] --proto" into oc-dev
am:
7db56af8f9
Change-Id: Idab3ef3f74f494a3d852f047088e621b4cc01fc5
Adam Lesinski [Wed, 31 May 2017 21:15:32 +0000 (21:15 +0000)]
Merge "AAPT2: Update --no-version-vector list" into oc-dev
am:
f296105e22
Change-Id: I0cde63dfd73b50debdc56f549f7adb1318f05309
Adam Lesinski [Wed, 31 May 2017 21:12:58 +0000 (21:12 +0000)]
Merge "AAPT2: Allow merging of Style attributes from overlays" into oc-dev
am:
f42c86660d
Change-Id: I4a52a16fff3d544d8d7d63d8a482ba7e2111d01a
TreeHugger Robot [Wed, 31 May 2017 21:07:03 +0000 (21:07 +0000)]
Merge "Do not add unnecessary prefix to dumpsys activity provider [NAME] --proto" into oc-dev
Felipe Leme [Wed, 31 May 2017 21:03:39 +0000 (21:03 +0000)]
Merge "Don't automatically autofill when manual request returned just 1 dataset." into oc-dev
am:
d8d9758363
Change-Id: I5e4e5effcfc58eaef9df1a29f23dce4ac553ad1e
John Reck [Wed, 31 May 2017 21:02:50 +0000 (14:02 -0700)]
Fix dequeus outside of frame drawing
Bug:
62213889
Test: Repro steps in bug
Change-Id: I8fc407b280ba82c669fc2bb03750cab139adb965
Bryce Lee [Wed, 31 May 2017 20:52:17 +0000 (20:52 +0000)]
Merge "Handle not having main window in createThumbnailAppAnimator." into oc-dev
am:
fd5129b978
Change-Id: Ic9e346ee1b246a96132b4492423216a54ce92b0b
TreeHugger Robot [Wed, 31 May 2017 20:48:49 +0000 (20:48 +0000)]
Merge "AAPT2: Update --no-version-vector list" into oc-dev
Adam Lesinski [Wed, 31 May 2017 20:48:00 +0000 (20:48 +0000)]
Merge "AAPT2: Allow merging of Style attributes from overlays" into oc-dev
TreeHugger Robot [Wed, 31 May 2017 20:43:14 +0000 (20:43 +0000)]
Merge "Don't automatically autofill when manual request returned just 1 dataset." into oc-dev
Bryce Lee [Wed, 31 May 2017 20:39:29 +0000 (20:39 +0000)]
Merge "Handle not having main window in createThumbnailAppAnimator." into oc-dev
Matthew Ng [Wed, 31 May 2017 20:17:55 +0000 (20:17 +0000)]
Merge "Added missing lock and clean up locked function that wasn't locked" into oc-dev
am:
39e8819755
Change-Id: If5f5953b95e27a809b50f7baac8a9a9ab99b1a14
Peter Qiu [Wed, 3 May 2017 17:23:22 +0000 (10:23 -0700)]
hotspot2: add/update javadoc for Passpoint APIs
Add javadoc for getter/setter methods configuration classes.
Document exceptions with @throws tag.
Bug:
37907515
Test: build
Change-Id: Ied1842912f6710530bf77db4df5ef5d30a44b2a7
Adrian Roos [Wed, 31 May 2017 20:13:54 +0000 (20:13 +0000)]
Merge "AOD: Scale icon padding with the drawing size" into oc-dev
am:
59e16c9eb9
Change-Id: Ie32c3107026409693d4fa11cab2047e00362c2b6
Julia Reynolds [Wed, 31 May 2017 20:06:12 +0000 (20:06 +0000)]
Merge "Change default for group alert behavior" into oc-dev
am:
faba1835b4
Change-Id: I622151274ad3d119e7c35ee00b9d3baa1d2efa45
Julia Reynolds [Wed, 31 May 2017 20:02:09 +0000 (20:02 +0000)]
Merge "Don't verify secondary setting on restore" into oc-dev
am:
25329fa14f
Change-Id: I674c7da780afba0974e4ffe3f53d31bca665fdf0
TreeHugger Robot [Wed, 31 May 2017 19:53:10 +0000 (19:53 +0000)]
Merge "Added missing lock and clean up locked function that wasn't locked" into oc-dev
Joe Onorato [Wed, 31 May 2017 19:49:49 +0000 (19:49 +0000)]
Merge "Track Partial wakelock time in background" into oc-dev
am:
1dfd194f7d
Change-Id: I06af34e0cf444fd7f26add4e6b54bcb0d7f4d617
Joe Onorato [Wed, 31 May 2017 19:47:16 +0000 (19:47 +0000)]
Merge "Fix batterystat Counter misreporting when charging" into oc-dev
am:
413b135244
Change-Id: I022ebf39e2dc8ac77466ffe23306f9f38914659d
Joe Onorato [Wed, 31 May 2017 19:46:11 +0000 (19:46 +0000)]
Merge "Batterystats track background bad ble scan time" into oc-dev
am:
fe06de1fc2
Change-Id: Ibca369ace041435ce1f9a9997658b86fd4b5f087
TreeHugger Robot [Wed, 31 May 2017 19:44:56 +0000 (19:44 +0000)]
Merge "AOD: Scale icon padding with the drawing size" into oc-dev
TreeHugger Robot [Wed, 31 May 2017 19:43:00 +0000 (19:43 +0000)]
Merge "Change default for group alert behavior" into oc-dev
TreeHugger Robot [Wed, 31 May 2017 19:40:38 +0000 (19:40 +0000)]
Merge "Don't verify secondary setting on restore" into oc-dev
Jack Yu [Fri, 26 May 2017 23:08:22 +0000 (16:08 -0700)]
Added video calling data usage per-uid support
Now the VT call data usage will be counted under
current dialer's data usage as well as the total
device data usage.
Test: Manual
bug:
37671326
Merged-In: I8351e9ae17c84210f7ca6c319d3bddcbb0043341
Change-Id: I8351e9ae17c84210f7ca6c319d3bddcbb0043341
Joe Onorato [Wed, 31 May 2017 19:26:45 +0000 (19:26 +0000)]
Merge "Track Partial wakelock time in background" into oc-dev
Joe Onorato [Wed, 31 May 2017 19:26:45 +0000 (19:26 +0000)]
Merge "Fix batterystat Counter misreporting when charging" into oc-dev
Joe Onorato [Wed, 31 May 2017 19:26:45 +0000 (19:26 +0000)]
Merge "Batterystats track background bad ble scan time" into oc-dev
Android Build Merger (Role) [Wed, 31 May 2017 19:07:21 +0000 (19:07 +0000)]
Merge "Merge "Don't call remoteFillService.destroy() until session is removed." into oc-dev am:
09f7dd5780" into oc-dev-plus-aosp
Felipe Leme [Wed, 31 May 2017 19:05:20 +0000 (19:05 +0000)]
Merge "Don't call remoteFillService.destroy() until session is removed." into oc-dev
am:
09f7dd5780
Change-Id: I40f0601e49f95ae7bd194431520a9ab0b8bfc488
Felipe Leme [Wed, 31 May 2017 19:01:15 +0000 (19:01 +0000)]
Merge "Don't call remoteFillService.destroy() until session is removed." into oc-dev
am:
09f7dd5780
Change-Id: I0cb4095dd6d7c05615db4312fceb412c481b0420
Felipe Leme [Wed, 31 May 2017 18:59:10 +0000 (18:59 +0000)]
Merge "Always post AutofillManager operations in the UI thread." into oc-dev
am:
21999d2895
Change-Id: Ieee6a19f7cabc65b973d09e7d73a8562c2a9ea6a
Winson Chung [Wed, 31 May 2017 18:56:50 +0000 (18:56 +0000)]
Merge changes from topic 'hw_bitmap' into oc-dev
am:
4e73123c52
Change-Id: Ic202387c7fddcf6cc87024812c112e5ce3a4ab7b
Adam Lesinski [Fri, 26 May 2017 18:50:40 +0000 (11:50 -0700)]
BatteryStats: Acquire network stats without BatteryStatsImpl lock
Moves the network stats collection under a different lock to
prevent the main BatteryStatsImpl lock from being held while doing I/O.
Bug:
37645919
Bug:
38296815
Test: manual
Change-Id: I0d6b4a7b12b234939cb6eb3a32658b28f61dff4f
TreeHugger Robot [Wed, 31 May 2017 18:50:55 +0000 (18:50 +0000)]
Merge "Don't call remoteFillService.destroy() until session is removed." into oc-dev
TreeHugger Robot [Wed, 31 May 2017 18:49:33 +0000 (18:49 +0000)]
Merge "Always post AutofillManager operations in the UI thread." into oc-dev
Winson Chung [Wed, 31 May 2017 18:46:53 +0000 (18:46 +0000)]
Merge changes from topic 'hw_bitmap' into oc-dev
* changes:
DO NOT MERGE Updating AnimationSpec and related internal APIs to use GraphicBuffer.
Update code to draw into hardware bitmaps.
Hyunyoung Song [Wed, 24 May 2017 23:48:41 +0000 (16:48 -0700)]
Do not add unnecessary prefix to dumpsys activity provider [NAME] --proto
Bug:
36904684
Test: builds, and tests succeed in the same topic branch
The test executes following
"dumpsys activity provider [launcher package name]/[provider name that implements workspace dump logging]
--proto"
In order to extract the proto binary from this stream, there cannot
be extra prefix added to each line. Hence, when "--proto" flag
is on, simply call the sub provider record's dump method.
This is following same pattern on other system service dump.
Having --proto flag also doesn't do any pretty printing.
e.g., dumpsys appwidget --proto.
Change-Id: I13712a45ce5b584123b3bd73c023df349fb86809
Bill Yi [Wed, 31 May 2017 18:30:00 +0000 (18:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
42f81ee464 -s ours
Change-Id: I6aef4a656ed7bb29f04921dc5fc25ad5530c7ff7
Bill Yi [Wed, 31 May 2017 18:27:54 +0000 (18:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
8748505b32 -s ours
Change-Id: I9efc01a30981af94061ea906727a72779e052c14
Jorim Jaggi [Wed, 31 May 2017 18:23:20 +0000 (18:23 +0000)]
Merge "Check for null owner info" into oc-dev
am:
f220d95f54
Change-Id: I69e55b862242a42054c87477cbbc2723fa1e76a4
TreeHugger Robot [Wed, 31 May 2017 18:22:52 +0000 (18:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 31 May 2017 18:17:42 +0000 (18:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Doris Liu [Tue, 30 May 2017 23:47:20 +0000 (16:47 -0700)]
Ensure start delay is properly scaled with duration scale
BUG:
62126024
Test: CTS test in the same target branch
Change-Id: Ia396e69e053ccd90cdf37ac0b59c404c9952e497
Jorim Jaggi [Wed, 31 May 2017 18:07:21 +0000 (18:07 +0000)]
Merge "Check for null owner info" into oc-dev
Julia Reynolds [Wed, 31 May 2017 17:45:52 +0000 (13:45 -0400)]
Change default for group alert behavior
To alert for children but not the summary.
Bug:
62027641
Test: cts
Change-Id: Ie7978514be45be6b13c2ea3bd7ff898db352a1ed
Bryce Lee [Wed, 31 May 2017 17:27:42 +0000 (10:27 -0700)]
Handle not having main window in createThumbnailAppAnimator.
A recent code change associated the SurfaceControl with the main
window owner id. However, it is possible for the an AppWindowToken to
not have a main window. This case is handled later in the method.
This CL restores the original behavior of using the calling uid in
the cases no main window is present.
Change-Id: Iad69fe383c2208c1db523c8b4601a8f927f9318a
Fixes:
62096254
Test: go/wm-smoke
Adam Lesinski [Wed, 31 May 2017 17:22:30 +0000 (10:22 -0700)]
AAPT2: Update --no-version-vector list
Keep in sync with AAPT. Since gradle is moving to use AAPT2
by default, updates to AAPT will no longer be necessary and
this will be the authoritative list until a more programmatic
solution presents itself.
Bug:
62211148
Test: manual
Change-Id: Id9232c9fb730c50e4850887fa0f5da82574ca900
Adam Lesinski [Tue, 30 May 2017 22:15:58 +0000 (15:15 -0700)]
AAPT2: Allow merging of Style attributes from overlays
Previously style overlays would completely override an existing style.
To be compatible with AAPT, styles now merge with the overlay, allowing
the overlay's attributes and parent to take precedence.
Bug:
38355988
Test: make aapt2_tests
Change-Id: Id25c7240050a43e6a4a177c6e3d51e048d0cceb5
Evan Laird [Wed, 31 May 2017 16:37:25 +0000 (16:37 +0000)]
Merge "Fix for wifi detail icon disappearing" into oc-dev
am:
db0836779e
Change-Id: Ie2fe3a75bd3baa5181cd1b1cb7a2b2d220072b81
TreeHugger Robot [Wed, 31 May 2017 16:28:51 +0000 (16:28 +0000)]
Merge "Fix for wifi detail icon disappearing" into oc-dev
Winson Chung [Wed, 24 May 2017 22:50:06 +0000 (15:50 -0700)]
DO NOT MERGE Updating AnimationSpec and related internal APIs to use GraphicBuffer.
- This reduces the copy of the hardware bitmap when it is
parceled/unparceled.
Bug:
38507414
Bug:
62021436
Test: Launch Overview to/from app, ensure that the header bar shows
Test: go/wm-smoke
Change-Id: I85a9a59a0a3699d1642158061d10fddef34393c3
Signed-off-by: Winson Chung <winsonc@google.com>
Julia Reynolds [Tue, 30 May 2017 19:36:49 +0000 (15:36 -0400)]
Don't verify secondary setting on restore
It'll already be verified as the primary setting of another
managed services type, and it will have a different service
interface, so it shouldn't be overwritten with the primary setting's
service information.
Fixes:
38236571
Test: restore a device. make sure the backup has vr notification
listener permissions on (or any other pkg with both a notification
listener and a condition provider) and some other enabled
notification listener (like a launcher). make sure both
listeners are enabled post restore.
Change-Id: I2e919c2bb06695a3326269571a901ed627c8bee6
Derek Sollenberger [Wed, 31 May 2017 16:09:50 +0000 (16:09 +0000)]
Merge "Don't crash when presented with non-roundRect clipping outline." into oc-dev
am:
2b81530bd2
Change-Id: I9da0d02131eefdb38b6025d4cdc6fb27ab3c82f2
TreeHugger Robot [Wed, 31 May 2017 16:04:23 +0000 (16:04 +0000)]
Merge "Don't crash when presented with non-roundRect clipping outline." into oc-dev
Lucas Dupin [Wed, 31 May 2017 16:02:16 +0000 (16:02 +0000)]
Merge "Fix header not set on initialization" into oc-dev
am:
388ceaa37a
Change-Id: Ia706458360372059715ea86873dbbefc854731d6
Rebecca Silberstein [Wed, 31 May 2017 15:59:37 +0000 (15:59 +0000)]
Merge "WifiManager: setWifiApEnabled always returns false" into oc-dev
am:
c0643da09e
Change-Id: Ibaec59c3416f502c6ff9b131d12f38c6205f2287
Yoshinori Hirano [Wed, 31 May 2017 15:57:00 +0000 (15:57 +0000)]
Merge "Hide Wi-Fi activity indicator when Wi-Fi icon is hidden" into oc-dev
am:
0b45799abc
Change-Id: I1cd5fb3d0d6ca3bbd98be741a265ef7561097d4b
Paul Duffin [Wed, 31 May 2017 15:46:29 +0000 (15:46 +0000)]
Merge "Fix Error Prone ArrayEquals/ArrayHashCode bugs" into oc-dev
am:
69bf3ea86d
Change-Id: Id3c170a155aebc448b41091604d57f85e3c411a5
TreeHugger Robot [Wed, 31 May 2017 15:42:52 +0000 (15:42 +0000)]
Merge "Fix header not set on initialization" into oc-dev
Rebecca Silberstein [Wed, 31 May 2017 15:42:27 +0000 (15:42 +0000)]
Merge "WifiManager: setWifiApEnabled always returns false" into oc-dev
TreeHugger Robot [Wed, 31 May 2017 15:41:58 +0000 (15:41 +0000)]
Merge "Hide Wi-Fi activity indicator when Wi-Fi icon is hidden" into oc-dev
TreeHugger Robot [Wed, 31 May 2017 15:37:42 +0000 (15:37 +0000)]
Merge "Fix Error Prone ArrayEquals/ArrayHashCode bugs" into oc-dev
Jeff Sharkey [Wed, 31 May 2017 14:43:51 +0000 (08:43 -0600)]
Merge commit '
06951ac74d9e74b29037b0a5d8e3b9ad85983b5b' into mergeit
Change-Id: Ifa69c7bb53de94312e2b32607fa098c194a4c72c
Jeff Sharkey [Wed, 31 May 2017 14:18:24 +0000 (14:18 +0000)]
Merge "Consistent "low storage" behavior." into oc-dev
Chet Haase [Wed, 31 May 2017 14:01:33 +0000 (14:01 +0000)]
Merge "Fix infinite loop problem in AnimationHandler" into oc-dev
am:
163ec051d1
Change-Id: I56250bcf79be21354469098598f8d3f39dc0d2de
TreeHugger Robot [Wed, 31 May 2017 13:53:09 +0000 (13:53 +0000)]
Merge "Fix infinite loop problem in AnimationHandler" into oc-dev
Yoshinori Hirano [Fri, 26 May 2017 02:53:34 +0000 (11:53 +0900)]
Hide Wi-Fi activity indicator when Wi-Fi icon is hidden
Wi-Fi icon in the status bar can be blocked by System UI Tuner.
So the activity indicator should be hidden.
Fixes:
62211154
Test: manual - block Wi-Fi icon
Author: Akira Oshimi <akira.oshimi@sony.com>
Change-Id: Iba698d621d60f6d6c9f6d8205f91df49806f3f54
Hugo Benichi [Wed, 31 May 2017 13:25:53 +0000 (13:25 +0000)]
Merge "Fix race condition in NsdManagerTest" am:
f2383db747 am:
2dfb494827
am:
ba82d646a6
Change-Id: I7efa4f92838428f69a6a7a9fa767fefa47246f69
Hugo Benichi [Wed, 31 May 2017 13:16:43 +0000 (13:16 +0000)]
Merge "Fix race condition in NsdManagerTest" am:
f2383db747
am:
2dfb494827
Change-Id: Id2036620f3780aca340470d03b3c579ed3e1e9b7
Hugo Benichi [Wed, 31 May 2017 13:08:37 +0000 (13:08 +0000)]
Merge "Fix race condition in NsdManagerTest"
am:
f2383db747
Change-Id: Ifd731767608e738a271bd5793a462675c2a93123
Treehugger Robot [Wed, 31 May 2017 12:56:55 +0000 (12:56 +0000)]
Merge "Fix race condition in NsdManagerTest"
daqi [Wed, 31 May 2017 12:50:47 +0000 (12:50 +0000)]
Merge "Fix TaskRecord wrong dump element firstActiveTime" am:
30895c5e1e am:
6bc2199774
am:
8274806df3
Change-Id: Ie2053782986f98db28e192b08c3d249bb9c04e30
daqi [Wed, 31 May 2017 12:42:12 +0000 (12:42 +0000)]
Merge "Fix TaskRecord wrong dump element firstActiveTime" am:
30895c5e1e
am:
6bc2199774
Change-Id: Idf798414b9d7d4c41d59c4b57c313e1030cba119
OSDN Git Service
