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

154701 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
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
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
6aaa61fd55 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-07 15:49:30 +00:00
Baligh Uddin
637176877e Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-07 15:45:37 +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
e6ac0cd883 Import translations. DO NOT MERGE 
Change-Id: I2cd2b6ae9fb2a5114ee931d03e7d1f5aff0bc1e6
Auto-generated-cl: translation import
 2014-11-06 23:26:52 -08: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
Quddus Chong
871aff9ca6 Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs 2014-11-07 01:11:33 +00:00
Winson Chung
2763095c13 Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581) 
Change-Id: I1bcf6f91f616890f0e815db33267c5230ae9c76f
(cherry picked from commit 559e6d34b4e76ee21dc6e300681c399ed735a964)
 2014-11-07 01:10:03 +00:00
Andre Eisenbach
df11d588bb Fix crash during Bluetooth on/off stress test 
Bug: 18106938
Change-Id: Icdeb736d89d5926264f2043455ccbc3760fd5d29
(cherry picked from commit 178d3b54cd50558be789c5dfd8dad80ffdc65021)
 2014-11-07 00:19:45 +00:00
Luan Nguyen
db21261339 am 816b93cf: am 712c7ea3: Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs 
* commit '816b93cf23c59a8a17e998ca706619b9eaa23793':
  cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4
 2014-11-07 00:10:25 +00:00
Joe Fernandez
5851fb9b82 am d00ce6c5: am 1d295821: docs: fix for Brand inquiries form 
* commit 'd00ce6c537242d8bf6f01122f7faebfc07652e87':
  docs: fix for Brand inquiries form
 2014-11-07 00:10:21 +00:00
Luan Nguyen
816b93cf23 am 712c7ea3: Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs 
* commit '712c7ea3d87be2afb7ecaf0d87ea9f9eb1a0007c':
  cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4
 2014-11-07 00:05:20 +00:00
Joe Fernandez
d00ce6c537 am 1d295821: docs: fix for Brand inquiries form 
* commit '1d295821355c6a1ffcb01866e38664343570129e':
  docs: fix for Brand inquiries form
 2014-11-07 00:05:16 +00:00
Andres Morales
f33d9db43a am b1477d11: Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev 
* commit 'b1477d11ca873db761dd378a5fea93b26d695f78':
  [DO NOT MERGE] Increase min free levels for cached processes on 64bit
 2014-11-06 23:57:25 +00:00
Andres Morales
b1477d11ca Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev 2014-11-06 23:51:00 +00:00
Andres Morales
423c44dc91 [DO NOT MERGE] Increase min free levels for cached processes on 64bit 
Requires less memory pressure to start killing cached
processes.

Change-Id: Ia02f5aee115535badc900330b9361f0099203e4f
 2014-11-06 15:44:02 -08:00
Luan Nguyen
712c7ea3d8 Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs 2014-11-06 23:26:53 +00:00
Joe Fernandez
1d29582135 docs: fix for Brand inquiries form 
b/18162023

Change-Id: Iaf8a82bf268fb1c798c90012928641bd2961f4df
 2014-11-06 14:53:04 -08:00
Jason Parks
94c3e3bfcf Merge "Fix NPE for CTS." into lmp-sprout-dev 2014-11-06 22:23:04 +00:00
Jeff Hao
2a83226c75 Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-sprout-dev 2014-11-06 20:45:01 +00:00
Rich Slogar
d47ab00cc4 am 830790ba: am b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs 
* commit '830790baf8c35942832c5e7fb2467be6112048f4':
  docs:Remove tools/index.jd file.
 2014-11-06 20:39:18 +00:00
Rich Slogar
830790baf8 am b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs 
* commit 'b0af6987aacec95b90c655f7e9bd9576baaab3df':
  docs:Remove tools/index.jd file.
 2014-11-06 20:33:30 +00:00
Rich Slogar
b0af6987aa Merge "docs:Remove tools/index.jd file." into lmp-docs 2014-11-06 20:30:11 +00:00
Jason Parks
de709869ae Fix NPE for CTS. 
The effect list can be empty and will return null
from native code. This fixes the CTS crash.

Bug: 18256010
Change-Id: Ifa552efc9de216993427115c001c7071c90403f1
 2014-11-06 14:08:52 -06:00
Quddus Chong
01ca1277b9 docs: Removed statement that ART does not implement compacting garbage collection. 
bug: 18181075

Change-Id: Ibbb20604595a6740d19ec1d887854d60fb9d797b
 2014-11-06 11:31:54 -08:00
Vinod Krishnan
1d6d427278 Adding wallpaper animations 
- this has the best behavior. Sometimes the behavior is not consistent

Bug: 18058382

Change-Id: I744169ea333d3cef9d7b3618b940280aa8db4dc3
 2014-11-06 09:43:49 -08:00
Ricardo Cervera
126eda32eb am b4a19198: am 58dc8c42: am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs 
* commit 'b4a1919816f4563390f2416038a66cd36b4f06aa':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
 2014-11-06 17:19:00 +00:00
Paul Lawrence
3bde026aeb am afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev 
* commit 'afb6b50e824153de5e2f0c4d49dd95fde79fa04f':
  DO NOT MERGE: Don't log passwords returned from vdc
 2014-11-06 17:14:35 +00:00
Ricardo Cervera
b4a1919816 am 58dc8c42: am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs 
* commit '58dc8c42f2880b4264bfad46b9ab443576d4b4f2':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
 2014-11-06 17:13:58 +00:00
Ricardo Cervera
0a285d4a34 am 9bc1b15a: am cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200 
* commit '9bc1b15a66647e63f15383c1f82d5ed7cca0a304':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
 2014-11-06 17:09:12 +00:00
Paul Lawrence
afb6b50e82 Merge "DO NOT MERGE: Don't log passwords returned from vdc" into lmp-dev 2014-11-06 17:08:27 +00:00
Ricardo Cervera
58dc8c42f2 am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs 
* commit 'e7cd5f2e9cf76ed789534dfe5cc60c27a3b4984f':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
 2014-11-06 17:03:00 +00:00
Ricardo Cervera
9bc1b15a66 am cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200 
* commit 'cc0753b077abb1ad5e5e95885567261b35067ed4':
  docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
 2014-11-06 17:02:56 +00:00
Ricardo Cervera
cc0753b077 docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200 
Change-Id: I4fed30061daabfb05b24e84bb36cd21d38ad0fea
(cherry picked from commit 2871e05b48f0b932885986322ce01212717a6399)
 2014-11-06 16:57:50 +00:00
Ricardo Cervera
e7cd5f2e9c Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs 2014-11-06 16:57:14 +00:00
Dirk Dougherty
61a76f2d79 am f15017fc: am 326c70ef: Doc change: Add play dev guide page with index card and shareable download. 
* commit 'f15017fc0af505e8fd5efab3791d153020621084':
  Doc change: Add play dev guide page with index card and shareable download.
 2014-11-06 05:25:51 +00:00
Dirk Dougherty
f15017fc0a am 326c70ef: Doc change: Add play dev guide page with index card and shareable download. 
* commit '326c70efeed9c01e8c8d0f38f7ae27891f726e6b':
  Doc change: Add play dev guide page with index card and shareable download.
 2014-11-06 05:20:29 +00:00
Dirk Dougherty
326c70efee Doc change: Add play dev guide page with index card and shareable download. 
Change-Id: I08f5c2a6b863ecb747c90d677f635fab511d91d3
(cherry picked from commit 0ce73219be7f37170eb19dba690a5cd8d3e22e21)
 2014-11-06 04:37:34 +00:00
Dirk Dougherty
2acfc3b9e2 am d7476cf4: Merge "Doc change: Add play dev guide page with index card and shareable download." into lmp-dev 
* commit 'd7476cf42fd397ae8dc70fd9eae636c845842df1':
  Doc change: Add play dev guide page with index card and shareable download.
 2014-11-06 04:29:44 +00:00
Joe Fernandez
93f8965768 am ab6e9048: am 2490ec83: Merge "docs: Add more information for getting started with TV app" into lmp-docs 
* commit 'ab6e9048ebe2ac6cd4897378b56017267d6ee16e':
  docs: Add more information for getting started with TV app
 2014-11-06 04:23:30 +00:00
Dirk Dougherty
d7476cf42f Merge "Doc change: Add play dev guide page with index card and shareable download." into lmp-dev 2014-11-06 04:22:11 +00:00
Joe Fernandez
ab6e9048eb am 2490ec83: Merge "docs: Add more information for getting started with TV app" into lmp-docs 
* commit '2490ec83702985bd70ac2d28322dc5c9625dc26a':
  docs: Add more information for getting started with TV app
 2014-11-06 04:14:26 +00:00
Dirk Dougherty
0ce73219be Doc change: Add play dev guide page with index card and shareable download. 
Change-Id: I08f5c2a6b863ecb747c90d677f635fab511d91d3
 2014-11-05 20:14:15 -08:00
Paul Lawrence
70c9a06af0 DO NOT MERGE: Don't log passwords returned from vdc 
Turns off logging of responses from native daemon connector altogether.
Proper solution to follow in LMP MR1

Bug: 18260068
Change-Id: I25bc9cb61049a3efdd9a9cd11195864a04ef05fd
 2014-11-05 19:07:57 -08:00
Joe Fernandez
2490ec8370 Merge "docs: Add more information for getting started with TV app" into lmp-docs 2014-11-06 01:31:56 +00:00
Joe Fernandez
9fe42219c6 docs: Add more information for getting started with TV app 
- required manifest entries
- more information on permissions that imply hardware features

Change-Id: I55454ba8725185094bef35b9be653d50b58c8137
 2014-11-05 17:29:31 -08:00