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

109173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
befd0b1bdf Track libcore API change. 
Change-Id: Ib818a7f21325c5f918bf497033a90d76b25ec9e7
 2013-07-09 14:46:18 -07:00
Jean-Baptiste Queru
4d380d71e0 am fb231fea: am 425729f9: Merge "Empty commit" 
* commit 'fb231fea6cd4dac7323b1df74006b294c3c9bfef':
  Empty commit
 2013-07-09 14:41:07 -07:00
Jean-Baptiste Queru
fb231fea6c am 425729f9: Merge "Empty commit" 
* commit '425729f92afc401f497e25b54460b1de8931c52e':
  Empty commit
 2013-07-09 14:39:29 -07:00
Jean-Baptiste Queru
425729f92a Merge "Empty commit" 2013-07-09 21:37:50 +00:00
Jean-Baptiste Queru
3ea7fe3054 Empty commit 
Work around a Gerrit issue.

Change-Id: If118caca3e9264f7dd88e554bb9d3cd219cb18bf
 2013-07-09 14:34:06 -07:00
Chad Brubaker
f11e5d3476 Permissions to protect socket marking settings 
Add the manifest entries for the net_mark group that protects marking
traffic as from another user in per user routing.

Change-Id: I97932a9e407467a7adc733caea8746a712bc6b68
 2013-07-09 13:48:21 -07:00
Craig Mautner
607c6e2a56 Merge "Refactor ActivityThread cache - Baby step 1." 2013-07-09 20:25:16 +00:00
Vinit Deshapnde
ada2f7e17b Merge "Flush scan results et al after band change" 2013-07-09 19:20:24 +00:00
Amith Yamasani
235e817c80 Merge "Clean up any restrictions files that shouldn't be there." 2013-07-09 18:32:41 +00:00
Amith Yamasani
b82add27d0 Clean up any restrictions files that shouldn't be there. 
Partially fixes the mess that was caused by #9681399

Change-Id: Iaabe15c87d1b002f0b2210b34adcc31b8fb4329c
 2013-07-09 11:24:44 -07:00
Scott Main
df541931f9 am c4570b32: am 29282f99: am b1b693ee: am 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev 
* commit 'c4570b32d87079a5ff81262c1646fa0301b7f3b9':
  update url for backup service key bug: 8834302
 2013-07-09 10:58:43 -07:00
Dirk Dougherty
5fc1e8a33d am ec47cc77: am 0f97f351: am cfb8f9a0: am 3059c708: am d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev 
* commit 'ec47cc7724464f0ce88456462cbd69aca9a6838e':
  docs: add link to developer survey on main landing pages
 2013-07-09 10:58:40 -07:00
Scott Main
c4570b32d8 am 29282f99: am b1b693ee: am 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev 
* commit '29282f99252237dd9674737d26ce72afbfdd3ac1':
  update url for backup service key bug: 8834302
 2013-07-09 10:56:35 -07:00
Dirk Dougherty
ec47cc7724 am 0f97f351: am cfb8f9a0: am 3059c708: am d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev 
* commit '0f97f3510bbef333887440b6f0bc65aea2352597':
  docs: add link to developer survey on main landing pages
 2013-07-09 10:56:32 -07:00
Scott Main
29282f9925 am b1b693ee: am 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev 
* commit 'b1b693eec6e171a059190e6f17ff53b8c558cbb3':
  update url for backup service key bug: 8834302
 2013-07-09 10:54:18 -07:00
Dirk Dougherty
0f97f3510b am cfb8f9a0: am 3059c708: am d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev 
* commit 'cfb8f9a07681cc090428a47aa856cba51be29ce5':
  docs: add link to developer survey on main landing pages
 2013-07-09 10:54:13 -07:00
Scott Main
b1b693eec6 am 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev 
* commit '5e0582cc0e09a209bed321323ad9dad3ca51dcb1':
  update url for backup service key bug: 8834302
 2013-07-09 10:52:44 -07:00
Dirk Dougherty
cfb8f9a076 am 3059c708: am d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev 
* commit '3059c70844848c7bd1aad7bffd2d5828cf745540':
  docs: add link to developer survey on main landing pages
 2013-07-09 10:52:40 -07:00
Scott Main
5e0582cc0e am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev 
* commit '7cf27aa8e3fe4735d1cf787917a524e472376e6e':
  update url for backup service key bug: 8834302
 2013-07-09 10:51:18 -07:00
Dirk Dougherty
3059c70844 am d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev 
* commit 'd5fee1644ec9829400dda77c650694f41c5decc3':
  docs: add link to developer survey on main landing pages
 2013-07-09 10:51:15 -07:00
Scott Main
7cf27aa8e3 Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev 2013-07-09 17:50:44 +00:00
Dirk Dougherty
d5fee1644e Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev 2013-07-09 17:50:08 +00:00
Scott Main
bd8dbf0d48 update url for backup service key 
bug: 8834302

Change-Id: I7bd35db2531bf03c7503cdf56f932cedacaa6771
 2013-07-09 10:49:20 -07:00
Vinit Deshapnde
b8d116a580 Flush scan results et al after band change 
This change flushes all bss data after a band change (because it
is potentially invalid). We do scan for new data just after we've
established connectivity on the new band.

Bug: 7053587

Change-Id: I8ab9d0bbc5c3f8f383c2b7868349634085cf94c1
 2013-07-09 10:42:38 -07:00
Satoshi Kataoka
7e0fad1d44 am 8b95d259: am b7925f22: Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-dev 
* commit '8b95d259b9f66342ba5ae6e8f4ea262dcb1de05b':
  Revert "Stop marking gamepads as keyboards"
 2013-07-09 10:25:02 -07:00
Satoshi Kataoka
8b95d259b9 am b7925f22: Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-dev 
* commit 'b7925f2219480d4ddbb1c655b9b386ed031815a3':
  Revert "Stop marking gamepads as keyboards"
 2013-07-09 10:23:00 -07:00
Satoshi Kataoka
b7925f2219 Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-dev 2013-07-09 17:20:39 +00:00
Joe Malin
fc13329b84 am 216e340b: am ea4193ef: am 46e8ca92: am a4d3dedc: am 420b8212: am a59eb93d: am a6241377: Doc Bug: b9739899 Bugs in Sync Adapters training 
* commit '216e340b72375c5888d1023226582f75c1ed6b98':
  Doc Bug: b9739899 Bugs in Sync Adapters training
 2013-07-09 10:11:05 -07:00
Joe Malin
216e340b72 am ea4193ef: am 46e8ca92: am a4d3dedc: am 420b8212: am a59eb93d: am a6241377: Doc Bug: b9739899 Bugs in Sync Adapters training 
* commit 'ea4193efaafb280e9e969cae72a4f43b913ae8b0':
  Doc Bug: b9739899 Bugs in Sync Adapters training
 2013-07-09 10:09:00 -07:00
Joe Malin
ea4193efaa am 46e8ca92: am a4d3dedc: am 420b8212: am a59eb93d: am a6241377: Doc Bug: b9739899 Bugs in Sync Adapters training 
* commit '46e8ca926cb9345e37ca35947d8a8ba3c131bda9':
  Doc Bug: b9739899 Bugs in Sync Adapters training
 2013-07-09 10:05:47 -07:00
Joe Malin
46e8ca926c am a4d3dedc: am 420b8212: am a59eb93d: am a6241377: Doc Bug: b9739899 Bugs in Sync Adapters training 
* commit 'a4d3dedcb18c56768bebeb3a41e257b80626f0fd':
  Doc Bug: b9739899 Bugs in Sync Adapters training
 2013-07-09 10:04:19 -07:00
Joe Malin
a4d3dedcb1 am 420b8212: am a59eb93d: am a6241377: Doc Bug: b9739899 Bugs in Sync Adapters training 
* commit '420b8212399589709b12d97323a56745480aa152':
  Doc Bug: b9739899 Bugs in Sync Adapters training
 2013-07-09 10:02:44 -07:00
Joe Malin
420b821239 am a59eb93d: am a6241377: Doc Bug: b9739899 Bugs in Sync Adapters training 
* commit 'a59eb93d1954a36b25a6277c0ce3145ce115d460':
  Doc Bug: b9739899 Bugs in Sync Adapters training
 2013-07-09 10:01:42 -07:00
Joe Malin
a59eb93d19 am a6241377: Doc Bug: b9739899 Bugs in Sync Adapters training 
* commit 'a62413772e6b5dad3a018c667ded5412e235c142':
  Doc Bug: b9739899 Bugs in Sync Adapters training
 2013-07-09 09:59:10 -07:00
Chris Wren
525b7c020b Merge "heads up notifications, v0.1" 2013-07-09 16:42:12 +00:00
The Android Open Source Project
b2bc333158 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: I033d0d25ecba2644ce84b294be1af7a1ab7951f2
 2013-07-09 09:37:30 -07:00
Craig Mautner
88c0589969 Refactor ActivityThread cache - Baby step 1. 
Introduce ResourcesManager and ResourcesKey as standalone classes.
Move DisplayMetrics and Resources HashMaps from ActivityThread to
ResourcesManager.

Change-Id: I20cc6c0dd1b74667354839e5ac9a660f4ee2d00d
 2013-07-09 09:36:42 -07:00
Chris Wren
157026f820 heads up notifications, v0.1 
1. re-name intruder alerts to heads up notifications
2. use interrupt for the verb form, instead of intrude
3. new policy: no full screen, high priority, screen on, not locked or dreaming
4. controlled by global setting, with an observer
5. only content view for now, expandable is a todo

to turn it on:
  adb  shell settings put global heads_up_enabled 1
calendar notifications (not pop-up) work well.

Change-Id: I253418c217d0a5cf81dc2fa001f4bad90fafcce5
 2013-07-09 11:12:49 -04:00
Satoshi Kataoka
42e230cdb4 Merge "Consolidate InputMethodUtils" 2013-07-09 14:42:18 +00:00
Satoshi Kataoka
b282726d86 Consolidate InputMethodUtils 
Change-Id: Ib5a5f3af8ea9eaaa81697d13c20abe28121e7373
 2013-07-09 23:20:06 +09:00
The Android Automerger
af39e2622c merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-09 05:55:27 -07:00
Dianne Hackborn
8f5c69a75f Merge "More procstats work." 2013-07-09 01:45:22 +00:00
Scott Main
5bb3b739b7 am 5c949ee4: am 0ebc82fe: am 597d7040: am 61e1a650: am e4d65d24: am eceeaf11: add link to cloud backend blog post 
* commit '5c949ee481f029fe6dc1c9b16ec1d917ba5df440':
  add link to cloud backend blog post
 2013-07-08 18:24:42 -07:00
Scott Main
5c949ee481 am 0ebc82fe: am 597d7040: am 61e1a650: am e4d65d24: am eceeaf11: add link to cloud backend blog post 
* commit '0ebc82fe79966882bf6cf798afa6c67e1fc7d196':
  add link to cloud backend blog post
 2013-07-08 18:22:42 -07:00
Scott Main
0ebc82fe79 am 597d7040: am 61e1a650: am e4d65d24: am eceeaf11: add link to cloud backend blog post 
* commit '597d7040309d86e366be7804238750ccc733a7ad':
  add link to cloud backend blog post
 2013-07-08 18:20:40 -07:00
Scott Main
597d704030 am 61e1a650: am e4d65d24: am eceeaf11: add link to cloud backend blog post 
* commit '61e1a650c032c1169c31aad7e0aed085c400327d':
  add link to cloud backend blog post
 2013-07-08 18:18:26 -07:00
Scott Main
61e1a650c0 am e4d65d24: am eceeaf11: add link to cloud backend blog post 
* commit 'e4d65d24c3d9b6ce286193c451b1e90fb2265215':
  add link to cloud backend blog post
 2013-07-08 18:15:25 -07:00
Scott Main
e4d65d24c3 am eceeaf11: add link to cloud backend blog post 
* commit 'eceeaf11467e53cbc7196695953d28ad896a3c6d':
  add link to cloud backend blog post
 2013-07-08 18:13:19 -07:00
Dianne Hackborn
a4cc205ee8 More procstats work. 
The historical data is now a more central part of the stats.
When a checkin happens, the data is not deleted, just marked
as checked in so we can continue to access it.

The default procstats dump is now a new "summary" mode that
shows a more useful set of data for all of the running processes.
By default the current and all committed states are shown; you
use "--current" to only show the current.  Use "--details" to
get the previous more detailed data (which now includes detailed
process data like the per-package data).

Also tweaked uid printing to be a little more compact.

Change-Id: I5414ea7c07134ebd5dc83f6f7b9f6e30151eda85
 2013-07-08 18:06:24 -07:00
Scott Main
eceeaf1146 add link to cloud backend blog post 
Change-Id: I38376ff9ceaa7338f03cdfe6cd1685efafa1a4e2
 2013-07-08 17:29:22 -07:00