Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,328 Commits 3 Branches 0 Tags
d3ee63b6c6999475288502ccd37eb8840fb8a1c0
Commit Graph

66 Commits

Author SHA1 Message Date
Jeff Brown
d3ee63b6c6 am 02cc684e: Delete unused power manager functionality. 
* commit '02cc684e42b13454ba1a013340b41696323a4c2a':
  Delete unused power manager functionality.
 2014-01-16 19:32:58 +00:00
Jeff Brown
02cc684e42 Delete unused power manager functionality. 
timeSinceScreenWasLastOn() was used by Watchdog previously but is no
longer so we can remove it.

Change-Id: I91c324b6c98c1aeb85f64b0296a41240e6c2ef4f
 2014-01-16 11:24:58 -08:00
John Spurlock
ac2c9bf4ce Merge "Defend against malformed broadcast in NotificationManager." 2014-01-16 16:14:09 +00:00
John Spurlock
5d2eeb111a Defend against malformed broadcast in NotificationManager. 
Bug:12583158
Change-Id: I4b10e19b9a23ff8e950006b3b3496bd6800346ea
 2014-01-16 10:46:36 -05:00
Craig Mautner
441b57bce9 am 593a4e6f: Fix NPE when destroyActivity occurs after detach. 
* commit '593a4e6f982cecddc3f2f6107044b5e12fab3e20':
  Fix NPE when destroyActivity occurs after detach.
 2014-01-16 15:22:27 +00:00
Craig Mautner
fc8fa54f80 am e9ddaa0b: Merge "Cleanup after ActivityView" into klp-modular-dev 
* commit 'e9ddaa0b183d979be782a63970929cebd861b7c9':
  Cleanup after ActivityView
 2014-01-16 15:22:15 +00:00
Craig Mautner
593a4e6f98 Fix NPE when destroyActivity occurs after detach. 
*** FATAL EXCEPTION IN SYSTEM PROCESS: ActivityManager
 java.lang.NullPointerException
 	at com.android.server.am.ActivityStack.removeTask(ActivityStack.java:3627)
 	at com.android.server.am.ActivityStack.removeActivityFromHistoryLocked(ActivityStack.java:2693)
 	at com.android.server.am.ActivityStack.activityDestroyedLocked(ActivityStack.java:2878)
 	at com.android.server.am.ActivityStack$ActivityStackHandler.handleMessage(ActivityStack.java:296)
 	at android.os.Handler.dispatchMessage(Handler.java:102)
 	at android.os.Looper.loop(Looper.java:136)
 	at com.android.server.am.ActivityManagerService$AThread.run(ActivityManagerService.java:1868)

Change-Id: Ifaf0fe6c62d1f63897d57dc96b4d86d8111b45db
 2014-01-15 17:59:22 -08:00
Craig Mautner
34b73dfaa3 Cleanup after ActivityView 
- Release Surface and VirtualDisplay when shutting down ActivityView.
- Shut down child stacks when relaunching parent activity.

Change-Id: I60314b2b43bd2da5406cf6ec871293b5baca157c
 2014-01-15 17:47:51 -08:00
Dianne Hackborn
c8345b32c9 Merge "Add battery power use reporting to batterystats service." 2014-01-16 01:39:06 +00:00
Dianne Hackborn
a7c837f043 Add battery power use reporting to batterystats service. 
Move the BatteryStatsHelper class (which computes power use based
on the raw battery stats) out of the settings app and in to the
framework.  It is now used by batterystats dump output to print
the computed power information from its current stats.

This involved a lot of refactoring of the BatteryStatsHelper code
to remove all of the UI dependencies.  I also did a bunch of cleanup
in it, such as making all power computations be in terms of mAh.

Change-Id: I8ccf2c9789dc9ad34904917ef57050371a59dc28
 2014-01-15 16:20:44 -08:00
Craig Mautner
3a43aa9cef am 9cfb2e5f: Merge "Retain stacks even if they are empty." into klp-modular-dev 
* commit '9cfb2e5f4c95c16d8ca531808f60486f214f9039':
  Retain stacks even if they are empty.
 2014-01-15 01:10:51 +00:00
Craig Mautner
9cfb2e5f4c Merge "Retain stacks even if they are empty." into klp-modular-dev 2014-01-15 01:07:15 +00:00
Dianne Hackborn
6873e17d4b am 305c61a1: am 3a8a8ddd: am 8c359bf4: am c174288d: Fix issue #12031685: Sticky Service Breakage in Android 4.4.1 
* commit '305c61a1c6816549b225719518df5b29a17f0f42':
  Fix issue #12031685: Sticky Service Breakage in Android 4.4.1
 2014-01-14 01:53:07 +00:00
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
Craig Mautner
04a0ea60ac Retain stacks even if they are empty. 
Previously stacks would be removed when the last ActivityRecord was
removed. This causes problems for ActivityContainers which persist and
permit activities to be launched into an empty stack.

Change-Id: Ia79ac65d17c42eff3a7b1321980c21b29996001b
 2014-01-13 12:51:26 -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