Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,987 Commits 3 Branches 0 Tags
8ad31fb08d7d0d4209590e191fa68a6716d595fa
Commit Graph

52 Commits

Author SHA1 Message Date
Craig Mautner
8ad31fb08d am 5c44c51c: Merge "Use new DisplayManager flag to show own content only." into klp-modular-dev 
* commit '5c44c51c2a0b5a2268de07fab6854623188b5a7c':
  Use new DisplayManager flag to show own content only.
 2014-01-14 00:05:41 +00:00
Craig Mautner
5c44c51c2a Merge "Use new DisplayManager flag to show own content only." into klp-modular-dev 2014-01-14 00:00:00 +00:00
Craig Mautner
529cbcd0af Use new DisplayManager flag to show own content only. 
Change-Id: I8b2666e5849e57b5eb2ed73ed3d5e39da2dbd55d
 2014-01-13 12:55:33 -08:00
Daniel Cashman
94827c3484 am 21a801d0: am 0d30e07d: am 3d5ea26f: am 4503409a: Merge "Clear cached locations when location providers disabled Bug: 12118307" into klp-dev 
* commit '21a801d0885d65f128b84a593140b07fd0d4e980':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 19:00:37 +00:00
Jeff Sharkey
4bc9432f28 am 38c65b1f: am 6fba240b: am 6d3700b3: am 47235e8b: am 90cadb35: Merge "MountService listeners can not be unregistered" 
* commit '38c65b1f70042bc8e37e91106692158f0ce98703':
  MountService listeners can not be unregistered
 2014-01-13 18:51:24 +00:00
Jeff Sharkey
38c65b1f70 am 6fba240b: am 6d3700b3: am 47235e8b: am 90cadb35: Merge "MountService listeners can not be unregistered" 
* commit '6fba240b72e9ae2bc66c98b058e78aecd568ae3f':
  MountService listeners can not be unregistered
 2014-01-13 18:47:41 +00:00
Craig Mautner
80a6e776e0 am cf6e0d68: Merge "Add display synchronously." into klp-modular-dev 
* commit 'cf6e0d686f42036992bdac4f47d37bc8c0775027':
  Add display synchronously.
 2014-01-13 05:44:18 +00:00
Craig Mautner
cf6e0d686f Merge "Add display synchronously." into klp-modular-dev 2014-01-13 05:33:51 +00:00
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
663fb7a09e am da9b87a7: am 5d8936b4: am 27581792: am 54f99137: am 3747768b: Merge "Fix visibility of multiple non-fullscreen activities." 
* commit 'da9b87a70994ed00868dd4405243932fe7e267f2':
  Fix visibility of multiple non-fullscreen activities.
 2014-01-11 00:12:50 +00:00
Craig Mautner
da9b87a709 am 5d8936b4: am 27581792: am 54f99137: am 3747768b: Merge "Fix visibility of multiple non-fullscreen activities." 
* commit '5d8936b4cfdb14941536e533c2cc376e99b9f7d5':
  Fix visibility of multiple non-fullscreen activities.
 2014-01-11 00:09:22 +00:00
Craig Mautner
7ef6c04afd am d7c97a79: Merge "Remove misleading warnings." into klp-modular-dev 
* commit 'd7c97a798f25d54a00adc0cfb2af4dedd5a4e3f2':
  Remove misleading warnings.
 2014-01-10 23:10:20 +00:00
Craig Mautner
d7c97a798f Merge "Remove misleading warnings." into klp-modular-dev 2014-01-10 23:06:50 +00:00
Craig Mautner
330a6bd8a6 Remove misleading warnings. 
Error messages that are obsolete and/or incorrect.

Fixes bug 12421138.

Change-Id: I43f095048757f7ae9bff47abed594dd34d8387ce
 2014-01-10 15:05:29 -08:00
Craig Mautner
d4abbb964b am 93884a5b: Fix invalid stackId bug. 
* commit '93884a5b35ec97a0f44795950363188d9a21137a':
  Fix invalid stackId bug.
 2014-01-10 21:32:21 +00:00
Craig Mautner
93884a5b35 Fix invalid stackId bug. 
Eliminate race condition by executing window manager createStack
directly from activity manager.

Change-Id: I2dda276d07d0ae09c7c958980bc5ebffe72ebd92
 2014-01-10 13:28:10 -08:00
Craig Mautner
1f7488e219 resolved conflicts for merge of 4504de5d to master 
Change-Id: I8d96fd2b479aebd6de913e617ca190f66c25aaa5
 2014-01-10 11:15:19 -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
88a00abe08 am 0bb2a4de: Merge "Call moveHomeStack before moving any stack." into klp-modular-dev 
* commit '0bb2a4deee6451a2f3075254761e9bfb38429fa4':
  Call moveHomeStack before moving any stack.
 2014-01-10 16:46:43 +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
Jeff Brown
7fa44e90ed am b6d9eb87: Merge "Add flag to force public virtual display to show own content." into klp-modular-dev 
* commit 'b6d9eb875a0bf1bb655a90c88457689342eb0991':
  Add flag to force public virtual display to show own content.
 2014-01-09 02:14:56 +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
Vinit Deshpande
80a3a364fd Merge "Revert "Revert "Move Wifi services to a new git project""" 2014-01-08 23:47:44 +00:00
RoboErik
2dfae9bea1 Merge "b/12068020 Make kb layouts only unique to vendor/product" 2014-01-08 22:07:14 +00:00
Craig Mautner
b859449b71 resolved conflicts for merge of 88bfc6dd to master 
Change-Id: Ib656ac0591b21ad14f2df51021729552e9373515
 2014-01-08 09:51:33 -08: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
7b925fbb87 am 43bc1c07: am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit '43bc1c07d25b7f278a860bbb9118f46ac732593a':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 16:10: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
Narayan Kamath
2c0971eeec am 3f7b8d0c: resolved conflicts for merge of 92ae0347 to klp-modular-dev 
* commit '3f7b8d0c6c2b1b6a8d183769621f5fd9c36cfc85':
  AArch64: Use long for pointers in services
 2014-01-08 12:34:29 +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
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
Vinit Deshpande
3ffa1a899a Revert "Revert "Move Wifi services to a new git project"" 
This reverts commit f1182c9c1a.

Change-Id: Ic440cfa6502b651b2cc67faf73c7c9c49df42190
 2014-01-08 02:55:29 +00:00
Vinit Deshpande
d9feaf4971 Merge "Revert "Move Wifi services to a new git project"" 2014-01-08 02:41:16 +00:00
Vinit Deshpande
f1182c9c1a Revert "Move Wifi services to a new git project" 
This reverts commit 4a3f9cf099.

Change-Id: I6269a683e842a5d1cfdafea892be86972ae11c40
 2014-01-08 02:38:31 +00:00
Vinit Deshapnde
ed8ed0bc81 Merge "Move Wifi services to a new git project" 2014-01-08 02:27:25 +00:00
RoboErik
fb290df3c9 b/12068020 Make kb layouts only unique to vendor/product 
Instead of storing a kb layout per device descriptor (which is expected
to be unique), store it for each vendor/product. This way we can keep
a consistent layout between identical but physically different keyboards.

There are some corner cases this is expected to fail on, namely devices
that incorrectly have the same vendor/product id. Devices that don't
define a vendor/product id will continue to use the descriptor to store
layout files.

Change-Id: Id0890d13e1c859eaf993d4831b7b1acbaf5df80f
 2014-01-07 17:37:24 -08:00
Christopher Tate
08af733f87 Don't just log this warning; record the situation for posterity 
When a previously 3rd-party permission declaration is superseded
by a new system-owned declaration, don't just log; leave a persistent
record of the fact for post-hoc recognition of what happened even
after reboots.

Change-Id: I816a5003f8f8ef2dfbdbfa36316c4bae5005dfbf
 2014-01-07 16:05:22 -08:00
Adam Lesinski
dfc73e9c24 am 66e9b1e1: Merge "Move SystemService code to frameworks/base/core" into klp-modular-dev 
* commit '66e9b1e1178813037daf3798b8fe23467c4b91ab':
  Move SystemService code to frameworks/base/core
 2014-01-07 20:58:16 +00:00
Adam Lesinski
66e9b1e117 Merge "Move SystemService code to frameworks/base/core" into klp-modular-dev 2014-01-07 20:53:20 +00:00
Vinit Deshapnde
4a3f9cf099 Move Wifi services to a new git project 
Bug: 12175455
Change-Id: I1fa07e29c6a9aae38d9e334d519a9f2445d15613
 2014-01-07 11:00:05 -08:00
Narayan Kamath
e4f7ce1670 am 107eb740: am ce9418c5: am c797fd61: am c9e27802: am 7e296254: Merge "Fix broken XML parsing idiom." 
* commit '107eb74074981904c29e005a24dc707b13db457e':
  Fix broken XML parsing idiom.
 2014-01-07 10:16:54 +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
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
Amith Yamasani
e58a49e411 Merge commit '817ec49e' into manualmerge 
Conflicts:
	services/print/java/com/android/server/print/PrintManagerService.java

Change-Id: I1b9bf364ca50ee3c48f53d87ae0ce23e7f3c2bc2
 2013-12-20 16:36:48 -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
David Christie
3bc26143dc Fix issue where gps "on" stats continue to run when gps is disabled. 
-Shows up in Settings->Battery->app_detail_page
-Bug: 12015795

Change-Id: Id1485eed72e22cffb3e6e306495fac37a4d348cc
 2013-12-19 17:22:23 -08:00
Amith Yamasani
1f4bf364b2 Merge "Move files to new directory structure of framework services" 2013-12-19 23:32:03 +00:00
Amith Yamasani
49782e46c0 am 9158825f: Move some system services to separate directories 
* commit '9158825f9c41869689d6b1786d7c7aa8bdd524ce':
  Move some system services to separate directories
 2013-12-19 23:30:35 +00:00