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

172788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
destradaa
ffa2b14d6f am 00916297: am 3546c9a5: Merge "Mark Gps Raw related APIs as System APIs. b/16727892" into lmp-mr1-dev 
* commit '0091629788e883222ad358fa70e2cdfb3d71a296':
  Mark Gps Raw related APIs as System APIs. b/16727892
 2014-11-07 18:43:36 +00:00
Winson Chung
05b500bfa0 am 37f0e4e7: am 14638d76: am e660d6f1: am 4ad2c5ba: Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)" into lmp-dev 
* commit '37f0e4e7eae7bab2b8e04d899a0192b797f3bbe7':
  Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)
 2014-11-07 18:43:31 +00:00
Jeff Davidson
6eab8d67c3 am d9475786: am ea09c7da: Merge "Let scorers fine-tune scoring heuristics." into lmp-mr1-dev 
* commit 'd9475786081fd89769901685bb9ba42f00da976d':
  Let scorers fine-tune scoring heuristics.
 2014-11-07 18:43:23 +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
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
Baligh Uddin
93a772cb86 am 4547cfeb: (-s ours) am a7d7437c: (-s ours) am f3a1007a: (-s ours) am 6aaa61fd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '4547cfeb07d50fd5360cd4bb545cf052feccbc0c':
  Import translations. DO NOT MERGE
 2014-11-07 16:14:12 +00:00
Baligh Uddin
55c933777e am 3cad9ae1: (-s ours) am 59bde842: (-s ours) am d8ed8060: (-s ours) am 63717687: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '3cad9ae1d210535746b0714924877d97ab8f4e34':
  Import translations. DO NOT MERGE
 2014-11-07 16:14:07 +00:00
Baligh Uddin
2ca702a8a0 am e6f060ff: (-s ours) am 8188fb92: (-s ours) am 714e1636: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'e6f060fff0f85cf7c202e38493d56514c6b5c6b5':
  Import translations. DO NOT MERGE
 2014-11-07 16:14:02 +00:00
Baligh Uddin
4547cfeb07 am a7d7437c: (-s ours) am f3a1007a: (-s ours) am 6aaa61fd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'a7d7437c12ae0bfd264712dd1db9290d480630f4':
  Import translations. DO NOT MERGE
 2014-11-07 16:09:25 +00:00
Jason Monk
18f99d9134 Material design for screen pinning cling 
Switching from a dialog to a cling-like view to be more material.
Also moving it into SysUI as it highlights the buttons in nav bar.
This will be triggered directly from recents, but from apps it
will be triggered by the PhoneStatusBar.  In the case that apps
trigger the request, there will be a 'no thanks' button so that
users can refuse.

Bug: 16957435
Change-Id: Ie880f82c66f4b2be98283ed3fa789703c4bd7ed5
 2014-11-07 11:09:19 -05:00
Baligh Uddin
1021bb96d1 am 864e2471: (-s ours) am b1ef8253: (-s ours) am 326b2919: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '864e24715bdbd1c509628568868b1f8447801df4':
  Import translations. DO NOT MERGE
 2014-11-07 16:09:14 +00:00
Baligh Uddin
3cad9ae1d2 am 59bde842: (-s ours) am d8ed8060: (-s ours) am 63717687: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '59bde8429b1faa24e60957eca3db07214d43c1ea':
  Import translations. DO NOT MERGE
 2014-11-07 16:04:56 +00:00
Baligh Uddin
e6f060fff0 am 8188fb92: (-s ours) am 714e1636: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '8188fb92b3001f70d007a5b04dc0ddf526fc674f':
  Import translations. DO NOT MERGE
 2014-11-07 16:04:51 +00:00
Baligh Uddin
a2cab633c6 am 74986839: (-s ours) am a9ad9ce7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '749868399ba941ce13edb510415dc88a0e094d7d':
  Import translations. DO NOT MERGE
 2014-11-07 16:03:26 +00:00
Baligh Uddin
5f6bbc72c7 am ca14e15a: (-s ours) am c805d359: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'ca14e15acd205edb27e3a0fd839470b30d2157d9':
  Import translations. DO NOT MERGE
 2014-11-07 16:03:20 +00:00
Baligh Uddin
a7d7437c12 am f3a1007a: (-s ours) am 6aaa61fd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'f3a1007af01d49db4af2d8152b781c55ee2f7bca':
  Import translations. DO NOT MERGE
 2014-11-07 16:02:40 +00:00
Baligh Uddin
864e24715b am b1ef8253: (-s ours) am 326b2919: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'b1ef825367588db74ecb6bd4ce3360d98a651b61':
  Import translations. DO NOT MERGE
 2014-11-07 16:00:07 +00:00
Baligh Uddin
f3a1007af0 am 6aaa61fd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '6aaa61fd55955fd711199035fbd9771dcb8a9656':
  Import translations. DO NOT MERGE
 2014-11-07 15:58:15 +00:00
Baligh Uddin
59bde8429b am d8ed8060: (-s ours) am 63717687: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'd8ed806034764b855b78d3b696c3307e5e8d2ce4':
  Import translations. DO NOT MERGE
 2014-11-07 15:58:04 +00:00
Baligh Uddin
8188fb92b3 am 714e1636: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '714e16366381a14a5d8dd768c78b0afdc81af35c':
  Import translations. DO NOT MERGE
 2014-11-07 15:57:59 +00:00
Baligh Uddin
749868399b am a9ad9ce7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'a9ad9ce71b77aa7b6d9dab3faccc4aa09ee06270':
  Import translations. DO NOT MERGE
 2014-11-07 15:53:31 +00:00
Baligh Uddin
ca14e15acd am c805d359: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'c805d3599b44c961dcaf461ab7b9d1bf437b705b':
  Import translations. DO NOT MERGE
 2014-11-07 15:53:21 +00:00
Baligh Uddin
d8ed806034 am 63717687: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '637176877e9358dc5badd140cd2b795701e7459c':
  Import translations. DO NOT MERGE
 2014-11-07 15:52:32 +00:00
Baligh Uddin
b1ef825367 am 326b2919: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '326b291988732765ea650c60b6c5efe74fb1b168':
  Import translations. DO NOT MERGE
 2014-11-07 15:52:19 +00:00
Baligh Uddin
714e163663 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-07 15:50:07 +00:00
Baligh Uddin
345c14fdc4 Merge "Import translations. DO NOT MERGE" 2014-11-07 15:49:58 +00:00
Baligh Uddin
c34cacc4d2 Merge "Import translations. DO NOT MERGE" 2014-11-07 15:49:54 +00:00