OSDN Git Service
Andrii Kulian [Tue, 30 May 2017 23:27:00 +0000 (23:27 +0000)]
Merge "Temporarily enable screen wakelock logging in WM" into oc-dev
am:
ea6c7db229
Change-Id: I857eb959e7215798a14f7055325c18ca42b1f14b
Jason Monk [Tue, 30 May 2017 23:24:52 +0000 (23:24 +0000)]
Merge "Random hacks to make QS DND work" into oc-dev
am:
28355df745
Change-Id: I71750f986834cf7391520f956cfec7183cc45758
Andrii Kulian [Tue, 30 May 2017 23:19:42 +0000 (23:19 +0000)]
Merge "Temporarily enable screen wakelock logging in WM" into oc-dev
TreeHugger Robot [Tue, 30 May 2017 23:12:25 +0000 (23:12 +0000)]
Merge "Random hacks to make QS DND work" into oc-dev
Wale Ogunwale [Tue, 30 May 2017 22:18:48 +0000 (22:18 +0000)]
Merge "Set correct task remove mode when reparenting" into oc-dev
am:
7b64dbd529
Change-Id: Iec0d1817e29d1ea1b06f0da10f42de2bb55c40dc
Jason Monk [Tue, 30 May 2017 22:16:02 +0000 (22:16 +0000)]
Merge "Fix ripple on QS Footer" into oc-dev
am:
13af917690
Change-Id: I59107dec864b0676c44476324c6dd0a6f3ee5394
yangbingqian [Tue, 30 May 2017 22:05:53 +0000 (22:05 +0000)]
Merge "use FgThread.class instead of UiThread.class for lock object" am:
e2fddf56a4 am:
a7d45cf3f0
am:
26d6431106
Change-Id: I666af86709586df062e323d58915605f68b6ca46
TreeHugger Robot [Tue, 30 May 2017 22:05:02 +0000 (22:05 +0000)]
Merge "Set correct task remove mode when reparenting" into oc-dev
TreeHugger Robot [Tue, 30 May 2017 22:01:32 +0000 (22:01 +0000)]
Merge "Fix ripple on QS Footer" into oc-dev
Jason Monk [Tue, 30 May 2017 21:56:55 +0000 (21:56 +0000)]
Merge "Fix crash from concurrent modification" into oc-dev
am:
e3f2f29cde
Change-Id: I8fa6d484066f6b7286b08983b5c6edce7caac9f9
yangbingqian [Tue, 30 May 2017 21:56:43 +0000 (21:56 +0000)]
Merge "use FgThread.class instead of UiThread.class for lock object" am:
e2fddf56a4
am:
a7d45cf3f0
Change-Id: If9a509ff24e5ea52602f50eb977ac94652bf2978
TreeHugger Robot [Tue, 30 May 2017 21:50:01 +0000 (21:50 +0000)]
Merge "Fix crash from concurrent modification" into oc-dev
yangbingqian [Tue, 30 May 2017 21:48:15 +0000 (21:48 +0000)]
Merge "use FgThread.class instead of UiThread.class for lock object"
am:
e2fddf56a4
Change-Id: Ia6d2154bf46d61ea55ef7e41abd538b1c71972b5
Robert Carr [Tue, 30 May 2017 21:39:09 +0000 (21:39 +0000)]
Merge changes I5762a98d,I39f4e015 into oc-dev
am:
c56b1d3c98
Change-Id: I4e6931609d4a3fc8a0c80b58f9d279f1f65d6a10
Treehugger Robot [Tue, 30 May 2017 21:35:11 +0000 (21:35 +0000)]
Merge "use FgThread.class instead of UiThread.class for lock object"
TreeHugger Robot [Tue, 30 May 2017 21:33:24 +0000 (21:33 +0000)]
Merge changes I5762a98d,I39f4e015 into oc-dev
* changes:
ViewRootImpl: More careful draw accounting.
SurfaceView: Avoid over-reporting DRAW_FINISHED.
Roozbeh Pournader [Tue, 30 May 2017 21:25:23 +0000 (21:25 +0000)]
Merge "Update Paint#mFontVariationSettings in set() and reset()" into oc-dev
am:
d865c624bd
Change-Id: I45e58aa1a1ac7b5319a891e3d4f449099b13384d
TreeHugger Robot [Tue, 30 May 2017 21:15:13 +0000 (21:15 +0000)]
Merge "Update Paint#mFontVariationSettings in set() and reset()" into oc-dev
Andrii Kulian [Fri, 26 May 2017 21:51:47 +0000 (14:51 -0700)]
Temporarily enable screen wakelock logging in WM
Enable DEBUG_KEEP_SCREEN_ON flag to get additional wakelock logs
to investigate b/
38416971.
Bug:
38416971
Test: No change in logic
Change-Id: I83c45a26befb6a767b5d9fc30b1cde07a2432ebe
Robert Carr [Tue, 30 May 2017 20:55:56 +0000 (20:55 +0000)]
Merge "Prevent unnecesary Surface preservation." into oc-dev
am:
bf7f23cc9c
Change-Id: Ia88d0b9658d9804187cf053ae83338b978ffa69b
Adam Lesinski [Tue, 30 May 2017 20:53:38 +0000 (20:53 +0000)]
Merge "AAPT2: Fix <add-resource> tag for overlays" into oc-dev
am:
8255ced3f5
Change-Id: Icc420eea48a8379723c0bc84a5f30c03ac2a2492
TreeHugger Robot [Tue, 30 May 2017 20:46:02 +0000 (20:46 +0000)]
Merge "Prevent unnecesary Surface preservation." into oc-dev
Adam Lesinski [Tue, 30 May 2017 20:42:00 +0000 (20:42 +0000)]
Merge "AAPT2: Fix <add-resource> tag for overlays" into oc-dev
Jason Monk [Tue, 30 May 2017 20:08:50 +0000 (16:08 -0400)]
Random hacks to make QS DND work
- Don't clear out as much state on attach
- Make sure condition updates trigger a reflecting radio check
- Assume that null conditions are forever
Test: manual
Fixes:
37944320
Fixes:
36031650
Change-Id: Ie926d16226e7b5431551a33515ac2b847e1d7a93
Dianne Hackborn [Tue, 30 May 2017 20:31:33 +0000 (20:31 +0000)]
Merge "Work on issue #
62095840: NPE in JobParamteres in the background" into oc-dev
am:
1399d3abf5
Change-Id: I49169ce6f6559d9bfad36693b1582b2d810380b6
Amit Pawar [Tue, 30 May 2017 20:28:39 +0000 (20:28 +0000)]
Merge "Fix #
62169466 bug report sharing options empty" into oc-dev
am:
4d473c65cb
Change-Id: I13b21aa8b731e09d22955d177589635427c1fb39
Dianne Hackborn [Tue, 30 May 2017 20:21:11 +0000 (20:21 +0000)]
Merge "Work on issue #
62095840: NPE in JobParamteres in the background" into oc-dev
Amit Pawar [Tue, 30 May 2017 20:20:18 +0000 (20:20 +0000)]
Merge "Fix #
62169466 bug report sharing options empty" into oc-dev
Bryce Lee [Tue, 30 May 2017 20:04:37 +0000 (20:04 +0000)]
Merge "Do not always skip preparing window to display when already visible." into oc-dev
am:
4dfc067b2c
Change-Id: I07eb33fe8df60b34b86380d6dbe8a3d03c7c6baa
Amith Yamasani [Tue, 30 May 2017 19:35:45 +0000 (12:35 -0700)]
Fix #
62169466 bug report sharing options empty
Was caused by a new requirement to not offer to show
non-exported intent handlers as options. For first
time warning dialog, don't show a chooser activity.
Change-Id: Ibada9a7a14b77ec0670bf35ba0944f369d42bf69
Fixes:
62169466
Test: manual
Test: mmm -j32 frameworks/base/packages/Shell && adb install -r -g ${OUT}/data/app/ShellTests/ShellTests.apk && adb shell am instrument -e class com.android.shell.BugreportReceiverTest$1 -w com.android.shell.tests/android.support.test.runner.AndroidJUnitRunner
Bryce Lee [Tue, 30 May 2017 19:58:32 +0000 (19:58 +0000)]
Merge "Check for source activity's task presence before referencing." into oc-dev
am:
cdb7e6d507
Change-Id: I75aed0fd10eb95d06f89c48cdda7fd1658a3ad2c
Bryce Lee [Tue, 30 May 2017 19:50:49 +0000 (19:50 +0000)]
Merge "Do not always skip preparing window to display when already visible." into oc-dev
Bryce Lee [Tue, 30 May 2017 19:50:11 +0000 (19:50 +0000)]
Merge "Check for source activity's task presence before referencing." into oc-dev
Jason Monk [Tue, 30 May 2017 19:37:11 +0000 (15:37 -0400)]
Fix ripple on QS Footer
Needs a background to draw on.
Test: manual
Change-Id: I7239520afc0aab65e9ff83a86dcf28b01a3fa25d
Fixes:
62194142
Android Build Merger (Role) [Tue, 30 May 2017 19:07:59 +0000 (19:07 +0000)]
Merge "Merge changes from topic 'hide_passpoint_r2' into oc-dev am:
4bd47fce86" into oc-dev-plus-aosp
Peter Qiu [Tue, 30 May 2017 19:06:38 +0000 (19:06 +0000)]
Merge changes from topic 'hide_passpoint_r2' into oc-dev
am:
4bd47fce86
Change-Id: I05ef978d28a69419e8ffe2ca4c357de5900e4049
Peter Qiu [Tue, 30 May 2017 18:55:37 +0000 (18:55 +0000)]
Merge changes from topic 'hide_passpoint_r2' into oc-dev
am:
4bd47fce86
Change-Id: I71fe905c7842384d7700f02f923b12cdae9bf594
Robert Carr [Tue, 30 May 2017 18:25:22 +0000 (11:25 -0700)]
Prevent unnecesary Surface preservation.
We don't save the Surface's pixel format, and so any time
there is a change in the pixel format as described in the params
we trigger a surface preservation. However if an app is switching
from forced translucent (due to HW accel) to explicitly translucent
even though the layout params have changed we don't actually need
to trigger a format change, just toggle the OPAQUE flag.
Bug:
38324871
Test: Launch Chrome Custom Tabs with Lateral Transition Animation from News and Weather App. No black bars. go/wm-smoke
Change-Id: I2151b4470fd7c395fba7aad7d6ffca4c51e55476
TreeHugger Robot [Tue, 30 May 2017 18:47:06 +0000 (18:47 +0000)]
Merge changes from topic 'hide_passpoint_r2' into oc-dev
* changes:
hotspot2: hide Release 2 APIs
Voice Messaging Intent API.
Jason Monk [Tue, 30 May 2017 18:31:51 +0000 (14:31 -0400)]
Fix crash from concurrent modification
Change zen callbacks to allow for concurrent modification.
Test: runtest systemui
Change-Id: I8233353f617c4537104be2ec7be13247ed7f6ae0
Fixes:
38449656
Wale Ogunwale [Tue, 30 May 2017 18:12:20 +0000 (11:12 -0700)]
Set correct task remove mode when reparenting
If we are reparenting a task to a stack and the stack is at the front or will
be at the front, then set the the remove mode to REMOVE_TASK_MODE_MOVING_TO_TOP
so we don't try to move the focus to another stack and resume another activity.
Change-Id: Iddd7464dfff128544f2f70394ccd538b567fe58d
Fixes:
62088341
Test: ActivityManagerAppConfigurationTests
Test: go/wm-smoke
Dianne Hackborn [Tue, 30 May 2017 18:04:23 +0000 (11:04 -0700)]
Work on issue #
62095840: NPE in JobParamteres in the background
Crash early if an app calls jobFinished() with null params.
Test: manual
Change-Id: Icc2cf241edaad00bc5bd49d07a431627bbd76524
Jason Monk [Tue, 30 May 2017 17:11:22 +0000 (17:11 +0000)]
Merge "Make QS signal indicator act like a QS signal indicator" into oc-dev
am:
d2638591d9
Change-Id: I9e90d2b0afd99b103fb4d5d6e1a81a7110f95529
Jason Monk [Tue, 30 May 2017 17:00:57 +0000 (17:00 +0000)]
Merge "Make QS signal indicator act like a QS signal indicator" into oc-dev
Jason Monk [Tue, 30 May 2017 16:53:15 +0000 (16:53 +0000)]
Merge "Change brightness dialog theme" into oc-dev
am:
3b5934b267
Change-Id: I0ea5462db449403c6a1a03267c87b7be9bc66174
Julia Reynolds [Tue, 30 May 2017 16:49:52 +0000 (16:49 +0000)]
Merge "Suppress HUNs according to group alert behavior" into oc-dev
am:
8bc45cb78f
Change-Id: I86f65c9f8ae331d5b3cc4a35af6a48aa2b04dce1
Peter Qiu [Fri, 12 May 2017 17:15:12 +0000 (10:15 -0700)]
hotspot2: hide Release 2 APIs
These APIs are based on the design of the legacy OSU app. Since
the app will be redesigned, hide these APIs for now.
Bug:
38260972
Test: build
Change-Id: I56b9c27305624306773284a7cc1721606037462d
Renat Aksitov [Fri, 28 Apr 2017 20:27:20 +0000 (13:27 -0700)]
Voice Messaging Intent API.
Removing EXTRA_SENDER_ACCOUNT_HASH, needs more work.
Bug
37747843
Test: make -j11 docs
Change-Id: I3046611510f85cf69ceff7c2274cda3b692581b9
(cherry picked from commit
2c4201448eb3c19f9b6d37c8b679f51362cff3a7)
Jason Monk [Tue, 30 May 2017 16:46:12 +0000 (16:46 +0000)]
Merge "Change brightness dialog theme" into oc-dev
Julia Reynolds [Tue, 30 May 2017 16:43:33 +0000 (16:43 +0000)]
Merge "Suppress HUNs according to group alert behavior" into oc-dev
Robert Carr [Fri, 26 May 2017 01:24:42 +0000 (18:24 -0700)]
ViewRootImpl: More careful draw accounting.
The strategy of beginning the count at 1 isn't enough
and we need to explicitly debt each request to report
draw. Imagine the case where a ViewRootImpl reports draw
multiple times, while we are waiting for a SurfaceView draw
completion callback. Without the explicit draw debt, the ViewRoot
would be counted as drawing for the SurfaceView and we could
notify the WM too early.
Test: Open Chrome a few hundred times. go/wm-smoke.
Bug:
38324871
Change-Id: I5762a98d1cc808125033ba3d1db8a3ea39a9e071
Robert Carr [Fri, 26 May 2017 01:20:49 +0000 (18:20 -0700)]
SurfaceView: Avoid over-reporting DRAW_FINISHED.
To some extent we rely on the app to call the draw callback
if they want the app to work properly, but this case is fairly easy
to detect, so why not prevent it and provide a helpful log.
Bug:
62051758
Test: Warm start camera a few times. go/wm-smoke.
Change-Id: I39f4e015bfa15a1e0c37dba70b4a700803a6a274
Rob Carr [Tue, 30 May 2017 16:23:49 +0000 (16:23 +0000)]
Merge "Fix SurfaceView handler." into oc-dev
am:
5366cfbef3
Change-Id: I29980e5255957c1830a72707bb20c2de128d76ac
Rob Carr [Tue, 30 May 2017 16:17:25 +0000 (16:17 +0000)]
Merge "Fix SurfaceView handler." into oc-dev
Bryce Lee [Fri, 5 May 2017 16:58:25 +0000 (09:58 -0700)]
Do not always skip preparing window to display when already visible.
The window flag FLAG_TURN_SCREEN_ON relies on this method to properly
flag the screen to turn on. An optimization was put in place to skip
this method when the window was already visible. As a result, we would
skip turning the screen on if the activity was recreated.
This changelist addresses this issue by causing this method to execute
always if the flag is set.
Change-Id: I82c05c66136f7cc252b8d574d305809d455732ce
Fixes:
37432034
Test: bit FrameworksServicesTests:com.android.server.wm.WindowStateTests#testPrepareWindowToDisplayDuringRelayout
Test: go/wm-smoke
Geoffrey Pitsch [Tue, 30 May 2017 15:44:14 +0000 (15:44 +0000)]
Merge "Reduce toast duration for channel warnings." into oc-dev
am:
f6e956b1c6
Change-Id: I5a28910fa155a17256655ccd2cc0dc341dc3fbc3
Bryce Lee [Mon, 22 May 2017 22:57:24 +0000 (15:57 -0700)]
Check for source activity's task presence before referencing.
ActivityStarter guards in all other spots for a null task in the
source activity, which can be the case if said activity is finishing.
This changelist adds the same check to the code when processing a
finishing source.
Change-Id: I78c284f45d96348767d06bb6ce0d78d6b77cb0ad
Fixes:
37428712
Test: manual testing & code inspection
Test: go/wm-smoke
Geoffrey Pitsch [Tue, 30 May 2017 15:38:59 +0000 (15:38 +0000)]
Merge "Reduce toast duration for channel warnings." into oc-dev
Yoshinori Hirano [Mon, 22 May 2017 08:34:54 +0000 (17:34 +0900)]
Change brightness dialog theme
Added new theme Theme.DeviceDefault.QuickSettings.Dialog and applied it
to the brightness dialog.
Fixes:
62010126
Test: visual
Change-Id: I3bc1116a227d5e62d8624c9a4911771152f3ced0
Erik Kline [Mon, 29 May 2017 08:55:13 +0000 (08:55 +0000)]
Merge "Support "dumpsys connectivity tethering"" am:
6cdcba7b48 am:
06e6033327
am:
ff8b93f815
Change-Id: I68ff0810e4109c52e1d594a4b75fc768570ef59d
Erik Kline [Mon, 29 May 2017 08:48:38 +0000 (08:48 +0000)]
Merge "Support "dumpsys connectivity tethering"" am:
6cdcba7b48
am:
06e6033327
Change-Id: Ib88b17502c344314cb81d9c0167c2610e55d8313
Erik Kline [Mon, 29 May 2017 08:42:04 +0000 (08:42 +0000)]
Merge "Support "dumpsys connectivity tethering""
am:
6cdcba7b48
Change-Id: I91ef704d3fda346a50016841f40fecce2e23d215
Erik Kline [Mon, 29 May 2017 08:33:09 +0000 (08:33 +0000)]
Merge "Support "dumpsys connectivity tethering""
Joel Scherpelz [Mon, 29 May 2017 03:51:25 +0000 (03:51 +0000)]
Merge "Support requesting and receiving wakeup events" am:
bf152b14c4 am:
4971745cf4
am:
880974f111
Change-Id: I98aa768cf47938aa0996ddabbbc9feb9dae96f1e
Joel Scherpelz [Mon, 29 May 2017 03:41:23 +0000 (03:41 +0000)]
Merge "Support requesting and receiving wakeup events" am:
bf152b14c4
am:
4971745cf4
Change-Id: I1212c64e90572b7f45ca106c36ea89f37fb086ae
Joel Scherpelz [Mon, 29 May 2017 03:33:08 +0000 (03:33 +0000)]
Merge "Support requesting and receiving wakeup events"
am:
bf152b14c4
Change-Id: I594d4b5921ec6f0f8f73b88fd4d0e06278838553
Joel Scherpelz [Mon, 29 May 2017 03:28:00 +0000 (03:28 +0000)]
Merge "Support requesting and receiving wakeup events"
Erik Kline [Mon, 29 May 2017 00:11:03 +0000 (09:11 +0900)]
Support "dumpsys connectivity tethering"
Also print current upstream interface in tethering dump output.
Test: as follows
- build
- flashed
- booted
- runtest frameworks-net passes
- "dumpsys connectivity tethering" shows just tethering info
Bug:
32163131
Bug:
36504926
Bug:
36988090
Bug:
38152109
Bug:
38186915
Bug:
38218697
Change-Id: I7f185fd71946a032e7f815207016294892df135d
Joel Scherpelz [Mon, 22 May 2017 04:47:41 +0000 (13:47 +0900)]
Support requesting and receiving wakeup events
Test: as follows
- built
- flashed
- booted
- ConnectivityServiceTest passes
Bug:
28806131
Change-Id: Ifc45260d5315479393da2c859ba4afed4e0e8c85
Erik Kline [Sun, 28 May 2017 11:31:32 +0000 (11:31 +0000)]
Merge "Minor improvement in logging in TetheringConfiguration" am:
39ce589f0b am:
8211c36db9
am:
1315903420
Change-Id: I77b4db07f2a43a576146537ae2ab72d2d0ebdde6
Erik Kline [Sun, 28 May 2017 11:25:29 +0000 (11:25 +0000)]
Merge "Minor improvement in logging in TetheringConfiguration" am:
39ce589f0b
am:
8211c36db9
Change-Id: Icf1f42b76998a3c7f4fd4285beb89e1310e5413d
Erik Kline [Sun, 28 May 2017 11:16:32 +0000 (11:16 +0000)]
Merge "Minor improvement in logging in TetheringConfiguration"
am:
39ce589f0b
Change-Id: I1d61308cf21f3c4ebcc37f78bdd102f96a676462
Erik Kline [Sun, 28 May 2017 11:06:39 +0000 (11:06 +0000)]
Merge "Minor improvement in logging in TetheringConfiguration"
Erik Kline [Fri, 19 May 2017 01:10:41 +0000 (10:10 +0900)]
Minor improvement in logging in TetheringConfiguration
Test: as follows
- built
- booted
- flashed
- runtest frameworks-net passes
- dumpsys connectivity shows expected output
Bug:
32163131
Bug:
36504926
Bug:
36988090
Bug:
38152109
Bug:
38186915
Bug:
38218697
Change-Id: I4a2129d780dfec7bca693486a100ea3c78465430
Felipe Leme [Sat, 27 May 2017 02:30:30 +0000 (02:30 +0000)]
Merge "Improved autofillHints documentation." into oc-dev
am:
0b1b1c4346
Change-Id: I2aeaefde853f941263fcf677dfdcb3bffc6ab337
TreeHugger Robot [Sat, 27 May 2017 02:25:02 +0000 (02:25 +0000)]
Merge "Improved autofillHints documentation." into oc-dev
Adam Lesinski [Sat, 27 May 2017 01:51:55 +0000 (01:51 +0000)]
Merge "AAPT2: Follow symlinks when compiling" into oc-dev
am:
6ea61f9c6d
Change-Id: I18dc95b8adf503e0bf72e5b48036945dc95312de
TreeHugger Robot [Sat, 27 May 2017 01:43:46 +0000 (01:43 +0000)]
Merge "AAPT2: Follow symlinks when compiling" into oc-dev
Android Build Merger (Role) [Sat, 27 May 2017 01:35:54 +0000 (01:35 +0000)]
Merge "Merge "DividerView choreographer set earlier to avoid null exception" into oc-dev am:
9c4b6d3bff" into oc-dev-plus-aosp
Matthew Ng [Sat, 27 May 2017 01:35:13 +0000 (01:35 +0000)]
Merge "DividerView choreographer set earlier to avoid null exception" into oc-dev
am:
9c4b6d3bff
Change-Id: I9ce71c3f2434ef98d91161353c358e65c336e3bc
Android Build Merger (Role) [Sat, 27 May 2017 01:34:51 +0000 (01:34 +0000)]
Merge "Merge "Add 32 and 128 bit Service Data parsing." into oc-dev am:
e2b92e904c" into oc-dev-plus-aosp
Jakub Pawlowski [Sat, 27 May 2017 01:33:59 +0000 (01:33 +0000)]
Merge "Add 32 and 128 bit Service Data parsing." into oc-dev
am:
e2b92e904c
Change-Id: Iabcac8a4597e2913d461cafa179a8a79ce0e48d9
Hall Liu [Sat, 27 May 2017 01:31:58 +0000 (01:31 +0000)]
Merge "Add new error codes in MbmsException" am:
8e7057ccf3 am:
20d98578f2
am:
aac7e3a182
Change-Id: Ie426c6334590f30656166b0a7851fe75fa3d4684
TreeHugger Robot [Sat, 27 May 2017 01:29:41 +0000 (01:29 +0000)]
Merge "DividerView choreographer set earlier to avoid null exception" into oc-dev
TreeHugger Robot [Sat, 27 May 2017 01:27:57 +0000 (01:27 +0000)]
Merge "Add 32 and 128 bit Service Data parsing." into oc-dev
Hall Liu [Sat, 27 May 2017 01:25:28 +0000 (01:25 +0000)]
Merge "Add new error codes in MbmsException" am:
8e7057ccf3
am:
20d98578f2
Change-Id: If10d6d2df336be4e52a5b0c4d1bab6455de0f1ce
Hall Liu [Sat, 27 May 2017 01:18:33 +0000 (01:18 +0000)]
Merge "Add new error codes in MbmsException"
am:
8e7057ccf3
Change-Id: Ie8bf825d1fe7c40c94abd0245e69d597afb2f9bc
Hall Liu [Sat, 27 May 2017 01:08:29 +0000 (01:08 +0000)]
Merge "Add new error codes in MbmsException"
Adam Lesinski [Sat, 27 May 2017 00:33:38 +0000 (17:33 -0700)]
AAPT2: Fix <add-resource> tag for overlays
Bug:
38355988
Test: make aapt2_tests
Change-Id: Iea8887f55f8ceb2c15bd963405fd132916173c0c
Siyamed Sinir [Sat, 27 May 2017 00:27:58 +0000 (00:27 +0000)]
Merge "Dont try to autoSize if TextView is not measured" into oc-dev
am:
42b2760525
Change-Id: I737e9498b08de1a8447db39b194fe1640c721f2d
Jiaquan He [Sat, 27 May 2017 00:20:56 +0000 (00:20 +0000)]
Merge changes from topic 'highlight_fixed' into oc-dev
am:
759669988b
Change-Id: I1856f049fbb1f76e728f881c088579309b81a57c
Jiaquan He [Sat, 27 May 2017 00:19:35 +0000 (00:19 +0000)]
Check state_focus in foreground.
am:
0bdf1c9c76
Change-Id: Ie7b36dfa723a110d553c2f6a5926314758e0da53
Siyamed Sinir [Sat, 27 May 2017 00:13:33 +0000 (00:13 +0000)]
Merge "Don’t try to autoSize if TextView is not measured" into oc-dev
TreeHugger Robot [Sat, 27 May 2017 00:11:01 +0000 (00:11 +0000)]
Merge changes from topic 'highlight_fixed' into oc-dev
* changes:
Check default focus highlight for ImageView.
Check state_focus in foreground.
Adam Lesinski [Fri, 26 May 2017 23:31:38 +0000 (16:31 -0700)]
AAPT2: Follow symlinks when compiling
Bug:
62144459
Test: make AaptSymlinkTest
Change-Id: Idb3ab1ece17c52bb4fd174ec4c08a9e173289e55
Selim Cinek [Fri, 26 May 2017 23:38:48 +0000 (23:38 +0000)]
Merge "Fixed a bug where min-priority were in the middle" into oc-dev
am:
7ddf54211f
Change-Id: I7cbee601bd0401e7ac20fdd2d2527f11dafcb068
Selim Cinek [Fri, 26 May 2017 23:32:11 +0000 (23:32 +0000)]
Merge "Fixed a bug where min-priority were in the middle" into oc-dev
Andrii Kulian [Fri, 26 May 2017 23:25:23 +0000 (23:25 +0000)]
Merge "Refresh screen off timeout when screen lock is released in VR" into oc-dev
am:
e63965cef5
Change-Id: If1e6876fa6466fa047213f6f1ebbb42d004486f0
Jakub Pawlowski [Fri, 26 May 2017 20:59:55 +0000 (13:59 -0700)]
Add 32 and 128 bit Service Data parsing.
Bug:
62078132
Change-Id: I79ff75cd5ccbe346dca79693b074ff3cd09112dd
(cherry picked from commit
45033a7e5799f2d957c7dad22eec0bfef94b3e16)
Android Build Merger (Role) [Fri, 26 May 2017 23:22:11 +0000 (23:22 +0000)]
Merge "Merge "Merge "Add 32 and 128 bit Service Data parsing." am:
725e212de3 am:
2acc8e28dd" into nyc-mr2-dev-plus-aosp am:
658e1ddc7e" into oc-dev-plus-aosp
OSDN Git Service
