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

167533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
a9ad9ce71b Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-07 15:49:33 +00:00
Baligh Uddin
6aaa61fd55 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-07 15:49:30 +00:00
Baligh Uddin
326b291988 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-07 15:45:43 +00:00
Baligh Uddin
c805d3599b Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-07 15:45:39 +00:00
Baligh Uddin
637176877e Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-07 15:45:37 +00:00
Ignacio Solla
ad87ec5bba am cf045ea8: am 803908b0: Merge "[WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting." into lmp-mr1-dev 
* commit 'cf045ea8e4b91ac662d0aff74df429a2569d8e46':
  [WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting.
 2014-11-07 10:08:22 +00:00
Ignacio Solla
cf045ea8e4 am 803908b0: Merge "[WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting." into lmp-mr1-dev 
* commit '803908b0db0139a2bc3eca2868cad67c9a274d97':
  [WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting.
 2014-11-07 10:01:08 +00:00
Baligh Uddin
ddfe33b690 Import translations. DO NOT MERGE 
Change-Id: Iae4fdd5608681f999b8b8234262b6da60d79eea2
Auto-generated-cl: translation import
 2014-11-07 01:50:28 -08:00
Baligh Uddin
ca372ca7f8 Import translations. DO NOT MERGE 
Change-Id: I3019f8f80cdeb209aa4f7903b149743af1b1473e
Auto-generated-cl: translation import
 2014-11-07 01:47:40 -08:00
Ignacio Solla
803908b0db Merge "[WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting." into lmp-mr1-dev 2014-11-07 09:44:59 +00:00
Baligh Uddin
31b3de0d95 Import translations. DO NOT MERGE 
Change-Id: Ic6355a1f0a89aadd602b3cfa6660f735f6d04d7b
Auto-generated-cl: translation import
 2014-11-07 01:44:33 -08:00
Baligh Uddin
e6ac0cd883 Import translations. DO NOT MERGE 
Change-Id: I2cd2b6ae9fb2a5114ee931d03e7d1f5aff0bc1e6
Auto-generated-cl: translation import
 2014-11-06 23:26:52 -08:00
Baligh Uddin
d3531b9880 Import translations. DO NOT MERGE 
Change-Id: I353eea105f85b0d45a2dd0f45b84921462c87c89
Auto-generated-cl: translation import
 2014-11-06 23:19:45 -08:00
Baligh Uddin
a8b1305363 Import translations. DO NOT MERGE 
Change-Id: Id09faf98f305e5319eecc2d18b25ccde8aed55c1
Auto-generated-cl: translation import
 2014-11-06 23:11:55 -08:00
Quddus Chong
402a14047a am 63bafb39: am fedaef0d: am 15127a69: am 871aff9c: Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs automerge: 0d7fa2f 
* commit '63bafb39bc64f671d686190985964f978a8cbd45':
  docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075
 2014-11-07 04:10:46 +00:00
Tyler Gunn
ab4650c456 Conference event package performance improvement. 
- Instead of sending each participant to the telephony conference
controller, all participants are sent at once.  This way the conference
only needs to be recalculated once.

Bug: 18057361
Change-Id: I86205fc7f1d2648bb180fc7eaf3ad611955952f9
 2014-11-06 20:06:23 -08:00
Quddus Chong
63bafb39bc am fedaef0d: am 15127a69: am 871aff9c: Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs automerge: 0d7fa2f 
* commit 'fedaef0d92e6760fbb8c02368ab74f5f4fe019cc':
  docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075
 2014-11-07 04:00:16 +00:00
Quddus Chong
fedaef0d92 am 15127a69: am 871aff9c: Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs automerge: 0d7fa2f 
* commit '15127a69f6885f6fda2f60f9f2eafa2752d0f3e6':
  docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075
 2014-11-07 03:53:14 +00:00
Quddus Chong
15127a69f6 am 871aff9c: Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs 
automerge: 0d7fa2f

* commit '0d7fa2fdd95a1e76373bfa8be31d8c50e96c5715':
  docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075
 2014-11-07 03:45:33 +00:00
Quddus Chong
0d7fa2fdd9 am 871aff9c: Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs 
* commit '871aff9ca6654ee17e1cfb6d76b987dd3d552bba':
  docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075
 2014-11-07 02:52:28 +00:00
Jim Miller
73d4368119 am eae9dc3b: am c6f5009f: Merge "Fix build" into lmp-mr1-dev 
* commit 'eae9dc3b7fdf21c50de864d5ab13c71446c7b2da':
  Fix build
 2014-11-07 02:27:08 +00:00
Jim Miller
eae9dc3b7f am c6f5009f: Merge "Fix build" into lmp-mr1-dev 
* commit 'c6f5009fdb6aeafbee6db2b3e381f405ff23718b':
  Fix build
 2014-11-07 02:21:20 +00:00
Jim Miller
c6f5009fdb Merge "Fix build" into lmp-mr1-dev 2014-11-07 02:18:20 +00:00
Jungshik Jang
7fb8e7f4ff CEC: Send <Give System Audio Mode> regardless of TV's setting. 
When TV is brought back out of standby, it should send <Give System Audio Mode>
to audio receiver so that TV recovers system audio mode.
Current implementation sends <Give System Audio Mode> only when setting is "ON".
In order to fix this, this change sends <Give System Audio Mode>
regardless of TV's setting and update system audio mode according to
response of <Give System Audio Mode>.

Bug: 18267467
Change-Id: I2c3c05347c6f2a7a3a5e3772e4e26c77156eb740
 2014-11-07 11:11:58 +09:00
Jim Miller
a237a31484 Fix build 
Change-Id: I1c4054f0e613f19a39c4bc32cc90bdec3b21dca9
 2014-11-06 18:05:59 -08:00