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

180422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Todd Kennedy
e1f183d01b Merge "Expose new binder call createStackOnDisplay()" 2015-01-20 19:17:01 +00:00
Ricardo Cervera
5b0d4881e7 am 7c002d75: am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 automerge: 458f432 automerge: 47e274c automerge: 046dc08 
automerge: 115759a

* commit '115759a3894eeede288fa1a7e5c3a09879bfe777':
 2015-01-20 19:10:41 +00:00
Ricardo Cervera
115759a389 am 7c002d75: am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 automerge: 458f432 automerge: 47e274c 
automerge: 046dc08

* commit '046dc08962fcf0ea32597859c3ef80afea0d4069':
 2015-01-20 19:07:11 +00:00
Todd Kennedy
4900bf9d82 Expose new binder call createStackOnDisplay() 
Creates a new, empty ActivityStack on a display. Use the binder call to
launch an activity on said stack.

Bug: 19001243
Change-Id: I0f04e8f2703bcc706f58e75333869fb35f6b1ee9
 2015-01-20 10:51:49 -08:00
Ricardo Cervera
046dc08962 am 7c002d75: am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 automerge: 458f432 automerge: 47e274c 
* commit '7c002d75b62585c3598a4a5a93647a3323e90b8d':
 2015-01-20 18:38:40 +00:00
Ricardo Cervera
7c002d75b6 am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 automerge: 458f432 
automerge: 47e274c

* commit '47e274c56a0662e3e2aef24f2a458cc078e70fd8':
 2015-01-20 18:32:22 +00:00
Ricardo Cervera
47e274c56a am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 
automerge: 458f432

* commit '458f4326bdff638cefe175b179a487872cf678c1':
 2015-01-20 18:10:49 +00:00
Ricardo Cervera
458f4326bd am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 
automerge: eada048

* commit 'eada048addc14a95ced54b17c6a75f5f899e2c2a':
 2015-01-20 18:03:50 +00:00
Ricardo Cervera
eada048add am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
automerge: e8f6bd4

* commit 'e8f6bd484627e16fa2fd9509b0f06056ee44be94':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-20 17:57:45 +00:00
Neil Fuller
df8e59abe5 am 77e7f401: am aa3a45ba: am 42c2ac00: Merge "Fix for broken docs build." 
* commit '77e7f401161e778e7f06401ac72b132f5272d4e2':
  Fix for broken docs build.
 2015-01-20 15:35:50 +00:00
Neil Fuller
77e7f40116 am aa3a45ba: am 42c2ac00: Merge "Fix for broken docs build." 
* commit 'aa3a45ba5bc78ab4015a1d2c4c361d3f54118d8e':
  Fix for broken docs build.
 2015-01-20 15:29:55 +00:00
Neil Fuller
aa3a45ba5b am 42c2ac00: Merge "Fix for broken docs build." 
* commit '42c2ac00e6e6e8fcfd15dcfbc6d70eabc709d904':
  Fix for broken docs build.
 2015-01-20 15:24:35 +00:00
Neil Fuller
42c2ac00e6 Merge "Fix for broken docs build." 2015-01-20 15:18:59 +00:00
Neil Fuller
ae69120b0f Fix for broken docs build. 
Broken by commit 50a01d89606b40dd151ad407d05c3b2867bbdbad

Change-Id: Iab460aa6254d320349f67e747f763bbf06d3e9e7
 2015-01-20 15:17:04 +00:00
Neil Fuller
4c7ddabefa am 7014da74: resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp 
* commit '7014da74e861f8cfc34fcbd528b4c83a1dc97503':
  Changes associated with an OkHttp upgrade
 2015-01-20 13:29:31 +00:00
Neil Fuller
7014da74e8 resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp 
Change-Id: Idfa2750230aa56e7ae34fcc33d62558df942abd0
 2015-01-20 13:21:58 +00:00
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
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