drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
294,971 Commits 1 Branch 0 Tags
Commit Graph

294971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steven Moreland
630fc8c4f7 Merge "Update for hidlized hwservicemanager." am: 8d0c4ed74c am: 8527f13251 
am: 0d5da175a0

Change-Id: I8ed00bc19e120e76e546c2ae0610f8771077a471
 2016-11-02 22:34:30 +00:00
Steven Moreland
0d5da175a0 Merge "Update for hidlized hwservicemanager." am: 8d0c4ed74c 
am: 8527f13251

Change-Id: I23ad38482ce6b7aa9857dccd6398af26b46ee46f
 2016-11-02 22:28:28 +00:00
Steven Moreland
8527f13251 Merge "Update for hidlized hwservicemanager." 
am: 8d0c4ed74c

Change-Id: I8314346b5ac8cf1f2b219580c02117cd6977e6aa
 2016-11-02 22:23:45 +00:00
TreeHugger Robot
d5a422d62e Merge "AAPT: fix error message" 2016-11-02 22:18:49 +00:00
Treehugger Robot
8d0c4ed74c Merge "Update for hidlized hwservicemanager." 2016-11-02 22:17:25 +00:00
Sudheer Shanka
aa2a530e64 Merge "Fix IApplicationThread transaction codes." 2016-11-02 22:00:30 +00:00
Garfield Tan
24b4a13b86 Merge "Iteration on findDocumentPath() API." 2016-11-02 21:59:31 +00:00
TreeHugger Robot
82df4ef603 Merge "Added support for window TYPE_PRESENTATION" 2016-11-02 21:50:40 +00:00
John Reck
3acf0382da 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
 2016-11-02 14:49:51 -07:00
neo.chae
6c8b93cf54 Merge "Fix idmap leak in zygote process" am: f5ad44b60a am: 4720125a3c am: 3e15d09ed4 
am: d3a209399a

Change-Id: I2c7272b5f79e029ac88fa6b6acb598bdf68f28e2
 2016-11-02 21:30:36 +00:00
neo.chae
d3a209399a Merge "Fix idmap leak in zygote process" am: f5ad44b60a am: 4720125a3c 
am: 3e15d09ed4

Change-Id: I7d3d7d72e92a66c48b68165e5e3d26a1ccd1b56a
 2016-11-02 21:25:05 +00:00
neo.chae
3e15d09ed4 Merge "Fix idmap leak in zygote process" am: f5ad44b60a 
am: 4720125a3c

Change-Id: If66e9476583ec50d2dca5a15376a4b84ae2a2885
 2016-11-02 21:21:32 +00:00
Jorim Jaggi
ad5d284643 Cleanup dumpstate for CTS tests 
Change-Id: Iefd7f2863b1a2d8974d0cd1c27b1d3b2d3ffbe8e
 2016-11-02 14:21:07 -07:00
neo.chae
4720125a3c Merge "Fix idmap leak in zygote process" 
am: f5ad44b60a

Change-Id: Ia9977c8166f797ad716284eda03076e282a9fde7
 2016-11-02 21:16:33 +00:00
Treehugger Robot
f5ad44b60a Merge "Fix idmap leak in zygote process" 2016-11-02 21:09:03 +00:00
Brad Ebinger
86223d3080 Merge "Modify ConnectionServiceAdapter to include Session" am: f231db7786 -s ours am: ccec8919fe am: a895383b44 
am: 02a42886ac

Change-Id: I5652f26f1a0d2c88c432a3eae0d58ef1477c986c
 2016-11-02 21:05:49 +00:00
Wei Jia
e1964aa0cc Merge "mediaplayer: add precise argument to seek function" 2016-11-02 21:03:23 +00:00
Brad Ebinger
02a42886ac Merge "Modify ConnectionServiceAdapter to include Session" am: f231db7786 -s ours am: ccec8919fe 
am: a895383b44

Change-Id: I0c606de6d7bd7eb37a3748c2f6ab3be889f933a6
 2016-11-02 21:00:05 +00:00
Brad Ebinger
a895383b44 Merge "Modify ConnectionServiceAdapter to include Session" am: f231db7786 -s ours 
am: ccec8919fe

Change-Id: I27443a9024ea4aff209a24a9049832a76f252476
 2016-11-02 20:55:16 +00:00
Brad Ebinger
ccec8919fe Merge "Modify ConnectionServiceAdapter to include Session" 
am: f231db7786  -s ours

Change-Id: Ia5ebf8f639e1336e9e7278faf8eb09285d3c5507
 2016-11-02 20:51:36 +00:00
Steven Moreland
a813686b9d Update for hidlized hwservicemanager. 
Bug: 32313592
Test: pass (end to end for others in topic).
Change-Id: I7ac6bbe8b8de5e1cb86759cbe6f31fac642cec28
 2016-11-02 13:43:28 -07:00
Brad Ebinger
f231db7786 Merge "Modify ConnectionServiceAdapter to include Session" 2016-11-02 20:39:41 +00:00
Ben Wagner
52d5a55614 Merge "Replace SkAutoTUnref with sk_sp." 2016-11-02 20:32:02 +00:00
TreeHugger Robot
9c1202be95 Merge "Add VERSION_CODES.O" 2016-11-02 20:27:15 +00:00
Adam Lesinski
fcb5f7bf36 AAPT: fix error message 
Test: none
Bug:9779154
Change-Id: Iebda7d4f0061cdc51db0103977195964fcc1211d
 2016-11-02 13:17:10 -07:00
Dianne Hackborn
1d44c243a8 Switch settings command to use "cmd" call on service. 
Test: manual

Change-Id: I369fd144d830529009f2859fa5c666973092bc09
 2016-11-02 13:11:15 -07:00
TreeHugger Robot
4cd3e8c0a9 Merge "Fixing issue with PIP while IME is showing." 2016-11-02 20:08:33 +00:00
Julia Reynolds
1864ff5dae Replace test TODOs with ACTION. 
Also call packagemanager less.

Test: runtest
Change-Id: Icff2a5b9e7fff49ef8cf7b643c198707a6089007
 2016-11-02 15:58:11 -04:00
TreeHugger Robot
46fff5e905 Merge changes I7ef5921c,I3bbd09c5 
* changes:
  Create test for CategoryManager.
  Backward-compat for DashboardCategory with app use old keys
 2016-11-02 19:50:46 +00:00
Dianne Hackborn
54c8ac3d6f Merge "Power manager always needs to allow wake locks for services, receivers" 2016-11-02 19:46:32 +00:00
TreeHugger Robot
3b59466f75 Merge "Make window token add/remove APIs require displayId" 2016-11-02 19:34:30 +00:00
pengzhicai
d0bc76db7f Merge "Fix String is empty issue" am: 80af1ba47b am: 38c585cb8d am: d7df704d98 
am: f85e7930d8

Change-Id: I9e85d16bd3edc529a97e4df3b8f90e9fdb2ee486
 2016-11-02 18:40:00 +00:00
pengzhicai
f85e7930d8 Merge "Fix String is empty issue" am: 80af1ba47b am: 38c585cb8d 
am: d7df704d98

Change-Id: Ia75039c87b396b8b0d15f0758d17e365fb2f18e6
 2016-11-02 18:34:53 +00:00
Makoto Onuki
864f4bd9ed Add VERSION_CODES.O 
So that the framework can do "targetSdk >= O".

Test: Additional hidden constant only. "m"
Change-Id: I6cde68869c3b8bdc8e8b06b7d63f164714fbd2b0
 2016-11-02 11:30:14 -07:00
pengzhicai
d7df704d98 Merge "Fix String is empty issue" am: 80af1ba47b 
am: 38c585cb8d

Change-Id: I091572280b0b2a33a2a5e2339a08df0759bb2bd7
 2016-11-02 18:29:24 +00:00
Wale Ogunwale
5b6714c2fa 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
 2016-11-02 18:25:34 +00:00
Winson Chung
14fefc26d3 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>
 2016-11-02 11:24:11 -07:00
pengzhicai
38c585cb8d Merge "Fix String is empty issue" 
am: 80af1ba47b

Change-Id: I7000d0fe8fd5c2145e628abec11b49653027138b
 2016-11-02 18:23:26 +00:00
Treehugger Robot
80af1ba47b Merge "Fix String is empty issue" 2016-11-02 18:14:50 +00:00
Brad Ebinger
5f667270c8 Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master am: def235760e am: c50005ee6c 
am: 1d35eee461

Change-Id: Icd422298d0d0372b969ce9cca481314980dc83d8
 2016-11-02 17:54:08 +00:00
Brad Ebinger
472da83b71 resolve merge conflicts of 4d75bee to nyc-mr1-dev-plus-aosp am: c5eacceb3f 
am: baa73944e4

Change-Id: I6d636ee7464a9dea03f2ad2f9474d23627c0b6f3
 2016-11-02 17:51:51 +00:00
Brad Ebinger
1d35eee461 Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master am: def235760e 
am: c50005ee6c

Change-Id: I7b04f249de691f1499d3e2bbcbc93bf81d4fd1ea
 2016-11-02 17:47:30 +00:00
Brad Ebinger
baa73944e4 resolve merge conflicts of 4d75bee to nyc-mr1-dev-plus-aosp 
am: c5eacceb3f

Change-Id: I1fe6eea67081a8d35132d87c8e3e38952e110cc0
 2016-11-02 17:46:43 +00:00
TreeHugger Robot
299978132b Merge changes from topic 'skia_merge' 
* changes:
  Adding changes required by the master-skia merge.
  use SkBlendMode
 2016-11-02 17:45:21 +00:00
Dianne Hackborn
951ea6907c 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
 2016-11-02 10:44:00 -07:00
Brad Ebinger
c50005ee6c Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master 
am: def235760e

Change-Id: I309cd302b14ee0d0980632086855ba2cf97c6798
 2016-11-02 17:43:49 +00:00
Sudheer Shanka
a14e4db959 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
 2016-11-02 10:38:37 -07:00
Android Build Merger (Role)
54f53906bd Merge "Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev am: 7ffc2a62ff am: 9bfdce4712 am: a3c03ba74a am: a79c39d53e" 2016-11-02 17:38:10 +00:00
Phil Weaver
e55488ed7f Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev am: 7ffc2a62ff am: 9bfdce4712 am: a3c03ba74a 
am: a79c39d53e

Change-Id: I59187a1105553b08e424de7e239533693ae2ecd8
 2016-11-02 17:37:28 +00:00
Android Build Merger (Role)
7d0196b595 Merge "Revert "Don't invalidate list data during layout." am: 866ded50bb am: 96b4a68c06 am: b8a314427b am: 1b5e3d98d2" 2016-11-02 17:37:07 +00:00