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

126252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
452fd49369 am 5332706b: am b98ee1eb: am 103ed355: am 557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown." 
* commit '5332706b87c8772b97198e30c7cb4cc4ef3b577f':
  Set ScreenshotSurface secure if any secure content is shown.
 2014-03-24 21:25:37 +00: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
Craig Mautner
f114a5c4d1 Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" 2014-03-24 20:52:14 +00: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
Will Haldean Brown
48a5dbd3cc Update current.txt for offset attributes. 
Change-Id: I0f88a6f327edfc207c081e424e3c97edd1451c90
 2014-03-24 13:23:42 -07:00
quddusc
370cd4677b am 87eac093: am 5771d425: am 5b2e92e3: am 529d47ac: am e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs 
* commit '87eac09358a49473549fa30e4acbf93c66b8915e':
  docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
 2014-03-24 19:36:50 +00:00
quddusc
0d828311ba am ce6307d3: am 3ee70ca4: am 9c1eaeb0: am ff2599f9: am 0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs 
* commit 'ce6307d3c84ebf200e35cabf70cf49712ac14e04':
  docs: Added Javadoc for Gcore Jarlsberg release.
 2014-03-24 19:36:45 +00:00
Selim Cinek
4c01eccb0c am 38fc02d4: am d9e5761a: am 04ea3ca0: am 50ac19e9: am ba126c09: Disable Set Wallpaper button while loading image 
* commit '38fc02d4efa9e943ab38306d466c5fe2786f1bb7':
  Disable Set Wallpaper button while loading image
 2014-03-24 19:36:14 +00:00
Chad Brubaker
87f738d278 am 51e93804: am 05e4dc96: am 850eb678: am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev 
* commit '51e938041e72f29c4e776a8627ea9d8a70d62728':
  Fix support for simultaneous VPN tuns
 2014-03-24 19:35:25 +00: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
Ricardo Cervera
b7fe33633b am 1575e1a1: (-s ours) am 419b17ec: am 1d77a874: am 588300cb: am 2e929658: Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs 
* commit '1575e1a1f5c6a0e1d870af88cba8d54023dfbcab':
  docs: Added new sensor types. Bug: 10674725
 2014-03-24 19:35:11 +00:00
Chris Wren
8ed3b587f0 Merge "add more dump info for heads up notifications" 2014-03-24 18:57:06 +00:00
John Reck
1e1f4d705e am 02e99e27: am ae316643: am aff40e25: am fc603ca6: am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev 
* commit '02e99e272dbfedf5d9ba1ae91fa2b83cab5b3d07':
  Eliminate mHasAlpha
 2014-03-24 18:44:01 +00: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
Unsuk Jung
1d22bd1986 am 8ae2ce76: am 7bde0fc7: am 2270ac96: am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev 
* commit '8ae2ce76e3d44f9b25f8121c693a1e21fef3bbe0':
  Change wallpaper sizing
 2014-03-24 17:34:22 +00:00
Will Haldean Brown
bdb78d8261 am ede2a729: am ccd55a92: am f8c78b50: Update current.txt to include windowSwipeToDismiss 
* commit 'ede2a729c394461e5b3ea674e4762e7e6feed81d':
  Update current.txt to include windowSwipeToDismiss
 2014-03-24 17:34:18 +00: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
Jeff Sharkey
6640f6be41 am b8846c81: am cf0c4a59: am 4868da52: am c620ec36: am 3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev 
* commit 'b8846c819e43535250b004dde593892fa305b7e7':
  Lock down MANAGE_DOCUMENTS permission.
 2014-03-24 17:34:02 +00:00
Will Haldean Brown
0289331500 am d3e33cc2: am aa0fa8eb: am cedbfad4: Fix link in documentation for SWIPE_TO_DISMISS. 
* commit 'd3e33cc25d638cced9c17822db21e6c32e00f461':
  Fix link in documentation for SWIPE_TO_DISMISS.
 2014-03-24 17:33:58 +00:00
Will Haldean Brown
125f2155be am e3d4f6c1: (-s ours) am 8f2c3252: am 496e8178: Merge "Make windowSwipeToDismiss a public attribute." into klp-modular-dev 
* commit 'e3d4f6c19bb21dd20d95446def9a8872ecab2721':
  Make windowSwipeToDismiss a public attribute.
 2014-03-24 17:33:55 +00:00
Will Haldean Brown
70d78bbeec Make windowSwipeToDismiss a public attribute. 
resolved conflicts for merge of e3d4f6c1 to master

Bug: 13348970
Change-Id: I695139376fc7f38b3438ab38659ca15490ce8f7c
 2014-03-24 10:22:38 -07:00
George Mount
fea8d95664 Merge "Fix null ActivityOptions when starting an Activity in a new Process." 2014-03-24 16:47:09 +00:00
George Mount
07e1b9002a Merge "Fix problem on Animator with a start delay." 2014-03-24 16:46:59 +00:00
Craig Mautner
5332706b87 am b98ee1eb: am 103ed355: am 557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown." 
* commit 'b98ee1eb50389520fd06255fd38b233c7adf5814':
  Set ScreenshotSurface secure if any secure content is shown.
 2014-03-24 14:44:17 +00:00
Craig Mautner
b98ee1eb50 am 103ed355: am 557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown." 
* commit '103ed3558764f1fd41c9a5399e2030baa4110bfb':
  Set ScreenshotSurface secure if any secure content is shown.
 2014-03-24 14:38:33 +00:00
Craig Mautner
103ed35587 am 557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown." 
* commit '557a93e104f1fec69ed05b2d0ff26c78bca4c5d6':
  Set ScreenshotSurface secure if any secure content is shown.
 2014-03-24 07:34:59 -07:00
Craig Mautner
557a93e104 Merge "Set ScreenshotSurface secure if any secure content is shown." 2014-03-24 14:31:38 +00:00
Jinsuk Kim
775a097f01 am 3c34e5db: am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev 
* commit '3c34e5dbbb99d3d66f71eea5db6e001cc5495263':
  Add HdmiCecManager
 2014-03-24 12:34:15 +00: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
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 f7ad855718dc576a1618a54035b82e92356aa0d8.

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
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
quddusc
87eac09358 am 5771d425: am 5b2e92e3: am 529d47ac: am e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs 
* commit '5771d42544ddc46f82c1b793d361df30c6fc90bf':
  docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
 2014-03-22 09:41:12 +00:00
quddusc
ce6307d3c8 am 3ee70ca4: am 9c1eaeb0: am ff2599f9: am 0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs 
* commit '3ee70ca452b3f0bf9482b6c18d18b9c03be07422':
  docs: Added Javadoc for Gcore Jarlsberg release.
 2014-03-22 09:41:08 +00:00
quddusc
5771d42544 am 5b2e92e3: am 529d47ac: am e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs 
* commit '5b2e92e37b41b1497b240d41df471081c9dfdc56':
  docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
 2014-03-22 09:30:56 +00:00
quddusc
3ee70ca452 am 9c1eaeb0: am ff2599f9: am 0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs 
* commit '9c1eaeb0b4f942b2163175c846e1c08ed4b14cbf':
  docs: Added Javadoc for Gcore Jarlsberg release.
 2014-03-22 09:30:42 +00:00
quddusc
5b2e92e37b am 529d47ac: am e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs 
* commit '529d47ace907c9d961e2c1fb2e4e68ff24833e72':
  docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
 2014-03-22 04:09:04 +00:00
quddusc
9c1eaeb0b4 am ff2599f9: am 0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs 
* commit 'ff2599f9b2f25179cad9631181216f2d24255901':
  docs: Added Javadoc for Gcore Jarlsberg release.
 2014-03-22 04:08:59 +00: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