OSDN Git Service
Dimitry Ivanov [Thu, 3 Nov 2016 00:27:38 +0000 (00:27 +0000)]
Merge "Change findPath() to findDocumentPath() in MtpDocumentsProvider."
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
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"
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."
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"
pengzhicai [Wed, 2 Nov 2016 18:40:00 +0000 (18:40 +0000)]
Merge "Fix String is empty issue" am:
80af1ba47b am:
38c585cb8d am:
d7df704d98
am:
f85e7930d8
Change-Id: I9e85d16bd3edc529a97e4df3b8f90e9fdb2ee486
pengzhicai [Wed, 2 Nov 2016 18:34:53 +0000 (18:34 +0000)]
Merge "Fix String is empty issue" am:
80af1ba47b am:
38c585cb8d
am:
d7df704d98
Change-Id: Ia75039c87b396b8b0d15f0758d17e365fb2f18e6
Makoto Onuki [Wed, 2 Nov 2016 18:11:32 +0000 (11:11 -0700)]
Add VERSION_CODES.O
So that the framework can do "targetSdk >= O".
Test: Additional hidden constant only. "m"
Change-Id: I6cde68869c3b8bdc8e8b06b7d63f164714fbd2b0
pengzhicai [Wed, 2 Nov 2016 18:29:24 +0000 (18:29 +0000)]
Merge "Fix String is empty issue" am:
80af1ba47b
am:
38c585cb8d
Change-Id: I091572280b0b2a33a2a5e2339a08df0759bb2bd7
Wale Ogunwale [Wed, 2 Nov 2016 03:54:46 +0000 (20:54 -0700)]
Added support for window TYPE_PRESENTATION
Switched presentation feature to use new window TYPE_PRESENTATION
and also add its own window token to the display the presentation
is running on. This is needed as window manager no longer allows
tokens to have windows on multiple displays.
Bug:
32566372
Test: Presentation mode works.
Change-Id: I9c2998311b65640743b8e23ec4f10bf1ffbfd785
Winson Chung [Wed, 2 Nov 2016 17:02:29 +0000 (10:02 -0700)]
Fixing issue with PIP while IME is showing.
- Unifying logic to ensure that the PIP is moved consistently as its
movement bounds are shifted. This is done by adding a snap fraction
which is a fraction relative to one set of movement bounds, and applied
to a new movement bounds. This is flexible to work with all of the
current snap modes being tested.
- Fixing issue where you can drag out of bounds when touching the PIP
before the IME shows.
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testPinnedStackOffsetForIME
Change-Id: Ie68c1ca599f6196726b8224585974a0972b93701
Signed-off-by: Winson Chung <winsonc@google.com>
pengzhicai [Wed, 2 Nov 2016 18:23:26 +0000 (18:23 +0000)]
Merge "Fix String is empty issue"
am:
80af1ba47b
Change-Id: I7000d0fe8fd5c2145e628abec11b49653027138b
Treehugger Robot [Wed, 2 Nov 2016 18:14:49 +0000 (18:14 +0000)]
Merge "Fix String is empty issue"
Brad Ebinger [Wed, 2 Nov 2016 17:54:08 +0000 (17:54 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master am:
def235760e am:
c50005ee6c
am:
1d35eee461
Change-Id: Icd422298d0d0372b969ce9cca481314980dc83d8
Brad Ebinger [Wed, 2 Nov 2016 17:51:51 +0000 (17:51 +0000)]
resolve merge conflicts of
4d75bee to nyc-mr1-dev-plus-aosp am:
c5eacceb3f
am:
baa73944e4
Change-Id: I6d636ee7464a9dea03f2ad2f9474d23627c0b6f3
Brad Ebinger [Wed, 2 Nov 2016 17:47:30 +0000 (17:47 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master am:
def235760e
am:
c50005ee6c
Change-Id: I7b04f249de691f1499d3e2bbcbc93bf81d4fd1ea
Brad Ebinger [Wed, 2 Nov 2016 17:46:43 +0000 (17:46 +0000)]
resolve merge conflicts of
4d75bee to nyc-mr1-dev-plus-aosp
am:
c5eacceb3f
Change-Id: I1fe6eea67081a8d35132d87c8e3e38952e110cc0
TreeHugger Robot [Wed, 2 Nov 2016 17:45:18 +0000 (17:45 +0000)]
Merge changes from topic 'skia_merge'
* changes:
Adding changes required by the master-skia merge.
use SkBlendMode
Dianne Hackborn [Wed, 2 Nov 2016 17:41:53 +0000 (10:41 -0700)]
Power manager always needs to allow wake locks for services, receivers
The change to not allow wake locks for idle apps was a little too
aggressive, since we allow apps that are currently executing services
or receivers to be idle. (Idle means that it hasn't been in the
foreground for X amount of time, but services and receivers don't count
as being in the foreground.)
So this takes in to account the actual procstate of the uid to determine
if it should actually respect the current idle state.
Test: manual
Change-Id: I32949124b37875b13233478719abccb8369e47f6
Brad Ebinger [Wed, 2 Nov 2016 17:43:49 +0000 (17:43 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master
am:
def235760e
Change-Id: I309cd302b14ee0d0980632086855ba2cf97c6798
Sudheer Shanka [Tue, 1 Nov 2016 01:45:57 +0000 (18:45 -0700)]
Fix IApplicationThread transaction codes.
(IBinder.FIRST_CALL_TRANSACTION=1) is added to the specified
transaction codes during binder generation. Correct transaction
Ids in IApplicationThread taking this into account.
Bug:
30977067
Test: Verified that the transactions in generated binder have
correct Ids.
Change-Id: Id1f6ce59814ed559cafda01be0d55c78d52e50e2
Android Build Merger (Role) [Wed, 2 Nov 2016 17:38:07 +0000 (17:38 +0000)]
Merge "Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev am:
7ffc2a62ff am:
9bfdce4712 am:
a3c03ba74a am:
a79c39d53e"
Phil Weaver [Wed, 2 Nov 2016 17:37:28 +0000 (17:37 +0000)]
Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev am:
7ffc2a62ff am:
9bfdce4712 am:
a3c03ba74a
am:
a79c39d53e
Change-Id: I59187a1105553b08e424de7e239533693ae2ecd8
Android Build Merger (Role) [Wed, 2 Nov 2016 17:37:04 +0000 (17:37 +0000)]
Merge "Revert "Don't invalidate list data during layout." am:
866ded50bb am:
96b4a68c06 am:
b8a314427b am:
1b5e3d98d2"
Phil Weaver [Wed, 2 Nov 2016 17:36:24 +0000 (17:36 +0000)]
Revert "Don't invalidate list data during layout." am:
866ded50bb am:
96b4a68c06 am:
b8a314427b
am:
1b5e3d98d2
Change-Id: I91a54e6f1f4d94da93b47cc79a8fdda5a8ae8580
Dianne Hackborn [Wed, 2 Nov 2016 17:35:39 +0000 (17:35 +0000)]
Merge "Implement Binder shell command for settings provider."
Brad Ebinger [Wed, 2 Nov 2016 17:28:54 +0000 (10:28 -0700)]
resolve merge conflicts of
4d75bee to nyc-mr1-dev-plus-aosp
Change-Id: Ib11bb52c9d3826e02089485af93856ba891ad034
Fan Zhang [Tue, 1 Nov 2016 22:36:25 +0000 (15:36 -0700)]
Create test for CategoryManager.
- Move SettingsLibTests to tests/integ
- Create a new robotests directory for SettingsLib.
- Add test cases for CategoryManager#backwardCompatCleanupForCategory
Bug:
32382487
Test: make RunSettingsLibRoboTests
Change-Id: I7ef5921ce8c47a3e1e7209be1abc97ea549a2378
Phil Weaver [Wed, 2 Nov 2016 17:31:45 +0000 (17:31 +0000)]
Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev am:
7ffc2a62ff am:
9bfdce4712
am:
a3c03ba74a
Change-Id: I90cf9264ede25712ebaeb1b787cc61c2438f35bc
Phil Weaver [Wed, 2 Nov 2016 17:30:48 +0000 (17:30 +0000)]
Revert "Don't invalidate list data during layout." am:
866ded50bb am:
96b4a68c06
am:
b8a314427b
Change-Id: I5ace1c6b058b795a5b04e48200d2b3d3a1ae2486
Wale Ogunwale [Tue, 1 Nov 2016 22:43:46 +0000 (15:43 -0700)]
Make window token add/remove APIs require displayId
Window tokens can now only be on one display, so we now require clients
that want to add/remove window tokens to specify the display they would
like the token to be created on. This simplifies the token handling code
in WM and will be useful moving forward for clients that want to add
windows to external displays.
Test: Existing tests pass
Change-Id: I6b2d8d58a913b3624f1a9a7bebbb99315613f103
Phil Weaver [Wed, 2 Nov 2016 17:26:10 +0000 (17:26 +0000)]
Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev am:
7ffc2a62ff
am:
9bfdce4712
Change-Id: Ic8a9c38988dd23d0b3c7e1fa96a28a2ffb2f3b6b
Phil Weaver [Wed, 2 Nov 2016 17:25:17 +0000 (17:25 +0000)]
Revert "Don't invalidate list data during layout." am:
866ded50bb
am:
96b4a68c06
Change-Id: I02b34aea90cae2312baa5f8300bc8f6349985470
Phil Weaver [Wed, 2 Nov 2016 17:20:20 +0000 (17:20 +0000)]
Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev
am:
7ffc2a62ff
Change-Id: Id1f42e0dcb96e9dab884faa5ecd070ced3c4fba2
Phil Weaver [Wed, 2 Nov 2016 17:20:17 +0000 (17:20 +0000)]
Revert "Don't invalidate list data during layout."
am:
866ded50bb
Change-Id: I191c26bfb9488d5d67514a81387a9cde95a20eb4
Phil Weaver [Wed, 2 Nov 2016 17:13:22 +0000 (17:13 +0000)]
Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev
Brad Ebinger [Wed, 2 Nov 2016 16:59:30 +0000 (16:59 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master
Fyodor Kupolov [Wed, 2 Nov 2016 16:57:02 +0000 (16:57 +0000)]
Merge "Reuse single AssetManager for lite/full parses"
Sunny Goyal [Wed, 2 Nov 2016 16:46:38 +0000 (16:46 +0000)]
Merge "Avoding writing ApplicationInfo multiple times for nested RemoteViews"
Fyodor Kupolov [Wed, 2 Nov 2016 16:44:09 +0000 (16:44 +0000)]
Merge "Do not exclude partial users that are not being removed"
Ben Wagner [Mon, 24 Oct 2016 18:50:10 +0000 (14:50 -0400)]
Replace SkAutoTUnref with sk_sp.
Skia would like to remove SkAutoTUnref and replace it with sk_sp.
This also removes the last SkAutoTDelete straggler.
Change-Id: Idd46fcbbffe7fc1edb243b82b1c2f5425ccd60b6
Brad Ebinger [Fri, 28 Oct 2016 19:29:55 +0000 (12:29 -0700)]
Modify ConnectionServiceAdapter to include Session
Modifies the ConnectionServiceAdapter to include Session Information in
the AIDL interface so that external Sessions can be started in Telecom
from Telephony.
Test: Manual testing and Unit Tests pass
Bug:
26571395
Change-Id: I31bbfe433dd062a50bd05083e1a639dd4cd03403
Shuo Gao [Wed, 2 Nov 2016 16:19:34 +0000 (16:19 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours am:
eb3696542a -s ours am:
41bdd3a668 -s ours am:
90c736f892 -s ours am:
e319e7335c -s ours am:
2e40559326 -s ours am:
2aa15664af -s ours
am:
9750c9b171 -s ours
Change-Id: I341568e08774d95db757bf1303d75debdc6a6ef6
Thomas Buhot [Wed, 2 Nov 2016 16:18:16 +0000 (16:18 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours am:
7b43f2af93 -s ours am:
40d2aa1edc -s ours am:
eae299874c -s ours am:
5e089ad195 -s ours am:
a71a6ec8fb -s ours am:
a682048141 -s ours
am:
6d69a1668f -s ours
Change-Id: Ide03b46a8a163f1c451b8e29c395aab07420411c
Shuo Gao [Wed, 2 Nov 2016 16:13:46 +0000 (16:13 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours am:
eb3696542a -s ours am:
41bdd3a668 -s ours am:
90c736f892 -s ours am:
e319e7335c -s ours am:
2e40559326 -s ours
am:
2aa15664af -s ours
Change-Id: I551a90774c523e4c27c87a4f804d2562490ca41a
Thomas Buhot [Wed, 2 Nov 2016 16:12:46 +0000 (16:12 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours am:
7b43f2af93 -s ours am:
40d2aa1edc -s ours am:
eae299874c -s ours am:
5e089ad195 -s ours am:
a71a6ec8fb -s ours
am:
a682048141 -s ours
Change-Id: I1e78b118ee1f4d4551558399b3cd2e9960270594
Shuo Gao [Wed, 2 Nov 2016 16:07:59 +0000 (16:07 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours am:
eb3696542a -s ours am:
41bdd3a668 -s ours am:
90c736f892 -s ours am:
e319e7335c -s ours
am:
2e40559326 -s ours
Change-Id: I7e74e80dabc62b2270628848b52b559999d05189
Thomas Buhot [Wed, 2 Nov 2016 16:07:10 +0000 (16:07 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours am:
7b43f2af93 -s ours am:
40d2aa1edc -s ours am:
eae299874c -s ours am:
5e089ad195 -s ours
am:
a71a6ec8fb -s ours
Change-Id: Ib8cba8d490f9777628108b56a6a3a81582c2a483
Fan Zhang [Tue, 1 Nov 2016 22:02:46 +0000 (15:02 -0700)]
Backward-compat for DashboardCategory with app use old keys
- Detect whether an app is using old key, new key, or a mix of both.
-- If app is using new keys, skip. They are already in the new IA.
-- If app is using old/new keys mixed, skip. Using both type of keys
implies the app wants to support old/new platform.
-- If app is using old keys only, map their tiles to new categories.
Bug:
32382487
Test: new unit tests
Change-Id: I3bbd09c531a97801dc382661a8bb10d0391bc177
Shuo Gao [Wed, 2 Nov 2016 16:03:00 +0000 (16:03 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours am:
eb3696542a -s ours am:
41bdd3a668 -s ours am:
90c736f892 -s ours
am:
e319e7335c -s ours
Change-Id: I848f238db11bc2f67fec83cb157d3cb3faec0212
Thomas Buhot [Wed, 2 Nov 2016 16:02:09 +0000 (16:02 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours am:
7b43f2af93 -s ours am:
40d2aa1edc -s ours am:
eae299874c -s ours
am:
5e089ad195 -s ours
Change-Id: I0062bfb72567ae43dbf50a1127e22b2363cac9e1
Shuo Gao [Wed, 2 Nov 2016 15:57:25 +0000 (15:57 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours am:
eb3696542a -s ours am:
41bdd3a668 -s ours
am:
90c736f892 -s ours
Change-Id: I38668b4a372530962a0ae0d6e2a717319731dff0
Thomas Buhot [Wed, 2 Nov 2016 15:56:38 +0000 (15:56 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours am:
7b43f2af93 -s ours am:
40d2aa1edc -s ours
am:
eae299874c -s ours
Change-Id: I6a8b5337f38b099bee806451db1df44c723e6596
Shuo Gao [Wed, 2 Nov 2016 15:51:17 +0000 (15:51 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours am:
eb3696542a -s ours
am:
41bdd3a668 -s ours
Change-Id: I70baae78d036713c95c02e9cad497a343d5d1309
Thomas Buhot [Wed, 2 Nov 2016 15:50:38 +0000 (15:50 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours am:
7b43f2af93 -s ours
am:
40d2aa1edc -s ours
Change-Id: I741b9682b066384aadce0dcaf9ca792de015d59e
Shuo Gao [Wed, 2 Nov 2016 15:46:36 +0000 (15:46 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours
am:
eb3696542a -s ours
Change-Id: I9a78875432e05918c574c9d8ea89230067b811cc
Thomas Buhot [Wed, 2 Nov 2016 15:45:43 +0000 (15:45 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours
am:
7b43f2af93 -s ours
Change-Id: Ia6804a8b93168a033075b6e77ac5d1bec63e3d69
Shuo Gao [Wed, 2 Nov 2016 15:41:06 +0000 (15:41 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages
am:
1b5d5bd119 -s ours
Change-Id: I6c218970581361c195471ee435f5a91b109911f0
Thomas Buhot [Wed, 2 Nov 2016 15:40:34 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous
am:
80e6d8873b -s ours
Change-Id: I521a8a64510e89ee97578fc5e2f600b4a1851bd3
Derek Sollenberger [Wed, 2 Nov 2016 15:34:27 +0000 (11:34 -0400)]
Adding changes required by the master-skia merge.
Test: compile only
Change-Id: I39637a20da439edbf2831952df9bfa12da78e9b9
Mike Reed [Fri, 28 Oct 2016 21:21:45 +0000 (17:21 -0400)]
use SkBlendMode
skbug.com/5814
Test: compile only
Change-Id: Ibbaff43df1117b2ca77fd8f917f03d88cc476330
(cherry picked from commit
26edbcba8a2ed4cb300e7f87e679e3b73cec2772)
Geoffrey Pitsch [Wed, 2 Nov 2016 14:58:22 +0000 (14:58 +0000)]
Merge "Move notification tests into separate APK."
Bill Yi [Wed, 2 Nov 2016 13:27:45 +0000 (13:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
125deebf5d -s ours am:
3b99360472 -s ours am:
77323eb2bd -s ours
am:
f38a9f357a -s ours
Change-Id: I71da3d656c18fd3f567d61f38ba40e2df5b97ba1
Bill Yi [Wed, 2 Nov 2016 13:26:51 +0000 (13:26 +0000)]
Import translations. DO NOT MERGE am:
7d24dd6448 -s ours am:
1aa04e8cae -s ours am:
70d5453b63 -s ours
am:
12bc7f28ad -s ours
Change-Id: I6ad9b8b0cb2cde89db344981e39ce92a745d0d14
Bill Yi [Wed, 2 Nov 2016 13:21:09 +0000 (13:21 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ba7f49030 -s ours am:
80914e10e5 -s ours
am:
c850e6cdac -s ours
Change-Id: I8e4922f0d2a04054a8d163ffa2888e129f803fcc
Bill Yi [Wed, 2 Nov 2016 13:20:19 +0000 (13:20 +0000)]
Import translations. DO NOT MERGE am:
6fb3b77745 -s ours am:
9e7ac87d08 -s ours
am:
ddb3a08aba -s ours
Change-Id: Iea3c6ec39fbd0c3e6454f6068aafe154de073155
Nimrod Gileadi [Wed, 2 Nov 2016 13:19:26 +0000 (13:19 +0000)]
Merge "Increment a MetricsLogger counter on back press." into cw-f-dev am:
523c4fd695 am:
2c2abe6db3
am:
b633e4402f
Change-Id: I6fae8a123c7528853fc66f90970cc9cee15be227
Nimrod Gileadi [Wed, 2 Nov 2016 13:18:36 +0000 (13:18 +0000)]
Increment a MetricsLogger counter on back press. am:
580135c1b8 am:
51ac3a911c
am:
a774e10aec
Change-Id: Ia3f485d5eb05c9700d8ae612dea069b97de7bf11
Geoffrey Pitsch [Tue, 1 Nov 2016 17:38:22 +0000 (13:38 -0400)]
Move notification tests into separate APK.
This will allow us to hook into a presubmit step without
bringing in the other tests.
Compile notification source directly into test APK, for
faster development.
Test: runtest --path
frameworks/base/services/tests/notification/
Change-Id: I04dbcec892cbd375ba1334f59e6b58bcafe80151
Bill Yi [Wed, 2 Nov 2016 13:16:30 +0000 (13:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
125deebf5d -s ours am:
3b99360472 -s ours
am:
77323eb2bd -s ours
Change-Id: Ib7e45076dda50cf23ee25743605480c58682af43
Bill Yi [Wed, 2 Nov 2016 13:15:36 +0000 (13:15 +0000)]
Import translations. DO NOT MERGE am:
7d24dd6448 -s ours am:
1aa04e8cae -s ours
am:
70d5453b63 -s ours
Change-Id: Ide7da0fea22b8e7af33a4cecfa7b73264a65846b
OSDN Git Service
