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

158692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
destradaa
0091629788 am 3546c9a5: Merge "Mark Gps Raw related APIs as System APIs. b/16727892" into lmp-mr1-dev 
* commit '3546c9a5821fc8a754e05593d314c49cd6bca0d0':
  Mark Gps Raw related APIs as System APIs. b/16727892
 2014-11-07 18:37:16 +00:00
Winson Chung
37f0e4e7ea am 14638d76: am e660d6f1: am 4ad2c5ba: Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)" into lmp-dev 
* commit '14638d76bb1be95c6de1df7daad98af4a0ea92d4':
  Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)
 2014-11-07 18:37:09 +00:00
Jeff Davidson
d947578608 am ea09c7da: Merge "Let scorers fine-tune scoring heuristics." into lmp-mr1-dev 
* commit 'ea09c7da01c1cd61a2f6d84302fd510c3887db07':
  Let scorers fine-tune scoring heuristics.
 2014-11-07 18:37:03 +00:00
John Reck
4b19b7aaff Merge "Fix wrong-thread issue" into lmp-mr1-dev 2014-11-07 18:34:55 +00:00
John Reck
c298f9c917 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
 2014-11-07 10:33:36 -08:00
Tom Taylor
ad697e5820 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 WAPPushManager automerge 
* commit 'd1290de2aabb0f79be29a9c5135fe1049df016d0':
 2014-11-07 18:33:30 +00:00
Tom Taylor
cc9c81a90a am 1764db5b: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager automerge: db864e4 automerge: 89f7eca 
* commit '1764db5bf2aad8353f94f28ef4ae6c284adeb547':
 2014-11-07 18:33:27 +00:00
John Reck
12f5e34332 Fix wrong-thread issue 
Bug: 18259560

Change-Id: Ic63a86efba9c86f21defac0695a73db8b09ae284
 2014-11-07 10:31:53 -08:00
Ricardo Cervera
578e205d97 am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs automerge: 58dc8c4 
automerge: c9ad13a

* commit 'c9ad13a5e18a6eea512547cba6530cb1eb6a9da8':
 2014-11-07 18:30:57 +00:00
Tom Taylor
d1290de2aa 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 WAPPushManager automerge: 6209d4e 
automerge: 739117f

* commit '739117f1a1f70168461a61219b02a90118641e05':
 2014-11-07 18:29:25 +00:00
Tom Taylor
1764db5bf2 am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager automerge: db864e4 
automerge: 89f7eca

* commit '89f7eca148869850fd5d107acbbb33a0a555fcd6':
 2014-11-07 18:27:57 +00:00
destradaa
3546c9a582 Merge "Mark Gps Raw related APIs as System APIs. b/16727892" into lmp-mr1-dev 2014-11-07 18:22:32 +00:00
Ricardo Cervera
c9ad13a5e1 am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs 
automerge: 58dc8c4

* commit '58dc8c42f2880b4264bfad46b9ab443576d4b4f2':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
 2014-11-07 17:49:58 +00:00
Winson Chung
14638d76bb am e660d6f1: am 4ad2c5ba: Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)" into lmp-dev 
* commit 'e660d6f179a01ea18867e9e2126eddd941596953':
  Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)
 2014-11-07 17:41:01 +00:00
Jeff Davidson
ea09c7da01 Merge "Let scorers fine-tune scoring heuristics." into lmp-mr1-dev 2014-11-07 17:38:38 +00:00
Winson Chung
e660d6f179 am 4ad2c5ba: Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)" into lmp-dev 
* commit '4ad2c5ba9ba39ff6116b657d36f671a4cdd2396f':
  Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)
 2014-11-07 17:34:57 +00:00
Winson Chung
4ad2c5ba9b Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)" into lmp-dev 2014-11-07 17:30:58 +00:00