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

11309 Commits

Author SHA1 Message Date
gcondra@google.com
bb393d68e4 am 0b063188: Merge "Set persistent property for SELinux enforcement on update." into jb-mr2-dev 
* commit '0b063188054e8d1843f19325063349529494e29d':
  Set persistent property for SELinux enforcement on update.
 2013-04-26 13:37:51 -07:00
repo sync
0b06318805 Merge "Set persistent property for SELinux enforcement on update." into jb-mr2-dev 2013-04-26 20:31:37 +00:00
Matthew Xie
1dd01eb36b Donot start Bluetooth Manager Service when bluetooth hardware feature is missing 
bug 8374762

Change-Id: Iea06bd05e19eeddf3398ac446f3d6b80fce51283
 2013-04-26 12:41:45 -07:00
Andreas Huber
b551c6d959 Fix wfd crash after disconnect due to null pointer exception in 
WindowManagerService.java

Change-Id: I661f9c73d481da88661793ad529c0807cf74a5e7
 2013-04-26 11:54:53 -07:00
Jeff Sharkey
68a13f3df4 am c054d414: am 99ba7203: Merge "Avoid leaking Surface native object." into jb-mr2-dev 
* commit 'c054d414eeafd5ba226c743626b9a7139bda9425':
  Avoid leaking Surface native object.
 2013-04-25 17:14:31 -07:00
Jeff Sharkey
60c7acaaf9 Merge "Track foreground activities in battery stats." 2013-04-26 00:02:49 +00:00
Jeff Sharkey
3e013e85b0 Track foreground activities in battery stats. 
To help correlate battery usage against actual foreground app usage,
start tracking time on a per UID basis.  It uses the nesting feature
of StopwatchTimer to track multiple PIDs inside the same UID.

Improves units on docs, and persists foreground CPU time with a
consistent ordering.  Reports foreground activities time and
foreground CPU time.

Change-Id: I95d12963923e3fd421730f6fbfc842dfd8d3a055
 2013-04-25 17:01:37 -07:00
Daniel Sandler
914dcfd093 am ca12d755: am 027f84c3: Merge "API: getPkg() -> getPackageName()" into jb-mr2-dev 
* commit 'ca12d75577afb7063af4cae1e6b989eec905cd58':
  API: getPkg() -> getPackageName()
 2013-04-25 17:01:13 -07:00
Daniel Sandler
06cacff626 am 4064af9b: am a7b6cbf1: Merge "API cleanup: NotificationListener" into jb-mr2-dev 
* commit '4064af9b096dfdf317d158c8aafd396c86f3fd0a':
  API cleanup: NotificationListener
 2013-04-25 17:01:10 -07:00
Jeff Sharkey
c054d414ee am 99ba7203: Merge "Avoid leaking Surface native object." into jb-mr2-dev 
* commit '99ba72039d9d97ea3ed7d01b327b98c87051e989':
  Avoid leaking Surface native object.
 2013-04-25 16:57:54 -07:00
Daniel Sandler
ca12d75577 am 027f84c3: Merge "API: getPkg() -> getPackageName()" into jb-mr2-dev 
* commit '027f84c310158edfc94d94ab0ef0480843d49d3b':
  API: getPkg() -> getPackageName()
 2013-04-25 16:57:45 -07:00
Daniel Sandler
4064af9b09 am a7b6cbf1: Merge "API cleanup: NotificationListener" into jb-mr2-dev 
* commit 'a7b6cbf1a3fe91bdbb01edd9a656a62c40c302fd':
  API cleanup: NotificationListener
 2013-04-25 16:57:43 -07:00
Jeff Sharkey
58b98d392d Merge "Report dead activities as paused to stats." 2013-04-25 23:49:08 +00:00
Jeff Sharkey
5782da778c Report dead activities as paused to stats. 
Also tell stats about pause before dispatching to remote side.

Change-Id: I975d0fba65515fa768127792d5aa7976df2ba2d3
 2013-04-25 15:01:48 -07:00
Michael Wright
4da44d144a Improve watchdog explanation when system server is blocked 
Change-Id: I5965a2b01c474cbe2a1ab342c3520b3d403d92e8
 2013-04-25 14:44:55 -07:00
Jeff Sharkey
99ba72039d Merge "Avoid leaking Surface native object." into jb-mr2-dev 2013-04-25 21:43:28 +00:00
repo sync
12566be46c Set persistent property for SELinux enforcement on update. 
Bug: 8702843
Change-Id: I41c0084a71160061b297d57d995261e238ea555c
 2013-04-25 14:41:33 -07:00
Daniel Sandler
027f84c310 Merge "API: getPkg() -> getPackageName()" into jb-mr2-dev 2013-04-25 21:03:55 +00:00
Daniel Sandler
6064df5c64 am fa1c4430: am 5e97c317: Merge "New NotificationListener API: getActiveNotifications()" into jb-mr2-dev 
* commit 'fa1c443063f3d3a98c4f3bb71689fb3e1d4c6c37':
  New NotificationListener API: getActiveNotifications()
 2013-04-25 13:50:40 -07:00
Ben Gruver
edb9639f7f am 0882a90e: am 09bb9f66: Merge "Ensure the intent firewall dir exists before starting the FileObserver" into jb-mr2-dev 
* commit '0882a90e1a357dc6882075b6b6e7c0b14de90645':
  Ensure the intent firewall dir exists before starting the FileObserver
 2013-04-25 13:50:21 -07:00
Craig Mautner
458dd87552 Merge "Fix launching non-full screen apps from home." 2013-04-25 20:46:05 +00:00
Daniel Sandler
4f91efdf42 API: getPkg() -> getPackageName() 
Bug: 8656860
Change-Id: If3062b9fc00270e5f0ecfe67e593b9a28c6bccdd
 2013-04-25 16:39:02 -04:00
Daniel Sandler
a7b6cbf1a3 Merge "API cleanup: NotificationListener" into jb-mr2-dev 2013-04-25 20:16:49 +00:00
Jeff Sharkey
7efcc0c16d Skip reporting resumes due to config change. 
This gives us matching pause/resume calls to updateUsageStats(),
since configuration changes never report the pause event.

Change-Id: I5c8afc28766cd90d4bd793980265ce7988750cae
 2013-04-25 13:11:47 -07:00
Craig Mautner
580ea81ccd Fix launching non-full screen apps from home. 
- Continue to display the home screen for non-fullscreen activities
such as Download. Previously launching Download from home would
display Download on top of the previous activity on the user activity
stack.

- Fix NPE when DEBUG_PROVIDER is true.

Change-Id: I705ea43e4b78a5f5e83fc3f5fa83e4c95e592268
 2013-04-25 12:58:38 -07:00
Jeff Sharkey
21ef9647e8 Avoid leaking Surface native object. 
Bug: 8721827
Change-Id: I8d6192b8eb47911fcf4964de399c7dba94ed9286
 2013-04-25 12:56:42 -07:00
Daniel Sandler
e6f7f2e3a0 API cleanup: NotificationListener 
- Wrap all public member variables in getters and make
    slots private
  - Rename clear* methods to cancel* to be more consistent
    with existing public Notification API

Bug: 8656860
Change-Id: I84f7e71fbb627f859352a93089c6a531b44dac95
 2013-04-25 15:51:08 -04:00
Daniel Sandler
fa1c443063 am 5e97c317: Merge "New NotificationListener API: getActiveNotifications()" into jb-mr2-dev 
* commit '5e97c317e07a81bf5670292e2223e14eb610b0fd':
  New NotificationListener API: getActiveNotifications()
 2013-04-25 12:44:52 -07:00
Daniel Sandler
5e97c317e0 Merge "New NotificationListener API: getActiveNotifications()" into jb-mr2-dev 2013-04-25 19:41:10 +00:00
Ben Gruver
0882a90e1a am 09bb9f66: Merge "Ensure the intent firewall dir exists before starting the FileObserver" into jb-mr2-dev 
* commit '09bb9f66a0c258d3393145d31529de92e55e039a':
  Ensure the intent firewall dir exists before starting the FileObserver
 2013-04-25 10:42:04 -07:00
Ben Gruver
09bb9f66a0 Merge "Ensure the intent firewall dir exists before starting the FileObserver" into jb-mr2-dev 2013-04-25 17:40:41 +00:00
Daniel Sandler
25cf8cee6f New NotificationListener API: getActiveNotifications() 
This allows a listener service to catch up on the current
state of the notification panel at any time, including at
startup.

Bug: 8656860
Change-Id: I1a3d665d84576e17870929a63dda334afc696010
 2013-04-24 23:19:08 -04:00
Svetoslav
a424bc8058 am c91d4dfe: am e00b297c: Merge "The touch exploration capability is dynamically granted pre-JellyBeanMR2." into jb-mr2-dev 
* commit 'c91d4dfe0a243f9f1d53bb4dbd435759da5202fd':
  The touch exploration capability is dynamically granted pre-JellyBeanMR2.
 2013-04-24 18:51:40 -07:00
Svetoslav
c91d4dfe0a am e00b297c: Merge "The touch exploration capability is dynamically granted pre-JellyBeanMR2." into jb-mr2-dev 
* commit 'e00b297c0b220148930d40d76f518cf51aa2c9ef':
  The touch exploration capability is dynamically granted pre-JellyBeanMR2.
 2013-04-24 18:49:23 -07:00
Svetoslav
e00b297c0b Merge "The touch exploration capability is dynamically granted pre-JellyBeanMR2." into jb-mr2-dev 2013-04-25 01:44:43 +00:00
Craig Mautner
c64f73e778 Fix startActivityAndWait bugs 
- Send timeout message with a delay. The delay got lost when moving
from ActivityStack to ActivityStackSupervisor. Fixes bug 8687083.

- Remove waiting activities from list after they have been awoken.
Previously the list just got bigger and bigger.

Change-Id: Icb9e394db1eefa444e58c5416472017cac32298c
 2013-04-24 16:44:56 -07:00
Craig Mautner
eb95786fd3 Pause activities when leaving. 
Missed a spot where an activity that is launching another was not
being paused. Fixes bug 8640130. At least in one case.

Release mWindowMap as soon as it is no longer needed.

Change-Id: Id2c63d3d715b98741e2ebe3c9985cb1e9ca5ffbc
 2013-04-24 15:34:32 -07:00
Svetoslav
11adf6dc24 The touch exploration capability is dynamically granted pre-JellyBeanMR2. 
Since the enable touch exploration capability is dynamically granted by
the user for apps targeting pre-JellybeanMR2 API level, we have to properly
update the accessibility service info for that service and also avoid
caching copies of the service info.

bug:8633951

Change-Id: I83dd1c852706ec55d40cda7209ad842889fb970a
 2013-04-24 14:59:04 -07:00
Craig Mautner
d3c933875c Fix deadlock. 
Grabbing StackTapDetector before grabbing mWindowMap doesn't play well
with grabbing mWindowMap and then StackTapDetector.

Change-Id: I40daa4c940930b1ebbb587edc1958e84321d6d7f
 2013-04-24 14:31:51 -07:00
Wink Saville
e193350992 am d2190a4b: am e148a49d: Merge "Support WiFi only device at runtime." into jb-mr2-dev 
* commit 'd2190a4bfb33e4586c4b94d77bb08f5de0e7ea46':
  Support WiFi only device at runtime.
 2013-04-24 10:45:10 -07:00
Wink Saville
d2190a4bfb am e148a49d: Merge "Support WiFi only device at runtime." into jb-mr2-dev 
* commit 'e148a49d9214724c7c6aa5b23eae7cdbb80da1ca':
  Support WiFi only device at runtime.
 2013-04-24 08:47:45 -07:00
Wink Saville
e148a49d92 Merge "Support WiFi only device at runtime." into jb-mr2-dev 2013-04-24 15:44:08 +00:00
Craig Mautner
a2e56c5a2f Merge "Fix user switching." 2013-04-24 14:53:51 +00:00
Craig Mautner
b58121c350 Merge "Add tap detector for switching stack focus." 2013-04-24 02:36:43 +00:00
Craig Mautner
858d8a6583 Fix user switching. 
- Save and restore WindowManager stack states.
- Maintain ActivityManager activity states based on the stack
the activity is in.

Fixes bug 8646641.

Change-Id: I16c76c7708ab49121c3884a7e5bf219898b92d3f
 2013-04-23 19:33:42 -07:00
Craig Mautner
cf910b0c71 Add tap detector for switching stack focus. 
- New InputEventReceiver for detecting taps outside of focused stack
boundaries.
- Fixed bug that wasn't pausing the non-focused window when returning
home.

Change-Id: Ia51d312a7c029abc01eb5df1102814cc29d33b47
 2013-04-23 19:33:27 -07:00
Jim Miller
ab18ec8eb5 am ca9904d0: am a3b5bae9: Fix the build. 
* commit 'ca9904d02147daf26def085f7b72d83d2abbd007':
  Fix the build.
 2013-04-23 18:46:57 -07:00
Jim Miller
ca9904d021 am a3b5bae9: Fix the build. 
* commit 'a3b5bae9cf9e28e5d461c543e9c3fc7920a2330c':
  Fix the build.
 2013-04-23 18:44:50 -07:00
Jim Miller
a3b5bae9cf Fix the build. 
This fixes a bad merge in LockSettingsService.

Change-Id: I941bae77446dd0e94f409f0d64330ca5391f8efa
 2013-04-23 18:34:46 -07:00
Svetoslav
fb2563103b am 939ff0ac: am 4c783066: Merge "Fixing bugs exposed when moving accessibility CTS tests to UiAutomation." into jb-mr2-dev 
* commit '939ff0acff8a21a023d79214130680a66214840f':
  Fixing bugs exposed when moving accessibility CTS tests to UiAutomation.
 2013-04-23 18:08:55 -07:00