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

128502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jeff Sharkey
f60e41f103 am 6640f6be: am b8846c81: am cf0c4a59: am 4868da52: am c620ec36: am 3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev 
* commit '6640f6be412e7454bfa7d457670e83aba46ea28c':
  Lock down MANAGE_DOCUMENTS permission.
 2014-03-24 10:38:48 -07:00
Will Haldean Brown
25e062a232 am 02893315: am d3e33cc2: am aa0fa8eb: am cedbfad4: Fix link in documentation for SWIPE_TO_DISMISS. 
* commit '0289331500457837f8ec20eea42f7bbbc2c3f479':
  Fix link in documentation for SWIPE_TO_DISMISS.
 2014-03-24 10:38:45 -07:00
Will Haldean Brown
56ff23af6b am 125f2155: am e3d4f6c1: (-s ours) am 8f2c3252: am 496e8178: Merge "Make windowSwipeToDismiss a public attribute." into klp-modular-dev 
* commit '125f2155bedf37841d7c9a9b59fb2680e41cfcef':
  Make windowSwipeToDismiss a public attribute.
 2014-03-24 10:38:42 -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
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
92c154594b am 70d78bbe: Make windowSwipeToDismiss a public attribute. 
* commit '70d78bbeecc491ebb0a30ee650d2445145992514':
  Make windowSwipeToDismiss a public attribute.
 2014-03-24 10:29:01 -07: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
02c40fdab7 am fea8d956: Merge "Fix null ActivityOptions when starting an Activity in a new Process." 
* commit 'fea8d956649589f1cfd378571cc9ad61a92cd480':
  Fix null ActivityOptions when starting an Activity in a new Process.
 2014-03-24 09:51:55 -07: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
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
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
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
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 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
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
e9c9c44134 Merge "Battery stats: track actually running time" 2014-03-22 00:26:19 +00:00
Christopher Tate
d13d3adfc3 am 18a65ad0: Merge "Cap the size of app-defined permission trees" 
* commit '18a65ad09d9a245266874015e5aacb05d868a534':
  Cap the size of app-defined permission trees
 2014-03-21 16:37:06 -07:00
Christopher Tate
18a65ad09d Merge "Cap the size of app-defined permission trees" 2014-03-21 23:32:59 +00:00
George Mount
2c92c9700c Fix null ActivityOptions when starting an Activity in a new Process. 
Bug 13563265

Change-Id: Ie56cd6d55f13dbf68bafb82ab4bd6b27fde60df6
 2014-03-21 16:25:08 -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
Winson Chung
fb50477932 am e9c77aee: Merge "Fixing crash with multiple touch pointers" 
* commit 'e9c77aee60fbb781db916d32fe1db81e1d973f8f':
  Fixing crash with multiple touch pointers
 2014-03-21 16:07:22 -07:00
Winson Chung
e9c77aee60 Merge "Fixing crash with multiple touch pointers" 2014-03-21 23:03:16 +00:00
Winson Chung
4c71aefcbd Fixing crash with multiple touch pointers 
- Adding support for force-reloading certain thumbnails (in prep for fix to Bug. 13587139)
- Use withLayer and withEndAction on ViewPropertyAnimator animations
- Ensuring that we close the notifications panel when we toggle recents

Change-Id: Ied2d841de42046fcb09fffb615156b07b4a67136
 2014-03-21 16:00:18 -07:00
Christopher Tate
c55f9c0442 Cap the size of app-defined permission trees 
Bug 13529742

Change-Id: I46c2ebc39caf4a9eacbffbb35fc386c2a1cedc12
 2014-03-21 15:16:14 -07:00
Matthew Williams
945f836acc am cde7086b: Merge "Downgrade expedited to normal on reschedule." 
* commit 'cde7086b900fd192a8e389f62ab5007d351d86b8':
  Downgrade expedited to normal on reschedule.
 2014-03-21 15:07:19 -07:00
Matthew Williams
cde7086b90 Merge "Downgrade expedited to normal on reschedule." 2014-03-21 21:59:07 +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
Jinsuk Kim
db73678e77 am a7efb93c: am a10958f1: am cfba284a: am d73e66cc: Fix broken build 
* commit 'a7efb93c1b4e717049b106312ff353cd95c74f0e':
  Fix broken build
 2014-03-21 13:30:02 -07:00
Jinsuk Kim
a7efb93c1b am a10958f1: am cfba284a: am d73e66cc: Fix broken build 
* commit 'a10958f1c386851dc69a5dae2c32b899b9f29277':
  Fix broken build
 2014-03-21 20:23:45 +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
Adam Cohen
df5699bd83 am fb40d78c: Merge "Catch exceptions if Exif is malformed" 
* commit 'fb40d78c57711585c9eaed467601bf3adb4f60f9':
  Catch exceptions if Exif is malformed
 2014-03-21 13:00:08 -07:00