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

158710 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
f13fe14853 am 001b2e93: Merge "ProcessCpuTracker touching proc is fine." into lmp-mr1-dev 
* commit '001b2e93030b06774e6af304157637c1acb94226':
  ProcessCpuTracker touching proc is fine.
 2014-11-07 23:08:07 +00:00
Christopher Tate
e5205d1ae4 am 48a7c3b5: Merge "Enable runtime turndown of backup/restore services" into lmp-mr1-dev 
* commit '48a7c3b522625ffbecb0cce7b95be6d41631577b':
  Enable runtime turndown of backup/restore services
 2014-11-07 23:03:21 +00:00
Jeff Sharkey
001b2e9303 Merge "ProcessCpuTracker touching proc is fine." into lmp-mr1-dev 2014-11-07 23:03:12 +00:00
Christopher Tate
48a7c3b522 Merge "Enable runtime turndown of backup/restore services" into lmp-mr1-dev 2014-11-07 23:00:24 +00:00
Jeff Sharkey
ccce016fb1 ProcessCpuTracker touching proc is fine. 
Otherwise we spew hundreds of StrictMode violations.

Bug: 18261125
Change-Id: I2e5ff697b99f55bb73e806f04dba8384e6f1b935
 2014-11-07 14:55:17 -08:00
John Reck
8dda03a086 am ca93f69c: Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev 
* commit 'ca93f69c96df85bd6bc72a2a47dae6c0d5336ab2':
  Have an actual fallback if the surface is lost
 2014-11-07 22:45:33 +00:00
John Reck
ca93f69c96 Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev 2014-11-07 22:41:03 +00:00
Sander Alewijnse
8c1cd7e61f am 3eed90f3: Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev 
* commit '3eed90f39301089a1c16d6e2c0d027b187567cf0':
  Added the restrictions pending application restrictions key.
 2014-11-07 22:30:50 +00:00
Sander Alewijnse
3eed90f393 Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev 2014-11-07 22:25:00 +00:00
Sander Alewijnse
53d63dcd04 Added the restrictions pending application restrictions key. 
Bug:17632522
Change-Id: If5a0d0ea1f479b0584fc0b1cff2a179d296d2904
 2014-11-07 22:19:48 +00:00
Alan Viverette
c30a7623a2 am 48c8cd06: Merge "Support theme attributes in StateListDrawable <item> element" into lmp-mr1-dev 
* commit '48c8cd06aa0b284368d836cf5d2e6c1b1630d322':
  Support theme attributes in StateListDrawable <item> element
 2014-11-07 22:14:45 +00:00
Alan Viverette
48c8cd06aa Merge "Support theme attributes in StateListDrawable <item> element" into lmp-mr1-dev 2014-11-07 22:09:44 +00:00
John Reck
413a68127a am 4734b67d: am 050a8a05: DO NOT MERGE Fix finalizer ordering/double-free issue 
* commit '4734b67dc56950f93da385d3d59b06b0058cf33b':
  DO NOT MERGE Fix finalizer ordering/double-free issue
 2014-11-07 21:52:08 +00:00
John Reck
4734b67dc5 am 050a8a05: DO NOT MERGE Fix finalizer ordering/double-free issue 
* commit '050a8a050de04bd0098cde8fdf665a7202929ee0':
  DO NOT MERGE Fix finalizer ordering/double-free issue
 2014-11-07 21:47:42 +00:00
John Reck
050a8a050d DO NOT MERGE Fix finalizer ordering/double-free issue 
Bug: 18289984

If Surface:finalize() happens after HwuiContext:finalize()
it would try to manipulate a destroyed object. However, as
Surface:finalize() always calls HwuiContext:destroy() this
can be fixed by simply getting rid of HwuiContext's finalizer

Change-Id: I7c912214417ab32891b1c58d045c9721e5f01965
(cherry picked from commit c298f9c9170b9e8721cfb616f784ec22734f22f4)
 2014-11-07 21:33:40 +00:00
Jason Monk
e2038151c2 am 872d4e00: Merge "Prepare for testing the NetworkControllerImpl" into lmp-mr1-dev 
* commit '872d4e00ed1715d76dc8e97853a4e3e9542ca8d0':
  Prepare for testing the NetworkControllerImpl
 2014-11-07 21:29:45 +00:00
Jason Monk
872d4e00ed Merge "Prepare for testing the NetworkControllerImpl" into lmp-mr1-dev 2014-11-07 21:26:40 +00:00
Tyler Gunn
3f5a43b2d3 Merge "Conference event package performance improvement." into lmp-mr1-dev 
automerge: af7dfdd

* commit 'af7dfddaade234bdad889eee4fcba7ba181031cb':
  Conference event package performance improvement.
 2014-11-07 20:57:36 +00:00
John Spurlock
d8367c24f7 Merge "QS: Long-press on usage-based tiles to hide." into lmp-mr1-dev 
automerge: 5cde5c6

* commit '5cde5c616a39b060730f9b995c19642695222975':
  QS: Long-press on usage-based tiles to hide.
 2014-11-07 20:56:35 +00:00
John Spurlock
1e64aa3382 Merge "Reset rotation-lock-for-accessibility setting on upgrade." into lmp-mr1-dev 
automerge: e586ab7

* commit 'e586ab79670b6fabfa80f1f29ecb184f97f06f72':
  Reset rotation-lock-for-accessibility setting on upgrade.
 2014-11-07 20:55:24 +00:00
Tyler Gunn
af7dfddaad Merge "Conference event package performance improvement." into lmp-mr1-dev 2014-11-07 20:42:23 +00:00
John Spurlock
5cde5c616a Merge "QS: Long-press on usage-based tiles to hide." into lmp-mr1-dev 2014-11-07 20:31:12 +00:00
John Spurlock
c247b8f727 QS: Long-press on usage-based tiles to hide. 
Bug: 18284167
Change-Id: Ia03ea34af5733b801be6a14645c76754b73c6165
 2014-11-07 15:30:04 -05:00
John Spurlock
e586ab7967 Merge "Reset rotation-lock-for-accessibility setting on upgrade." into lmp-mr1-dev 2014-11-07 20:26:35 +00:00
John Spurlock
8c51d0b711 Reset rotation-lock-for-accessibility setting on upgrade. 
Since it now hides the display setting, force the user to opt-in
again.

Bug: 18104538
Change-Id: I4cac947f7a35ba0f578d059542401dcc5d169307
 2014-11-07 15:14:21 -05:00
Jason Monk
e0cdb6079e Prepare for testing the NetworkControllerImpl 
This will allow us to add some test cases to verify that under
certain phone/signal conditions we get out the icons we expect.
This will let us break less things when refactoring for MSIM.

Bug: 18222975
Change-Id: I7bd3e66e7de6b30fede72e40fb6aa37dd523336c
 2014-11-07 20:08:47 +00:00
Sanket Padawe
d0062deacc am d227b4aa: Merge "API changes to add carrier name to subinforecord" into lmp-mr1-dev 
* commit 'd227b4aa91b5db20d448d76a2c6f0d4d37f97363':
  API changes to add carrier name to subinforecord
 2014-11-07 19:58:10 +00:00
Dan Stoza
bb8a87f48a am d17793ea: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 
* commit 'd17793ea2a93af6ba9bc64c77502f48aa32814e4':
  Add a BufferItem parameter to onFrameAvailable
 2014-11-07 19:48:50 +00:00
Sanket Padawe
d227b4aa91 Merge "API changes to add carrier name to subinforecord" into lmp-mr1-dev 2014-11-07 19:47:49 +00:00
Dan Stoza
d17793ea2a Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 2014-11-07 19:44:34 +00:00
Sanket Padawe
e1013f964d API changes to add carrier name to subinforecord 
API changes required to add carrier name of sim as a member of subinforecord.

Change-Id: I08a7f53dc012967005f7b5abd1fbc08f2947da67
 2014-11-07 11:37:29 -08:00
Jason Monk
dbda9d1c1b am f9cf698f: Merge "Fix Build" into lmp-mr1-dev 
* commit 'f9cf698fe00da7a0bf2ded408b86926c1f9155b2':
  Fix Build
 2014-11-07 19:35:53 +00:00
John Reck
76adcd6ec5 am ea4e76f6: Merge "Fix finalizer ordering/double-free issue" into lmp-mr1-dev 
* commit 'ea4e76f68a60a02e175755d22e88894f11282850':
  Fix finalizer ordering/double-free issue
 2014-11-07 19:35:48 +00:00
Jason Monk
f9cf698fe0 Merge "Fix Build" into lmp-mr1-dev 2014-11-07 19:32:47 +00:00
John Reck
ea4e76f68a Merge "Fix finalizer ordering/double-free issue" into lmp-mr1-dev 2014-11-07 19:29:47 +00:00
Jason Monk
823c7bc5c5 Fix Build 
Change-Id: I0f4094718435b219b6e6b1d98435377a42319adb
 2014-11-07 14:25:17 -05:00
Jason Monk
68d0089c66 am 975590f2: Merge "Material design for screen pinning cling" into lmp-mr1-dev 
* commit '975590f22916e184204678758bb339c1d2b6b57f':
  Material design for screen pinning cling
 2014-11-07 19:05:50 +00:00
John Reck
aa95a88327 Have an actual fallback if the surface is lost 
Bug: 17516789

This will force a relayout/reinitialize pass if the Surface
is lost mid-render instead of crashing on the next frame

Change-Id: If08bfa16f740728fa7c05904fa11e26f07b81e2e
 2014-11-07 11:02:07 -08:00
Jason Monk
88aad1af7f am 2f04d16f: Merge "Plumbing for screen pinning request from sysui" into lmp-mr1-dev 
* commit '2f04d16f16ea935895872efe4dfcff3366070e9c':
  Plumbing for screen pinning request from sysui
 2014-11-07 19:01:09 +00:00
Jason Monk
975590f229 Merge "Material design for screen pinning cling" into lmp-mr1-dev 2014-11-07 18:59:25 +00:00
Jason Monk
2f04d16f16 Merge "Plumbing for screen pinning request from sysui" into lmp-mr1-dev 2014-11-07 18:53:54 +00:00
Ricardo Cervera
bd41fd4e94 am 68dcc56a: am 10a08abd: am 578e205d: am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs automerge: 58dc8c4 automerge: c9ad13a 
* commit '68dcc56aec520b6e38cff0d11dcec1ae92a204ea':
 2014-11-07 18:52:52 +00:00
Tom Taylor
70a5f3da57 am 563a4383: am ad697e58: am d1290de2: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection i 
* commit '563a438363acf3b56d3d55d3f54a4eb11604a3c9':
 2014-11-07 18:47:51 +00:00
Tom Taylor
7f4180a4c8 am d6b14cbe: am cc9c81a9: am 1764db5b: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager automerge: db864e4 automerge: 89f7eca 
* commit 'd6b14cbeda9883c28f40f7a352212176afbbbb50':
 2014-11-07 18:47:43 +00:00
Ricardo Cervera
68dcc56aec am 10a08abd: am 578e205d: am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs automerge: 58dc8c4 automerge: c9ad13a 
* commit '10a08abd8f9249f66f73070955c2f3f09d45598b':
 2014-11-07 18:46:44 +00:00
John Reck
f7d3ce6a3c am 4b19b7aa: Merge "Fix wrong-thread issue" into lmp-mr1-dev 
* commit '4b19b7aaff1d1ff972ebe68101c2107454bbe5de':
  Fix wrong-thread issue
 2014-11-07 18:42:28 +00:00
Tom Taylor
563a438363 am ad697e58: am d1290de2: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushMana 
* commit 'ad697e5820ba624935929bcc9f33b9c38dd28f76':
 2014-11-07 18:41:30 +00:00
Tom Taylor
d6b14cbeda am cc9c81a9: am 1764db5b: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager automerge: db864e4 automerge: 89f7eca 
* commit 'cc9c81a90aab5bc5849272fa8a4d2f64366e7c19':
 2014-11-07 18:41:26 +00:00
Christopher Tate
bbe23b31dc Enable runtime turndown of backup/restore services 
The heavy implementation of the backup manager service is now sitting
behind a lightweight trampoline that actually provides the binder
call interface.  The indirection allows us now to tear down the
implementation on the fly without breaking callers who have cached
binder references to the backup services: these callers will simply
see their future invocations failing benignly.

In addition there is now an API for suitably privileged callers such
as device policy management to effect this turndown.

Finally, there is now a static system property, "ro.backup.disable",
that a product can use to outright remove backup/restore operation
from the system's operation.  The public APIs will continue to be
safely usable on such products but no data will be moved to or
from the device.

Bug 17367491

Change-Id: I8108e386ef3b5c967938fae483366d6978fe4e04
 2014-11-07 18:40:47 +00:00
Ricardo Cervera
10a08abd8f am 578e205d: am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs automerge: 58dc8c4 automerge: c9ad13a 
* commit '578e205d977d66fce491015f1f31ab82c534587d':
 2014-11-07 18:39:00 +00:00