159263 Commits

Author SHA1 Message Date
Paul Lawrence
53d1022e83 am a15d6402: Merge "Fix crash caused by toHex returning exception"
* commit 'a15d6402cf4f99e448c7aaa69553483cdb18e0d4':
  Fix crash caused by toHex returning exception
2015-01-06 23:39:44 +00:00
Paul Lawrence
a15d6402cf Merge "Fix crash caused by toHex returning exception" 2015-01-06 23:34:07 +00:00
Paul Lawrence
24063b5ebd Fix crash caused by toHex returning exception
toHex was changed to throw an exception in
I4986a8e806d9066129f696ab9f2e80655424e723, but its caller was not adjusted
accordingly, causing a crash whenever an unencrypted device was booted.

Bug: 18886749
Change-Id: If0505f617001cf5e0d99cf14c8b09e6a6a377167
2015-01-06 15:09:49 -08:00
Olawale Ogunwale
d8aa4660b0 am da90a9c2: Merge "Do not allow the navigation bar to move if width == height"
* commit 'da90a9c2355841bb98c2a669446b93ffe487a829':
  Do not allow the navigation bar to move if width == height
2015-01-06 16:50:56 +00:00
Olawale Ogunwale
da90a9c235 Merge "Do not allow the navigation bar to move if width == height" 2015-01-06 16:43:56 +00:00
Narayan Kamath
3787decd8d am 5137415e: Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod."
* commit '5137415e391d8491d92535b17445ab646a3fcb5d':
  Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
2015-01-06 10:10:09 +00:00
Narayan Kamath
f60b2d40b0 am 024191b5: Merge "Fix comment. It should be \'or\' not \'of\'."
* commit '024191b57f2165e4d0c2c579f95046d491feacb5':
  Fix comment.  It should be 'or' not 'of'.
2015-01-06 10:09:59 +00:00
Narayan Kamath
5137415e39 Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod." 2015-01-06 10:06:06 +00:00
Haitao Feng
8bd6a203ca Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
CallStaticVoidMethod is varargs function, and calling it with
a literal 0 like CallStaticVoidMethod(..., 0) will treat the
argument as a 4 byte int in both 32 and 64 bit processes.

This is incorrect for pointer arguments where NULL should be
used instead.

Reviewed-by: Liao, Bruce <bruce.liao@intel.com>
Signed-off-by: Yong Yao <yong.yao@intel.com>

Change-Id: I9d700d3790a80dbee6826f64baf9ef5d81ca390f
2015-01-06 09:57:13 +00:00
Narayan Kamath
024191b57f Merge "Fix comment. It should be 'or' not 'of'." 2015-01-06 09:46:17 +00:00
Robert Greenwalt
d38218d880 am b385e0b4: Merge "Telephony: Initialize GsmCellLocation class members properly"
* commit 'b385e0b4923e9bd4663e6b3c976fbff105b343c3':
  Telephony: Initialize GsmCellLocation class members properly
2015-01-05 23:33:37 +00:00
Robert Greenwalt
b385e0b492 Merge "Telephony: Initialize GsmCellLocation class members properly" 2015-01-05 23:28:23 +00:00
Narayan Kamath
dd65a4f735 am ea4cdd44: Merge "Race-condition in SoundPool during release"
* commit 'ea4cdd44541d76adea9b0b185740796d6cf6ac64':
  Race-condition in SoundPool during release
2015-01-05 18:02:32 +00:00
Narayan Kamath
ea4cdd4454 Merge "Race-condition in SoundPool during release" 2015-01-05 17:57:27 +00:00
Devin Kim
d7b12b44db Do not allow the navigation bar to move if width == height
If width == height and mNavigationBarCanMove is true, the navigation bar
doesn't shows properly. Because wm doesn't know if the device is in landscape
mode or portrait mode.

Change-Id: I2077eacae50e6e498767f5c93b697e0459ad07fe
Signed-off-by: Devin Kim <dojip.kim@lge.com>
2015-01-03 14:09:19 -08:00
Narayan Kamath
3d6cfe0eb1 am 873b291b: Merge "fix issuse 65774"
* commit '873b291b15c35ae1ec7ea29de4c012275e13e761':
  fix issuse 65774
2015-01-02 10:28:22 +00:00
Narayan Kamath
873b291b15 Merge "fix issuse 65774" 2015-01-02 10:22:21 +00:00
Paul Quei
65e37ee936 fix issuse 65774
"Some vendors have there own well defined specifications ...". Should be "Some vendors have their own well defined specifications ..."

Change-Id: I0d770ac0591812c1c61389eb0078493098784323
Signed-off-by: Paul Quei <paulquei@gmail.com>
2015-01-02 10:21:55 +00:00
Narayan Kamath
d3d95172c3 am 38c2dae5: Merge "Remove hardcoded include paths."
* commit '38c2dae5f12003ff39a5b1a5e46f079174fcedca':
  Remove hardcoded include paths.
2014-12-31 10:13:23 +00:00
Narayan Kamath
38c2dae5f1 Merge "Remove hardcoded include paths." 2014-12-31 10:08:49 +00:00
Narayan Kamath
bc2cc2f350 Remove hardcoded include paths.
ICU, zlib & openssl export them using LOCAL_EXPORT_C_INCLUDE_DIRS.
The dependency on libc/dns/include was bogus and can be removed
trivially.

bug: 18581021
Change-Id: I4b8047ff0df1050ab48b61c0c886888b3f2f0c18
2014-12-31 10:06:51 +00:00
Narayan Kamath
a4c40c3734 am 72d33849: Merge "Missing break in switch statement"
* commit '72d33849fea5de45087bfa79e645fa282ce8fcef':
  Missing break in switch statement
2014-12-30 12:20:56 +00:00
Narayan Kamath
72d33849fe Merge "Missing break in switch statement" 2014-12-30 09:43:03 +00:00
Narayan Kamath
c97d1fbbe0 am 5106dd44: Merge "Throw IllegalArgumentException on invalid hex-strings."
* commit '5106dd44f9e5877aee8e70711c026e9e23783d4c':
  Throw IllegalArgumentException on invalid hex-strings.
2014-12-29 16:15:04 +00:00
Narayan Kamath
5106dd44f9 Merge "Throw IllegalArgumentException on invalid hex-strings." 2014-12-29 16:08:34 +00:00
Narayan Kamath
be8053a23c am 5ae63a25: Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class."
* commit '5ae63a258b78c4982a6c4ae984b86bb7b2db1dd4':
  Fixed grammar in the comment that introduces the Debug.MemoryInfo class.
2014-12-29 12:14:41 +00:00
Narayan Kamath
5ae63a258b Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class." 2014-12-29 12:08:58 +00:00
Narayan Kamath
1bafd01a3f am 44a5a30a: Merge "Fix "pm list permissions" crash if resource string missing"
* commit '44a5a30a61e69b60f2f2b4b8884d28a0ec855f3a':
  Fix "pm list permissions" crash if resource string missing
2014-12-29 11:06:53 +00:00
Srikanth Chintala
e4ec09da0b Telephony: Initialize GsmCellLocation class members properly
Default values for class members mLac, mCid, mPsc would be 0.
Initialize these variables with -1 as 0 is considered as valid value.

CRs-Fixed: 406479
Change-Id: Idb3d1737c7101b97a90eab3dc7436ee1806d0bc4
2014-12-29 11:05:22 +00:00
Narayan Kamath
44a5a30a61 Merge "Fix "pm list permissions" crash if resource string missing" 2014-12-29 11:01:28 +00:00
Narayan Kamath
7d019394f7 am 712a0205: Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT""
* commit '712a02050e7be4479f12a81aeb23d7217b8d7a8d':
  Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"
2014-12-29 10:07:13 +00:00
Narayan Kamath
712a02050e Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"" 2014-12-29 10:02:28 +00:00
Craig Mautner
443d1a6ae3 am cfa31a60: Merge "[ActivityManager] Reset ActivityRecord\'s waitingVisible"
* commit 'cfa31a605cda26a556009ddd4eae83085e74339b':
  [ActivityManager] Reset ActivityRecord's waitingVisible
2014-12-29 01:44:25 +00:00
Craig Mautner
cfa31a605c Merge "[ActivityManager] Reset ActivityRecord's waitingVisible" 2014-12-29 01:30:50 +00:00
Elliott Hughes
f9f4195170 am ee435b16: Merge "telephony: Update comments for preferred network mode"
* commit 'ee435b16d89ee9cb65eead9ac7507693342c15b3':
  telephony: Update comments for preferred network mode
2014-12-26 18:53:55 +00:00
Elliott Hughes
ee435b16d8 Merge "telephony: Update comments for preferred network mode" 2014-12-26 18:48:57 +00:00
Sungmin Choi
e099ab18e6 telephony: Update comments for preferred network mode
Change-Id: I4718674ff73116cc6bbec4540c3450ed14663c0d
2014-12-25 07:39:37 +00:00
Nick Kralevich
8454f2d485 am 5e1e38cc: Merge "Mods to the SELinuxMMAC engine code."
* commit '5e1e38ccdd3da34f65a642dc25b5b2b5cf2b6059':
  Mods to the SELinuxMMAC engine code.
2014-12-23 19:46:44 +00:00
Nick Kralevich
5e1e38ccdd Merge "Mods to the SELinuxMMAC engine code." 2014-12-23 19:42:06 +00:00
Robert Craig
2e1f052f45 Mods to the SELinuxMMAC engine code.
* We now require that all certs used to sign the apk and all
  certs stored with policy be tested for set equality. Prior
  efforts required that the cert included with policy only
  needed to match one of the certs included with an apk.

* Allowed a new tag to be included with policy describing the
  signatures. <cert signature=""/> is now allowed as a child
  element of the <signer> tag describing multiple certs. The
  old way of describing signatures attached as attributes to
  the root signer tag is still supported. The engine now treats
  it the same as if they used the new layout with the outer
  signature as the first signature value.

* Moved the class which holds all policy from an inner static
  to a builder pattern governed by the Policy.PolicyBuilder
  class. This will help provide more clarity and allow for
  easier enforcement of certain invariants as the policy
  representation is being built.

* Loads of new comments.

Change-Id: I38eb00ed8962fdef71bc9f2e7370cb910cadeff4
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-12-23 18:30:31 +00:00
Narayan Kamath
4dcc8d28d7 am d7771768: Merge "Build against libphonenumber-platform."
* commit 'd777176872792ed2a17f46acbd2f8ebc64ac1995':
  Build against libphonenumber-platform.
2014-12-23 13:41:17 +00:00
Narayan Kamath
d777176872 Merge "Build against libphonenumber-platform." 2014-12-23 13:33:45 +00:00
Andreas Gampe
5470c16991 am 2b20efa7: Merge "Core/jni: Remove Dalvik options from AndroidRuntime"
* commit '2b20efa728f79ef9322930aefbbf0483a578ee74':
  Core/jni: Remove Dalvik options from AndroidRuntime
2014-12-23 03:37:07 +00:00
Andreas Gampe
2b20efa728 Merge "Core/jni: Remove Dalvik options from AndroidRuntime" 2014-12-23 03:29:46 +00:00
Andreas Gampe
08b2d585b1 Core/jni: Remove Dalvik options from AndroidRuntime
Dalvik is dead. Remove old command-line options from AndroidRuntime.

Bug: 18833580
Bug: 18834205
Change-Id: If9a6f78cc0d74fc7a596b08065059b388a8d4b2f
2014-12-22 14:57:18 -08:00
Olawale Ogunwale
796a177307 am 4fa039df: Merge "Layout the config-changed window if it has surface"
* commit '4fa039dfb1a5a23dad493f3c8c2c7529ecc1e96d':
  Layout the config-changed window if it has surface
2014-12-19 15:37:11 +00:00
Olawale Ogunwale
4fa039dfb1 Merge "Layout the config-changed window if it has surface" 2014-12-19 15:30:39 +00:00
louis_chang
1110f55470 [ActivityManager] Reset ActivityRecord's waitingVisible
Symptom:
The ActivityRecord's waitingVisible is not set to false for
all cases when the ActivityRecord is removed from
mStackSupervisor.mWaitingVisibleActivities.

Solution:
Set the waitingVisible to false when it is removed from
mStackSupervisor.mWaitingVisibleActivities

Change-Id: If0f0683971d70a6866b0167e91dd95feebaac178
2014-12-19 17:30:45 +08:00
Craig Mautner
c14a4b10ca Merge "Fix racing condition of mTouchExcludeRegion"
automerge: 6007d9a

* commit '6007d9aa5f53685bba47ee63d6b4702b9f802744':
  Fix racing condition of mTouchExcludeRegion
2014-12-19 06:44:30 +00:00
Craig Mautner
6007d9aa5f Merge "Fix racing condition of mTouchExcludeRegion" 2014-12-19 06:41:27 +00:00