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

106732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
94de60cccc am e431b97c: Merge "Fixed Drag-and-Drop sample code" 
* commit 'e431b97c1f1692a42c9a348a5ff930f82eee2537':
  Fixed Drag-and-Drop sample code
 2013-10-29 15:05:54 -07:00
Christopher Tate
e431b97c1f Merge "Fixed Drag-and-Drop sample code" 2013-10-29 22:02:06 +00:00
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
69920427ea Merge "Fix a variety of small publicly-reported bugs." 2013-10-29 20:30:27 +00: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
b4cae4a955 Merge "Fix SSLCertificateSocketFactory.getDefaultCipherSuites." 2013-10-29 15:47:34 +00:00
Taeho Kim
130e1294e8 Fixed Drag-and-Drop sample code 
Fixed some erros in 'Responding to drag events' sample code on
http://developer.android.com/guide/topics/ui/drag-drop.html

Changed View.OnDragEventListener to View.OnDragListener,
deleted brace start('{') after DragEvent.ACTION_DRAG_ENTERED which
does not have matching ends, and removed 'break' on each case in
swich statement which causes 'Unreachable code' error.
Added return statement at the 'default' case, so that onDrag() method
can return value in all case.

Change-Id: I7d2335f5c405626e3f0cff275b52818762c84634
Signed-off-by: Taeho Kim <jyte82@gmail.com>
 2013-10-29 23:32:16 +09: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
Kenny Root
ddc9162881 am a1b4d97b: Merge "Removed duplicate items on table of contents" 
* commit 'a1b4d97b6920d3cd84fe19b07512a0de6996bb4c':
  Removed duplicate items on table of contents
 2013-10-21 10:31:23 -07:00
Kenny Root
a1b4d97b69 Merge "Removed duplicate items on table of contents" 2013-10-21 17:27:34 +00:00
Wink Saville
6614220cd4 am 3b459214: Merge "Fix typo for radio technology" 
* commit '3b459214f6e4682c75b58e101ce4679ecc1382b1':
  Fix typo for radio technology
 2013-10-21 09:01:38 -07:00
Wink Saville
3b459214f6 Merge "Fix typo for radio technology" 2013-10-21 15:58:33 +00:00
Sungmin Choi
20a03ecc10 Fix typo for radio technology 
Change-Id: I792517f4c3aa568b014d6c2bc0023ce5255f8abb
 2013-10-20 00:27:32 +00: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
Elliott Hughes
cf4c7bdd1c Merge "Fix whitespace issues after casts." 2013-10-18 18:05:27 +00:00
Mathieu Chartier
6ecb7a9a27 Fix whitespace issues after casts. 
Change-Id: Ief3e50fbedd193e22509aac783f16ba1288908de
 2013-10-18 11:04:31 -07:00
Elliott Hughes
ac6e036a78 Merge "Remove dependency on jniGetNonMovableArrayElements." 2013-10-18 18:01:12 +00: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
Taeho Kim
6ef383ad13 Removed duplicate items on table of contents 
Removed duplicate, broken item in 'in this document' on Performance Tips (http://developer.android.com/traning/articles/perf-tips.html)

Change-Id: I499d9bb314fa471e6d2c0590f59c2f71077c00b8
Signed-off-by: Taeho Kim <jyte82@gmail.com>
 2013-10-17 11:10:19 +09: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
Nick Kralevich
d6c2ccb25f Merge "core: fix arithmetic on a pointer to void" 2013-10-14 20:11:05 +00: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
Nick Kralevich
a299862dd2 Merge "Fix App Ops permission mapping structure." 2013-10-08 21:25:24 +00: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
Alex Klyubin
a9bce46876 am 84742149: Merge "Make EntropyMixer mix in output of Hardware RNG into Linux RNG." 
* commit '84742149257554e804b155d15b0af762d6f737ca':
  Make EntropyMixer mix in output of Hardware RNG into Linux RNG.
 2013-10-03 15:17:49 -07:00
Alex Klyubin
8474214925 Merge "Make EntropyMixer mix in output of Hardware RNG into Linux RNG." 2013-10-03 22:12:36 +00:00
Alex Klyubin
6ab3d20d3c Make EntropyMixer mix in output of Hardware RNG into Linux RNG. 
On devices with Hardware RNG (HW RNG), this makes EntropyMixer
periodically (every three hours) read 512 bytes from HW RNG and mix
them into the Linux RNG.

This is done without increasing Linux RNG's entropy estimates to
avoid having to trust the quality of the HW RNG. This approach cannot
reduce the quality of the Linux RNG output, but may increase it.

Change-Id: Ifde851004301ffd41b2189151a64a0c5989c630f
 2013-10-03 15:07:37 -07:00
Alex Klyubin
6a603e7be9 am 1a07229b: Merge "Reduce EntropyMixer seed size from 4096 to 512 bytes." 
* commit '1a07229bc2042676c866051938ebe35d9cded900':
  Reduce EntropyMixer seed size from 4096 to 512 bytes.
 2013-10-03 14:36:49 -07:00
Alex Klyubin
1a07229bc2 Merge "Reduce EntropyMixer seed size from 4096 to 512 bytes." 2013-10-03 21:34:23 +00:00
Alex Klyubin
3c2ae2f4ed Reduce EntropyMixer seed size from 4096 to 512 bytes. 
The suggested seed size from Linux drivers/char/random.c is 512 bytes
rather than the 4096 bytes currently used.

Change-Id: I3dd55105f0a95ce9cda34b4cf08987b8a28c4ac9
 2013-10-03 13:56:09 -07:00
Elliott Hughes
ad8ec14f85 am 7fb64c6e: Merge "more locale-appropriate screenshot share text" 
* commit '7fb64c6e6c3360a61a8c726d0edbda3a20c037ac':
  more locale-appropriate screenshot share text
 2013-10-01 14:33:30 -07:00
Elliott Hughes
7fb64c6e6c Merge "more locale-appropriate screenshot share text" 2013-10-01 21:30:25 +00:00
Victoria Lease
e733a4012d more locale-appropriate screenshot share text 
The SimpleDateFormat version of this produces very poor results in
locales other than en_US. Trusting DateFormat to do its thing
produces more consistently-pleasing results across all locales.

(cherry-pick of e45e1f2efe69ba931efa88c6e33879fbc8d8c4c1.)

Change-Id: I7f1714446bb50285d851e8e313e7f32a0a822bf2
 2013-10-01 14:25:39 -07:00
Elliott Hughes
591e8ae307 am b4d1ad29: Merge "Added missing permission declaration on <service> tag of AccessibilityService guide documentation (Building Accessibility Services)" 
* commit 'b4d1ad29c00b6d7f66192f91fcac359981102185':
  Added missing permission declaration on <service> tag of AccessibilityService guide documentation (Building Accessibility Services)
 2013-10-01 10:51:22 -07:00
Elliott Hughes
b4d1ad29c0 Merge "Added missing permission declaration on <service> tag of AccessibilityService guide documentation (Building Accessibility Services)" 2013-10-01 17:49:16 +00: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
Romain Guy
5fceada31f Merge "Fragement, or Fragment: that is the question" 2013-09-30 22:48:44 +00:00
Cyril Mottier
2de5082f43 Fragement, or Fragment: that is the question 
Change-Id: Iac3a14b9d2d7b4bd1e452db987b3c5c95dbefd3b
 2013-09-30 22:43:59 +02:00
Taeho Kim
3d02011734 Added missing permission declaration on <service> tag of AccessibilityService guide documentation (Building Accessibility Services) 
With code snippet on current docs, the accessibility service does not show up on the Settings > Accessibility > Services list, with API level 17 or higher. In order to declare service correctly, user have to declare "permission" property with value of "android.permission.BIND_ACCESSIBILITY_SERVICE".

Change-Id: I70c8f98d4ff6fd2286bf5866098b22443afb6cd9
 2013-09-30 04:11:39 +09: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