Ying Wang
ceddb389b4
am b33fe50a: am dcbde1b0: Merge "libcore_to_document and junit_to_document are no longer functions."
...
* commit 'b33fe50a634e4fde635f7e662526db1c3e2cfa5c':
libcore_to_document and junit_to_document are no longer functions.
2013-12-05 17:56:45 +00:00
Ying Wang
b33fe50a63
am dcbde1b0: Merge "libcore_to_document and junit_to_document are no longer functions."
...
* commit 'dcbde1b02ad69c18509afd87974c72c3a22f45dd':
libcore_to_document and junit_to_document are no longer functions.
2013-12-05 09:47:04 -08:00
Ying Wang
dcbde1b02a
Merge "libcore_to_document and junit_to_document are no longer functions."
2013-12-05 17:39:59 +00:00
Brian Carlstrom
4a657244b3
am 59595f7a: am 8026b2ce: Merge "Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf."
...
* commit '59595f7a3e8efcefc62bbcf8e085b6da6d8ea339':
Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf.
2013-12-05 15:29:41 +00:00
Brian Carlstrom
59595f7a3e
am 8026b2ce: Merge "Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf."
...
* commit '8026b2ce23396262ad1f1e7a75093cd0e2467d4b':
Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf.
2013-12-05 07:25:20 -08:00
Brian Carlstrom
8026b2ce23
Merge "Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf."
2013-12-05 06:20:48 +00:00
Mathieu Chartier
a1a19d28d0
Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf.
...
Since VMRuntime.newNonMovableArray and VMRuntime.addressOf are java
methods implemented in Native, they don't necessarily return NULL
when an exception is thrown. Checking the exception instead of the
return value fixes errors which may occur if the runtime returns
garbage when an exception is pending.
Bug: 11971220
Change-Id: I70478834c9f14cc5d9e666e1e174d3fd09269719
2013-12-04 17:58:37 -08:00
John Huang
66a9ebfd2f
am c91c7b4b: am 2e12e052: Merge "RIL changes for supporting generic SIM communication."
...
* commit 'c91c7b4b5d61e2121cd60c5c27a6a8df0ecf155e':
RIL changes for supporting generic SIM communication.
2013-12-05 01:12:12 +00:00
John Huang
c91c7b4b5d
am 2e12e052: Merge "RIL changes for supporting generic SIM communication."
...
* commit '2e12e0522641649d363a1c6ede9be9af235197fa':
RIL changes for supporting generic SIM communication.
2013-12-04 17:09:18 -08:00
John Huang
2e12e05226
Merge "RIL changes for supporting generic SIM communication."
2013-12-05 00:59:36 +00:00
Ying Wang
50a0fd50f7
libcore_to_document and junit_to_document are no longer functions.
...
They are evaluated only once in the corresponding export .mk file.
This fixes build log spam reported in:
https://code.google.com/p/android/issues/detail?id=63184
Change-Id: I549eb052272bbdebef8fca697822f5eaa0fe5764
2013-12-04 16:58:59 -08:00
Dirk Dougherty
d5967e777e
am e8b49c43: am c09e0ee9: am c9cad879: Merge "Doc change: add cropped kk device image and adjust position on highlights doc." into klp-docs
...
* commit 'e8b49c433156b450289a4cd7ff1a7c8d7f05ebb8':
Doc change: add cropped kk device image and adjust position on highlights doc.
2013-12-04 22:13:47 +00:00
Dirk Dougherty
e8b49c4331
am c09e0ee9: am c9cad879: Merge "Doc change: add cropped kk device image and adjust position on highlights doc." into klp-docs
...
* commit 'c09e0ee90e00acbde85a6b3ee4413ca6e245f601':
Doc change: add cropped kk device image and adjust position on highlights doc.
2013-12-04 14:09:59 -08:00
Dirk Dougherty
c09e0ee90e
am c9cad879: Merge "Doc change: add cropped kk device image and adjust position on highlights doc." into klp-docs
...
* commit 'c9cad879597dd15983a35fbf997898a771672a69':
Doc change: add cropped kk device image and adjust position on highlights doc.
2013-12-04 22:05:51 +00:00
Dirk Dougherty
c9cad87959
Merge "Doc change: add cropped kk device image and adjust position on highlights doc." into klp-docs
2013-12-04 22:01:41 +00:00
Dirk Dougherty
56278b7e14
Doc change: add cropped kk device image and adjust position on highlights doc.
...
Change-Id: I927091e1251c5477de4462a61c01c9bcf82ad9e2
2013-12-04 13:55:59 -08:00
Geoff Mendal
ece1bc5174
am f6e6e160: (-s ours) am 82af5d89: (-s ours) am 6d25c934: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f6e6e1606234a5a9ee9c2eeb2f8c06392b2b7f10':
Import translations. DO NOT MERGE
2013-12-04 21:12:50 +00:00
Geoff Mendal
f6e6e16062
am 82af5d89: (-s ours) am 6d25c934: (-s ours) Import translations. DO NOT MERGE
...
* commit '82af5d893102dfb51257f2a4ff97c0c4c36fdd1a':
Import translations. DO NOT MERGE
2013-12-04 13:07:57 -08:00
Geoff Mendal
82af5d8931
am 6d25c934: (-s ours) Import translations. DO NOT MERGE
...
* commit '6d25c934dcdf7a098d4e9f96cb206789dfd4afb7':
Import translations. DO NOT MERGE
2013-12-04 13:01:30 -08:00
Geoff Mendal
6d25c934dc
Import translations. DO NOT MERGE
...
Change-Id: Ia2a23f77b1bb0b7fc9d731a185f3104d963cb44d
Auto-generated-cl: translation import
2013-12-04 11:35:25 -08:00
Lorenzo Colitti
13d9dfb495
am 86570409: am 453a5233: Merge "Minor changes to LinkAddress."
...
* commit '86570409a28ff359acbf56cc11bc1ad4d5f57630':
Minor changes to LinkAddress.
2013-12-04 01:29:35 +00:00
Lorenzo Colitti
86570409a2
am 453a5233: Merge "Minor changes to LinkAddress."
...
* commit '453a5233086b216f2a95d0879954a2af39279095':
Minor changes to LinkAddress.
2013-12-03 17:26:06 -08:00
Lorenzo Colitti
453a523308
Merge "Minor changes to LinkAddress."
2013-12-04 01:21:07 +00:00
Dirk Dougherty
efbc4aeb4a
am 31c041a5: am 1c64e2f4: Add samples TOC generated from browsable sources.
...
* commit '31c041a58315eca907192411905273e88dbc2f8f':
Add samples TOC generated from browsable sources.
2013-12-03 17:53:12 +00:00
Dirk Dougherty
31c041a583
am 1c64e2f4: Add samples TOC generated from browsable sources.
...
* commit '1c64e2f429bfc97fcf64ebeaa0b3aa2d6b609a1d':
Add samples TOC generated from browsable sources.
2013-12-03 09:51:05 -08:00
Lorenzo Colitti
e1ad1849f3
Minor changes to LinkAddress.
...
1. Simplify the parceling code. Since the InetAddress inside a
LinkAddress can never be null, we don't need to special-case
the case where it is.
2. Add / update method documentation.
3. Write a unit test.
Change-Id: Iba0a8cecc683d55d736419965e72ee33dd66dc22
2013-12-03 19:46:36 +09:00
Dirk Dougherty
1c64e2f429
Add samples TOC generated from browsable sources.
...
Change-Id: I760eceb3a315d5fd1b65ecdcd014a9507990a26b
2013-12-03 00:14:39 +00:00
Mathieu Chartier
dae9f5a515
am f3a2430a: am 738fa2f6: Merge "Add dalvik.vm.gctype to enable switching between different GCs."
...
* commit 'f3a2430a2b849f2c4041bcfba7fbefa9b2bb4d79':
Add dalvik.vm.gctype to enable switching between different GCs.
2013-12-03 00:05:32 +00:00
Mathieu Chartier
f3a2430a2b
am 738fa2f6: Merge "Add dalvik.vm.gctype to enable switching between different GCs."
...
* commit '738fa2f64e064f5c6d1003e528cde742e262312f':
Add dalvik.vm.gctype to enable switching between different GCs.
2013-12-02 16:00:49 -08:00
Mathieu Chartier
738fa2f64e
Merge "Add dalvik.vm.gctype to enable switching between different GCs."
2013-12-02 23:53:10 +00:00
Mathieu Chartier
7e4fdec6f0
Add dalvik.vm.gctype to enable switching between different GCs.
...
The option passes the specified GC type into the Xgc runtime
option.
Currently the three different supported GC types are MS, CMS, SS
which represent mark-sweep, concurrent mark-sweep, mark-sweep +
semi-space hybrid.
Change-Id: I6ad95c8d12c0d1158f7c861ff0c3180761619172
2013-12-02 15:50:18 -08:00
Scott Main
5c4c68da54
am d400e614: am 7511d659: am 2dd715ed: Merge "fix FPS typo in JB highlights, reported by vharron" into klp-docs
...
* commit 'd400e6146b18b12a75d750654b8a118105fd1834':
fix FPS typo in JB highlights, reported by vharron
2013-12-02 22:29:33 +00:00
Scott Main
d400e6146b
am 7511d659: am 2dd715ed: Merge "fix FPS typo in JB highlights, reported by vharron" into klp-docs
...
* commit '7511d659a2a3815cc6894cd71ebed0a27e341430':
fix FPS typo in JB highlights, reported by vharron
2013-12-02 14:25:52 -08:00
Scott Main
7511d659a2
am 2dd715ed: Merge "fix FPS typo in JB highlights, reported by vharron" into klp-docs
...
* commit '2dd715ed45b9000eab81b0972d0585294d7f9ddd':
fix FPS typo in JB highlights, reported by vharron
2013-12-02 22:20:22 +00:00
Scott Main
2dd715ed45
Merge "fix FPS typo in JB highlights, reported by vharron" into klp-docs
2013-12-02 22:16:24 +00:00
Dirk Dougherty
ac5894d4b2
am ba6854d6: am b5d5a787: am 19d3ac5e: Merge "Doc change: update gcore docs to fix javadoc ref error and expose Samples tab." into klp-docs
...
* commit 'ba6854d6f6e564d3cfad70ad0674924a1aca6cc9':
Doc change: update gcore docs to fix javadoc ref error and expose Samples tab.
2013-12-02 21:57:50 +00:00
Dirk Dougherty
ba6854d6f6
am b5d5a787: am 19d3ac5e: Merge "Doc change: update gcore docs to fix javadoc ref error and expose Samples tab." into klp-docs
...
* commit 'b5d5a787e31bcba8822545c56d6506a38229bf22':
Doc change: update gcore docs to fix javadoc ref error and expose Samples tab.
2013-12-02 13:53:52 -08:00
Dirk Dougherty
b5d5a787e3
am 19d3ac5e: Merge "Doc change: update gcore docs to fix javadoc ref error and expose Samples tab." into klp-docs
...
* commit '19d3ac5eb67bcb99f249642d41bcea89d7146104':
Doc change: update gcore docs to fix javadoc ref error and expose Samples tab.
2013-12-02 21:49:31 +00:00
Dirk Dougherty
19d3ac5eb6
Merge "Doc change: update gcore docs to fix javadoc ref error and expose Samples tab." into klp-docs
2013-12-02 21:47:04 +00:00
Dirk Dougherty
d189845323
Doc change: update gcore docs to fix javadoc ref error and expose Samples tab.
...
Change-Id: I93133f3424127a0e2da256eceee3eebc8c8add18
2013-12-02 13:40:27 -08:00
Scott Main
351001f904
fix FPS typo in JB highlights, reported by vharron
...
Change-Id: I6a98af7730d1e56f08b5ba9a9f7d462cc35e17e8
2013-12-02 12:55:33 -08:00
Scott Main
8be9d428a1
am b7cdfa02: am b243bbb4: am 65907fd4: dashboard update for 12/2/13 first appearance of kitkat
...
* commit 'b7cdfa0238436d2ead785587bd50ec560bcae5bb':
dashboard update for 12/2/13 first appearance of kitkat
2013-12-02 20:28:56 +00:00
Scott Main
b7cdfa0238
am b243bbb4: am 65907fd4: dashboard update for 12/2/13 first appearance of kitkat
...
* commit 'b243bbb4c89e67bdbf11df47dd79645c398b877b':
dashboard update for 12/2/13 first appearance of kitkat
2013-12-02 12:25:07 -08:00
Scott Main
b243bbb4c8
am 65907fd4: dashboard update for 12/2/13 first appearance of kitkat
...
* commit '65907fd4af6a1074a7b052751746fd99095627c6':
dashboard update for 12/2/13 first appearance of kitkat
2013-12-02 20:21:33 +00:00
Nick Kralevich
18c2736cf0
am a5a0de9f: am b6634304: Merge "Remove setEnforcingMode from SELinuxPolicyInstallReceiver."
...
* commit 'a5a0de9f2943c6188bd5855adfe4c5da7a985d2d':
Remove setEnforcingMode from SELinuxPolicyInstallReceiver.
2013-12-02 20:12:55 +00:00
Scott Main
65907fd4af
dashboard update for 12/2/13
...
first appearance of kitkat
Change-Id: I528cb8d938b3a9e0da4c44db2b615ad90c211436
2013-12-02 12:11:22 -08:00
Nick Kralevich
a5a0de9f29
am b6634304: Merge "Remove setEnforcingMode from SELinuxPolicyInstallReceiver."
...
* commit 'b66343049bc56d29988a91d2d29d49861a469b84':
Remove setEnforcingMode from SELinuxPolicyInstallReceiver.
2013-12-02 12:08:42 -08:00
Nick Kralevich
b66343049b
Merge "Remove setEnforcingMode from SELinuxPolicyInstallReceiver."
2013-12-02 20:00:28 +00:00
Stephen Smalley
856df42a5a
Remove setEnforcingMode from SELinuxPolicyInstallReceiver.
...
It never worked anyhow, at least in AOSP, as nothing checks that property,
and is pointless now that enforcing mode is set by init.
Change-Id: If05dd49963c5d7081e00039b5e378032bea0939b
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-12-02 14:38:31 -05:00
Shishir Agrawal
8b03ab8502
RIL changes for supporting generic SIM communication.
...
Adds the 4 new commands to RIL interface:
- RIL_REQUEST_SIM_TRANSMIT_BASIC (AT+CSIM - TS 27.007)
- RIL_REQUEST_SIM_OPEN_CHANNEL (AT+CCHO - TS 27.007)
- RIL_REQUEST_SIM_CLOSE_CHANNEL (AT+CCHC - TS 27.007)
- RIL_REQUEST_SIM_TRANSMIT_CHANNEL (AT+CGLA - TS 27.007)
Change-Id: Iee4d950d37a6097493cd945e611c914c40827215
2013-12-02 10:56:21 -08:00