OSDN Git Service
Ricardo Cervera [Tue, 14 Jan 2014 00:23:19 +0000 (16:23 -0800)]
am
faca5e3c: am
ac5ad7b9: docs: Fixed typos.
* commit '
faca5e3c917a6197b380eb5d2b51893b5d689946':
docs: Fixed typos.
Ricardo Cervera [Tue, 14 Jan 2014 00:19:51 +0000 (00:19 +0000)]
am
ac5ad7b9: docs: Fixed typos.
* commit '
ac5ad7b9e488a967ffee56fd1b168c010c1d62e8':
docs: Fixed typos.
Ricardo Cervera [Mon, 13 Jan 2014 21:48:45 +0000 (13:48 -0800)]
docs: Fixed typos.
bug:
10732654
Change-Id: I5a580cf40e2670485f9c57e2376efd20bcf7b60d
Review URL: http://quixote.mtv.corp.google.com:8002/training/articles/security-tips.html
David Christie [Mon, 13 Jan 2014 21:03:33 +0000 (13:03 -0800)]
am
d8dfa528: am
301b1fac: am
26c6c15f: am
b3c96c4c: am
1d151607: am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
d8dfa528b86e734318159b6fa75814184fb02c9d':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:59:20 +0000 (12:59 -0800)]
am
301b1fac: am
26c6c15f: am
b3c96c4c: am
1d151607: am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
301b1facb23d148efebd7a2aa5c174cd7c04cc6f':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:56:27 +0000 (12:56 -0800)]
am
26c6c15f: am
b3c96c4c: am
1d151607: am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
26c6c15f54231c154bb2f7febb053d034cbe40c5':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:53:27 +0000 (12:53 -0800)]
am
b3c96c4c: am
1d151607: am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
b3c96c4c57cb97924f828ea917b1c4d63b2c9d00':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:50:18 +0000 (12:50 -0800)]
am
1d151607: am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
1d151607fbee65fc9fc2bb1cb38a850c1f68bede':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:46:35 +0000 (12:46 -0800)]
am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
4013c4b18ccc66b510f4cdb222d4c04597975843':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:43:47 +0000 (12:43 -0800)]
am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
42d7a0bff5da6aeb8323ae0c797e9c4e116b637b':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:41:48 +0000 (12:41 -0800)]
am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
a7d13fabd6184e411215e9a841cf16097f1a5127':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:40:04 +0000 (12:40 -0800)]
am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
45aaa377c5d090003c6cf5fb54fff856a0807c4f':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:36:49 +0000 (12:36 -0800)]
am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
a1b89310d58df14570f7f6f5abb677c976c63a7a':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:33:39 +0000 (12:33 -0800)]
am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
a87bdc1f8ff308f90ec7a3234c4848c79d4c3988':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 19:02:15 +0000 (11:02 -0800)]
am
fe7bfdd3: am
af2f2f76: am
9ecadd7c: am
6f34b938: am
3238d0d9: Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
* commit '
fe7bfdd384f199668ba9b1b751194e06cbb50b3b':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 19:00:02 +0000 (11:00 -0800)]
am
af2f2f76: am
9ecadd7c: am
6f34b938: am
3238d0d9: Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
* commit '
af2f2f767a1673f10a2b44f913832cacefda341b':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 18:56:41 +0000 (10:56 -0800)]
am
9ecadd7c: am
6f34b938: am
3238d0d9: Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
* commit '
9ecadd7cedc492faef163a314713caddbd5da39a':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 18:53:31 +0000 (10:53 -0800)]
am
6f34b938: am
3238d0d9: Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
* commit '
6f34b9382f0dac64952e0e5c05e96ea2ef3e28e8':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 18:52:54 +0000 (10:52 -0800)]
am
3d5ea26f: am
4503409a: Merge "Clear cached locations when location providers disabled Bug:
12118307" into klp-dev
* commit '
3d5ea26fbb92b1b780cd9763c0731288f48341a3':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 18:50:03 +0000 (10:50 -0800)]
am
3238d0d9: Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
* commit '
3238d0d9f98d4d0972e52a81a4e9b8d2aea0436d':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 18:49:40 +0000 (10:49 -0800)]
am
4503409a: Merge "Clear cached locations when location providers disabled Bug:
12118307" into klp-dev
* commit '
4503409a477f3fca2eb60e4105d804069d7b0cad':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 18:44:45 +0000 (18:44 +0000)]
Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
Daniel Cashman [Mon, 13 Jan 2014 18:44:37 +0000 (18:44 +0000)]
Merge "Clear cached locations when location providers disabled Bug:
12118307" into klp-dev
Jeff Sharkey [Mon, 13 Jan 2014 18:42:07 +0000 (10:42 -0800)]
am
47235e8b: am
90cadb35: Merge "MountService listeners can not be unregistered"
* commit '
47235e8b5ce6c622a1182933404cf5a17fcd35dc':
MountService listeners can not be unregistered
Jeff Sharkey [Mon, 13 Jan 2014 18:37:51 +0000 (10:37 -0800)]
am
90cadb35: Merge "MountService listeners can not be unregistered"
* commit '
90cadb35156829ff1d6b7066409596da38fc70e1':
MountService listeners can not be unregistered
Jeff Sharkey [Mon, 13 Jan 2014 18:35:31 +0000 (18:35 +0000)]
Merge "MountService listeners can not be unregistered"
Narayan Kamath [Mon, 13 Jan 2014 13:01:44 +0000 (05:01 -0800)]
am
bc2a449a: am
cb4d3ec1: Merge "Fix preference puts with "null" values."
* commit '
bc2a449a615b30efb81a1a0082a1bb0db515d0f5':
Fix preference puts with "null" values.
Narayan Kamath [Mon, 13 Jan 2014 12:32:19 +0000 (04:32 -0800)]
am
cb4d3ec1: Merge "Fix preference puts with "null" values."
* commit '
cb4d3ec1ea446fc9ce51514cbf5b16da0ec0fa0f':
Fix preference puts with "null" values.
Narayan Kamath [Mon, 13 Jan 2014 12:29:41 +0000 (12:29 +0000)]
Merge "Fix preference puts with "null" values."
Jason Sams [Sat, 11 Jan 2014 00:50:54 +0000 (16:50 -0800)]
am
739ae9b3: am
868173a5: Merge "Fix a JNI local reference leak in MediaDrm"
* commit '
739ae9b3b77458b4c77f799cba56dc68d65ab424':
Fix a JNI local reference leak in MediaDrm
Jason Sams [Sat, 11 Jan 2014 00:48:12 +0000 (16:48 -0800)]
am
868173a5: Merge "Fix a JNI local reference leak in MediaDrm"
* commit '
868173a53f0d1059408b049f30af3402d5b0de64':
Fix a JNI local reference leak in MediaDrm
Jason Sams [Sat, 11 Jan 2014 00:42:19 +0000 (00:42 +0000)]
Merge "Fix a JNI local reference leak in MediaDrm"
Craig Mautner [Sat, 11 Jan 2014 00:03:06 +0000 (16:03 -0800)]
am
54f99137: am
3747768b: Merge "Fix visibility of multiple non-fullscreen activities."
* commit '
54f991375a9c7c2a256e6aec7d4a223be8d36b39':
Fix visibility of multiple non-fullscreen activities.
Craig Mautner [Fri, 10 Jan 2014 23:59:59 +0000 (15:59 -0800)]
am
3747768b: Merge "Fix visibility of multiple non-fullscreen activities."
* commit '
3747768bde14ff9db96279830f07602ec50544cc':
Fix visibility of multiple non-fullscreen activities.
Craig Mautner [Fri, 10 Jan 2014 23:55:43 +0000 (23:55 +0000)]
Merge "Fix visibility of multiple non-fullscreen activities."
Dirk Dougherty [Fri, 10 Jan 2014 23:09:33 +0000 (15:09 -0800)]
am
d8849489: am
ccc5ca14: Doc change: dashboard update.
* commit '
d8849489a79a6b46996f3192b92d5089521e9341':
Doc change: dashboard update.
Dirk Dougherty [Fri, 10 Jan 2014 23:06:16 +0000 (23:06 +0000)]
am
ccc5ca14: Doc change: dashboard update.
* commit '
ccc5ca144c2d6e21df5118870d0a3f3c65055686':
Doc change: dashboard update.
Dirk Dougherty [Wed, 8 Jan 2014 23:52:27 +0000 (15:52 -0800)]
Doc change: dashboard update.
Change-Id: Ic65cd8d6bf2435fa3efd73f3337c462c02a752ed
David Christie [Fri, 10 Jan 2014 21:34:13 +0000 (13:34 -0800)]
am
36788815: am
a4bd5931: am
c454bbe8: (-s ours) am
b15429a6: am
503c5a32: am
ea47cb67: (-s ours) am
bf6cecc2: am
5716e4bf: am
776b3956: am
7f4d8293: am
6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
* commit '
36788815be0e9c2d12cdc44d186f0cbe6a9e7122':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Fri, 10 Jan 2014 21:30:36 +0000 (13:30 -0800)]
am
a4bd5931: am
c454bbe8: (-s ours) am
b15429a6: am
503c5a32: am
ea47cb67: (-s ours) am
bf6cecc2: am
5716e4bf: am
776b3956: am
7f4d8293: am
6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
* commit '
a4bd5931554ccf8e93b1c773a8f3cb4f15fdd23c':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Fri, 10 Jan 2014 21:27:26 +0000 (13:27 -0800)]
am
c454bbe8: (-s ours) am
b15429a6: am
503c5a32: am
ea47cb67: (-s ours) am
bf6cecc2: am
5716e4bf: am
776b3956: am
7f4d8293: am
6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
* commit '
c454bbe805bd6ed096ec6b4b811c4e4b67a86225':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Fri, 10 Jan 2014 21:24:05 +0000 (13:24 -0800)]
am
b15429a6: am
503c5a32: am
ea47cb67: (-s ours) am
bf6cecc2: am
5716e4bf: am
776b3956: am
7f4d8293: am
6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
* commit '
b15429a6853472207c2a4aefd22dd009e851edb7':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Fri, 10 Jan 2014 21:18:58 +0000 (13:18 -0800)]
am
503c5a32: am
ea47cb67: (-s ours) am
bf6cecc2: am
5716e4bf: am
776b3956: am
7f4d8293: am
6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
* commit '
503c5a32a4e718282b88f73e602c09e1bda49aec':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Fri, 10 Jan 2014 21:17:01 +0000 (13:17 -0800)]
Merge commit '
bc39746e' into manualmerge
David Christie [Fri, 10 Jan 2014 21:14:04 +0000 (13:14 -0800)]
am
ea47cb67: (-s ours) am
bf6cecc2: am
5716e4bf: am
776b3956: am
7f4d8293: am
6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
* commit '
ea47cb6763d36fcc916c63dd764b48b4b6f1ff01':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Fri, 10 Jan 2014 21:10:12 +0000 (13:10 -0800)]
am
bf6cecc2: am
5716e4bf: am
776b3956: am
7f4d8293: am
6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
* commit '
bf6cecc21f50d1bc98e0d2dec41bef3ce259a23f':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Fri, 10 Jan 2014 21:05:35 +0000 (13:05 -0800)]
am
5716e4bf: am
776b3956: am
7f4d8293: am
6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
* commit '
5716e4bfb980c8bab01b51944c1e715d76d59b1d':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Fri, 10 Jan 2014 21:02:48 +0000 (13:02 -0800)]
am
776b3956: am
7f4d8293: am
6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
* commit '
776b3956a9742b868b037dffd2b24c17b2dfa0e6':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Fri, 10 Jan 2014 21:00:09 +0000 (13:00 -0800)]
am
7f4d8293: am
6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
* commit '
7f4d82932c812fbac1d99ceaf9462b7a763f5231':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Fri, 10 Jan 2014 20:55:24 +0000 (12:55 -0800)]
am
6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
* commit '
6826387e50f9f272d53ca1f725f573bbddcdf5c1':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Fri, 10 Jan 2014 20:53:41 +0000 (12:53 -0800)]
am
8e0c7768: DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
* commit '
8e0c7768c87014fef277df84c737dd6c37fb8866':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
Christopher Tate [Thu, 9 Jan 2014 20:47:50 +0000 (12:47 -0800)]
am
5fbcb134: am
35b7de4c: Merge "Cursor leakage due to cancellation signal"
* commit '
5fbcb1347494e17dc9e9cd66d8e47a3972a8b90d':
Cursor leakage due to cancellation signal
Christopher Tate [Thu, 9 Jan 2014 20:43:39 +0000 (12:43 -0800)]
am
35b7de4c: Merge "Cursor leakage due to cancellation signal"
* commit '
35b7de4c4562db8af697ad3384c09d2258d183ba':
Cursor leakage due to cancellation signal
Christopher Tate [Thu, 9 Jan 2014 20:41:26 +0000 (20:41 +0000)]
Merge "Cursor leakage due to cancellation signal"
riddle_hsu [Thu, 9 Jan 2014 12:24:34 +0000 (20:24 +0800)]
Fix visibility of multiple non-fullscreen activities.
Issue detail:
Assume X, Y are non-fullscreen activities.
a.Home starts an activity X in task A in application stack.
b.X starts an activity Y in <task A> or <new task B>
c.Activity X will be invisible.
How to fix:
Because the function "isActivityOverHome" means an activity is able to see home.
But there may have many non-fullscreen activities between the top non-fullscreen activity and home.
If flag "behindFullscreen" is set, those middle activities will be invisible.
So it should only take care from who is adjacent to home.
Then check two flags frontOfTask(task root) and mOnTopOfHome for constraining the condition.
Change-Id: I60bcea304976414e44835a0a38675aae365e9e19
Wink Saville [Wed, 8 Jan 2014 19:31:02 +0000 (11:31 -0800)]
am
ad068837: am
76d5cdd8: Merge "telephony: Add same named operator configuration for some operators"
* commit '
ad06883730b4cd4af98c0c3ec69a7e851f9cace9':
telephony: Add same named operator configuration for some operators
Wink Saville [Wed, 8 Jan 2014 19:28:58 +0000 (11:28 -0800)]
am
76d5cdd8: Merge "telephony: Add same named operator configuration for some operators"
* commit '
76d5cdd820b5d81af8de73180c272d7f8a01caae':
telephony: Add same named operator configuration for some operators
Wink Saville [Wed, 8 Jan 2014 19:25:11 +0000 (19:25 +0000)]
Merge "telephony: Add same named operator configuration for some operators"
Mike Lockwood [Wed, 8 Jan 2014 16:01:42 +0000 (08:01 -0800)]
am
99206593: am
9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"
* commit '
992065938a95e5273b22dea009b8581bcc693e61':
Added missing USB device descriptor fields needed for intent filters
Mike Lockwood [Wed, 8 Jan 2014 15:59:06 +0000 (07:59 -0800)]
am
9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"
* commit '
9607d78f5144792993bd254a4b5983b2a9d5bf83':
Added missing USB device descriptor fields needed for intent filters
Mike Lockwood [Wed, 8 Jan 2014 15:56:13 +0000 (15:56 +0000)]
Merge "Added missing USB device descriptor fields needed for intent filters"
Narayan Kamath [Wed, 8 Jan 2014 13:00:33 +0000 (05:00 -0800)]
am
c156021d: am
8a927cfa: Merge "Fix a bug introduced in change 73712"
* commit '
c156021debb8e13324e451cb288da7edd7e112ca':
Fix a bug introduced in change 73712
Narayan Kamath [Wed, 8 Jan 2014 12:49:24 +0000 (04:49 -0800)]
am
8a927cfa: Merge "Fix a bug introduced in change 73712"
* commit '
8a927cfa4ea8e4a78f6a9fa1e2b1da9187a3d1e8':
Fix a bug introduced in change 73712
Narayan Kamath [Wed, 8 Jan 2014 12:47:31 +0000 (12:47 +0000)]
Merge "Fix a bug introduced in change 73712"
Narayan Kamath [Wed, 8 Jan 2014 12:26:28 +0000 (12:26 +0000)]
Fix a bug introduced in change 73712
"return (bool) true" was incorrectly changed to
"return (jboolean) JNI_FALSE"
Change-Id: I45f62f60c5affbae7970bb8889c55981e26d01ba
Narayan Kamath [Wed, 8 Jan 2014 11:58:32 +0000 (11:58 +0000)]
Fix preference puts with "null" values.
Null values were being written out as <null /> elements in the
XML prefs file (as expected). This allowed the getFoo() functions
to work correctly because they treated null values as missing mappings
but containsKey would fail.
bug: https://code.google.com/p/android/issues/detail?id=64563
Change-Id: I1f466d01db96bf26e208d4fed3a6f257228bea5d
Narayan Kamath [Wed, 8 Jan 2014 12:02:05 +0000 (04:02 -0800)]
am
2842bd02: am
de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup"
* commit '
2842bd021c11274720d6a10219538b536b7d2050':
AArch64: Use long for pointers in App/Backup
Narayan Kamath [Wed, 8 Jan 2014 11:59:46 +0000 (03:59 -0800)]
am
de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup"
* commit '
de8c3cf13b0fc0655cf49934658e652b441ee019':
AArch64: Use long for pointers in App/Backup
Narayan Kamath [Wed, 8 Jan 2014 11:58:22 +0000 (03:58 -0800)]
am
b5558817: am
002ae75b: Merge "AArch64: Use long for pointers"
* commit '
b5558817c78e3140fa3f9cbbe167cacf6481f47f':
AArch64: Use long for pointers
Narayan Kamath [Wed, 8 Jan 2014 11:58:17 +0000 (03:58 -0800)]
am
53acc7ae: am
f5598210: Merge "AArch64: Use long for pointers in hardware classes"
* commit '
53acc7ae00ba921e8c7afb9415dbf473785a3be6':
AArch64: Use long for pointers in hardware classes
Narayan Kamath [Wed, 8 Jan 2014 11:58:13 +0000 (03:58 -0800)]
am
ab169215: am
f210044f: Merge "AArch64: Use long for pointers in services"
* commit '
ab169215fb135f590f0960ab89f5199dd7303a33':
AArch64: Use long for pointers in services
Narayan Kamath [Wed, 8 Jan 2014 11:56:00 +0000 (03:56 -0800)]
am
002ae75b: Merge "AArch64: Use long for pointers"
* commit '
002ae75b829730047240ab20a044a00570eb71d2':
AArch64: Use long for pointers
Narayan Kamath [Wed, 8 Jan 2014 11:55:56 +0000 (03:55 -0800)]
am
f5598210: Merge "AArch64: Use long for pointers in hardware classes"
* commit '
f5598210f067acf340487ba2fe55b00e43be1d9d':
AArch64: Use long for pointers in hardware classes
Narayan Kamath [Wed, 8 Jan 2014 11:55:52 +0000 (03:55 -0800)]
am
f210044f: Merge "AArch64: Use long for pointers in services"
* commit '
f210044fb8e2f6c056e5314702353d7b97d64978':
AArch64: Use long for pointers in services
Narayan Kamath [Wed, 8 Jan 2014 11:54:29 +0000 (11:54 +0000)]
Merge "AArch64: Use long for pointers in App/Backup"
Ashok Bhat [Thu, 2 Jan 2014 16:52:41 +0000 (16:52 +0000)]
AArch64: Use long for pointers in App/Backup
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: I7aee49dc26cf6c86af8f1d882e9cd1cc145a1977
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>
Narayan Kamath [Wed, 8 Jan 2014 11:53:50 +0000 (11:53 +0000)]
Merge "AArch64: Use long for pointers"
Ashok Bhat [Thu, 2 Jan 2014 13:42:56 +0000 (13:42 +0000)]
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>
Narayan Kamath [Wed, 8 Jan 2014 11:53:11 +0000 (11:53 +0000)]
Merge "AArch64: Use long for pointers in hardware classes"
Narayan Kamath [Wed, 8 Jan 2014 11:53:00 +0000 (11:53 +0000)]
Merge "AArch64: Use long for pointers in services"
Ashok Bhat [Fri, 3 Jan 2014 14:37:19 +0000 (14:37 +0000)]
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>
Ashok Bhat [Thu, 2 Jan 2014 19:43:30 +0000 (19:43 +0000)]
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>
Robert Greenwalt [Wed, 8 Jan 2014 00:44:30 +0000 (16:44 -0800)]
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"
Robert Greenwalt [Wed, 8 Jan 2014 00:41:16 +0000 (16:41 -0800)]
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"
Robert Greenwalt [Wed, 8 Jan 2014 00:38:29 +0000 (00:38 +0000)]
Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network""
Ian Rogers [Tue, 7 Jan 2014 21:38:44 +0000 (13:38 -0800)]
am
c2b50c10: am
f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime"
* commit '
c2b50c10f0bf636562deba1d92ec7b54b13909de':
Add a call to registerAppInfo for the VMRuntime
Ian Rogers [Tue, 7 Jan 2014 21:36:29 +0000 (13:36 -0800)]
am
f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime"
* commit '
f11dee797177760f089e757d91ed6bce32043750':
Add a call to registerAppInfo for the VMRuntime
Ian Rogers [Tue, 7 Jan 2014 21:31:17 +0000 (21:31 +0000)]
Merge "Add a call to registerAppInfo for the VMRuntime"
Dave Platt [Tue, 7 Jan 2014 19:53:12 +0000 (11:53 -0800)]
am
62bac75d: am
76e5ca81: Fix descriptor leak after accepting connections
* commit '
62bac75d677de5398b48487e758dcbdf7bc9d834':
Fix descriptor leak after accepting connections
Dave Platt [Tue, 7 Jan 2014 19:53:07 +0000 (11:53 -0800)]
am
e966e577: am
02f042dd: Fix socket descriptor leak from Zygote to child app
* commit '
e966e5774ad8d478bc89b541bcac3740fe267d18':
Fix socket descriptor leak from Zygote to child app
Dave Platt [Tue, 7 Jan 2014 19:49:54 +0000 (11:49 -0800)]
am
76e5ca81: Fix descriptor leak after accepting connections
* commit '
76e5ca81b3ba5a4f52126f2ec8907679b4356292':
Fix descriptor leak after accepting connections
Dave Platt [Tue, 7 Jan 2014 19:49:49 +0000 (11:49 -0800)]
am
02f042dd: Fix socket descriptor leak from Zygote to child app
* commit '
02f042ddd9ddf47ef88c4f174eb19a9bee296a45':
Fix socket descriptor leak from Zygote to child app
Narayan Kamath [Tue, 7 Jan 2014 13:01:13 +0000 (05:01 -0800)]
am
79ceb53a: am
c58abeea: Merge "AArch64: Use long for pointers in MTP classes"
* commit '
79ceb53ae5b867a954476e3f6499f89664fbc669':
AArch64: Use long for pointers in MTP classes
Narayan Kamath [Tue, 7 Jan 2014 13:01:08 +0000 (05:01 -0800)]
am
08467c57: am
9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes"
* commit '
08467c5727c04c1fef40ff1e361628944275ef28':
AArch64: Use long for pointers in VideoEditor classes
Narayan Kamath [Tue, 7 Jan 2014 13:01:03 +0000 (05:01 -0800)]
am
02baba25: am
67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
* commit '
02baba25545b232436502a73e2928a1d72fa240e':
AArch64: Use long for pointers in DisplayEventReceiver
Narayan Kamath [Tue, 7 Jan 2014 13:00:58 +0000 (05:00 -0800)]
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
Narayan Kamath [Tue, 7 Jan 2014 13:00:53 +0000 (05:00 -0800)]
am
80cff944: am
74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"
* commit '
80cff94478a39914012df816179ea57c53040903':
AArch64: Use long for pointers in AmrInputStream
Narayan Kamath [Tue, 7 Jan 2014 12:58:23 +0000 (04:58 -0800)]
am
c58abeea: Merge "AArch64: Use long for pointers in MTP classes"
* commit '
c58abeeae34c77559c00c7d967c77443469abeef':
AArch64: Use long for pointers in MTP classes
Narayan Kamath [Tue, 7 Jan 2014 12:54:46 +0000 (04:54 -0800)]
am
9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes"
* commit '
9bc6acf27ac446b7e18a51a926caafd99cf34713':
AArch64: Use long for pointers in VideoEditor classes
Narayan Kamath [Tue, 7 Jan 2014 12:54:42 +0000 (04:54 -0800)]
am
67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
* commit '
670327544184dbd6274de9127ceaf20dfd5801b4':
AArch64: Use long for pointers in DisplayEventReceiver
OSDN Git Service
