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

105641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Kralevich
a4c63e275b am 071c78e0: am e00a3b80: Merge "Don\'t set ADDR_COMPAT_LAYOUT on the emulator" into jb-mr2-dev 
* commit '071c78e0070f4add5b811b1abccc9e6f6f312276':
  Don't set ADDR_COMPAT_LAYOUT on the emulator
 2013-04-25 17:14:36 -07:00
Svetoslav
afab4fd00b am c6eeacd9: am c38bc5ab: Merge "Lockscreen widgets not always announced." into jb-mr2-dev 
* commit 'c6eeacd9341c0348c2eb29d1808eb17ea08464f4':
  Lockscreen widgets not always announced.
 2013-04-25 17:14:33 -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
Michael Wright
b31c361077 resolved conflicts for merge of f652551b to master 
Change-Id: I210f0e45d9163a8f5b70f99eba38f343c621a8e7
 2013-04-25 17:09:58 -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
Igor Murashkin
2d0ed28ff6 am 10ce90ad: am eaebe4c1: Merge "Add new android.permission.CAMERA_DISABLE_TRANSMIT_LED" into jb-mr2-dev 
* commit '10ce90adfafa25e417fdefa7510e53bc70bccd7b':
  Add new android.permission.CAMERA_DISABLE_TRANSMIT_LED
 2013-04-25 17:01:18 -07:00
Daniel Sandler
0c482b3c96 am 56f7afb0: am cc165d16: Merge "Fix build." into jb-mr2-dev 
* commit '56f7afb05685f293551dd33d1b52e42114857bc2':
  Fix build.
 2013-04-25 17:01:15 -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
Nick Kralevich
071c78e007 am e00a3b80: Merge "Don\'t set ADDR_COMPAT_LAYOUT on the emulator" into jb-mr2-dev 
* commit 'e00a3b80635c830dc57510556231cc40db6651f5':
  Don't set ADDR_COMPAT_LAYOUT on the emulator
 2013-04-25 16:57:59 -07:00
Svetoslav
c6eeacd934 am c38bc5ab: Merge "Lockscreen widgets not always announced." into jb-mr2-dev 
* commit 'c38bc5ab6b55804c7a8d440cf2bf249baa2efc98':
  Lockscreen widgets not always announced.
 2013-04-25 16:57:56 -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
Michael Wright
f652551b3b am b044c40c: Merge "Fixed javadoc in input related classes" into jb-mr2-dev 
* commit 'b044c40c154ba8abe62154608812ad87993ca0d8':
  Fixed javadoc in input related classes
 2013-04-25 16:57:52 -07:00
Igor Murashkin
10ce90adfa am eaebe4c1: Merge "Add new android.permission.CAMERA_DISABLE_TRANSMIT_LED" into jb-mr2-dev 
* commit 'eaebe4c1062e3196f6dbff1c33ef7ec3c21c1900':
  Add new android.permission.CAMERA_DISABLE_TRANSMIT_LED
 2013-04-25 16:57:49 -07:00
Daniel Sandler
56f7afb056 am cc165d16: Merge "Fix build." into jb-mr2-dev 
* commit 'cc165d165e314ccef5d14891fb7673d3baefd7bb':
  Fix build.
 2013-04-25 16:57:47 -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
Michael Wright
5944ae74da Merge "Improve watchdog explanation when system server is blocked" 2013-04-25 23:42:01 +00:00
Nick Kralevich
e00a3b8063 Merge "Don't set ADDR_COMPAT_LAYOUT on the emulator" into jb-mr2-dev 2013-04-25 22:08:20 +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
Romain Guy
281f422686 Merge "Revert "Skip 2nd measure pass whenever possible"" 2013-04-25 21:56:07 +00:00
Romain Guy
1b7c791adf Revert "Skip 2nd measure pass whenever possible" 
This reverts commit e8fb03c05899c00f55ab1990e1b16038e82d1167.
 2013-04-25 14:55:28 -07:00
Svetoslav
c38bc5ab6b Merge "Lockscreen widgets not always announced." into jb-mr2-dev 2013-04-25 21:49:00 +00: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
Michael Wright
b044c40c15 Merge "Fixed javadoc in input related classes" into jb-mr2-dev 2013-04-25 21:43:03 +00:00
Igor Murashkin
eaebe4c106 Merge "Add new android.permission.CAMERA_DISABLE_TRANSMIT_LED" into jb-mr2-dev 2013-04-25 21:32:26 +00:00
Daniel Sandler
cc165d165e Merge "Fix build." into jb-mr2-dev 2013-04-25 21:16:56 +00:00
Daniel Sandler
5b94114fa4 Fix build. 
Change-Id: I2e41f312f51c3fd72ed63bc544b4fa815c2c3ba4
 2013-04-25 17:13:53 -04:00
Nick Kralevich
68a032936e Don't set ADDR_COMPAT_LAYOUT on the emulator 
Don't work around third party app bugs on the emulator.

(cherry picked from commit fc17dc2548234461eb43ff83539ede4c9893a825)

Change-Id: I35246c447de65ad4649b9aa3eb67194234fd6378
 2013-04-25 14:09:21 -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
Amith Yamasani
4699b68859 am 269c068d: am df181185: Merge "Hide TYPE_CHOICE_LEVEL since there\'s no visual representation for it yet." into jb-mr2-dev 
* commit '269c068de9ffb44aefa0bca99c77636263f8b8fb':
  Hide TYPE_CHOICE_LEVEL since there's no visual representation for it yet.
 2013-04-25 13:50:26 -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
Jeff Sharkey
a7ef6c50b6 Merge "Always close incoming PFD to avoid leaking." 2013-04-25 20:35:59 +00:00
Jeff Sharkey
09d8141d96 Merge "Skip reporting resumes due to config change." 2013-04-25 20:34:38 +00:00
Svetoslav
4293e233dc Lockscreen widgets not always announced. 
1. The accessibility events for switching a widget were dispatched
   before we update the important for accessibility property. We
   were lucky to get events in some cases since the pages in the
   pager had alpha grater than zero, i.e. the page was already
   set as important for accessibility, due to a running animation.

2. Accessibility focus clear event not fired if we give focus to
   another view. The old focus was correctly cleared just the
   events were not dispatched.

bug:8599670

Change-Id: Ia2647d77eaa4e10fbaf3a047dc9ea5b728f9c3c3
 2013-04-25 13:25:11 -07: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
Romain Guy
17e858a9c0 Merge "Skip 2nd measure pass whenever possible" 2013-04-25 18:54:25 +00:00
Romain Guy
e8fb03c058 Skip 2nd measure pass whenever possible 
If the height measured during the horizontal pass fits within the
constraints of the vertical pass we can skip the second call to
child.measure().

Change-Id: I3aebf78967e5920ffb28bbe8985ca7a426327a82
 2013-04-25 11:49:26 -07:00