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

173498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
5afc62cd39 Merge "Don\'t write widget metadata to backup unless it\'s new/changed" into lmp-mr1-dev 
automerge: 7651dcb

* commit '7651dcb92193a5a970a2554e067ec14d6fcad802':
  Don't write widget metadata to backup unless it's new/changed
 2015-01-20 21:26:56 +00:00
Christopher Tate
7651dcb921 Merge "Don't write widget metadata to backup unless it's new/changed" into lmp-mr1-dev 2015-01-20 21:24:00 +00:00
Wale Ogunwale
f5f54dd691 am 92dd1abe: Update restored task uid to match the package uid on current device. 
automerge: 7fd985f

* commit '7fd985f2c69f600f7530311ac9b7c9af196dc0e0':
  Update restored task uid to match the package uid on current device.
 2015-01-20 21:10:01 +00:00
Wale Ogunwale
7fd985f2c6 am 92dd1abe: Update restored task uid to match the package uid on current device. 
* commit '92dd1abef4c0a22db40c5f7bbd100e6b471a1ad3':
  Update restored task uid to match the package uid on current device.
 2015-01-20 20:58:26 +00:00
Wale Ogunwale
92dd1abef4 Update restored task uid to match the package uid on current device. 
The uid on the task we are restoring from another device are
meaningless on the current device. Change updates the uid of any
task we restore to match the package uid on the current device.

Bug: 19014377
Change-Id: I285fbe9f509cae3d2e9a212a59e88f34b4db20e5
 2015-01-20 12:52:07 -08:00
Jason Sams
a5835a2e5f Add FP16 types to the list of RenderScript types. 
Change-Id: Ibf9a6d391fb4d6a5c4b4e05ab73fb58bd74dc586
 2015-01-20 12:51:14 -08:00
Ying Wang
b643624d2f New trick to install bad dex file. 
Previously we use LOCAL_JAVA_RESOURCE_FILES to override the normally
generated classes.dex with a bad dex file.
Now as we have moved Java resource processing before running jarjar, dx
would fail for the bad classes.dex inside the classes.jar.
Instead we override the target specific variable PRIVATE_DEX_FILE to
inject the bad dex file.

(cherry-picked from commit f122d90c290c789e0d0085127beebdcf1935c127)

Bug: 18837479
Change-Id: I73f82c8a15e1d8935d9c2f290ba9456184a56ec7
 2015-01-20 12:15:17 -08:00
Kenny Guy
2b43c73e66 Only hide cross profile disclosure when showing resolver. 
Hiding the cross profile discoloure for all system apps
also meant it wasn't shown for CALL_PRIVILEGED intents.

Bug: 18702461
Change-Id: I8129bc4b07573b547aefe2dbcc6938a60305c216
 2015-01-20 19:27:38 +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
Craig Mautner
94ab46659b More debugging for bug 17721767 
Narrow down why GEL is being resumed instead of the top stack.

Change-Id: I79c0be4adf0ccee30e1a5aa4308ee91148f239fa
 2015-01-20 10:52:53 -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
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
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
Wonsik Kim
b2b85f9576 TIF: TvInputHardwareManager puts multiple sink ports into audio patch 
Bug: 18823504
Change-Id: Id1dfe6c87bb26a8cb3ffafae8b256fa9e87d9d8c
 2015-01-20 06:40:25 +00:00
Narayan Kamath
37ad4b0242 Choose the right executable for wrapped applications. 
64 bit zygotes should exec app_process64, whereas 32 bit
zygotes should exec app_process32.

Change-Id: I63b56400e0478cd2bb206c98da6858be558f0525
 2015-01-19 16:09:17 +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
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
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
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
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
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