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

15340 Commits

Author SHA1 Message Date
Craig Mautner
ad25fa36cb Add display synchronously. 
Adding the virtual display to window manager through a handler message
causes timing issues. Add the display directly to fix it.

Change-Id: I3ad6b16ce6dff2a48abd120a8e873e11a028e2c3
 2014-01-12 21:26:09 -08:00
Craig Mautner
4504de5d5a Implement ActivityView. 
With an existing ActivityContainer a caller can now create an
ActivityView which consists of a new VirtualDisplay immediately
attached to the ActivityContainer.

Change-Id: Id70333dcbef55d524a87df8f8c92d72ca5579364
 2014-01-10 10:54:55 -08:00
Craig Mautner
0bb2a4deee Merge "Call moveHomeStack before moving any stack." into klp-modular-dev 2014-01-10 16:43:19 +00:00
Craig Mautner
fefeef8249 Call moveHomeStack before moving any stack. 
Order matters, otherwise mFocusedStack and mLastStack aren't updated
correctly.

Fixes bug 12478856.

Change-Id: I12e4334678bb3af49d1ff26c4003def3e8d987c2
 2014-01-10 08:40:23 -08:00
Amith Yamasani
22eba28e90 Only compile the services jar and so when using mmm 
Don't build the tests when using "mmm frameworks/base/services"

Change-Id: If1895598381bd0fce0b4d7f5e879f154d8fc44d0
 2014-01-09 15:38:12 -08:00
Ying Wang
ba09ada20e Include subdirectory Android.mks. 
Change-Id: I6e6bc721dbcf127b52f2a60f255c9fc677d3be29
(cherry picked from commit c459bfea7e7be4343387dee137d4a5be9742fd91)
 2014-01-09 20:41:57 +00:00
Jeff Brown
b6d9eb875a Merge "Add flag to force public virtual display to show own content." into klp-modular-dev 2014-01-09 02:12:59 +00:00
Craig Mautner
88bfc6ddc8 Merge "Extend stack management to other displays." into klp-modular-dev 2014-01-08 17:33:42 +00:00
Mike Lockwood
43bc1c07d2 am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit 'd9e708e365d94e83ec135f1486129febd3f8eaea':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 16:08:17 +00:00
Mike Lockwood
d9e708e365 am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit '12ec2e6d71bc69ca11946f7f051931863c934273':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 16:05:29 +00:00
Mike Lockwood
12ec2e6d71 am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit '992065938a95e5273b22dea009b8581bcc693e61':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 08:01:42 -08:00
Mike Lockwood
9607d78f51 Merge "Added missing USB device descriptor fields needed for intent filters" 2014-01-08 15:56:13 +00:00
Narayan Kamath
e853de1f10 am 2d87407e: am 136c0219: am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712" 
* commit '2d87407e5765228a3469b9681ebff6c0c7eee140':
  Fix a bug introduced in change 73712
 2014-01-08 13:06:55 +00:00
Narayan Kamath
2d87407e57 am 136c0219: am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712" 
* commit '136c02191790aa937c490341df49e966735f6857':
  Fix a bug introduced in change 73712
 2014-01-08 13:04:15 +00:00
Narayan Kamath
136c021917 am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712" 
* commit 'c156021debb8e13324e451cb288da7edd7e112ca':
  Fix a bug introduced in change 73712
 2014-01-08 05:00:33 -08:00
Narayan Kamath
87d6cd4537 Fix a bug introduced in change 73712 
"return (bool) true" was incorrectly changed to
"return (jboolean) JNI_FALSE"

Change-Id: I45f62f60c5affbae7970bb8889c55981e26d01ba
 2014-01-08 12:26:28 +00:00
Narayan Kamath
3f7b8d0c6c resolved conflicts for merge of 92ae0347 to klp-modular-dev 
Change-Id: I703aea4f20985a4bbda0f685254721d6480bb20f
 2014-01-08 12:19:40 +00:00
Narayan Kamath
92ae034756 am cbf339f6: am ab169215: am f210044f: Merge "AArch64: Use long for pointers in services" 
* commit 'cbf339f6e4bf45a7d41cd0327d2dd7975875b8aa':
  AArch64: Use long for pointers in services
 2014-01-08 12:01:04 +00:00
Narayan Kamath
cbf339f6e4 am ab169215: am f210044f: Merge "AArch64: Use long for pointers in services" 
* commit 'ab169215fb135f590f0960ab89f5199dd7303a33':
  AArch64: Use long for pointers in services
 2014-01-08 03:58:13 -08:00
Ashok Bhat
7e2a9dcf1a AArch64: Use long for pointers in services 
For storing pointers, long is used, as native pointers
can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: Ib4435f0794740d545c1e640087849215e6844802
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
 2014-01-08 10:06:07 +00:00
Jeff Brown
d14c8c9039 Add flag to force public virtual display to show own content. 
Change-Id: I1039f2ef3154169ec90411a4c7ba2c94629f72c4
 2014-01-07 19:30:07 -08:00
Adam Lesinski
66e9b1e117 Merge "Move SystemService code to frameworks/base/core" into klp-modular-dev 2014-01-07 20:53:20 +00:00
Narayan Kamath
107eb74074 am ce9418c5: am c797fd61: am c9e27802: am 7e296254: Merge "Fix broken XML parsing idiom." 
* commit 'ce9418c59e1c9e696b35123d75c077c164893b9f':
  Fix broken XML parsing idiom.
 2014-01-07 10:13:53 +00:00
Narayan Kamath
ce9418c59e am c797fd61: am c9e27802: am 7e296254: Merge "Fix broken XML parsing idiom." 
* commit 'c797fd614d28a0c5c3aacbff325e9de572d7f091':
  Fix broken XML parsing idiom.
 2014-01-07 10:10:45 +00:00
Narayan Kamath
c797fd614d am c9e27802: am 7e296254: Merge "Fix broken XML parsing idiom." 
* commit 'c9e27802f049b9c3086770a7710b421ce33d2791':
  Fix broken XML parsing idiom.
 2014-01-07 02:07:56 -08:00
Todd Poynor
a807dbaeed am 91ecb36d: ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE 
* commit '91ecb36df50be3446809e9da2a8f571d157f7549':
  ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE
 2014-01-06 17:12:11 +00:00
Craig Mautner
e0a3884cb6 Extend stack management to other displays. 
- Abandon ActivityContainer.startActivity() in favor of
IActivityManager.startActivityAsUserInContainer().
- Modify Am to test starting an activity on a container.
- Create a DisplayContext as the base context if the activity token
is on a different display.
- Test for home display in more cases when manipulating home stack.
- Rename mDisplayInfos => mActivityDisplays.
- Create new method for moving task to front of stack regardless of
which display it is on.

Change-Id: I4fcb83ae844c5839ee3e2722229623d1a80ed921
 2014-01-06 08:51:21 -08:00
Narayan Kamath
2ac3cb7aef Fix broken XML parsing idiom. 
Code that expected a single top level element in an XML file
was doing something like :

while (type != START_TAG) { next(); }

This would loop forever when the XML being parsed was empty,
where each call to XmlPullParser.next() would return END_DOCUMENT.

bug: https://code.google.com/p/android/issues/detail?id=64173
Change-Id: I7543203e976a8999ae471a6c2d629249a87011bb
 2014-01-06 11:31:35 +00:00
Todd Poynor
91ecb36df5 ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE 
Change-Id: Ie2f8af1e411c28d7f03be56c356ec39e1d71558e
 2014-01-03 16:30:25 -08:00
Amith Yamasani
817ec49e79 Wrap some services into a SystemService 
These services can now be excluded by modifying the list of REQUIRED_SERVICES (TB renamed)

Changed appwidget, devicepolicy, backup and print services.

Change-Id: Id8e2855d5c045cd57bdb02dca9ed75172803bce7
 2013-12-20 14:46:56 -08:00
Adam Lesinski
b102b2cc73 Move SystemService code to frameworks/base/core 
Paves the way for building services without needing to see the
rest of frameworks/base/services.

Change-Id: I8ac4bc9d25471e96076cd888c1fc24b918d8911f
 2013-12-20 13:27:38 -08:00
Amith Yamasani
9158825f9c Move some system services to separate directories 
Refactored the directory structure so that services can be optionally
excluded. This is step 1. Will be followed by another change that makes
it possible to remove services from the build.

Change-Id: Ideacedfd34b5e213217ad3ff4ebb21c4a8e73f85
 2013-12-19 15:25:37 -08:00
Craig Mautner
b7bba718a8 Merge "Pair ActivityStacks with Displays" into klp-modular-dev 2013-12-19 18:29:50 +00:00
Craig Mautner
b905a37c7a am 46f618a7: am a8dfd5d8: am 4dcf1af3: am cccf2a33: Merge "Keydispatching timeout while finish Activity" 
* commit '46f618a7d9dde8e668666e0c582d88ddfea759d9':
  Keydispatching timeout while finish Activity
 2013-12-19 18:00:40 +00:00
Craig Mautner
46f618a7d9 am a8dfd5d8: am 4dcf1af3: am cccf2a33: Merge "Keydispatching timeout while finish Activity" 
* commit 'a8dfd5d896b71faf87b03d27df6050284765fb21':
  Keydispatching timeout while finish Activity
 2013-12-19 17:58:08 +00:00
Craig Mautner
a8dfd5d896 am 4dcf1af3: am cccf2a33: Merge "Keydispatching timeout while finish Activity" 
* commit '4dcf1af3ed8dfa546e6cbf5ecfa66914a3fda883':
  Keydispatching timeout while finish Activity
 2013-12-19 09:55:33 -08:00
Martin Wallgren
c8733b818d Keydispatching timeout while finish Activity 
If there is input to be handled during finish activity we can get a
keydispatching timeout ANR. The reason is that finish activity is some
times not possible, and the activity is instead put on a finish queue.
The activity will then be finished sometime in the future. When we add
the activity to the finish queue, key dispatching is paused, and there
is an ANR timer waiting for it to be resumed again. Since it can take a
long time before the activity is actually finished, we need to resume
the key dispatching to avoid the ANR.

Change-Id: Icea4ab3b5ad05c8bfbadf8f5cece1a59ec621469
 2013-12-19 13:24:00 +01:00
Craig Mautner
704e40b8ba Fix loop limits. 
Fixes bug 12207606.

Change-Id: I9b450d2bc2a72a1f6581147f8930188f34c85299
 2013-12-18 16:43:51 -08:00
Craig Mautner
4a1cb22056 Pair ActivityStacks with Displays 
- Introduce concept of ActivityStacks residing on Displays and able
to be decoupled and moved around.
- Add a new interface, IActivityContainer for clients to handle
ActivityStacks.
- Abandon ordering of stacks based on mStackState and instead use
ActivityDisplayInfo.stacks<ActivityStack> ordering.

Progress towards closing bug 12078972.

Change-Id: I7785b61c26dc17f432a4803eebee07c7415fcc1f
 2013-12-18 15:08:15 -08:00
Greg Hackmann
f1bdbdd1be resolved conflicts for merge of 08579921 to klp-modular-dev 
Change-Id: I08e9f9a2d2185ccf0c41a87c8527ea7e02ac3117
 2013-12-17 11:56:22 -08:00
Greg Hackmann
552eba80ef am 153ec6ca: am 3545433d: am 9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings" 
* commit '153ec6cae7db2053c71541af8973244f0dbf6d4a':
  Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
 2013-12-17 18:22:24 +00:00
Greg Hackmann
0857992140 am 060ae1db: am eb0ca2b7: Merge "Add timerfd backend to AlarmManagerService" 
* commit '060ae1db7bba39cb8171f4267b5de9538f1ab440':
  Add timerfd backend to AlarmManagerService
 2013-12-17 18:19:04 +00:00
Greg Hackmann
153ec6cae7 am 3545433d: am 9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings" 
* commit '3545433d052769417dcdd70bc59fbf31f9925ba4':
  Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
 2013-12-17 18:18:58 +00:00
Greg Hackmann
060ae1db7b am eb0ca2b7: Merge "Add timerfd backend to AlarmManagerService" 
* commit 'eb0ca2b7bfd70fbbf2bd730b1c431faac21d0416':
  Add timerfd backend to AlarmManagerService
 2013-12-17 10:15:33 -08:00
Greg Hackmann
3545433d05 am 9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings" 
* commit '9f4e67c50b5c311adeaaf6135ef79214a46d0e26':
  Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
 2013-12-17 10:15:29 -08:00
Greg Hackmann
eb0ca2b7bf Merge "Add timerfd backend to AlarmManagerService" 2013-12-17 18:10:49 +00:00
Greg Hackmann
9f4e67c50b Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings" 2013-12-17 18:10:33 +00:00
Craig Mautner
4e09cb9bf6 am 38bcf6dc: am 422d7003: am f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack." 
* commit '38bcf6dc8784625eb4b68634450c578719346669':
  Fix to NullPointerException on move back in ActivityStack.
 2013-12-17 16:48:46 +00:00
Craig Mautner
38bcf6dc87 am 422d7003: am f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack." 
* commit '422d7003db8d26b5fa503aa294348d7b53621db1':
  Fix to NullPointerException on move back in ActivityStack.
 2013-12-17 16:45:06 +00:00
Craig Mautner
422d7003db am f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack." 
* commit 'f431daa22811fdce9c4ec975d5d33121898b4f9b':
  Fix to NullPointerException on move back in ActivityStack.
 2013-12-17 08:42:31 -08:00