Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,732 Commits 3 Branches 0 Tags
94de60cccc2ac971aa5a63edd1783e99956473c4
Commit Graph

41146 Commits

Author SHA1 Message Date
Jeff Brown
145cac85f8 am 4bf6eb17: Merge "Memory leak in IInputMethodSessionWrapper executeMessage" 
* commit '4bf6eb1775649a803efcc6da8f06e5083ed24f34':
  Memory leak in IInputMethodSessionWrapper executeMessage
 2013-10-29 14:06:07 -07:00
Jeff Brown
5214dae44c am 6dbbba4e: Merge "handle negative temperature" 
* commit '6dbbba4e9adc3f1c2481698e42f4ffc0c68937f1':
  handle negative temperature
 2013-10-29 14:02:34 -07:00
Jeff Brown
4bf6eb1775 Merge "Memory leak in IInputMethodSessionWrapper executeMessage" 2013-10-29 21:01:13 +00:00
Jeff Brown
6dbbba4e9a Merge "handle negative temperature" 2013-10-29 20:59:38 +00:00
Elliott Hughes
8f592378a1 am 69920427: Merge "Fix a variety of small publicly-reported bugs." 
* commit '69920427ea01421d34f3a7576bdd135527b20859':
  Fix a variety of small publicly-reported bugs.
 2013-10-29 13:32:33 -07:00
Elliott Hughes
c367d48c55 Fix a variety of small publicly-reported bugs. 
Possible NULL dereference in cmds/bootanimation/BootAnimation.cpp.
https://code.google.com/p/android/issues/detail?id=61556

Missing fclose in core/jni/android_os_Debug.cpp.
https://code.google.com/p/android/issues/detail?id=61546

Bad loop guards in core/jni/android_util_Process.cpp.
https://code.google.com/p/android/issues/detail?id=61557

Assignment to wrong variable in libs/androidfw/AssetManager.cpp.
https://code.google.com/p/android/issues/detail?id=61560

Missing delete[]s in libs/androidfw/ObbFile.cpp.
https://code.google.com/p/android/issues/detail?id=61549

Leaks on error in tools/aapt/Images.cpp.
https://code.google.com/p/android/issues/detail?id=61552

Two missing fclose calls in tools/aapt/Resource.cpp.
https://code.google.com/p/android/issues/detail?id=61553

Missing fclose in tools/aidl/aidl.cpp.
https://code.google.com/p/android/issues/detail?id=61554

Change-Id: I5820f3824e72d07a9acb776cf0af3e7443f5694a
 2013-10-29 13:12:55 -07:00
Alex Klyubin
5692203998 am b4cae4a9: Merge "Fix SSLCertificateSocketFactory.getDefaultCipherSuites." 
* commit 'b4cae4a955ebd91cf35aaeb00ab12ce6f1d5fc48':
  Fix SSLCertificateSocketFactory.getDefaultCipherSuites.
 2013-10-29 08:50:28 -07:00
Alex Klyubin
019118af67 Fix SSLCertificateSocketFactory.getDefaultCipherSuites. 
The method was returning all supported cipher suites instead of the
default ones only. The default list of cipher suites actually used by
sockets created by this factory is not affected by this issue.

Change-Id: I2e4d7c6547fcb29ff7a0943bc8791706cc8d22bc
 2013-10-28 16:24:33 -07:00
Elliott Hughes
2ec939bac6 am cf4c7bdd: Merge "Fix whitespace issues after casts." 
* commit 'cf4c7bdd1c108345596ebf77ab9c853da9235de5':
  Fix whitespace issues after casts.
 2013-10-18 12:07:52 -07:00
Elliott Hughes
4a5b3f0ad0 am ac6e036a: Merge "Remove dependency on jniGetNonMovableArrayElements." 
* commit 'ac6e036a787de7582ec1556038f7170b3a020fcb':
  Remove dependency on jniGetNonMovableArrayElements.
 2013-10-18 12:07:43 -07:00
Mathieu Chartier
6ecb7a9a27 Fix whitespace issues after casts. 
Change-Id: Ief3e50fbedd193e22509aac783f16ba1288908de
 2013-10-18 11:04:31 -07:00
Mathieu Chartier
7384b428c4 Remove dependency on jniGetNonMovableArrayElements. 
jniGetNonMovableArrayElements is not safe and is going to be deleted.

Change-Id: I6daae1e4ac9e01ca593cda522fdbeb774eef1eff
(cherry picked from commit 75a5038849)
 2013-10-18 10:58:25 -07:00
Kenny Root
69779458ae am 7878883e: Merge "Remove direct reference to X509CertImpl" 
* commit '7878883ed922f17c930c0d40588f62acf73f9a9c':
  Remove direct reference to X509CertImpl
 2013-10-14 14:02:52 -07:00
Kenny Root
7878883ed9 Merge "Remove direct reference to X509CertImpl" 2013-10-14 20:59:48 +00:00
Kenny Root
27e549428e Remove direct reference to X509CertImpl 
This should use the system default X.509 certificate provider.

Change-Id: Ibdfd800a9d10f9dc566a360401efe7c3dc6cef5d
 2013-10-14 13:39:43 -07:00
Nick Kralevich
f730b7599d am d6c2ccb2: Merge "core: fix arithmetic on a pointer to void" 
* commit 'd6c2ccb25f08447b0358173ff64725d28f207d7b':
  core: fix arithmetic on a pointer to void
 2013-10-14 13:14:37 -07:00
synergydev
01994c79f4 core: fix arithmetic on a pointer to void 
Use char* instead of void* for this
pointer arithmetic. Fixes the following:

error: arithmetic on a pointer to void
buf = buf + offset;
      ~~~ ^

Change-Id: I6cfc92c9240fda66a52e780cda7820fdba76914a
 2013-10-14 12:27:22 -07:00
Nick Kralevich
0b8fd029c0 am a299862d: Merge "Fix App Ops permission mapping structure." 
* commit 'a299862dd2d46fda54678df07db66bef1a63bb9b':
  Fix App Ops permission mapping structure.
 2013-10-08 14:30:11 -07:00
Robert Craig
f97616c7ba Fix App Ops permission mapping structure. 
The entry to map the post notification op
to a permission is at the wrong offset
within the sOpPerms array. This patch
fixes the issue.

Change-Id: Ia241d274e484b6a24edbfb17b87bb887b61f1ee1
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2013-10-07 12:43:06 -04:00
Romain Guy
d6c1870d43 am 5fceada3: Merge "Fragement, or Fragment: that is the question" 
* commit '5fceada31f0dc8f8e003e9c1d0a0ed0363711343':
  Fragement, or Fragment: that is the question
 2013-09-30 16:19:22 -07:00
Cyril Mottier
2de5082f43 Fragement, or Fragment: that is the question 
Change-Id: Iac3a14b9d2d7b4bd1e452db987b3c5c95dbefd3b
 2013-09-30 22:43:59 +02:00
Elliott Hughes
82e5d8758a am ebd397ad: Merge "Regenerate all the OpenGL stubs." 
* commit 'ebd397ad9182c37487ba95aaa71ae6dcf0c9d762':
  Regenerate all the OpenGL stubs.
 2013-09-27 15:37:56 -07:00
Elliott Hughes
ebd397ad91 Merge "Regenerate all the OpenGL stubs." 2013-09-27 22:33:25 +00:00
Nick Kralevich
19f9f445bf am 7a56d949: Merge "Fix SELinux.java doc errors" 
* commit '7a56d949ef524d00e4091827104ac2450e4ec9db':
  Fix SELinux.java doc errors
 2013-09-27 09:35:01 -07:00
Nick Kralevich
7a56d949ef Merge "Fix SELinux.java doc errors" 2013-09-27 16:32:57 +00:00
Dianne Hackborn
4213e68f67 am 3a7d5f71: Merge "Replace SEAndroid with SELinux." 
* commit '3a7d5f71456b57f712b0f878beb5317f0ce6d564':
  Replace SEAndroid with SELinux.
 2013-09-25 11:42:07 -07:00
Dianne Hackborn
3a7d5f7145 Merge "Replace SEAndroid with SELinux." 2013-09-25 18:39:58 +00:00
Elliott Hughes
d82b1c3bf2 am 9d8721f8: Merge "Remove dead code." 
* commit '9d8721f8abb018429e3dba2296bce789b776aa0c':
  Remove dead code.
 2013-09-24 17:51:58 -07:00
Elliott Hughes
4b395a3625 Remove dead code. 
This hasn't been used since at least 2011, and we're no longer
shipping the data supporting it either.

Change-Id: Ibe42057650b49794c65d6f0d54ed7a492f3b594b
 2013-09-24 17:22:11 -07:00
Elliott Hughes
428d3fcbe3 Regenerate all the OpenGL stubs. 
Bug: https://code.google.com/p/android/issues/detail?id=60390
Change-Id: I2e6f210178f656a5f08a1fcd4239581d680329a6
 2013-09-24 17:15:41 -07:00
Kenny Root
753c1a3342 am 457f0f5e: Merge "Move helper function to webkit" 
* commit '457f0f5e486c158bbe9816df39d2cbc52cec3b51':
  Move helper function to webkit
 2013-09-12 23:35:13 -07:00
Kenny Root
cb4317a5a7 Move helper function to webkit 
This particular helper function is being removed from NativeCrypto, so
move it here as it's the last user of it.

Change-Id: Iea13ba499487d838068d6156d4d1e6861d05eb36
 2013-09-12 23:00:54 -07:00
Elliott Hughes
442a8753a0 am c3415a91: Merge "Remove ArpPeer; dead code from Google TV." 
* commit 'c3415a918df78715db756f02d8c55a1e7ab94244':
  Remove ArpPeer; dead code from Google TV.
 2013-09-11 16:52:01 -07:00
Elliott Hughes
c3415a918d Merge "Remove ArpPeer; dead code from Google TV." 2013-09-11 23:48:34 +00:00
Elliott Hughes
62d7bf2ab3 Remove ArpPeer; dead code from Google TV. 
Change-Id: I595a6b6f52ab513a008e0fd861e98bc4488a1999
 2013-09-11 16:21:16 -07:00
Kenny Root
0611f47721 am 90e42717: Merge changes I5d2be3c5,I9017256b 
* commit '90e42717e590e2f7d2fb7270daae589a97271c63':
  Add argument to binder call to check key types
  Use hostname verifier directly instead of instance
 2013-09-10 11:52:16 -07:00
Kenny Root
0b83f9c805 Add argument to binder call to check key types 
Before there was only one key type supported, so we didn't need to query
a key type. Now there is DSA, EC, and RSA, so there needs to be another
argument.

(cherry picked from commit b91773bce1)

Bug: 10600582
Change-Id: I5d2be3c514ff7404a90df76dc263484c5f226e6f
 2013-09-10 18:49:40 +00:00
Kenny Root
4a406787c7 Use hostname verifier directly instead of instance 
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.

(cherry picked from commit 928ee1e48f)

Bug: 9984058
Change-Id: I9017256b3b5d137aeb5a6f455868af7bdfec7885
 2013-09-10 11:05:23 -07:00
Kenny Root
333bd17eec am 7adc233c: Merge "Add support for DSA and ECDSA key types" 
* commit '7adc233cf8f6f9e2a83a4549a9295d1a3933beab':
  Add support for DSA and ECDSA key types
 2013-09-03 00:15:43 -07:00
Kenny Root
7adc233cf8 Merge "Add support for DSA and ECDSA key types" 2013-09-03 07:11:36 +00:00
Kenny Root
f64386fc26 Add support for DSA and ECDSA key types 
Change-Id: Ic6f029d66210052ce2f75d46102a100ac7db2b49
 2013-08-30 17:54:13 -07:00
Jeff Hao
482dfd5548 am 6110d16b: Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." 
* commit '6110d16b8dd08d276902d2c6d8e90562a3d3694d':
  Change IsMethodTracingActive to GetMethodTracingMode for frameworks.
 2013-08-30 15:19:01 -07:00
Jeff Hao
6f0a04f5d2 Change IsMethodTracingActive to GetMethodTracingMode for frameworks. 
(cherry picked from commit ffbe799f3824f4be705ca726988355d3943a9004)

Change-Id: Ic87a254171fca7dfdf02c8643cd367055c8889cd
 2013-08-30 14:40:26 -07:00
Brian Carlstrom
98c9491f4d am 39e885dc: Merge "Make MeasuredText.sCached field final" 
* commit '39e885dc821fbfade43423fae712f82b1df08467':
  Make MeasuredText.sCached field final
 2013-08-29 22:04:18 -07:00
Brian Carlstrom
39e885dc82 Merge "Make MeasuredText.sCached field final" 2013-08-30 05:01:55 +00:00
Kenny Root
9c83b96859 am 85b666c3: Merge "Use core-tests-support instead of core-tests" 
* commit '85b666c3b61fd9a64731b144f00abe91e19cfe54':
  Use core-tests-support instead of core-tests
 2013-08-29 14:52:34 -07:00
Kenny Root
c2d6728350 Use core-tests-support instead of core-tests 
The core-tests-support library is newly created. It doesn't have any
tests itself but some support for tests that need to use mocked classes
for testing. In this case, some tests are using TestKeyStore for SSL
testing in frameworks tests.

Change-Id: I70dc31c9fcddf256b515e2c16f581648bc8cf880
 2013-08-29 14:28:41 -07:00
Brian Carlstrom
d4f4526cb4 Make MeasuredText.sCached field final 
Change-Id: Id3be64c48be1bcf55ac1a4b00b76a40861bf2f61
 2013-08-29 01:32:13 -07:00
Jeff Hao
09944b04fa am 6b34ab3f: Merge "Merge MPSE and SPSE Chunk handlers for ddms." 
* commit '6b34ab3f1aafc3143c71e342b7a9f5a6ddfeabb4':
  Merge MPSE and SPSE Chunk handlers for ddms.
 2013-08-27 18:18:47 -07:00
Jeff Hao
5d21168bb4 am 366291e2: Merge "Add frameworks support for sample profiling from traceview gui." 
* commit '366291e2830b96268458dd6c5b15412e46d93145':
  Add frameworks support for sample profiling from traceview gui.
 2013-08-27 18:18:43 -07:00