OSDN Git Service
Phil Weaver [Thu, 3 Nov 2016 22:23:23 +0000 (22:23 +0000)]
Merge "Make calls from apps to a11y oneway."
Stephen Chen [Thu, 3 Nov 2016 21:09:45 +0000 (21:09 +0000)]
Merge "Document Subtype additions for ACTION_WIFI_CONNECT, ACTION_WIFI_OFF."
Etan Cohen [Thu, 3 Nov 2016 20:45:31 +0000 (20:45 +0000)]
Merge "Update service test runner to allow test args" am:
56b92e8191 am:
dde9ea21e4 am:
10840d1897
am:
be8e13de60
Change-Id: I48302e70e01fb290634f66bd679268fea0ede22d
Etan Cohen [Thu, 3 Nov 2016 20:39:26 +0000 (20:39 +0000)]
Merge "Update service test runner to allow test args" am:
56b92e8191 am:
dde9ea21e4
am:
10840d1897
Change-Id: I200c88f0d6d00bef77fe00a59f8e99b3b91f7aa2
Greg Plesur [Thu, 3 Nov 2016 20:37:33 +0000 (20:37 +0000)]
Merge "New Wear devices need to update their DISABLE_LOCKSCREEN_KEY." into cw-f-dev am:
343dbac2e0 am:
c447d9ef6a
am:
0cbe2e1a5c
Change-Id: I98803fd185b5d523e5aec610d29c112ee78a6254
Greg Plesur [Thu, 3 Nov 2016 20:36:27 +0000 (20:36 +0000)]
New Wear devices need to update their DISABLE_LOCKSCREEN_KEY. am:
eb2e45369a am:
a71a0b8da1
am:
e44736a819
Change-Id: I36f1980ede5ea483c4750386a7b5905254ce33f8
Etan Cohen [Thu, 3 Nov 2016 20:32:54 +0000 (20:32 +0000)]
Merge "Update service test runner to allow test args" am:
56b92e8191
am:
dde9ea21e4
Change-Id: I59d572e233720ecf0ddc6cbb5893323b563a3241
Greg Plesur [Thu, 3 Nov 2016 20:30:59 +0000 (20:30 +0000)]
Merge "New Wear devices need to update their DISABLE_LOCKSCREEN_KEY." into cw-f-dev am:
343dbac2e0
am:
c447d9ef6a
Change-Id: I17a831ab2c537c00452f250d151ec3f63b2d6277
Greg Plesur [Thu, 3 Nov 2016 20:29:55 +0000 (20:29 +0000)]
New Wear devices need to update their DISABLE_LOCKSCREEN_KEY. am:
eb2e45369a
am:
a71a0b8da1
Change-Id: I9a19eea21e008a9253ea7abbd854b21f4696548c
Etan Cohen [Thu, 3 Nov 2016 20:26:29 +0000 (20:26 +0000)]
Merge "Update service test runner to allow test args"
am:
56b92e8191
Change-Id: Ib5f44685228bab61d50dea4c5bd226c4b80c2dd1
Greg Plesur [Thu, 3 Nov 2016 20:23:29 +0000 (20:23 +0000)]
Merge "New Wear devices need to update their DISABLE_LOCKSCREEN_KEY." into cw-f-dev
am:
343dbac2e0
Change-Id: Ia7b6297443c555edc9372e6991784b2a6920d2ba
Greg Plesur [Thu, 3 Nov 2016 20:23:24 +0000 (20:23 +0000)]
New Wear devices need to update their DISABLE_LOCKSCREEN_KEY.
am:
eb2e45369a
Change-Id: I64c1cc38bc38d9d0ee6214a64c6ddfaa57095ce0
Etan Cohen [Thu, 3 Nov 2016 20:18:53 +0000 (20:18 +0000)]
Merge "Update service test runner to allow test args"
Greg Plesur [Thu, 3 Nov 2016 20:15:15 +0000 (20:15 +0000)]
Merge "New Wear devices need to update their DISABLE_LOCKSCREEN_KEY." into cw-f-dev
Michael Kwan [Thu, 3 Nov 2016 20:09:24 +0000 (20:09 +0000)]
Merge "Disable multiwindow support for watch devices by default." into cw-f-dev am:
0d3f740316 am:
10f3eda0fd
am:
af03cd3c5b
Change-Id: Ifac814e3904d92dc193dcb17ea9c4bc046ad0272
Michael Kwan [Thu, 3 Nov 2016 20:08:25 +0000 (20:08 +0000)]
Disable multiwindow support for watch devices by default. am:
1cb6777e51 am:
620a33b827
am:
4c5d4dd64d
Change-Id: I8bb789fee47c5b14612ac29ea43fd8ae4e4a7ea5
Android Build Merger (Role) [Thu, 3 Nov 2016 20:06:13 +0000 (20:06 +0000)]
Merge "[NAN-AWARE] Rename NAN to Aware [DO NOT MERGE] am:
a61b9fb569 -s ours"
TreeHugger Robot [Thu, 3 Nov 2016 20:04:14 +0000 (20:04 +0000)]
Merge "Implement onDrawTextBlob in the SkiaCanvasProxy."
Etan Cohen [Thu, 3 Nov 2016 20:03:59 +0000 (20:03 +0000)]
[NAN-AWARE] Rename NAN to Aware [DO NOT MERGE]
am:
a61b9fb569 -s ours
Change-Id: I40abb81290d255c0369f4356bd78b46f5479a857
Michael Kwan [Thu, 3 Nov 2016 20:03:55 +0000 (20:03 +0000)]
Merge "Disable multiwindow support for watch devices by default." into cw-f-dev am:
0d3f740316
am:
10f3eda0fd
Change-Id: I5d6ad3b9b5ce63546907f629c289229bf673186d
Michael Kwan [Thu, 3 Nov 2016 20:02:55 +0000 (20:02 +0000)]
Disable multiwindow support for watch devices by default. am:
1cb6777e51
am:
620a33b827
Change-Id: Id2f6d1e2a12c6644f41ed5f535568130139cd355
TreeHugger Robot [Thu, 3 Nov 2016 19:59:41 +0000 (19:59 +0000)]
Merge "Implement Skia pipelines for OpenGL and Vulkan."
Michael Kwan [Thu, 3 Nov 2016 19:56:24 +0000 (19:56 +0000)]
Merge "Disable multiwindow support for watch devices by default." into cw-f-dev
am:
0d3f740316
Change-Id: I7867b0ff72237c7ce216f570034f6f811e5a6abb
Michael Kwan [Thu, 3 Nov 2016 19:56:20 +0000 (19:56 +0000)]
Disable multiwindow support for watch devices by default.
am:
1cb6777e51
Change-Id: I9e42480be007387109f9e58efe594dca860e3597
Michael Kwan [Thu, 3 Nov 2016 19:48:53 +0000 (19:48 +0000)]
Merge "Disable multiwindow support for watch devices by default." into cw-f-dev
TreeHugger Robot [Thu, 3 Nov 2016 19:43:29 +0000 (19:43 +0000)]
Merge "Reference ctable when adopting pointer in Bitmap"
TreeHugger Robot [Thu, 3 Nov 2016 19:27:43 +0000 (19:27 +0000)]
Merge "update callers to newer Skia APIs"
Greg Plesur [Wed, 2 Nov 2016 21:10:27 +0000 (17:10 -0400)]
New Wear devices need to update their DISABLE_LOCKSCREEN_KEY.
Previous versions of Wear forced this flag to "true."
BUG:
32591969
Change-Id: I9619eee5df5f67e92818ef0b7b45ddd2299449f1
Phil Weaver [Thu, 3 Nov 2016 16:34:29 +0000 (09:34 -0700)]
Make calls from apps to a11y oneway.
Saves about 300us for each AccessibilityEvent sent, which
translates to 1 ms in gfx-avg-frame-time in the
QuickSettingsPull.
Test: Ran a11y cts and unit tests. Ran systrace and the
QuickSettingsPull to measure jank improvement.
Change-Id: I6d219b0e82c21047e50d402d930d8a5cc93fa6ad
Paulo Casanova [Thu, 3 Nov 2016 18:39:02 +0000 (18:39 +0000)]
Merge "Updated JNI interface."
Paulo Casanova [Thu, 3 Nov 2016 18:38:19 +0000 (18:38 +0000)]
Merge "Added Windows support for aapt/JNI."
Robert Greenwalt [Thu, 3 Nov 2016 18:23:29 +0000 (18:23 +0000)]
Merge "Fixed string array resource"
Winson Chung [Thu, 3 Nov 2016 17:48:09 +0000 (17:48 +0000)]
Merge changes I0d6f2f0c,I278ab8c3
* changes:
Experiment for snapping PIP to closest edge.
Experiment with allowing tap to break through to interact with the PIP.
Stephen Chen [Thu, 3 Nov 2016 17:44:32 +0000 (10:44 -0700)]
Document Subtype additions for ACTION_WIFI_CONNECT, ACTION_WIFI_OFF.
Bug:
32371451
Test: n/a
Change-Id: Ib4f0eb49242c9ec248f3e8931ff73d35c2cb1167
Derek Sollenberger [Thu, 3 Nov 2016 16:54:06 +0000 (12:54 -0400)]
Implement onDrawTextBlob in the SkiaCanvasProxy.
Test: hwui_unit_tests now pass
Bug:
30353290
Change-Id: I26c98be394e9dbd1cf63fe3eac18cb090403ace7
Wyatt Riley [Thu, 3 Nov 2016 17:40:28 +0000 (17:40 +0000)]
Merge "High speed GPS/GNSS Navigation Information Block" into nyc-mr2-dev am:
8b85444802
am:
df03f37af4
Change-Id: I5a6573d97c501e56e8133e1dc4cda9dceec2aecc
Wyatt Riley [Thu, 3 Nov 2016 17:39:18 +0000 (17:39 +0000)]
High speed GPS/GNSS Navigation Information Block am:
5d5bac8383
am:
0021090eb9
Change-Id: I77d910e9cfd33d5b4aeabfa0f2c2db7fa73120b4
Wyatt Riley [Thu, 3 Nov 2016 17:33:26 +0000 (17:33 +0000)]
Merge "High speed GPS/GNSS Navigation Information Block" into nyc-mr2-dev
am:
8b85444802
Change-Id: I44ba889725acdb43e7eea890cc0bfa9fe3c2b5a6
Wyatt Riley [Thu, 3 Nov 2016 17:33:19 +0000 (17:33 +0000)]
High speed GPS/GNSS Navigation Information Block
am:
5d5bac8383
Change-Id: If8e8576f7e18faf6cb45ff228222c0c34be98d6d
Stan Iliev [Wed, 26 Oct 2016 14:30:09 +0000 (10:30 -0400)]
Implement Skia pipelines for OpenGL and Vulkan.
Implement Skia pipelines for OpenGL and Vulkan:
base SkiaPipeline, SkiaOpenGLPipeline and SkiaVulkanPipeline.
Write unit tests for SkiaPipeline.
Test: Built and run manually on angler-eng.
Change-Id: Ie02583426cb3547541ad9bf91700602a6163ff58
TreeHugger Robot [Thu, 3 Nov 2016 17:27:05 +0000 (17:27 +0000)]
Merge "High speed GPS/GNSS Navigation Information Block" into nyc-mr2-dev
TreeHugger Robot [Thu, 3 Nov 2016 17:15:29 +0000 (17:15 +0000)]
Merge "resolve merge conflicts of
0d16fa4 to master"
John Reck [Thu, 3 Nov 2016 17:14:53 +0000 (17:14 +0000)]
Merge "Add benchmarks for View inflation"
sergeyv [Thu, 3 Nov 2016 17:00:32 +0000 (10:00 -0700)]
Reference ctable when adopting pointer in Bitmap
Change-Id: I56aea10928f0ec73756ed055488a3e3516a9096e
Test: manual.
bug:
32621254,
32561595
Mike Reed [Thu, 3 Nov 2016 16:54:10 +0000 (12:54 -0400)]
update callers to newer Skia APIs
Test: refactoring CL. Existing unit tests still pass.
Change-Id: I47e73e00f14f78dd9d4c48a142ac9853e7e4cad7
Torne (Richard Coles) [Thu, 3 Nov 2016 15:09:34 +0000 (15:09 +0000)]
resolve merge conflicts of
0d16fa4 to master
Change-Id: I3c01fe6f5439885d28c6d28415004b26845f06b0
Richard Coles [Thu, 3 Nov 2016 14:54:09 +0000 (14:54 +0000)]
Merge "Fix WebViewUpdateServiceTest failures when using Thread without Looper." am:
be19fe5e8a am:
9c47f5c87a
am:
0092dbabe0
Change-Id: Ic1b2d362c582513ba821f6b9035e1ac91dcfa471
Richard Coles [Thu, 3 Nov 2016 14:48:05 +0000 (14:48 +0000)]
Merge "Fix WebViewUpdateServiceTest failures when using Thread without Looper." am:
be19fe5e8a
am:
9c47f5c87a
Change-Id: Ia5d867468080e0e48a4e5b3c08b1ee627e16cebe
Richard Coles [Thu, 3 Nov 2016 14:42:08 +0000 (14:42 +0000)]
Merge "Fix WebViewUpdateServiceTest failures when using Thread without Looper."
am:
be19fe5e8a
Change-Id: I85e2e13f395dac085616838670c19ddbedc67e9d
Richard Coles [Thu, 3 Nov 2016 14:34:49 +0000 (14:34 +0000)]
Merge "Fix WebViewUpdateServiceTest failures when using Thread without Looper."
Julia Reynolds [Thu, 3 Nov 2016 13:42:26 +0000 (13:42 +0000)]
Merge "Replace test TODOs with ACTION."
Michal Karpinski [Thu, 3 Nov 2016 10:19:23 +0000 (10:19 +0000)]
Stop non-DO devices from disabling network logging
Bug:
32623860
Change-Id: Ia53ce842fffb2a15c16c9535fbe07421ae7f2578
Paulo Casanova [Tue, 1 Nov 2016 14:50:46 +0000 (14:50 +0000)]
Updated JNI interface.
Added new "ping" method used to detect if the shared
library has already been loaded.
Fixed a few bugs in the implementation (and now it works
from the Java side).
See http://ag/
1590668 for the implementation on devtools.
Test: Done on the tools side
Change-Id: Ifa41073dc3b6ac69cdb9f77e655bf261c3b4c3d1
Paulo Casanova [Tue, 1 Nov 2016 17:07:06 +0000 (17:07 +0000)]
Added Windows support for aapt/JNI.
This includes copying and slightly modifying
libnativehelper's ScopedUtfChars' implementation.
Test: Done in studio-master-dev
Change-Id: I2aacc67b444668478aaa5bb0db991a201c571d1f
Michael Kwan [Thu, 3 Nov 2016 08:09:08 +0000 (01:09 -0700)]
Disable multiwindow support for watch devices by default.
Bug:
30120559
Change-Id: I458eac557e38fd32533a98cca7cbbabc5fa08b09
Jorim Jaggi [Thu, 3 Nov 2016 04:17:11 +0000 (04:17 +0000)]
Merge "Fix that bouncer is not focusable if shown without notification shade"
Jorim Jaggi [Thu, 3 Nov 2016 04:14:14 +0000 (04:14 +0000)]
Merge "The big Keyguard transition refactor (7/n)"
TreeHugger Robot [Thu, 3 Nov 2016 03:26:50 +0000 (03:26 +0000)]
Merge "Add traces to systrace when binder tracing is enabled"
Winson Chung [Thu, 3 Nov 2016 00:28:03 +0000 (17:28 -0700)]
Experiment for snapping PIP to closest edge.
Test: Enable in SysUI tuner, drag PIP. This is only experimental to help
figure out what UX we want to keep.
Change-Id: I0d6f2f0c5909d6a76aae4a8fb84c5076f6996fdd
Jorim Jaggi [Thu, 3 Nov 2016 01:11:03 +0000 (18:11 -0700)]
Fix that bouncer is not focusable if shown without notification shade
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test android.server.cts.KeyguardLockedTests#testDismissKeyguard_fromShowWhenLocked
Change-Id: Ia300cea18b0ed7c9bfe04f3aa051d8a04a6eaedc
Winson Chung [Thu, 3 Nov 2016 01:11:36 +0000 (18:11 -0700)]
Experiment with allowing tap to break through to interact with the PIP.
Test: Enable SysUI tuner, tap once on PIP to interact with the activity.
This is only experimental behaviour, and
android.server.cts.ActivityManagerPinnedStackTests will be updated
accordingly if we keep this behavior.
Change-Id: I278ab8c360c44718cfcac0fd761f476a875f9b15
Dimitry Ivanov [Thu, 3 Nov 2016 00:27:38 +0000 (00:27 +0000)]
Merge "Change findPath() to findDocumentPath() in MtpDocumentsProvider."
Wyatt Riley [Tue, 1 Nov 2016 14:05:16 +0000 (07:05 -0700)]
High speed GPS/GNSS Navigation Information Block
When speed goes above 400m/s, the GnssLocationProvider will
stop output of location, measurements and navigation message.
Test: Several on device tests, see bug for details
Bug:
31711586
Change-Id: I8bceb9a67b10ac7cf21983bb856ed0608957096a
TreeHugger Robot [Thu, 3 Nov 2016 00:21:27 +0000 (00:21 +0000)]
Merge "Cleanup dumpstate for CTS tests"
Christopher Tate [Thu, 27 Oct 2016 01:06:42 +0000 (18:06 -0700)]
Make SET_TIME_ZONE permission match SET_TIME
That is, SET_TIME_ZONE is now signature|privileged.
Bug
19129180
Test: dumpsys package to verify assignment; clock app works
Change-Id: Id0e16499a00e1f5cfb5bd4d9fb421f93bb283ee1
TreeHugger Robot [Wed, 2 Nov 2016 23:28:07 +0000 (23:28 +0000)]
Merge "[DPM] Management and retrieval of network logs"
Garfield Tan [Wed, 2 Nov 2016 23:00:17 +0000 (16:00 -0700)]
Change findPath() to findDocumentPath() in MtpDocumentsProvider.
Test: It builds.
Change-Id: If474e766b5680d49a7557f0e7ee1c039eb4efae0
Jorim Jaggi [Tue, 1 Nov 2016 23:17:22 +0000 (16:17 -0700)]
Add traces to systrace when binder tracing is enabled
If binder tracing is enabled, we also output the class/method name
to systrace. This is the first step toward a system in which we could
show the full stack trace in systrace.
Test:
adb shell am trace-ipc start
python systrace.py
adb shell am trace-ipc stop
Change-Id: I6d0354c9560c4518c84fb3fdb66219b460e69f67
Jorim Jaggi [Fri, 28 Oct 2016 02:57:08 +0000 (19:57 -0700)]
The big Keyguard transition refactor (7/n)
There was some window animation jank because we ran a layout during
the animation, as the SysUI animations are slightly faster, so we
collapsed the window already during the animation which caused
a layout which caused window animation jank.
Bug:
32057734
Change-Id: I296f961be8cfc39b08859b7d3d41f1e81b2eaaa3
Steven Moreland [Wed, 2 Nov 2016 22:39:52 +0000 (22:39 +0000)]
Merge "Update for hidlized hwservicemanager." am:
8d0c4ed74c am:
8527f13251 am:
0d5da175a0
am:
630fc8c4f7
Change-Id: Iac8cf0e85a0595dc87d5118b8150888c866262fe
Steven Moreland [Wed, 2 Nov 2016 22:34:30 +0000 (22:34 +0000)]
Merge "Update for hidlized hwservicemanager." am:
8d0c4ed74c am:
8527f13251
am:
0d5da175a0
Change-Id: I8ed00bc19e120e76e546c2ae0610f8771077a471
Steven Moreland [Wed, 2 Nov 2016 22:28:28 +0000 (22:28 +0000)]
Merge "Update for hidlized hwservicemanager." am:
8d0c4ed74c
am:
8527f13251
Change-Id: I23ad38482ce6b7aa9857dccd6398af26b46ee46f
Steven Moreland [Wed, 2 Nov 2016 22:23:45 +0000 (22:23 +0000)]
Merge "Update for hidlized hwservicemanager."
am:
8d0c4ed74c
Change-Id: I8314346b5ac8cf1f2b219580c02117cd6977e6aa
TreeHugger Robot [Wed, 2 Nov 2016 22:18:47 +0000 (22:18 +0000)]
Merge "AAPT: fix error message"
Treehugger Robot [Wed, 2 Nov 2016 22:17:24 +0000 (22:17 +0000)]
Merge "Update for hidlized hwservicemanager."
Sudheer Shanka [Wed, 2 Nov 2016 22:00:26 +0000 (22:00 +0000)]
Merge "Fix IApplicationThread transaction codes."
Garfield Tan [Wed, 2 Nov 2016 21:59:28 +0000 (21:59 +0000)]
Merge "Iteration on findDocumentPath() API."
TreeHugger Robot [Wed, 2 Nov 2016 21:50:36 +0000 (21:50 +0000)]
Merge "Added support for window TYPE_PRESENTATION"
John Reck [Wed, 2 Nov 2016 18:14:47 +0000 (11:14 -0700)]
Add benchmarks for View inflation
Also speed up RenderNode creation:
Use finalizer() instead of NativeAllocationRegistry, this
shaves ~3us off of creation currently
Avoid instanceof, instead have SurfaceView explicitly ask
for updates.
Remove unused method call.
Test: ran benchmarks
Change-Id: I3117fdf72313a4e6a9965baca9f2a8b855c19b34
neo.chae [Wed, 2 Nov 2016 21:30:36 +0000 (21:30 +0000)]
Merge "Fix idmap leak in zygote process" am:
f5ad44b60a am:
4720125a3c am:
3e15d09ed4
am:
d3a209399a
Change-Id: I2c7272b5f79e029ac88fa6b6acb598bdf68f28e2
neo.chae [Wed, 2 Nov 2016 21:25:05 +0000 (21:25 +0000)]
Merge "Fix idmap leak in zygote process" am:
f5ad44b60a am:
4720125a3c
am:
3e15d09ed4
Change-Id: I7d3d7d72e92a66c48b68165e5e3d26a1ccd1b56a
neo.chae [Wed, 2 Nov 2016 21:21:32 +0000 (21:21 +0000)]
Merge "Fix idmap leak in zygote process" am:
f5ad44b60a
am:
4720125a3c
Change-Id: If66e9476583ec50d2dca5a15376a4b84ae2a2885
Jorim Jaggi [Wed, 2 Nov 2016 01:22:53 +0000 (18:22 -0700)]
Cleanup dumpstate for CTS tests
Change-Id: Iefd7f2863b1a2d8974d0cd1c27b1d3b2d3ffbe8e
neo.chae [Wed, 2 Nov 2016 21:16:33 +0000 (21:16 +0000)]
Merge "Fix idmap leak in zygote process"
am:
f5ad44b60a
Change-Id: Ia9977c8166f797ad716284eda03076e282a9fde7
Treehugger Robot [Wed, 2 Nov 2016 21:09:02 +0000 (21:09 +0000)]
Merge "Fix idmap leak in zygote process"
Brad Ebinger [Wed, 2 Nov 2016 21:05:49 +0000 (21:05 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session" am:
f231db7786 -s ours am:
ccec8919fe am:
a895383b44
am:
02a42886ac
Change-Id: I5652f26f1a0d2c88c432a3eae0d58ef1477c986c
Wei Jia [Wed, 2 Nov 2016 21:03:19 +0000 (21:03 +0000)]
Merge "mediaplayer: add precise argument to seek function"
Brad Ebinger [Wed, 2 Nov 2016 21:00:05 +0000 (21:00 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session" am:
f231db7786 -s ours am:
ccec8919fe
am:
a895383b44
Change-Id: I0c606de6d7bd7eb37a3748c2f6ab3be889f933a6
Brad Ebinger [Wed, 2 Nov 2016 20:55:16 +0000 (20:55 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session" am:
f231db7786 -s ours
am:
ccec8919fe
Change-Id: I27443a9024ea4aff209a24a9049832a76f252476
Brad Ebinger [Wed, 2 Nov 2016 20:51:36 +0000 (20:51 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session"
am:
f231db7786 -s ours
Change-Id: Ia5ebf8f639e1336e9e7278faf8eb09285d3c5507
Steven Moreland [Mon, 24 Oct 2016 20:44:41 +0000 (13:44 -0700)]
Update for hidlized hwservicemanager.
Bug:
32313592
Test: pass (end to end for others in topic).
Change-Id: I7ac6bbe8b8de5e1cb86759cbe6f31fac642cec28
Brad Ebinger [Wed, 2 Nov 2016 20:39:40 +0000 (20:39 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session"
Ben Wagner [Wed, 2 Nov 2016 20:31:58 +0000 (20:31 +0000)]
Merge "Replace SkAutoTUnref with sk_sp."
TreeHugger Robot [Wed, 2 Nov 2016 20:27:10 +0000 (20:27 +0000)]
Merge "Add VERSION_CODES.O"
Adam Lesinski [Wed, 2 Nov 2016 20:17:10 +0000 (13:17 -0700)]
AAPT: fix error message
Test: none
Bug:
9779154
Change-Id: Iebda7d4f0061cdc51db0103977195964fcc1211d
TreeHugger Robot [Wed, 2 Nov 2016 20:08:29 +0000 (20:08 +0000)]
Merge "Fixing issue with PIP while IME is showing."
Julia Reynolds [Wed, 2 Nov 2016 13:54:47 +0000 (09:54 -0400)]
Replace test TODOs with ACTION.
Also call packagemanager less.
Test: runtest
Change-Id: Icff2a5b9e7fff49ef8cf7b643c198707a6089007
TreeHugger Robot [Wed, 2 Nov 2016 19:50:42 +0000 (19:50 +0000)]
Merge changes I7ef5921c,I3bbd09c5
* changes:
Create test for CategoryManager.
Backward-compat for DashboardCategory with app use old keys
Dianne Hackborn [Wed, 2 Nov 2016 19:46:29 +0000 (19:46 +0000)]
Merge "Power manager always needs to allow wake locks for services, receivers"
TreeHugger Robot [Wed, 2 Nov 2016 19:34:27 +0000 (19:34 +0000)]
Merge "Make window token add/remove APIs require displayId"