Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
178,626 Commits 3 Branches 0 Tags
cb4ffae80d1d4e91309179aa1085ec2ce0579e46
Commit Graph

178626 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pavel Zhamaitsiak
cb4ffae80d am 3a359345: Merge "IMS: Set phone account in IMS Conference object" into lmp-mr1-dev automerge: a0fc9f2 
automerge: 11603be

* commit '11603bebfad30ed0cf0f4abbfd7817bc81b40c5e':
  IMS: Set phone account in IMS Conference object
 2014-12-18 02:01:20 +00:00
Pavel Zhamaitsiak
11603bebfa am 3a359345: Merge "IMS: Set phone account in IMS Conference object" into lmp-mr1-dev 
automerge: a0fc9f2

* commit 'a0fc9f2dd1820611295c6f83efec60c2a8f37eee':
  IMS: Set phone account in IMS Conference object
 2014-12-18 01:55:06 +00:00
Wonsik Kim
874d0c61e3 Merge "TIF: change TvInputHal events to run on its own thread" 2014-12-18 01:40:32 +00:00
Pavel Zhamaitsiak
a0fc9f2dd1 am 3a359345: Merge "IMS: Set phone account in IMS Conference object" into lmp-mr1-dev 
* commit '3a35934540060441bc9f80cdf86b5013722553e2':
  IMS: Set phone account in IMS Conference object
 2014-12-18 01:34:21 +00:00
Pavel Zhamaitsiak
3a35934540 Merge "IMS: Set phone account in IMS Conference object" into lmp-mr1-dev 2014-12-18 01:27:38 +00:00
Sanket Padawe
c7fe97ef70 am 1e63f414: am 776164da: Merge "Removing unwanted tethering profiles from config.xml" into lmp-mr1-dev 
automerge: 8c3b102

* commit '8c3b1021ba5d18f791edf8e7d9199c60e6fe0746':
  Removing unwanted tethering profiles from config.xml
 2014-12-18 00:56:58 +00:00
Sanket Padawe
8c3b1021ba am 1e63f414: am 776164da: Merge "Removing unwanted tethering profiles from config.xml" into lmp-mr1-dev 
* commit '1e63f414ea7ecbe712e8b0dc493bb329f93e6031':
  Removing unwanted tethering profiles from config.xml
 2014-12-18 00:54:48 +00:00
Sanket Padawe
1e63f414ea am 776164da: Merge "Removing unwanted tethering profiles from config.xml" into lmp-mr1-dev 
* commit '776164da3cd5f64de009f75f9530953fadd8626a':
  Removing unwanted tethering profiles from config.xml
 2014-12-18 00:48:48 +00:00
Sanket Padawe
776164da3c Merge "Removing unwanted tethering profiles from config.xml" into lmp-mr1-dev 2014-12-18 00:44:08 +00:00
Winson Chung
2b9d4cdcfb am 9f48e316: am e2ed349c: Merge "Removing context ref from AppWidgetHost. (Bug 18769791)" into lmp-mr1-dev 
automerge: a4fe261

* commit 'a4fe261ec0d8ea9a820a30ea696498c6d5a2f2d4':
  Removing context ref from AppWidgetHost. (Bug 18769791)
 2014-12-18 00:27:29 +00:00
Winson Chung
a4fe261ec0 am 9f48e316: am e2ed349c: Merge "Removing context ref from AppWidgetHost. (Bug 18769791)" into lmp-mr1-dev 
* commit '9f48e3160f2768d3322670cbbcc606c9eef76bad':
  Removing context ref from AppWidgetHost. (Bug 18769791)
 2014-12-18 00:26:16 +00:00
Winson Chung
9f48e3160f am e2ed349c: Merge "Removing context ref from AppWidgetHost. (Bug 18769791)" into lmp-mr1-dev 
* commit 'e2ed349cfa838223160e83be7df144e2265cdce4':
  Removing context ref from AppWidgetHost. (Bug 18769791)
 2014-12-18 00:18:53 +00:00
Winson Chung
e2ed349cfa Merge "Removing context ref from AppWidgetHost. (Bug 18769791)" into lmp-mr1-dev 2014-12-18 00:15:42 +00:00
Alan Viverette
8db231af04 Merge "Allow theme attributes in <include> tag, fix <tag> context" 2014-12-18 00:11:14 +00:00
Amit Mahajan
dba700ef43 am e69b5d68: Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev automerge: eac6db5 
automerge: ea1656f

* commit 'ea1656f408376d71b124d1ea62116862731aa4ab':
  Change to write (create) setting+subid if it does not already exist when it is queried for the first time.
 2014-12-18 00:05:30 +00:00
Amit Mahajan
ea1656f408 am e69b5d68: Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev 
automerge: eac6db5

* commit 'eac6db511b02ebf398a5e70eb70a7a5f05133945':
  Change to write (create) setting+subid if it does not already exist when it is queried for the first time.
 2014-12-18 00:03:08 +00:00
Amit Mahajan
eac6db511b am e69b5d68: Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev 
* commit 'e69b5d68c2a52d867a614ff0ca378de4ec7d0f54':
  Change to write (create) setting+subid if it does not already exist when it is queried for the first time.
 2014-12-18 00:01:30 +00:00
Amit Mahajan
e69b5d68c2 Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev 2014-12-17 23:58:11 +00:00
Alan Viverette
33e3cdab5b Allow theme attributes in <include> tag, fix <tag> context 
BUG: 17658979
Change-Id: I79a55ee53bff5ea6efb04997973a9aa810ff0950
 2014-12-17 15:43:29 -08:00
Amit Mahajan
2a65688d40 Change to write (create) setting+subid if it does not already exist 
when it is queried for the first time.

Bug: 18791109
Change-Id: Ib9dae9401a18f1ec0eb0477486c7c7e4cb0364b0
 2014-12-17 15:42:56 -08:00
Raph Levien
faf2190334 am 3ac280c9: am 078ce5fc: Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev 
automerge: d946753

* commit 'd946753aa4ac3ac9b16ff1627a19fb05f1608660':
  Revert "Change Linkify leniency to VALID"
 2014-12-17 23:21:16 +00:00
Raph Levien
d946753aa4 am 3ac280c9: am 078ce5fc: Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev 
* commit '3ac280c93bdebe4ca698e9a2e3d6d2daf3598e7a':
  Revert "Change Linkify leniency to VALID"
 2014-12-17 23:19:25 +00:00
Raph Levien
2e0af53de9 am 51004268: am 0b6e78d9: Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev 
automerge: 28e6910

* commit '28e691010f2990825c2e30ea244ba3bbac935725':
  Preserve leading "+" in phone numbers
 2014-12-17 23:16:32 +00:00
Raph Levien
28e691010f am 51004268: am 0b6e78d9: Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev 
* commit '510042688ad8ffee499974b45551cfdf528f86da':
  Preserve leading "+" in phone numbers
 2014-12-17 23:15:07 +00:00
Raph Levien
3ac280c93b am 078ce5fc: Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev 
* commit '078ce5fc820d4744f5b1af384e427cedb7e90643':
  Revert "Change Linkify leniency to VALID"
 2014-12-17 23:14:13 +00:00
Chris Craik
a5f0918ec1 resolved conflicts for merge of fd461ede to master 
Change-Id: I36f263c7e6d96355dd8a2c3565581b9a983ae481
 2014-12-17 15:11:30 -08:00
Raph Levien
510042688a am 0b6e78d9: Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev 
* commit '0b6e78d9971c61877ca312801fd8258aec352231':
  Preserve leading "+" in phone numbers
 2014-12-17 23:09:59 +00:00
Raph Levien
078ce5fc82 Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev 2014-12-17 23:08:51 +00:00
Raph Levien
0b6e78d997 Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev 2014-12-17 23:04:17 +00:00
Raph Levien
047e816fe2 Revert "Change Linkify leniency to VALID" 
This reverts commit 9dfe86d410.

That change moved the lenience from POSSIBLE to VALID, which eliminated
false positive links, especially 4 digit phone numbers, but caused
significant false negatives, leading to CTS test failures
(android.text.util.cts.LinkifyTest#testAddLinks7 in particular).

The true fix requires new functionality to validate phone numbers in
a mobile context. In the meantime, the best solution is to revert.

Bug: 18708556
 2014-12-17 14:31:39 -08:00
Sanket Padawe
d6d84bb856 Removing unwanted tethering profiles from config.xml 
Bug: 18769044
Change-Id: I9002f6bdcd23bf02596798bcb5370ed456aaca39
 2014-12-17 14:19:58 -08:00
Chris Craik
fd461edee0 am 93492d1a: am c748832f: Merge "Revert overdraw avoidance visualization change" into lmp-mr1-dev 
* commit '93492d1a478770783abab764855c8d47e0264f71':
  Revert overdraw avoidance visualization change
 2014-12-17 22:17:21 +00:00
Chris Craik
93492d1a47 am c748832f: Merge "Revert overdraw avoidance visualization change" into lmp-mr1-dev 
* commit 'c748832f759cd7a390a32890530e854b9711eb7c':
  Revert overdraw avoidance visualization change
 2014-12-17 22:11:19 +00:00
Chris Craik
c748832f75 Merge "Revert overdraw avoidance visualization change" into lmp-mr1-dev 2014-12-17 22:07:04 +00:00
Olawale Ogunwale
4ff7aaf1a2 am f62877d3: Merge "Prevent wrong system ui visibility callback after the user swipe" automerge: fd7819d 
automerge: 424924a

* commit '424924afc17c807a8059a55a522c976f64973c5d':
  Prevent wrong system ui visibility callback after the user swipe
 2014-12-17 21:56:28 +00:00
Olawale Ogunwale
c946e92e6c am 486a9942: Merge "[ActivityManager] Use synchronized to protect object" automerge: e3b07b4 
automerge: a230a43

* commit 'a230a43204e3567d93a2d914123b21c14bdf495d':
  [ActivityManager] Use synchronized to protect object
 2014-12-17 21:55:05 +00:00
Olawale Ogunwale
424924afc1 am f62877d3: Merge "Prevent wrong system ui visibility callback after the user swipe" 
automerge: fd7819d

* commit 'fd7819dbe0cf2cef9c03b2c4b04a92f0a2a36604':
  Prevent wrong system ui visibility callback after the user swipe
 2014-12-17 21:51:40 +00:00
Olawale Ogunwale
a230a43204 am 486a9942: Merge "[ActivityManager] Use synchronized to protect object" 
automerge: e3b07b4

* commit 'e3b07b4856d55f7d96dcb25e3749c7cce1a1cd3d':
  [ActivityManager] Use synchronized to protect object
 2014-12-17 21:50:31 +00:00
Olawale Ogunwale
fd7819dbe0 am f62877d3: Merge "Prevent wrong system ui visibility callback after the user swipe" 
* commit 'f62877d305d2da4876707137cefe0eaa1b2953c3':
  Prevent wrong system ui visibility callback after the user swipe
 2014-12-17 21:47:45 +00:00
Olawale Ogunwale
e3b07b4856 am 486a9942: Merge "[ActivityManager] Use synchronized to protect object" 
* commit '486a9942ebc6e3efe04004afd759a53ab96517ec':
  [ActivityManager] Use synchronized to protect object
 2014-12-17 21:47:38 +00:00
Olawale Ogunwale
f62877d305 Merge "Prevent wrong system ui visibility callback after the user swipe" 2014-12-17 21:43:27 +00:00
Olawale Ogunwale
486a9942eb Merge "[ActivityManager] Use synchronized to protect object" 2014-12-17 21:42:44 +00:00
Jinsuk Kim
e8826ba3dd am 08ca1694: am fadfe708: Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev 
automerge: 23ac13c

* commit '23ac13c6b95c15d029426ff8424f7f6f23bf0220':
  CEC: Pass port ID for set_audio_return_channel
 2014-12-17 21:28:11 +00:00
Jinsuk Kim
23ac13c6b9 am 08ca1694: am fadfe708: Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev 
* commit '08ca1694eb3013bd1f6c050e021588b8614e8764':
  CEC: Pass port ID for set_audio_return_channel
 2014-12-17 21:24:50 +00:00
Jinsuk Kim
08ca1694eb am fadfe708: Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev 
* commit 'fadfe708e6f0c74890fe2b3292a91570f3049215':
  CEC: Pass port ID for set_audio_return_channel
 2014-12-17 21:20:08 +00:00
Jinsuk Kim
fadfe708e6 Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev 2014-12-17 21:15:20 +00:00
Anju Mathapati
f9c4d84ea9 IMS: Set phone account in IMS Conference object 
Get phone account from conference host connection and set
it to ImsConference while constructing

Bug: 18690773
Change-Id: I018a84512eb6ce001a8021d148895bf87dddc2ef
 2014-12-17 13:06:46 -08:00
Jeff Davidson
1eb5ca609a am 0b3718d6: Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev automerge: cc4f183 
automerge: 38e8763

* commit '38e8763df55ebedcf65178f8acced806113af4a5':
  Add global setting for ephemeral network timeout.
 2014-12-17 21:05:53 +00:00
Jeff Davidson
38e8763df5 am 0b3718d6: Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev automerge: cc4f183 
* commit '0b3718d6b157bf15db9d709d50019f81f06195b9':
  Add global setting for ephemeral network timeout.
 2014-12-17 20:58:44 +00:00
Cheuksan Wang
f46a0b6f20 am 2045d5f3: am f1b64b4b: am e8ea1645: Merge "remove actions and calls for the old sms/mms api BUG: 18005911" into lmp-mr1-dev 
* commit '2045d5f3a23f8e462d05acf6d6cf6ea08e236a1e':
  remove actions and calls for the old sms/mms api BUG: 18005911
 2014-12-17 20:56:23 +00:00