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

180512 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Neil Fuller
7382c02d62 am 00502e89: Merge "Changes associated with an OkHttp upgrade" 
* commit '00502e89603fa460cfd29d8759d74e38946105d4':
  Changes associated with an OkHttp upgrade
 2015-01-20 12:56:34 +00:00
Neil Fuller
00502e8960 Merge "Changes associated with an OkHttp upgrade" 2015-01-20 12:50:48 +00:00
Neil Fuller
50a01d8960 Changes associated with an OkHttp upgrade 
Change-Id: I2a4db602aa7ffdef886e0f1a955715a2551a87a5
 2015-01-20 11:59:24 +00:00
Geoff Mendal
1480108d05 Merge "Import translations. DO NOT MERGE" 2015-01-19 18:45:46 +00:00
Geoff Mendal
6b5eedfdcd Import translations. DO NOT MERGE 
Change-Id: I495a71dc523687a3484aaf570c2efbc2a7801a6a
Auto-generated-cl: translation import
 2015-01-19 12:43:05 -06:00
Sudheer Shanka
c7321134b3 Merge "Update dpm command to follow --user convention." 2015-01-19 18:41:33 +00:00
Narayan Kamath
d6fe549b50 am 66bbfb6b: am 17f50f81: am d8beca64: Merge "Remove support for --classpath and make --runtime-init the default." 
* commit '66bbfb6b2ccedecba3cbd0843b5a9ae498c68c82':
  Remove support for --classpath and make --runtime-init the default.
 2015-01-19 15:24:02 +00:00
Narayan Kamath
da1da678db am 1f7d657b: am 3e809794: am e315feea: Merge "Fix handling of wrapped processes [part 1]." 
* commit '1f7d657b43fd7d40c402340c02ece5beb4b28c52':
  Fix handling of wrapped processes [part 1].
 2015-01-19 15:23:57 +00:00
Narayan Kamath
66bbfb6b2c am 17f50f81: am d8beca64: Merge "Remove support for --classpath and make --runtime-init the default." 
* commit '17f50f8119f4a8bdec304cde527f68ddd0b3bc0a':
  Remove support for --classpath and make --runtime-init the default.
 2015-01-19 15:21:30 +00:00
Geoff Mendal
a2a6a7d2ee am bb0bb9ae: (-s ours) am 8a28956d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'bb0bb9aebb76a516bae7b32054852eb828a8ece8':
  Import translations. DO NOT MERGE
 2015-01-19 15:18:09 +00:00
Narayan Kamath
1f7d657b43 am 3e809794: am e315feea: Merge "Fix handling of wrapped processes [part 1]." 
* commit '3e809794fe558d8a10851c0ac22a65a2c81fa315':
  Fix handling of wrapped processes [part 1].
 2015-01-19 15:16:58 +00:00
Narayan Kamath
17f50f8119 am d8beca64: Merge "Remove support for --classpath and make --runtime-init the default." 
* commit 'd8beca64e086a9c4a214c7dcb9b6e59c2c482173':
  Remove support for --classpath and make --runtime-init the default.
 2015-01-19 15:14:02 +00:00
Geoff Mendal
e9a6f03529 Merge "Import translations. DO NOT MERGE" 2015-01-19 15:13:59 +00:00
Geoff Mendal
9563c9bef4 Import translations. DO NOT MERGE 
Change-Id: I5022d077fb7b8badc66406965b2406d4250e254d
Auto-generated-cl: translation import
 2015-01-19 07:13:09 -08:00
Geoff Mendal
b3adc50504 am 45ac66f4: (-s ours) am c7f4582c: (-s ours) am 2bc2a994: (-s ours) Import translations. DO NOT MERGE 
* commit '45ac66f4b9b80b9fae9d925cd98a709b65cd41a7':
  Import translations. DO NOT MERGE
 2015-01-19 15:12:18 +00:00
Geoff Mendal
bb0bb9aebb am 8a28956d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '8a28956d5e55baa47aafb8a10003b995f6bc734d':
  Import translations. DO NOT MERGE
 2015-01-19 15:11:59 +00:00
Narayan Kamath
d8beca64e0 Merge "Remove support for --classpath and make --runtime-init the default." 2015-01-19 15:09:17 +00:00
Geoff Mendal
8a28956d5e Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-01-19 15:07:39 +00:00
Geoff Mendal
45ac66f4b9 am c7f4582c: (-s ours) am 2bc2a994: (-s ours) Import translations. DO NOT MERGE 
* commit 'c7f4582c410760105e9eac10597fd5a23257685b':
  Import translations. DO NOT MERGE
 2015-01-19 15:05:41 +00:00
Geoff Mendal
03488d2f0f Import translations. DO NOT MERGE 
Change-Id: Ibcf24ef2774ef4c96d75daca257c202686e630da
Auto-generated-cl: translation import
 2015-01-19 09:05:34 -06:00
Narayan Kamath
3e809794fe am e315feea: Merge "Fix handling of wrapped processes [part 1]." 
* commit 'e315feeaff544b1d4dd173f0e341398906f4c0c9':
  Fix handling of wrapped processes [part 1].
 2015-01-19 15:05:02 +00:00
Narayan Kamath
f48029f00a Remove support for --classpath and make --runtime-init the default. 
--classpath hasn't been properly supported or used for as long as
git history exists, and the non --runtime-init classpath is useless
without it.

Also, forking and exec' a bare dalvikvm instance from the zygote seems
somewhat pointless since we might as well just execute it directly.

Change-Id: Ib07d822d448e7b431d7564381f9cd11735fd1113
 2015-01-19 15:04:58 +00:00
Narayan Kamath
e315feeaff Merge "Fix handling of wrapped processes [part 1]." 2015-01-19 15:00:00 +00:00
Geoff Mendal
c7f4582c41 am 2bc2a994: (-s ours) Import translations. DO NOT MERGE 
* commit '2bc2a99406d1d0a4a6c0a6a5ec39f5f9273a1634':
  Import translations. DO NOT MERGE
 2015-01-19 14:59:18 +00:00
Geoff Mendal
2bc2a99406 Import translations. DO NOT MERGE 
Change-Id: If4c684beabdf14e6dad7c9584ac9b9cb0fb048d0
Auto-generated-cl: translation import
 2015-01-19 06:49:11 -08:00
Narayan Kamath
6ac7e67168 Fix handling of wrapped processes [part 1]. 
Change 3fe595108f47fffd changed our pipe creation to CLOEXEC,
which doesn't work so well for wrapper processes that call exec.

Sending down the PID pre-exec won't work so well because wrappers
are arbitrary and might fork themselves before finally starting
the child application process.

Change-Id: I065f0f2150dc1ff04d2b2e8b25f06b4c754809b9
 2015-01-19 14:17:49 +00:00
Chris Banes
5cd13265af Fix NPE in ActionMenuView when there isn't a presenter 
BUG: 19060917
Change-Id: I5d63aa6e85238ea7cec6faf60d444c98bc583293
 2015-01-19 12:08:22 +00:00
Narayan Kamath
2e139d5b4c am e05f269b: am 96b87a1d: am 4ac5775d: Merge "Fix handling of wrapped processes [part 2]" 
* commit 'e05f269bfe17065f5a3d291961700e2d9befc345':
  Fix handling of wrapped processes [part 2]
 2015-01-19 10:20:54 +00:00
Narayan Kamath
e05f269bfe am 96b87a1d: am 4ac5775d: Merge "Fix handling of wrapped processes [part 2]" 
* commit '96b87a1dc0b822a057ad978de1d52990d617be62':
  Fix handling of wrapped processes [part 2]
 2015-01-19 10:15:32 +00:00
Narayan Kamath
96b87a1dc0 am 4ac5775d: Merge "Fix handling of wrapped processes [part 2]" 
* commit '4ac5775d63791ae3635882a3b49f5ebc253262bb':
  Fix handling of wrapped processes [part 2]
 2015-01-19 10:09:42 +00:00
Narayan Kamath
4ac5775d63 Merge "Fix handling of wrapped processes [part 2]" 2015-01-19 09:52:21 +00:00
Jinsuk Kim
f614a9f7ac am 1951fc36: am d38f077b: am 5b8cb00b: CEC: Process new options for CEC/MHL HAL 
* commit '1951fc3667eb5216500cfcc63c1bc3506759e086':
  CEC: Process new options for CEC/MHL HAL
 2015-01-19 02:58:40 +00:00
Jinsuk Kim
22443c94a7 am a73cbece: am 4d37a358: am bbfec56d: Merge "CEC: Make TV try to allocate logical address 0 first" into lmp-mr1-dev 
* commit 'a73cbecef2367fba708e1ed159a578c5117ca3dd':
  CEC: Make TV try to allocate logical address 0 first
 2015-01-19 02:58:35 +00:00
Jinsuk Kim
1951fc3667 am d38f077b: am 5b8cb00b: CEC: Process new options for CEC/MHL HAL 
* commit 'd38f077b10f1d6885834805bed1ec093f6ea8fe0':
  CEC: Process new options for CEC/MHL HAL
 2015-01-19 02:53:19 +00:00
Jinsuk Kim
a73cbecef2 am 4d37a358: am bbfec56d: Merge "CEC: Make TV try to allocate logical address 0 first" into lmp-mr1-dev 
* commit '4d37a3584cbdf9a2e73887b645950d30a0ce38ce':
  CEC: Make TV try to allocate logical address 0 first
 2015-01-19 02:53:13 +00:00
Jinsuk Kim
d38f077b10 am 5b8cb00b: CEC: Process new options for CEC/MHL HAL 
* commit '5b8cb00b8a302329b98a5528eaa7934d0f5c3e65':
  CEC: Process new options for CEC/MHL HAL
 2015-01-19 02:25:48 +00:00
Jinsuk Kim
4d37a3584c am bbfec56d: Merge "CEC: Make TV try to allocate logical address 0 first" into lmp-mr1-dev 
* commit 'bbfec56dfcb1fdcb0307b3df83e2ad855c0b0b88':
  CEC: Make TV try to allocate logical address 0 first
 2015-01-19 02:25:44 +00:00
Jinsuk Kim
5b8cb00b8a CEC: Process new options for CEC/MHL HAL 
1) Inform MHL HAL of OPTION_MHL_SERVICE_CONTROL at system
ready/standby event.

2) Call OPTION_CEC_SET_LANGUAGE with current system language info
for HAL to be able to respond to <Get Menu Language> while in standby
mode.

Bug: 19054079
Change-Id: I92c9f392a94f70e11157d20a33163ef2d8bc832f
 2015-01-19 02:22:05 +00:00
Jinsuk Kim
bbfec56dfc Merge "CEC: Make TV try to allocate logical address 0 first" into lmp-mr1-dev 2015-01-19 02:20:18 +00:00
Jinsuk Kim
d47abefc82 CEC: Make TV try to allocate logical address 0 first 
HDMI Spec says TV shall try to allocate TV() logical address, unlike
other kinds of devices that are recommended to use the previously
allocated one.

Also included are small changes:

- reply with 'can not provide source' if TV has no source to provide
- return the present device info if we have one at the given path

Bug: 19045081
Change-Id: Icf17cb581f0ef2274e252ec5665f80bb1c08b494
 2015-01-19 10:44:38 +09:00
Sanket Padawe
c0fa70ee19 am 60b41e6a: am 543348eb: am d2dd69ae: Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev 
* commit '60b41e6aa7a93bf90cb1b7715a2429dbe7c975fe':
  Modify getDeviceId() to get device id independent of Subscription.
 2015-01-17 22:37:03 +00:00
Sanket Padawe
60b41e6aa7 am 543348eb: am d2dd69ae: Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev 
* commit '543348eb94624907102c1baffe5bdaf1087fede8':
  Modify getDeviceId() to get device id independent of Subscription.
 2015-01-17 22:30:25 +00:00
Sanket Padawe
543348eb94 am d2dd69ae: Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev 
* commit 'd2dd69ae8d81defc5f2286690b3dd246d4118fcc':
  Modify getDeviceId() to get device id independent of Subscription.
 2015-01-17 22:20:19 +00:00
Sanket Padawe
d2dd69ae8d Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev 2015-01-17 22:15:56 +00:00
Scott Rowe
bd74a7022c am cee634df: am 11ce4b75: am c68ab86a: am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs 
* commit 'cee634df2c8fe3a10a3aef754b3e168c646d47f3':
  docs: removing code captions
 2015-01-17 05:38:02 +00:00
Scott Rowe
9d6f65e0a8 am ec015c50: am e019bbb1: am 278f5e2a: am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs 
* commit 'ec015c504fe2cb4c3171e0f405d1b3df0567b5f4':
  docs: Add screenshot
 2015-01-17 05:37:55 +00:00
Scott Rowe
cee634df2c am 11ce4b75: am c68ab86a: am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs 
* commit '11ce4b759497546f4182b00cc6b92cfe42acf32e':
  docs: removing code captions
 2015-01-17 05:31:43 +00:00
Scott Rowe
ec015c504f am e019bbb1: am 278f5e2a: am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs 
* commit 'e019bbb1619700c952181fe9717060aaef7bce12':
  docs: Add screenshot
 2015-01-17 05:31:36 +00:00
Scott Rowe
11ce4b7594 am c68ab86a: am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs 
* commit 'c68ab86a8cef8b8ca4588e7eb482c5acf9821aa9':
  docs: removing code captions
 2015-01-17 05:25:25 +00:00
Scott Rowe
e019bbb161 am 278f5e2a: am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs 
* commit '278f5e2a63961f468457ab00ceeaec84aff7bc61':
  docs: Add screenshot
 2015-01-17 05:25:20 +00:00