OSDN Git Service
Michael Dooley [Tue, 2 May 2017 22:08:43 +0000 (22:08 +0000)]
Merge "Adding voicemail transcription state to the database" into oc-dev
am:
4794cbf574
Change-Id: I121f40cb64c546b0f6e140943d5a263ee05b05b4
Michael Dooley [Tue, 2 May 2017 22:01:12 +0000 (22:01 +0000)]
Merge "Adding voicemail transcription state to the database" into oc-dev
Adrian Roos [Tue, 2 May 2017 21:21:24 +0000 (21:21 +0000)]
Merge "StatusBar: Catch OOM caused by third-party icons" am:
ed112e3c11 am:
7135f5d2e5
am:
6983178c59
Change-Id: I8c66710c1f64dc14899a019a36c046e9996058ba
Adrian Roos [Tue, 2 May 2017 21:14:20 +0000 (21:14 +0000)]
Merge "StatusBar: Catch OOM caused by third-party icons" am:
ed112e3c11
am:
7135f5d2e5
Change-Id: I2b807be9ff69796ccc3dde64fb215250d9690717
Adrian Roos [Tue, 2 May 2017 21:09:32 +0000 (21:09 +0000)]
Merge "StatusBar: Catch OOM caused by third-party icons"
am:
ed112e3c11
Change-Id: I60313cc9a4560fd8e8308108a4d878ab49fcbea1
Tyler Gunn [Tue, 2 May 2017 21:07:25 +0000 (21:07 +0000)]
Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission." am:
34e0a257d5 am:
a2ed986390
am:
4db9f6d393 -s ours
Change-Id: Ie7051d0b4de000a304e8762916187bd2208ce029
Evan Rosky [Tue, 2 May 2017 21:01:30 +0000 (21:01 +0000)]
Merge "Don't focus search user-specified views which are invisible" into oc-dev
am:
3b213ed438
Change-Id: I5a058c7024020e41ba8747c243d7209127cba19f
Adrian Roos [Tue, 2 May 2017 21:00:40 +0000 (21:00 +0000)]
Merge "StatusBar: Catch OOM caused by third-party icons"
Tyler Gunn [Tue, 2 May 2017 20:55:45 +0000 (20:55 +0000)]
Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission." am:
34e0a257d5
am:
a2ed986390
Change-Id: I438bacc7028fb2c385a6dd21a79172f145490f6d
Evan Rosky [Tue, 2 May 2017 20:54:00 +0000 (20:54 +0000)]
Merge "Don't focus search user-specified views which are invisible" into oc-dev
Tyler Gunn [Tue, 2 May 2017 20:48:09 +0000 (20:48 +0000)]
Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission."
am:
34e0a257d5
Change-Id: I4c996f0e2e3d56bb36231f765a0d1a4d15cc171c
Tyler Gunn [Tue, 2 May 2017 20:36:37 +0000 (20:36 +0000)]
Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission."
Wale Ogunwale [Tue, 2 May 2017 20:29:00 +0000 (20:29 +0000)]
Merge "Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays" into oc-dev
am:
5f0e436548
Change-Id: Icc1d09c16abc31d15a7ea5960ab1640ae265c31c
Wale Ogunwale [Tue, 2 May 2017 20:23:43 +0000 (20:23 +0000)]
Merge "Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays" into oc-dev
Abodunrinwa Toki [Tue, 2 May 2017 20:17:18 +0000 (20:17 +0000)]
Merge "Support resetting "smart selection" to any word in the selection." into oc-dev
am:
3cb61255ab
Change-Id: Ie089ed63df8064798fa98a8a2378b81d09cf3b1c
Wale Ogunwale [Tue, 2 May 2017 20:16:39 +0000 (13:16 -0700)]
Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays
Reduce pre-submit noise. We can re-enable once we figure-out why it
is flaky.
Bug:
37908381
Test: disabled!
Change-Id: Ia82ba73fafafc433487027f2ee2d582dceb65ed2
Geoffrey Pitsch [Tue, 2 May 2017 20:11:50 +0000 (20:11 +0000)]
Merge "Fix cancel when the same notification is enqueued twice." into oc-dev
am:
67ced6c08f
Change-Id: Iadde1ec051096176e68fbec5f0a3ce2acf3eb39b
TreeHugger Robot [Tue, 2 May 2017 20:05:42 +0000 (20:05 +0000)]
Merge "Support resetting "smart selection" to any word in the selection." into oc-dev
Sudheer Shanka [Tue, 2 May 2017 20:04:57 +0000 (20:04 +0000)]
Merge "Add commandline option to update power-save-except-idle whitelist." into oc-dev
am:
89bc8b17d6
Change-Id: Id87f06d4e13059e2f258508bf31348aba85ca5a9
TreeHugger Robot [Tue, 2 May 2017 20:02:13 +0000 (20:02 +0000)]
Merge "Fix cancel when the same notification is enqueued twice." into oc-dev
Sudheer Shanka [Tue, 2 May 2017 19:56:59 +0000 (19:56 +0000)]
Merge "Add commandline option to update power-save-except-idle whitelist." into oc-dev
TreeHugger Robot [Tue, 2 May 2017 19:54:21 +0000 (19:54 +0000)]
Merge "Resolve merge conflicts of
ccc5b9bbd02a to oc-dev-plus-aosp" into oc-dev-plus-aosp
Yi Kong [Tue, 2 May 2017 19:49:25 +0000 (12:49 -0700)]
Resolve merge conflicts of
ccc5b9bbd02a to oc-dev-plus-aosp
Test: Build
Change-Id: I7d3d6bb4c436b2025a0293f9c6475855243f4dd9
Jean-Michel Trivi [Tue, 2 May 2017 19:24:43 +0000 (19:24 +0000)]
Merge "Message about audio stream deprecation as warning" into oc-dev
am:
dd8a71f4a9
Change-Id: I35b530efc40eb025b5e1b0fe757ed2e4ed6a33ac
Android Build Merger (Role) [Tue, 2 May 2017 19:20:28 +0000 (19:20 +0000)]
Merge "Merge "Removing check preventing pinned stack tasks from matching by affinity." into oc-dev am:
4ec5dd1d88" into oc-dev-plus-aosp
Winson Chung [Tue, 2 May 2017 19:19:15 +0000 (19:19 +0000)]
Merge "Removing check preventing pinned stack tasks from matching by affinity." into oc-dev
am:
4ec5dd1d88
Change-Id: I72050ea3a1a6d2345d1f511cad2f048b4224c63c
TreeHugger Robot [Tue, 2 May 2017 19:18:33 +0000 (19:18 +0000)]
Merge "RenderScript: IWYU" into oc-dev-plus-aosp
TreeHugger Robot [Tue, 2 May 2017 19:13:19 +0000 (19:13 +0000)]
Merge "Message about audio stream deprecation as warning" into oc-dev
Calin Juravle [Tue, 2 May 2017 19:10:17 +0000 (19:10 +0000)]
Merge "Make PM#notifyDexLoad oneway" into oc-dev
am:
5f016f6705
Change-Id: Ica5f01a3c66c71104ff0e3b26e9e5fdf7802bc60
Winson Chung [Tue, 2 May 2017 19:07:24 +0000 (19:07 +0000)]
Merge "Removing check preventing pinned stack tasks from matching by affinity." into oc-dev
Steven Moreland [Mon, 1 May 2017 19:56:08 +0000 (12:56 -0700)]
RenderScript: IWYU
Renderscript was depending on macros from android-base that were
transitively included from MQDescriptor.h
Test: links
Bug:
37791060
Change-Id: Ie34ddef67328c5fcc6b0122a32725b980615ff43
(cherry picked from commit
dc01e938c2550390a540311b22e3e6c7603ed975)
Calin Juravle [Tue, 2 May 2017 19:03:18 +0000 (19:03 +0000)]
Merge "Make PM#notifyDexLoad oneway" into oc-dev
Abodunrinwa Toki [Tue, 2 May 2017 19:00:53 +0000 (19:00 +0000)]
Merge "Close file descriptor after SmartSelection is initialized." into oc-dev
am:
b950ac6b0f
Change-Id: I9ec0463e9641fb6a54e26311273932d3d1a6d41e
TreeHugger Robot [Tue, 2 May 2017 18:54:59 +0000 (18:54 +0000)]
Merge "Close file descriptor after SmartSelection is initialized." into oc-dev
Adrian Roos [Tue, 31 Jan 2017 23:10:00 +0000 (15:10 -0800)]
StatusBar: Catch OOM caused by third-party icons
Bug:
31825355
Change-Id: I3e2a8c3da43a572a026ea0bbe1d39234035a4801
Merged-In: I3e2a8c3da43a572a026ea0bbe1d39234035a4801
Yi Kong [Tue, 2 May 2017 18:31:59 +0000 (18:31 +0000)]
Merge "SymbolComparator operator() is missing const" am:
e74483074e
am:
a522b4af78
Change-Id: If68306b217d19fb1d1d4bc71a8fd452a47aa8ed2
Yi Kong [Tue, 2 May 2017 18:26:57 +0000 (18:26 +0000)]
Merge "SymbolComparator operator() is missing const"
am:
e74483074e
Change-Id: I86f332f10f87d519c42c5880c49dacf98be2c9e5
Yi Kong [Tue, 2 May 2017 18:15:02 +0000 (18:15 +0000)]
Merge "SymbolComparator operator() is missing const"
Jean-Michel Trivi [Tue, 2 May 2017 17:56:07 +0000 (17:56 +0000)]
Merge "Audio focus: fix notifying apps to pause without an external policy" into oc-dev
am:
dce4dfc6fc
Change-Id: Ic42056d370ecd0a08574dd575856ff15813bc8c0
Jean-Michel Trivi [Tue, 2 May 2017 17:52:32 +0000 (17:52 +0000)]
Merge "Audio focus: fix notifying apps to pause without an external policy" into oc-dev
Dianne Hackborn [Tue, 2 May 2017 17:51:20 +0000 (17:51 +0000)]
Merge "Work on issue #
37815224: DeviceManagementService is incorrectly..." into oc-dev
am:
72c0ab518a
Change-Id: I1987075221d0d5fa16483e6a41003b0394291d10
Tyler Gunn [Fri, 28 Apr 2017 17:45:23 +0000 (10:45 -0700)]
Change MANAGE_OWN_CALLS permission to be a "normal" permission.
Also remove from Phone group since this isn't really related to phone
calls as much as interacting with Telecom APIs.
Test: Manual
Bug:
37722558
Merged-In: Ia972db4bd79a34bc9b9d3896910adc205c286367
Change-Id: Icc4d2170cc7c83f653eeb0438938f7c0c91a0a7c
Dianne Hackborn [Tue, 2 May 2017 17:45:46 +0000 (17:45 +0000)]
Merge "Work on issue #
37815224: DeviceManagementService is incorrectly..." into oc-dev
Abodunrinwa Toki [Tue, 2 May 2017 17:44:19 +0000 (18:44 +0100)]
Support resetting "smart selection" to any word in the selection.
Test: See topic
Bug:
34779207
Change-Id: I75a9b991571f750b362047baa13675250e929223
Seigo Nonaka [Tue, 2 May 2017 17:32:04 +0000 (17:32 +0000)]
Merge "Fix NPE happens if no source was specified to font element." into oc-dev
am:
b3e92234fa
Change-Id: If06bf0e49030839f1b4f95c0a776e4aab1ed94d8
Amith Yamasani [Tue, 2 May 2017 17:29:39 +0000 (17:29 +0000)]
Merge "Clear calling uid before changing whitelist" into oc-dev
am:
97e3db9aee
Change-Id: Icc858733afb22720a9adf1a1c4e85ba47cf03e2d
Geoffrey Pitsch [Tue, 2 May 2017 15:41:31 +0000 (11:41 -0400)]
Fix cancel when the same notification is enqueued twice.
Change-Id: I6563c70ac441ff1c1951d5220c2e6a7c5f210d49
Fixes:
37706685
Test: runtest systemui-notification
TreeHugger Robot [Tue, 2 May 2017 17:22:58 +0000 (17:22 +0000)]
Merge "Fix NPE happens if no source was specified to font element." into oc-dev
Jorim Jaggi [Tue, 2 May 2017 17:21:24 +0000 (17:21 +0000)]
Merge "Fix app transition logging when switching quickly" into oc-dev
am:
4cbad7fac1
Change-Id: I2b759dbcc3f010172c843e84835ccb68182b5efd
Amith Yamasani [Tue, 2 May 2017 17:20:31 +0000 (17:20 +0000)]
Merge "Clear calling uid before changing whitelist" into oc-dev
Abodunrinwa Toki [Fri, 28 Apr 2017 18:25:24 +0000 (19:25 +0100)]
Close file descriptor after SmartSelection is initialized.
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug:
37446398
Change-Id: I6f6d927f447d3cc1dffaee2406ff240d0600eb19
TreeHugger Robot [Tue, 2 May 2017 17:14:57 +0000 (17:14 +0000)]
Merge "Fix app transition logging when switching quickly" into oc-dev
Daniel Nishi [Tue, 2 May 2017 17:09:51 +0000 (17:09 +0000)]
Merge "Don't crash during app uninstall." into oc-dev
am:
661b6badef
Change-Id: Iceab4bdd88e348c4bd4019ee1fb6c7c8b3f5baf1
Daniel Nishi [Tue, 2 May 2017 17:03:51 +0000 (17:03 +0000)]
Merge "Don't crash during app uninstall." into oc-dev
Jean-Michel Trivi [Tue, 2 May 2017 17:01:08 +0000 (10:01 -0700)]
Message about audio stream deprecation as warning
The message indicating the use of stream types for operations
other than volume control is deprecated shouldn't be an
error but a warning
Test: use apps that request audio focus with a stream type, check log
Bug:
37887058
Change-Id: Iaafae8aa599984688dae448e868de81317add4d3
Abodunrinwa Toki [Tue, 2 May 2017 16:31:50 +0000 (16:31 +0000)]
Merge "Add "Paste as plain text" in TextView's toolbar." into oc-dev
am:
0fe5a2d5b3
Change-Id: I72d5fdd4351860bc02289abde6b1c36e13407e69
TreeHugger Robot [Tue, 2 May 2017 16:21:10 +0000 (16:21 +0000)]
Merge "Add "Paste as plain text" in TextView's toolbar." into oc-dev
Android Build Merger (Role) [Tue, 2 May 2017 16:10:47 +0000 (16:10 +0000)]
Merge "Merge "DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759 am:
a399705286 -s ours" into oc-dev am:
550e1c9a6b" into oc-dev-plus-aosp
Erik Wolsheimer [Tue, 2 May 2017 16:10:00 +0000 (16:10 +0000)]
Merge "DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759 am:
a399705286 -s ours" into oc-dev
am:
550e1c9a6b
Change-Id: Ie3ec9c7b8aee293f79cccde97b197c8c77d63281
Android Build Merger (Role) [Tue, 2 May 2017 16:09:21 +0000 (16:09 +0000)]
Merge "Merge "SurfaceTexture: setConsumerIsProtected" into oc-dev am:
9967a4d3af" into oc-dev-plus-aosp
Erik Wolsheimer [Tue, 2 May 2017 16:07:10 +0000 (16:07 +0000)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759 am:
a399705286
am:
ab4617dd92 -s ours
Change-Id: I4d65ed8df4f31b6e7aff05a554207a6a3d093614
Jiwen Cai [Tue, 2 May 2017 16:04:26 +0000 (16:04 +0000)]
Merge "SurfaceTexture: setConsumerIsProtected" into oc-dev
am:
9967a4d3af
Change-Id: If2ec26782f82e0f22deb7d952b79436e30a91867
Android Build Merger (Role) [Tue, 2 May 2017 16:00:52 +0000 (16:00 +0000)]
Merge "DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759 am:
a399705286 -s ours" into oc-dev
Erik Wolsheimer [Tue, 2 May 2017 15:59:55 +0000 (15:59 +0000)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759
am:
a399705286
Change-Id: I31b67a7bb496051a9062d4770a96119251a1b434
Erik Wolsheimer [Tue, 2 May 2017 15:59:43 +0000 (15:59 +0000)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759
am:
a399705286 -s ours
Change-Id: I654fc19afef7f11d894590d287cde3650b8252af
Jiwen Cai [Tue, 2 May 2017 15:59:21 +0000 (15:59 +0000)]
Merge "SurfaceTexture: setConsumerIsProtected" into oc-dev
The Android Open Source Project [Tue, 2 May 2017 15:56:20 +0000 (15:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7f43068aa5 -s ours
Change-Id: Ib3bf970248fec4410e2a4de47825c511b34fff6e
Erik Wolsheimer [Tue, 2 May 2017 15:54:40 +0000 (15:54 +0000)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s
am:
a686345759
Change-Id: I0598c6210dbf0d0447c31112419a2fee829037be
The Android Open Source Project [Tue, 2 May 2017 15:54:35 +0000 (15:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
71ffd8bc87 -s ours
Change-Id: Iff4a81cc730f7d35d95da27937df2d171b3379d9
TreeHugger Robot [Tue, 2 May 2017 15:49:24 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Vladislav Kaznacheev [Tue, 2 May 2017 15:48:11 +0000 (15:48 +0000)]
Merge "Fix submenu position when showing with Gravity.END" into oc-dev
am:
883af0766a
Change-Id: Ib2799189f34cb8fc2baeb19a6a4a005eb13b64d1
TreeHugger Robot [Tue, 2 May 2017 15:47:33 +0000 (15:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Tony Mak [Tue, 2 May 2017 15:46:13 +0000 (15:46 +0000)]
Merge "Add back the throwIfParentInstance checking in getAffiliationIds" into oc-dev
am:
91c6e44e9e
Change-Id: I360c03f15bf8a84d58100e371ed5528db6975f4d
TreeHugger Robot [Tue, 2 May 2017 15:40:37 +0000 (15:40 +0000)]
Merge "Fix submenu position when showing with Gravity.END" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 15:38:44 +0000 (15:38 +0000)]
Merge "Add back the throwIfParentInstance checking in getAffiliationIds" into oc-dev
Jorim Jaggi [Tue, 2 May 2017 15:05:12 +0000 (15:05 +0000)]
Merge "Split out whether frame callback and tick is scheduled" into oc-dev
am:
756efea145
Change-Id: I73a1585ac7e287afcf2f0d15d9ccedc5627deed0
Jorim Jaggi [Fri, 28 Apr 2017 17:06:24 +0000 (19:06 +0200)]
Fix app transition logging when switching quickly
If an app was set to invisible before the transition started,
which happens when quickly open an app and then closing again
before the animation is starting (only possible if starting
window is slightly delayed), we never receive onWindowsDrawn so we
need to cancel the transition in this case.
Also fixes an issue where the wrong activity was reported as
starting to us in case reusedActivity != null but we'll only reuse
it for the task and not the actual activity.
Test: Open Calendar, press home immediately, open another app, make
sure all logged events and times are correct.
Fixes:
37538546
Change-Id: I5819bd97964ab2dd5cb40b2f4e3bc5a9ac348152
TreeHugger Robot [Tue, 2 May 2017 14:58:15 +0000 (14:58 +0000)]
Merge "Split out whether frame callback and tick is scheduled" into oc-dev
Abodunrinwa Toki [Fri, 28 Apr 2017 21:14:13 +0000 (22:14 +0100)]
Add "Paste as plain text" in TextView's toolbar.
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Bug:
36179795
Change-Id: Iee0502678adcfb9de58c107b9247a528718b2c40
Wale Ogunwale [Tue, 2 May 2017 14:06:01 +0000 (14:06 +0000)]
Merge "Don't send configuration that app doesn't support to it." into oc-dev
am:
22c1275c89
Change-Id: Ib7b3b945c476fae59800421c6075397d8bb6352c
TreeHugger Robot [Tue, 2 May 2017 13:58:55 +0000 (13:58 +0000)]
Merge "Don't send configuration that app doesn't support to it." into oc-dev
Tony Mak [Tue, 2 May 2017 12:50:18 +0000 (13:50 +0100)]
Add back the throwIfParentInstance checking in getAffiliationIds
Fix:
37887947
Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.ParentProfileTest#testParentProfileApiDisabled
Change-Id: I05944c7a2447998d3ea948195fb25b09ab9735fc
Oleksiy Avramchenko [Tue, 2 May 2017 12:58:12 +0000 (12:58 +0000)]
Merge "Force a light to be set for the first time" am:
e6ad7a6704 am:
96a8556990
am:
db877fa31c
Change-Id: Ib03f7ded6bb232193eec32a4f566244d3caa94b5
Oleksiy Avramchenko [Tue, 2 May 2017 12:53:33 +0000 (12:53 +0000)]
Merge "Force a light to be set for the first time" am:
e6ad7a6704
am:
96a8556990
Change-Id: I5caed909e1ba67931f05b0b44a0ff0fd62b131d0
Oleksiy Avramchenko [Tue, 2 May 2017 12:48:34 +0000 (12:48 +0000)]
Merge "Force a light to be set for the first time"
am:
e6ad7a6704
Change-Id: Icc13b24debc55f4c107dea61123e468a79828f11
Treehugger Robot [Tue, 2 May 2017 12:42:12 +0000 (12:42 +0000)]
Merge "Force a light to be set for the first time"
Jorim Jaggi [Fri, 28 Apr 2017 14:39:19 +0000 (16:39 +0200)]
Split out whether frame callback and tick is scheduled
Since the animation/gesture for screen zoom is running at
vsync-app, calling WMS.scheduleAnimation will schedule only
at the next frame. However, in the next frame, only the frame
callback is handled but not the tick yet, however
mAnimationScheduled was still true. Thus, the request to schedule
another frame callback is ignored, and then the things get
updated only every 2nd frame.
Fix this by splitting the information whether the frame callback
is scheduled or the actual tick.
Test: Use accessibility screen zoom, make sure gestures are
smooth.
Fixes:
37476440
Change-Id: I2301fab5bf3f3b896d4aa131fb041b89572fa3a7
Narayan Kamath [Tue, 2 May 2017 10:26:33 +0000 (10:26 +0000)]
Merge "Track libcore change
03e8c7dca78a95ccf719a7." am:
194f8471fd am:
f06800c3ff
am:
58508dfd6e
Change-Id: Ia3f2a9ac5843a32da7c730a172af248abebd7b00
Narayan Kamath [Tue, 2 May 2017 10:19:30 +0000 (10:19 +0000)]
Merge "Track libcore change
03e8c7dca78a95ccf719a7." am:
194f8471fd
am:
f06800c3ff
Change-Id: I3c734734bf553e0b4695a897de113d9031f18abd
Narayan Kamath [Tue, 2 May 2017 10:13:48 +0000 (10:13 +0000)]
Merge "Track libcore change
03e8c7dca78a95ccf719a7."
am:
194f8471fd
Change-Id: Ie4fbcc4defee14c91cd3b84adf4f3ae5f47add3f
Narayan Kamath [Tue, 2 May 2017 10:06:48 +0000 (10:06 +0000)]
Merge "Track libcore change
03e8c7dca78a95ccf719a7."
Hugo Benichi [Tue, 2 May 2017 09:04:59 +0000 (09:04 +0000)]
Merge "NsdManager: add test coverage for discoverServices()" am:
3e21b1745c am:
60182dbe4e
am:
27b0eebb4d
Change-Id: I46acfd104ac3457126c3ccef5041788e4146321c
Hugo Benichi [Tue, 2 May 2017 08:59:22 +0000 (08:59 +0000)]
Merge "NsdManager: add test coverage for discoverServices()" am:
3e21b1745c
am:
60182dbe4e
Change-Id: I341cbbfd36b4e849651505c187053115833ca4b0
Hugo Benichi [Tue, 2 May 2017 08:54:46 +0000 (08:54 +0000)]
Merge "NsdManager: add test coverage for discoverServices()"
am:
3e21b1745c
Change-Id: I0fd1d8e6ea3264a96b144c6701200f7b0be5f9c4
Treehugger Robot [Tue, 2 May 2017 08:44:27 +0000 (08:44 +0000)]
Merge "NsdManager: add test coverage for discoverServices()"
Oleksiy Avramchenko [Tue, 25 Apr 2017 10:30:49 +0000 (12:30 +0200)]
Force a light to be set for the first time
The check in LightImpl::setLightLocked skips HAL call if light
parameters aren't changed. During initialization these parameters
are zeroed, thus it's not possible to turn the light off at the
startup.
As an example this fixes the issue with "stuck" battery light
in the following scenario:
1. Device has secure start-up option set (either pin or pattern).
2. Charger is connected at the startup and battery light shows the
charging state on pin or pattern prompt.
3. Device is unlocked and charger disconnected after some time,
e.g. after com.android.server.lights.LightsService restarted.
4. The battery light is not off and stuck in the previous state
until charger is connected / disconnected again.
Bug:
37662368
Test: manual - follow the above step-by-step
Change-Id: I45470e945fe4d26d37a5641dfff3311968f51ee4
The Android Open Source Project [Tue, 2 May 2017 07:05:25 +0000 (00:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia533546d474a51fa42205fa4ebf7ec122d17fa38
Auto-generated-cl: translation import
Chulwoo Lee [Tue, 2 May 2017 07:02:35 +0000 (07:02 +0000)]
Merge "Allow null setup activity for TV input" into oc-dev
am:
90074d1ec8
Change-Id: I18545582572c60956548af8c732b7e6543f00d76
TreeHugger Robot [Tue, 2 May 2017 06:56:48 +0000 (06:56 +0000)]
Merge "Allow null setup activity for TV input" into oc-dev
Hugo Benichi [Tue, 2 May 2017 06:49:52 +0000 (06:49 +0000)]
Merge "NsdManager: unit test coverage for servive registration" am:
b0e408450c am:
bc57faa1ac
am:
9a3e69d9b6
Change-Id: Ideabb1c929ddd4307e66831cddb20e2feac2c6d9
OSDN Git Service
