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

162112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
3f7b4d8ff3 Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs 2014-10-07 04:41:13 +00:00
Yorke Lee
a0392c038b am 7dacceb9: am 7a394311: am 770ed6ec: Fix build break 
* commit '7dacceb9ee6ba7a01fda9660f86af031af1850c1':
  Fix build break
 2014-10-07 04:04:22 +00:00
Yorke Lee
7dacceb9ee am 7a394311: am 770ed6ec: Fix build break 
* commit '7a394311ad23b648e4cc9efa4538e06b57f5f08f':
  Fix build break
 2014-10-07 03:56:34 +00:00
Yorke Lee
7a394311ad am 770ed6ec: Fix build break 
* commit '770ed6ec920ec10798c5b7a7b4850ccc0b2a531f':
  Fix build break
 2014-10-07 03:31:21 +00:00
Yorke Lee
770ed6ec92 Fix build break 
Bug: 16852844
Change-Id: I227aab0afdf4a5a5cd5dc38e7af055b7a1b94729
(cherry picked from commit 9858af0ec68ad28db60047587c8eb6232b4a6591)
 2014-10-07 03:13:12 +00:00
Ricardo Cervera
cee4ed8a1d docs: Update Common Intents page with Google Now actions 
Change-Id: I474539d37791b16df693193bcdaee4e2161a2612
 2014-10-06 19:16:06 -07:00
Yorke Lee
7f22eb9818 Merge "Fix build break" into lmp-dev 2014-10-07 02:12:02 +00:00
Yorke Lee
9858af0ec6 Fix build break 
Bug: 16852844
Change-Id: I227aab0afdf4a5a5cd5dc38e7af055b7a1b94729
 2014-10-06 18:58:52 -07:00
Amith Yamasani
aa6634eaca Set the default user restrictions to disallow calling and sms 
When creating a user via the UI, disallow phone calls and SMS by
default. Primary user must explicitly enable it via Settings.

Bug: 17832802
Change-Id: I18cad4be8493ddc8890b5d90da2df256cb3f1ec9
 2014-10-06 18:24:32 -07:00
Amit Mahajan
69555fc2c8 Merge "Sms7BitEncodingTranslator" into lmp-dev 2014-10-07 01:20:27 +00:00
Yorke Lee
3e6fe5d87b am 5cf70a1f: am 0b27c283: am 7e552595: am 4c334f3d: Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-dev 
* commit '5cf70a1f7de3b3e3b4fb45fcb379aa2f8d6ac3e2':
  Add ability to add sim-initiated MO call to UI (2/4)
 2014-10-07 01:15:26 +00:00
Yorke Lee
5cf70a1f7d am 0b27c283: am 7e552595: am 4c334f3d: Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-dev 
* commit '0b27c283771e3690f47900d0c2130ae10af332a5':
  Add ability to add sim-initiated MO call to UI (2/4)
 2014-10-07 01:08:52 +00:00
Yorke Lee
0b27c28377 am 7e552595: am 4c334f3d: Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-dev 
* commit '7e552595bda0825787820e3d9bb58b5fad32cd01':
  Add ability to add sim-initiated MO call to UI (2/4)
 2014-10-07 01:04:30 +00:00
Xia Ying
43eb8a97e7 Sms7BitEncodingTranslator 
Bug: 16197894
Change-Id: I2bd5ae0a3c2d5d8f869f5e2de7009fd450070521
 2014-10-07 01:02:04 +00:00
Christopher Tate
406abd4547 Accept any restored wallpaper 
...and let the wallpaper service & hosts figure out what to do
with it.

Bug 17677006

Change-Id: Ie5bfa549af4da178e621ffc42a759a552897d93a
 2014-10-06 18:00:51 -07:00
Yorke Lee
7e552595bd am 4c334f3d: Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-dev 
* commit '4c334f3def076d2940b53641c932050b1e4ce286':
  Add ability to add sim-initiated MO call to UI (2/4)
 2014-10-07 00:58:47 +00:00
Jeff Sharkey
0cfe6f1d2f am 6d3ea645: am fcc059dc: am 1d5ef81e: am 99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev 
* commit '6d3ea64599518fcbdceade5ebde7e08cc4613819':
  Reduce PackageInstaller I/O pressure.
 2014-10-07 00:56:00 +00:00
Geoff Mendal
8b2b262875 am 4dae637f: (-s ours) am 17cef234: (-s ours) am 6a6369b6: (-s ours) am fc8d6519: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '4dae637fcc1dee64fb6edb279d7c9f2578b717ed':
  Import translations. DO NOT MERGE
 2014-10-07 00:55:56 +00:00
Raluca Sauciuc
b81889f54e am 59f7c4c7: am 1cb156bb: am f35c305f: am 6a3faf5a: Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev 
* commit '59f7c4c749fb69c9f83a3d28784147a941fecc58':
  Fix test framework to allow Mockito tests to run successfully on ART.
 2014-10-07 00:55:52 +00:00
Paul Jensen
7f1146084b am 35c19fb0: am 84527eca: am 69c489ed: am 7627d2cd: Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev 
* commit '35c19fb0f4dd67b907c74294d7880d3547a209af':
  Use network-specific HTTP proxy settings in captive portal login app.
 2014-10-07 00:55:48 +00:00
Geoff Mendal
9cbb754dac am e78ec420: (-s ours) am f2bef9cd: (-s ours) am 1d593ad4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'e78ec420a713978431ee1e03f559b023f3be6cb4':
  Import translations. DO NOT MERGE
 2014-10-07 00:55:44 +00:00
Yuncheol Heo
c104455512 am 684675f4: am d534b936: Merge "Change visibility of RecordSource into public." into lmp-mr1-dev 
* commit '684675f44ddb8792affbb54fdc194fa944c4ba43':
  Change visibility of RecordSource into public.
 2014-10-07 00:55:24 +00:00
Yorke Lee
4c334f3def Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-dev 2014-10-07 00:54:52 +00:00
Jeff Sharkey
6d3ea64599 am fcc059dc: am 1d5ef81e: am 99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev 
* commit 'fcc059dcf0d84a77d9c2b5ef3b01c23afe25f72c':
  Reduce PackageInstaller I/O pressure.
 2014-10-07 00:40:11 +00:00
Geoff Mendal
4dae637fcc am 17cef234: (-s ours) am 6a6369b6: (-s ours) am fc8d6519: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '17cef23480b7cb05ce35cc3e666d3871352c495c':
  Import translations. DO NOT MERGE
 2014-10-07 00:40:03 +00:00
Raluca Sauciuc
59f7c4c749 am 1cb156bb: am f35c305f: am 6a3faf5a: Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev 
* commit '1cb156bb0160a1474b1703893b6e3e96c407cc5a':
  Fix test framework to allow Mockito tests to run successfully on ART.
 2014-10-07 00:39:59 +00:00
Paul Jensen
35c19fb0f4 am 84527eca: am 69c489ed: am 7627d2cd: Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev 
* commit '84527eca759495b4a5514edbea9a56b907992a42':
  Use network-specific HTTP proxy settings in captive portal login app.
 2014-10-07 00:39:55 +00:00
Geoff Mendal
e78ec420a7 am f2bef9cd: (-s ours) am 1d593ad4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'f2bef9cd1936c5d26d88c17b56746361af6e78f3':
  Import translations. DO NOT MERGE
 2014-10-07 00:39:51 +00:00
Selim Cinek
afb1981e00 am 63a6bc2d: am 79934acb: Merge "Fixed a crash when the detail panel got very big" into lmp-mr1-dev 
* commit '63a6bc2d996381ae62a71b2d464978b7f884d7d1':
  Fixed a crash when the detail panel got very big
 2014-10-07 00:35:06 +00:00
Yuncheol Heo
684675f44d am d534b936: Merge "Change visibility of RecordSource into public." into lmp-mr1-dev 
* commit 'd534b936d70cd45d7dffd623ca16ec9b7fdbcbe2':
  Change visibility of RecordSource into public.
 2014-10-07 00:34:25 +00:00
Jeff Sharkey
fcc059dcf0 am 1d5ef81e: am 99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev 
* commit '1d5ef81e29279f769d79315f2a38e747ea92e10f':
  Reduce PackageInstaller I/O pressure.
 2014-10-07 00:32:19 +00:00
Geoff Mendal
17cef23480 am 6a6369b6: (-s ours) am fc8d6519: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '6a6369b61a51ebf415a37d19e5b2aba789bc9ce7':
  Import translations. DO NOT MERGE
 2014-10-07 00:32:15 +00:00
Raluca Sauciuc
1cb156bb01 am f35c305f: am 6a3faf5a: Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev 
* commit 'f35c305f45db60394c3c7fec2e41b38963da70ca':
  Fix test framework to allow Mockito tests to run successfully on ART.
 2014-10-07 00:32:10 +00:00
Paul Jensen
84527eca75 am 69c489ed: am 7627d2cd: Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev 
* commit '69c489ed6f28cb3c79f13b2f7b6cffc6d3b49627':
  Use network-specific HTTP proxy settings in captive portal login app.
 2014-10-07 00:32:00 +00:00
Geoff Mendal
f2bef9cd19 am 1d593ad4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '1d593ad47470150f751cc573eb56dae97470cf41':
  Import translations. DO NOT MERGE
 2014-10-07 00:31:51 +00:00
Yuncheol Heo
d534b936d7 Merge "Change visibility of RecordSource into public." into lmp-mr1-dev 2014-10-07 00:29:06 +00:00
Selim Cinek
63a6bc2d99 am 79934acb: Merge "Fixed a crash when the detail panel got very big" into lmp-mr1-dev 
* commit '79934acb40de31a7c4572bdb7a747edcb12bb8e4':
  Fixed a crash when the detail panel got very big
 2014-10-07 00:28:51 +00:00
Selim Cinek
79934acb40 Merge "Fixed a crash when the detail panel got very big" into lmp-mr1-dev 2014-10-07 00:22:34 +00:00
Chris Craik
2cf2ae7231 am 1155ed19: am 0aa69ff2: am 1a6c41fb: am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev 
* commit '1155ed1920fb93ff79e4e61fc928f6bd1d68c18c':
  Avoid changeBounds animations on Views that are not yet laidout
 2014-10-07 00:13:22 +00:00
Mike Lockwood
73c35e27d3 am 66c009eb: am bb68c263: am 3df6b76c: am 56b7d562: Merge "Add support for playing audio during bootanimation" into lmp-dev 
* commit '66c009ebfe5b31aa1f176d4856d95f5daad6079d':
  Add support for playing audio during bootanimation
 2014-10-07 00:13:18 +00:00
Mathieu Chartier
361e204991 am 830467e2: am 5ade30e8: am 405a934e: am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev 
* commit '830467e2873767ff11960c3b9fecb2e7d4c57b21':
  Fix incorrect JNI_ABORT
 2014-10-07 00:13:14 +00:00
Jinsuk Kim
c71c833327 am 7f84aec9: am 84659edd: Merge "CEC: Send <Device Vendor ID> after address allocation" into lmp-mr1-dev 
* commit '7f84aec9b34b3dea2fdf3ee4fc3273e1bdd8a573':
  CEC: Send <Device Vendor ID> after address allocation
 2014-10-07 00:13:06 +00:00
Geoff Mendal
1180831b64 am bfa09525: (-s ours) am a6b02708: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'bfa09525ab4b307ebe8f4e38f8b3ac6aee19e466':
  Import translations. DO NOT MERGE
 2014-10-07 00:13:02 +00:00
Jinsuk Kim
4f729b3fc7 am a3ad702f: am 85c927cf: Merge "CEC: Ensure the key transmission finishes all the time" into lmp-mr1-dev 
* commit 'a3ad702f38b17fe27d5f73bb98a123959ada59ac':
  CEC: Ensure the key transmission finishes all the time
 2014-10-07 00:12:58 +00:00
Geoff Mendal
b65c9a1bbe am a997d0e3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'a997d0e3b6e46fdeaa8d91ea306c0ce7602aa52b':
  Import translations. DO NOT MERGE
 2014-10-07 00:06:00 +00:00
Wei Liu
38f4d48288 am a84130d3: am de93b104: am a940f865: Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev 
* commit 'a84130d3e45ad1ac4cb5843adc027d463c3c304d':
  Hide bug report notification in Android Framework from watches.
 2014-10-07 00:05:56 +00:00
Chris Craik
1155ed1920 am 0aa69ff2: am 1a6c41fb: am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev 
* commit '0aa69ff2ff9e8556f4963b7dfdad56996a604392':
  Avoid changeBounds animations on Views that are not yet laidout
 2014-10-07 00:05:32 +00:00
Mike Lockwood
66c009ebfe am bb68c263: am 3df6b76c: am 56b7d562: Merge "Add support for playing audio during bootanimation" into lmp-dev 
* commit 'bb68c263620fe91eefb241efaf099742b3e6069c':
  Add support for playing audio during bootanimation
 2014-10-07 00:05:28 +00:00
Mathieu Chartier
830467e287 am 5ade30e8: am 405a934e: am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev 
* commit '5ade30e82e05c783d74e3a52316be4c3ed11239c':
  Fix incorrect JNI_ABORT
 2014-10-07 00:05:24 +00:00
Jeff Sharkey
1d5ef81e29 am 99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev 
* commit '99586dc0108d0f4311c8af4d06ed113bbf40a6ee':
  Reduce PackageInstaller I/O pressure.
 2014-10-06 23:59:43 +00:00