156889 Commits

Author SHA1 Message Date
Cheuksan Wang
f9c50c45c6 new sms/mms carrier app API
BUG: 18005911

Change-Id: Ib961badc1ccac270f1244f8d971d9abec324b73f
2014-11-12 15:29:41 -08: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
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
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
John Reck
4b19b7aaff Merge "Fix wrong-thread issue" into lmp-mr1-dev 2014-11-07 18:34:55 +00: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
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
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
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
714e163663 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-07 15:50:07 +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
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
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
a8b1305363 Import translations. DO NOT MERGE
Change-Id: Id09faf98f305e5319eecc2d18b25ccde8aed55c1
Auto-generated-cl: translation import
2014-11-06 23:11:55 -08: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
c6f5009fdb Merge "Fix build" into lmp-mr1-dev 2014-11-07 02:18:20 +00:00
Jim Miller
a237a31484 Fix build
Change-Id: I1c4054f0e613f19a39c4bc32cc90bdec3b21dca9
2014-11-06 18:05:59 -08:00
Andrew Lee
a70688f2a5 Merge "Replace onConferenceChanged with onConnectionAdded." into lmp-mr1-dev 2014-11-07 01:54:01 +00:00
Winson Chung
3ed9f2f903 Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 2014-11-07 01:30:20 +00:00
Winson Chung
7bd54c1122 Merge "Fixing Recents crash when resetting focus of TaskView already returned to the pool." into lmp-mr1-dev 2014-11-07 01:28:08 +00:00
Andrew Lee
46f7f5dce4 Replace onConferenceChanged with onConnectionAdded.
This change is motivated by a desire to be able to adjust the
phone capabilities of a conference depending on its connections.

Turns out Connection is not a good place to do this, because when
the conference is set, this code is only fired if the connection
service already contains the conference. Conference makes more
sense to do this anyways, at the end of the day.

+ Add onConnectionAdded function to Conference.java.
- Remove onConferenceChanged function from Connection.java.

Bug: 18241753
Change-Id: Ib9212a8483a7a7b542618697399bbab8b2701b04
2014-11-06 17:19:51 -08: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
Winson Chung
7ae4b7e196 Fixing Recents crash when resetting focus of TaskView already returned to the pool.
Change-Id: Iee789e4e726d5f035ec518f4fec444afecc2bbf2
2014-11-06 17:07:52 -08:00
Anthony Lee
30e6584249 Change access to removeConnection so we can override it.
Bug: 18056632
Bug: 18240234
Change-Id: I4e82051a27f3565e9a854df8b27c35300cdbe2ad
2014-11-06 16:47:20 -08:00
Brian Carlstrom
f4d2c8eebd Merge "Restore mLazyDexOpt behavior for eng builds" into lmp-mr1-dev 2014-11-07 00:39:09 +00:00
Andre Eisenbach
44c11b9d2a am df11d588: Fix crash during Bluetooth on/off stress test
* commit 'df11d588bb26ad0e8b8a6e8551393a0abeec2fef':
  Fix crash during Bluetooth on/off stress test
2014-11-07 00:27:28 +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
Amit Mahajan
fc3f2380c9 Merge "Add configuration to control converting sms destination number" into lmp-mr1-dev 2014-11-07 00:17:43 +00:00
Luan Nguyen
df8daa8c13 am db212613: am 816b93cf: am 712c7ea3: Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs
* commit 'db21261339f37666a23b5d1e7f8997af4439c0c2':
  cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4
2014-11-07 00:17:02 +00:00