118587 Commits

Author SHA1 Message Date
Ashok Bhat
738702d28a AArch64: Use long for pointers
For storing pointers, long is used in CursorWindow
and SQLiteConnection classes as native pointers can
be 64-bit.

Change-Id: Ia686006a7b8bdc7b95e5de0d0a294b155034a921
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-08 11:53:21 +00:00
Narayan Kamath
f5598210f0 Merge "AArch64: Use long for pointers in hardware classes" 2014-01-08 11:53:12 +00:00
Narayan Kamath
f210044fb8 Merge "AArch64: Use long for pointers in services" 2014-01-08 11:53:00 +00:00
Ashok Bhat
4838e33812 AArch64: Use long for pointers in hardware classes
For storing pointers, long is used in hardware classes,
as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: Icdeb67f9273fb2d8f6d88ca68d7f7d0950796fc1
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-08 10:17:21 +00:00
Ashok Bhat
7e2a9dcf1a AArch64: Use long for pointers in services
For storing pointers, long is used, as native pointers
can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: Ib4435f0794740d545c1e640087849215e6844802
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2014-01-08 10:06:07 +00:00
Robert Greenwalt
400e6b705f am cbf5e875: am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network""
* commit 'cbf5e8758ff9ef2eb21228fba20c962002f1e42d':
  Revert "Do not show roaming icon for Videotron operator when access Canada network"
2014-01-07 16:44:30 -08:00
Robert Greenwalt
cbf5e8758f am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network""
* commit '517e9b11d53609d59c60d22dc085e7f9fd442248':
  Revert "Do not show roaming icon for Videotron operator when access Canada network"
2014-01-07 16:41:16 -08:00
Robert Greenwalt
517e9b11d5 Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network"" 2014-01-08 00:38:29 +00:00
Joe Fernandez
c6735c069c docs: Added note to Support Library Setup page: mediarouter to appcompat dependency
The v7 mediarouter support library depends on a couple of styles that are located
in the v7 appcompat library. This dependency requires developers to have both
libraries imported in their Eclipse workspace and to set up a library dependency
between the mediarouter to the appcompat library.

See Stackoverflow for issue and fix: http://goo.gl/xQI0Iw

Staging: http://joefernandez2.mtv.corp.google.com:8208/tools/support-library/setup.html#libs-with-res

Change-Id: Ifc7fa3dfcf9dfdb7faac7d2695a9988d49440c7d
2014-01-07 23:46:07 +00:00
Ian Rogers
0e16e3d7dd am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime"
* commit 'c2b50c10f0bf636562deba1d92ec7b54b13909de':
  Add a call to registerAppInfo for the VMRuntime
2014-01-07 13:38:44 -08:00
Ian Rogers
c2b50c10f0 am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime"
* commit 'f11dee797177760f089e757d91ed6bce32043750':
  Add a call to registerAppInfo for the VMRuntime
2014-01-07 13:36:29 -08:00
Ian Rogers
f11dee7971 Merge "Add a call to registerAppInfo for the VMRuntime" 2014-01-07 21:31:18 +00:00
Deepanshu Gupta
5ad7c183f3 Fix the measurement of text bounds.
Bug: 12366230
Change-Id: I203b678363dc7b688c744503ee10216baca658a9
2014-01-07 12:07:45 -08:00
Dave Platt
3bbf7e6aa5 am 62bac75d: am 76e5ca81: Fix descriptor leak after accepting connections
* commit '62bac75d677de5398b48487e758dcbdf7bc9d834':
  Fix descriptor leak after accepting connections
2014-01-07 11:53:12 -08:00
Dave Platt
bd9acc2218 am e966e577: am 02f042dd: Fix socket descriptor leak from Zygote to child app
* commit 'e966e5774ad8d478bc89b541bcac3740fe267d18':
  Fix socket descriptor leak from Zygote to child app
2014-01-07 11:53:07 -08:00
Dave Platt
62bac75d67 am 76e5ca81: Fix descriptor leak after accepting connections
* commit '76e5ca81b3ba5a4f52126f2ec8907679b4356292':
  Fix descriptor leak after accepting connections
2014-01-07 11:49:54 -08:00
Dave Platt
e966e5774a am 02f042dd: Fix socket descriptor leak from Zygote to child app
* commit '02f042ddd9ddf47ef88c4f174eb19a9bee296a45':
  Fix socket descriptor leak from Zygote to child app
2014-01-07 11:49:49 -08:00
Narayan Kamath
0dce19caf8 am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes"
* commit '79ceb53ae5b867a954476e3f6499f89664fbc669':
  AArch64: Use long for pointers in MTP classes
2014-01-07 05:01:13 -08:00
Narayan Kamath
23ebc24eee am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes"
* commit '08467c5727c04c1fef40ff1e361628944275ef28':
  AArch64: Use long for pointers in VideoEditor classes
2014-01-07 05:01:08 -08:00
Narayan Kamath
e7d7908c28 am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
* commit '02baba25545b232436502a73e2928a1d72fa240e':
  AArch64: Use long for pointers in DisplayEventReceiver
2014-01-07 05:01:03 -08:00
Narayan Kamath
bfbe585ed4 am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes"
* commit 'c0c92f206eddb6fb319bd11929c1703daf17248f':
  AArch64: Use long for pointers in audio effect classes
2014-01-07 05:00:58 -08:00
Narayan Kamath
568cde557a am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"
* commit '80cff94478a39914012df816179ea57c53040903':
  AArch64: Use long for pointers in AmrInputStream
2014-01-07 05:00:53 -08:00
Narayan Kamath
79ceb53ae5 am c58abeea: Merge "AArch64: Use long for pointers in MTP classes"
* commit 'c58abeeae34c77559c00c7d967c77443469abeef':
  AArch64: Use long for pointers in MTP classes
2014-01-07 04:58:23 -08:00
Narayan Kamath
08467c5727 am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes"
* commit '9bc6acf27ac446b7e18a51a926caafd99cf34713':
  AArch64: Use long for pointers in VideoEditor classes
2014-01-07 04:54:46 -08:00
Narayan Kamath
02baba2554 am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
* commit '670327544184dbd6274de9127ceaf20dfd5801b4':
  AArch64: Use long for pointers in DisplayEventReceiver
2014-01-07 04:54:42 -08:00
Narayan Kamath
c0c92f206e am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes"
* commit '357ea90515025d806c6360ef846bf6f84b45a64e':
  AArch64: Use long for pointers in audio effect classes
2014-01-07 04:54:35 -08:00
Narayan Kamath
c58abeeae3 Merge "AArch64: Use long for pointers in MTP classes" 2014-01-07 12:54:11 +00:00
Ashok Bhat
e2e59326f1 AArch64: Use long for pointers in MTP classes
For storing pointers, long is used in MTP classes,
as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: I67805547251722e7b77611d47d0bb632a64d3e6d
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-07 12:52:57 +00:00
Narayan Kamath
80cff94478 am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"
* commit '74675f29133ff36dccc95387392bf3654dc94e15':
  AArch64: Use long for pointers in AmrInputStream
2014-01-07 04:50:56 -08:00
Narayan Kamath
9bc6acf27a Merge "AArch64: Use long for pointers in VideoEditor classes" 2014-01-07 12:50:07 +00:00
Ashok Bhat
44ba5c1b4e AArch64: Use long for pointers in VideoEditor classes
For storing pointers, long is used in VideoEditor
classes, as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: Ifff3a28f2ab6774ee89d31770ad63451c8726431
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-07 12:49:41 +00:00
Narayan Kamath
6703275441 Merge "AArch64: Use long for pointers in DisplayEventReceiver" 2014-01-07 12:49:27 +00:00
Ashok Bhat
27285821b7 AArch64: Use long for pointers in DisplayEventReceiver
For storing pointers, long is used as
native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: I3c0855373c0e4bedc172adb82b103586de9219dc
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-01-07 12:48:43 +00:00
Narayan Kamath
357ea90515 Merge "AArch64: Use long for pointers in audio effect classes" 2014-01-07 12:48:21 +00:00
Ashok Bhat
ea7861c918 AArch64: Use long for pointers in audio effect classes
For storing pointers, long is used in AudioEffect
and Visualizer classes, as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: Ief49bbe5baef663e268c7f6d70ac33a4df45621c
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-07 12:47:51 +00:00
Narayan Kamath
74675f2913 Merge "AArch64: Use long for pointers in AmrInputStream" 2014-01-07 12:45:06 +00:00
Ashok Bhat
b348c3fd87 AArch64: Use long for pointers in AmrInputStream
For storing pointers, long is used in AmrInputStream
class, as native pointers can be 64-bit.

Change-Id: I78fff3eb54fc7101746b0d693cbc4e923c2bad08
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-07 12:44:38 +00:00
Narayan Kamath
c47b7d377c am 9d4ebdca: am cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys."
* commit '9d4ebdcafaa6a3f29978a7095f2bc3cbe0d5240a':
  XmlUtils#readThisMapXml should handle null keys.
2014-01-07 02:08:02 -08:00
Narayan Kamath
c797fd614d am c9e27802: am 7e296254: Merge "Fix broken XML parsing idiom."
* commit 'c9e27802f049b9c3086770a7710b421ce33d2791':
  Fix broken XML parsing idiom.
2014-01-07 02:07:56 -08:00
Narayan Kamath
9d4ebdcafa am cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys."
* commit 'cf1aa551eed7be4310a386b9b9e458e46847207a':
  XmlUtils#readThisMapXml should handle null keys.
2014-01-07 02:05:39 -08:00
Narayan Kamath
c9e27802f0 am 7e296254: Merge "Fix broken XML parsing idiom."
* commit '7e29625463e6034147c24992d0ad319ddf426088':
  Fix broken XML parsing idiom.
2014-01-07 02:05:35 -08:00
Narayan Kamath
cf1aa551ee Merge "XmlUtils#readThisMapXml should handle null keys." 2014-01-07 10:03:21 +00:00
Narayan Kamath
7e29625463 Merge "Fix broken XML parsing idiom." 2014-01-07 10:02:57 +00:00
David Christie
6826387e50 DO NOT MERGE: Clear cached locations when location providers disabled
Bug: 12118307

Change-Id: I8595b50d30c0f3ff2cc7dab14141a739cd6b9daa
2014-01-06 18:15:05 -08:00
David Christie
8e0c7768c8 DO NOT MERGE: Clear cached locations when location providers disabled
Bug: 12118307

Change-Id: Iae668409be5c5bd715681624b2a54a4daa690932
2014-01-06 17:57:30 -08:00
quddusc
fd08cd4852 am 0d4068ad: am ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477" into klp-docs
* commit '0d4068ad1cbc8b8c550118c2214eb70116b83f81':
  docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477
2014-01-06 16:30:35 -08:00
Baligh Uddin
be24e41b41 am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '2c4d6d91e21ae678cff7b9ee2c78ffd0681d5da2':
  Import translations. DO NOT MERGE
2014-01-06 16:30:30 -08:00
Baligh Uddin
f256f49f9f am 258bd63f: (-s ours) am 6e15a49e: (-s ours) Import translations. DO NOT MERGE
* commit '258bd63f38d90ac96aac5eb4e3a5c696e8b089f8':
  Import translations. DO NOT MERGE
2014-01-06 16:30:25 -08:00
quddusc
0182bbea6d docs: Removed stray link.
Bug: 11773486

Change-Id: I6d4f697cffd5a104fee87e9e1fb32cfa0611b1f0
2014-01-06 16:14:31 -08:00
Conley Owens
7f16047b9e am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by config"
* commit '73a6702eeaabdeb7b405ec504413d41716ef3508':
  CompoundButton: Let text can be changed by config
2014-01-06 15:41:50 -08:00