Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
128,598 Commits 3 Branches 0 Tags
e25ad4fbe71f47f2b616b4660d0b448e4e3599ed
Commit Graph

34831 Commits

Author SHA1 Message Date
Jinsuk Kim
e25ad4fbe7 am 1c855178: am 775a097f: am 3c34e5db: am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev 
* commit '1c855178e497f7ba788dadb87167f1e6735d10cb':
  Add HdmiCecManager
 2014-03-24 14:30:39 -07:00
Chris Craik
58de1c2b7e am 76c30ce3: Merge "Rework Outline API, remove isolatedZVolume remnants" 
* commit '76c30ce3c1d8f1a818502aaea2c42c84d6bd3f92':
  Rework Outline API, remove isolatedZVolume remnants
 2014-03-24 14:27:11 -07:00
Jinsuk Kim
1c855178e4 am 775a097f: am 3c34e5db: am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev 
* commit '775a097f01a349548d2124ae9d7dd562c72eaa27':
  Add HdmiCecManager
 2014-03-24 21:25:21 +00:00
Chris Craik
76c30ce3c1 Merge "Rework Outline API, remove isolatedZVolume remnants" 2014-03-24 21:22:36 +00:00
Dianne Hackborn
5ead8196fd am 43111e89: Merge "Battery stats: wake locks, radio active, cleanup." 
* commit '43111e897be9f79ababb0ecf99f155695416d956':
  Battery stats: wake locks, radio active, cleanup.
 2014-03-24 13:46:08 -07:00
Dianne Hackborn
43111e897b Merge "Battery stats: wake locks, radio active, cleanup." 2014-03-24 20:42:31 +00:00
Dianne Hackborn
4590e52f3d Battery stats: wake locks, radio active, cleanup. 
- Improve wake lock work source updates to also update the current
  history tag, in case the new work source gets recorded in the
  history.

- Fix bug in recording radio active time that was not distributing
  any time to apps.

- No longer hold a wake lock while dispatching data conn active call,
  since it comes with its own timestamp.

- Fix issue where the top app was not being cleared while the screen
  was off.

- Remove obsolete STATS_LAST stats type.

- Fix bug that was not clearing the total run time when resetting
  the stats.

Change-Id: Iabe17a9edf34f762374ae09fcffb8a819cf72e30
 2014-03-24 13:36:46 -07:00
Chad Brubaker
7a30a143d2 am ff3bb2fe: am 7f623d6b: am 9506e84b: am c7726147: am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev 
* commit 'ff3bb2fe95a7d0158f5a456368eb7fa91069bc23':
  Include the interface for clearDnsInterfaceForUidRange
 2014-03-24 12:45:01 -07:00
Chad Brubaker
ff3bb2fe95 am 7f623d6b: am 9506e84b: am c7726147: am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev 
* commit '7f623d6b9459bc982c49f0a74aa2c9911f8e1dd8':
  Include the interface for clearDnsInterfaceForUidRange
 2014-03-24 19:35:20 +00:00
Dianne Hackborn
e2f970a239 am 48600b95: Merge "Fix issue #13564072: Back button no longer dismisses IME after voice usage" 
* commit '48600b95cad8d49772ca5634a317b893d2346f42':
  Fix issue #13564072: Back button no longer dismisses IME after voice usage
 2014-03-24 11:43:17 -07:00
Dianne Hackborn
35d6ab9289 am 7d867342: Merge "Get rid of not specifying a user errors in bluetooth." 
* commit '7d86734297bf6c2f71404498567cc92576591b8c':
  Get rid of not specifying a user errors in bluetooth.
 2014-03-24 11:43:14 -07:00
Dianne Hackborn
48600b95ca Merge "Fix issue #13564072: Back button no longer dismisses IME after voice usage" 2014-03-24 18:37:51 +00:00
Dianne Hackborn
7d86734297 Merge "Get rid of not specifying a user errors in bluetooth." 2014-03-24 18:37:19 +00:00
Chris Craik
b49f446c98 Rework Outline API, remove isolatedZVolume remnants 
Change-Id: I30c2fe832dcb98fa6329b1a595b3d3aafbdcad6b
 2014-03-24 11:37:06 -07:00
Dianne Hackborn
6b6b3fdbf5 Fix issue #13564072: Back button no longer dismisses IME after voice usage 
Calling identity wasn't being cleared in an incoming code path.

Change-Id: Ib32060a91bf81531de049fafde69835b5382a25f
 2014-03-24 11:28:27 -07:00
Alex Klyubin
092876b3fa am f96bfe86: am 7ae93b1d: am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API." 
* commit 'f96bfe86a68bfd0491a76cf6dfa515dc58f027bb':
  Adjust to the change in the private SSLParameterImpl API.
 2014-03-24 10:38:51 -07:00
Alex Klyubin
f96bfe86a6 am 7ae93b1d: am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API." 
* commit '7ae93b1d0cd1eb43b5fc8248dfc2703608a461f3':
  Adjust to the change in the private SSLParameterImpl API.
 2014-03-24 17:34:11 +00:00
George Mount
8fc8b5707c am 07e1b900: Merge "Fix problem on Animator with a start delay." 
* commit '07e1b9002a51032a7dc782178d3c29d3417ab266':
  Fix problem on Animator with a start delay.
 2014-03-24 09:51:52 -07:00
George Mount
07e1b9002a Merge "Fix problem on Animator with a start delay." 2014-03-24 16:46:59 +00:00
Przemyslaw Szczepaniak
ea8aa10d63 am 7638b1f3: Merge "Do not reset language in case of the TTS service reconnect." 
* commit '7638b1f3b56d8176e401a4067b18749682635f0c':
  Do not reset language in case of the TTS service reconnect.
 2014-03-24 05:28:44 -07:00
Mathew Inwood
2fd1031460 am a73b0c54: Merge "Fix log spam from View.toString()." 
* commit 'a73b0c54b3f8c00028ff9b39aa1e0f5556d7c6f2':
  Fix log spam from View.toString().
 2014-03-24 05:28:40 -07:00
Jinsuk Kim
3c34e5dbbb am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev 
* commit 'c01e1aeb0d86bd626684c97d709d4a8e995fddfb':
  Add HdmiCecManager
 2014-03-24 12:26:51 +00:00
Przemyslaw Szczepaniak
7638b1f3b5 Merge "Do not reset language in case of the TTS service reconnect." 2014-03-24 10:08:37 +00:00
Mathew Inwood
a73b0c54b3 Merge "Fix log spam from View.toString()." 2014-03-24 09:46:24 +00:00
Jinsuk Kim
c01e1aeb0d Merge "Add HdmiCecManager" into klp-modular-dev 2014-03-23 23:24:44 +00:00
Jinsuk Kim
fbcd503645 Add HdmiCecManager 
Introduces HdmiCecManager/HdmiCecClient to provide apps/system components
with the way to access HdmiCecService via Context.getSystemService(HDMI_CEC_SERVICE).

Change-Id: I39da071a328074a4b7b049947943688bd7779c26
 2014-03-24 08:19:39 +09:00
Craig Mautner
d649f574d5 am 296f1a91: Merge "Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks."" 
* commit '296f1a9130cc5d5339ab1d1c3cfc7324920acf8a':
  Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks."
 2014-03-22 18:24:22 -07:00
Craig Mautner
296f1a9130 Merge "Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks."" 2014-03-23 01:20:42 +00:00
Craig Mautner
9cf34e2ee4 Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks." 
This reverts commit f7ad855718.

After careful consideration this would prove to be a security leak to leave it in. Tasks could deliberately launch dialog activities that don't want to be seen in an unsecure setting. These would then be visible over the task background.

Change-Id: Ia7e984bc9616573af6c7772f6ea0f2dd588bb85d
 2014-03-23 00:10:33 +00:00
Craig Mautner
a4796e0da7 am 61ada5d3: Merge "Add Activity methods for icons and labels." 
* commit '61ada5d330e10a738ba5f085cae5b9b339895d19':
  Add Activity methods for icons and labels.
 2014-03-22 16:50:28 -07:00
Craig Mautner
61ada5d330 Merge "Add Activity methods for icons and labels." 2014-03-22 23:44:37 +00:00
Craig Mautner
2fbd754180 Add Activity methods for icons and labels. 
New Activity methods setRecentsLabel(CharSequence) and
setRecentsIcon(Bitmap) have been added. The topmost
activity with either of these set will be returned in
RecentTaskInfo members activityLabel and activityIcon.

Fixes bug 13562992.

Change-Id: Ic15d1d27b733b892a2a940063b105ac48f1ffee5
 2014-03-22 16:39:33 -07:00
John Spurlock
b7d975eeb6 am 9ae0c8ff: Merge "Add notification category for recommendations." 
* commit '9ae0c8ffba5ab50fb02d319a00e56fe42960cb4a':
  Add notification category for recommendations.
 2014-03-21 18:40:38 -07:00
John Spurlock
9ae0c8ffba Merge "Add notification category for recommendations." 2014-03-22 01:35:46 +00:00
John Spurlock
0a69c8c4bd Add notification category for recommendations. 
Change-Id: I3718b8273c3f901aee1b2c2cdc4fcdae25fadcad
 2014-03-21 21:33:37 -04:00
Dianne Hackborn
d134fbedad am e9c9c441: Merge "Battery stats: track actually running time" 
* commit 'e9c9c441346586e26eccc0523fcf12f5158e53f7':
  Battery stats: track actually running time
 2014-03-21 17:30:55 -07:00
Dianne Hackborn
a1bd79268b Battery stats: track actually running time 
Use the uptime while creating the battery stats history to
generate a new event indicating when the CPU is actually running.
We can do this in combination with the new event reporting when
the CPU comes awake, looking at the difference between the
uptime and elapsed time at that point to determine when it last
when to sleep.

Also use this information to generate a new set of aggregated
states, the uptime caused by each wake reason.

Finally use new radio down timestamp to adjust the times we
compute for radio use.  Note that this information is not (yet)
being used to adjust how these are recorded in the history.

Change-Id: I723b3b526c8e7d64de0cac9d1193e04132d5a3e4
 2014-03-21 16:14:59 -07:00
George Mount
2ed16ac623 Fix problem on Animator with a start delay. 
Bug 13589060

Change-Id: I05b9421fa141466bdbfe19f1bd5d993fa23982cb
 2014-03-21 16:13:37 -07:00
Chad Brubaker
9506e84b6f am c7726147: am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev 
* commit 'c77261471432e1577586395dd0a6a481ef7431b5':
  Include the interface for clearDnsInterfaceForUidRange
 2014-03-21 21:09:41 +00:00
Chad Brubaker
c772614714 am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev 
* commit '1fce89d946760a1bcf3a733f55494f963eab00c2':
  Include the interface for clearDnsInterfaceForUidRange
 2014-03-21 21:02:43 +00:00
Chad Brubaker
1fce89d946 am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev 
* commit 'de4e7b4947998638e0345ab9a181bf35a8827bef':
  Include the interface for clearDnsInterfaceForUidRange
 2014-03-21 20:56:37 +00:00
Chad Brubaker
de4e7b4947 Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev 2014-03-21 20:52:05 +00:00
Paul Lawrence
81d63c442b am 717e0f5d: Merge "Don\'t prompt at boot if we already did that when decrypting" 
* commit '717e0f5db7161ddfff98f21fe1cdb2a3b1a6c8b7':
  Don't prompt at boot if we already did that when decrypting
 2014-03-21 13:45:20 -07:00
Paul Lawrence
717e0f5db7 Merge "Don't prompt at boot if we already did that when decrypting" 2014-03-21 20:40:46 +00:00
Colin Cross
6418a7d30c am 8a60ded0: Merge "resolved conflicts for merge of a67e34c8 to master" 
* commit '8a60ded02614bc8358f89aa9b7cf3f8e7b1383a2':
  Add HDMI-CEC service
 2014-03-21 13:23:05 -07:00
Colin Cross
8a60ded026 Merge "resolved conflicts for merge of a67e34c8 to master" 2014-03-21 20:19:54 +00:00
Colin Cross
a42cb8b0e2 resolved conflicts for merge of a67e34c8 to master 
Change-Id: I597525886260884c9b2dfc7945e01eb8138a58c2
 2014-03-21 13:11:02 -07:00
Bo Liu
4474da7c74 am caf94773: Merge "Convert a attach/detach functor in ViewRootImpl to x64" 
* commit 'caf947737d3e94d2f5d839ec1fa951df7937fdb2':
  Convert a attach/detach functor in ViewRootImpl to x64
 2014-03-21 13:05:57 -07:00
Bo Liu
caf947737d Merge "Convert a attach/detach functor in ViewRootImpl to x64" 2014-03-21 20:00:35 +00:00
John Spurlock
5c076ac025 am 3daafcd7: Merge "Annotate framework vibrate calls with stream hints." 
* commit '3daafcd7bab6e3ace72396576529e3049ab4c066':
  Annotate framework vibrate calls with stream hints.
 2014-03-21 12:56:43 -07:00