117735 Commits

Author SHA1 Message Date
Elliott Hughes
12377887e3 am 991e9818: Merge "AArch64: Use long for pointers in speech/srec classes"
* commit '991e9818c69443fac927970c4c3521adaf687a44':
  AArch64: Use long for pointers in speech/srec classes
2014-01-16 07:31:36 -08:00
Elliott Hughes
991e9818c6 Merge "AArch64: Use long for pointers in speech/srec classes" 2014-01-16 01:38:51 +00:00
Ashok Bhat
bdebe1ad95 AArch64: Use long for pointers in speech/srec classes
For storing pointers, long is used in speech/srec classes,
as native pointers can be 64-bit.

Note corresponding JNI files are in the external/srec project
under srec_jni directory.

Change-Id: Iacd10840e81f5acc3eb202424f83b49ae4eb23ab
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-01-15 17:38:06 -08:00
Wink Saville
5775697029 am a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug 7637224"
* commit 'a6aa3199bdb676e349c28b861a04c34a4ec136e0':
  Fixed mistaken reference to "LTE". Bug 7637224
2014-01-15 15:49:14 -08:00
Wink Saville
a6aa3199bd Merge "Fixed mistaken reference to "LTE". Bug 7637224" 2014-01-15 23:44:54 +00:00
Jeff Hao
9a5005a3bf am f6730d26: Merge "Add sample profiling interface to startMethodTracing."
* commit 'f6730d26841377de0f7ee60fa78c6ef2f8be1f2e':
  Add sample profiling interface to startMethodTracing.
2014-01-15 11:38:01 -08:00
Jeff Hao
f6730d2684 Merge "Add sample profiling interface to startMethodTracing." 2014-01-15 19:34:39 +00:00
Jeff Hao
d02e60fbd4 Add sample profiling interface to startMethodTracing.
Frameworks base side of this change. Also changed art and libcore.

Change-Id: Ib5ba0445163dca714d1ae66430750346ff8811be
2014-01-15 11:27:24 -08:00
Marco Nelissen
0d4916f19f am c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit 'c3036a12467395465b86e6935af8aa500c1b128d':
  Before requerying a cursor, check if it is closed.
2014-01-15 09:19:52 -08:00
Marco Nelissen
c3036a1246 Merge "Before requerying a cursor, check if it is closed." 2014-01-15 17:17:05 +00:00
Marco Nelissen
a9045d24a7 am 337aa376: Merge "Add NULL check in updateProxyConfig"
* commit '337aa376c09bb97a48afe075b4018f030445534f':
  Add NULL check in updateProxyConfig
2014-01-14 08:11:39 -08:00
Marco Nelissen
337aa376c0 Merge "Add NULL check in updateProxyConfig" 2014-01-14 16:08:18 +00:00
Narayan Kamath
2db26788ab am e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""
* commit 'e71afc2ea72e98c4631e79cad65f678090da87d3':
  Revert "Hide AssetInputStream.getAssetInt."
2014-01-14 02:13:45 -08:00
Narayan Kamath
e71afc2ea7 Merge "Revert "Hide AssetInputStream.getAssetInt."" 2014-01-14 10:09:50 +00:00
Narayan Kamath
b1bd1fe7fd Revert "Hide AssetInputStream.getAssetInt."
This reverts commit 842d44ec1765e01f4a37af99cc1935b4d0399758.

Change-Id: I188e49d3651fd4941491c239b6a7c9f475995187
2014-01-14 10:08:45 +00:00
Narayan Kamath
8021316010 am ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt."
* commit 'ac8ccc3c181a27103955b0f7bbf3dddabb0a6305':
  Hide AssetInputStream.getAssetInt.
2014-01-14 01:48:37 -08:00
Narayan Kamath
ac8ccc3c18 Merge "Hide AssetInputStream.getAssetInt." 2014-01-14 09:45:41 +00:00
Narayan Kamath
842d44ec17 Hide AssetInputStream.getAssetInt.
It returns a pointer to a private data structure, so there's
no sensible use for it. Also, the emergence of 64 bit processors
means that the return value isn't wide enough to represent
values in the native heap.

(cherry picked from commit f8f09a15a409f373f22aa475bb0defd264088e4f)

Change-Id: I9c9b5bae6db8638e65dda60f924aa3dddd06813a
2014-01-14 09:34:00 +00:00
Jeff Sharkey
47235e8b5c am 90cadb35: Merge "MountService listeners can not be unregistered"
* commit '90cadb35156829ff1d6b7066409596da38fc70e1':
  MountService listeners can not be unregistered
2014-01-13 10:37:51 -08:00
Jeff Sharkey
90cadb3515 Merge "MountService listeners can not be unregistered" 2014-01-13 18:35:32 +00:00
Narayan Kamath
bc2a449a61 am cb4d3ec1: Merge "Fix preference puts with "null" values."
* commit 'cb4d3ec1ea446fc9ce51514cbf5b16da0ec0fa0f':
  Fix preference puts with "null" values.
2014-01-13 04:32:19 -08:00
Narayan Kamath
cb4d3ec1ea Merge "Fix preference puts with "null" values." 2014-01-13 12:29:41 +00:00
Jason Sams
739ae9b3b7 am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm"
* commit '868173a53f0d1059408b049f30af3402d5b0de64':
  Fix a JNI local reference leak in MediaDrm
2014-01-10 16:48:12 -08:00
Jason Sams
868173a53f Merge "Fix a JNI local reference leak in MediaDrm" 2014-01-11 00:42:20 +00:00
Craig Mautner
54f991375a am 3747768b: Merge "Fix visibility of multiple non-fullscreen activities."
* commit '3747768bde14ff9db96279830f07602ec50544cc':
  Fix visibility of multiple non-fullscreen activities.
2014-01-10 15:59:59 -08:00
Craig Mautner
3747768bde Merge "Fix visibility of multiple non-fullscreen activities." 2014-01-10 23:55:44 +00:00
Christopher Tate
5fbcb13474 am 35b7de4c: Merge "Cursor leakage due to cancellation signal"
* commit '35b7de4c4562db8af697ad3384c09d2258d183ba':
  Cursor leakage due to cancellation signal
2014-01-09 12:43:39 -08:00
Christopher Tate
35b7de4c45 Merge "Cursor leakage due to cancellation signal" 2014-01-09 20:41:26 +00:00
riddle_hsu
446ef1de8d 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
2014-01-09 20:24:34 +08:00
David Friedman
5ceef3288d Fixed mistaken reference to "LTE".
Bug 7637224

Change-Id: I9c78fe6edd1182f8132cc5db9ecedbb69681b473
2014-01-08 21:34:02 -08:00
Wink Saville
ad06883730 am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators"
* commit '76d5cdd820b5d81af8de73180c272d7f8a01caae':
  telephony: Add same named operator configuration for some operators
2014-01-08 11:28:58 -08:00
Wink Saville
76d5cdd820 Merge "telephony: Add same named operator configuration for some operators" 2014-01-08 19:25:11 +00:00
Mike Lockwood
992065938a 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
2014-01-08 07:59:06 -08:00
Mike Lockwood
9607d78f51 Merge "Added missing USB device descriptor fields needed for intent filters" 2014-01-08 15:56:13 +00:00
Narayan Kamath
c156021deb am 8a927cfa: Merge "Fix a bug introduced in change 73712"
* commit '8a927cfa4ea8e4a78f6a9fa1e2b1da9187a3d1e8':
  Fix a bug introduced in change 73712
2014-01-08 04:49:24 -08:00
Narayan Kamath
8a927cfa4e Merge "Fix a bug introduced in change 73712" 2014-01-08 12:47:31 +00:00
Narayan Kamath
87d6cd4537 Fix a bug introduced in change 73712
"return (bool) true" was incorrectly changed to
"return (jboolean) JNI_FALSE"

Change-Id: I45f62f60c5affbae7970bb8889c55981e26d01ba
2014-01-08 12:26:28 +00:00
Narayan Kamath
c6f429007c 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
2014-01-08 12:04:53 +00:00
Narayan Kamath
2842bd021c am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup"
* commit 'de8c3cf13b0fc0655cf49934658e652b441ee019':
  AArch64: Use long for pointers in App/Backup
2014-01-08 03:59:46 -08:00
Narayan Kamath
b5558817c7 am 002ae75b: Merge "AArch64: Use long for pointers"
* commit '002ae75b829730047240ab20a044a00570eb71d2':
  AArch64: Use long for pointers
2014-01-08 03:56:00 -08:00
Narayan Kamath
53acc7ae00 am f5598210: Merge "AArch64: Use long for pointers in hardware classes"
* commit 'f5598210f067acf340487ba2fe55b00e43be1d9d':
  AArch64: Use long for pointers in hardware classes
2014-01-08 03:55:56 -08:00
Narayan Kamath
ab169215fb am f210044f: Merge "AArch64: Use long for pointers in services"
* commit 'f210044fb8e2f6c056e5314702353d7b97d64978':
  AArch64: Use long for pointers in services
2014-01-08 03:55:52 -08:00
Narayan Kamath
de8c3cf13b Merge "AArch64: Use long for pointers in App/Backup" 2014-01-08 11:54:29 +00:00
Ashok Bhat
58b8b24256 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>
2014-01-08 11:54:01 +00:00
Narayan Kamath
002ae75b82 Merge "AArch64: Use long for pointers" 2014-01-08 11:53:51 +00:00
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