drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,756 Commits 1 Branch 0 Tags
Commit Graph

29649 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
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
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
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
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
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
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 b91773bce1126d28a93f73fbef18f3a79245f24e)

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 928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)

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
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
Jeff Hao
6c7bac69f5 Merge MPSE and SPSE Chunk handlers for ddms. 
(cherry picked from commit fd224b97797dfb7e3ee1e2f56c3109d1594cf040)

Change-Id: I1dab7801d47f092259916c4aea19b20d17951c2f
 2013-08-27 17:59:32 -07:00
Jeff Hao
ffee626c3a Add frameworks support for sample profiling from traceview gui. 
(cherry picked from commit ca307d3138ff1e5d0bcf190eb24f3b8dbcabfaa9)

Change-Id: Ic193ddadf01c42905fc7c35a1a8bf89fba4556e9
 2013-08-27 17:46:18 -07:00
Elliott Hughes
2a8be3cf5e am ecdf20d4: Merge "Fix NPE in DateFormat.is24HourFormat." 
* commit 'ecdf20d4fec6107ee49e315cff3dc73f65569843':
  Fix NPE in DateFormat.is24HourFormat.
 2013-08-16 14:17:10 -07:00
Elliott Hughes
8d8ef00c82 Fix NPE in DateFormat.is24HourFormat. 
In some cases, we end up being called by code that doesn't have a valid
Context. It got away with this historically because it wasn't formatting
times (just dates), so it never went down a path that tried to query the
user's 12/24-hour preference. This patch just ensures that we don't try
to get the preference unless we actually need it.

Bug: 10339015
Change-Id: I2df466d85cdeba14dbf882498808cbad9bbb57f4
 2013-08-16 11:56:35 -07:00
Elliott Hughes
8a19606599 am 82461951: Merge "DateUtils should use the user\'s 12/24-hour preference, not the locale\'s." 
* commit '82461951c3bddd5e6873dbb66703b838cbb66b2c':
  DateUtils should use the user's 12/24-hour preference, not the locale's.
 2013-08-14 15:30:02 -07:00
Elliott Hughes
f0b79aeed3 DateUtils should use the user's 12/24-hour preference, not the locale's. 
Bug: 10312832
Change-Id: If23c124cf8442988de5feccb6f2c40b808a2eb89
 2013-08-14 15:12:43 -07:00
Henrik Baard
857cdff078 Memory leak in IInputMethodSessionWrapper executeMessage 
In some cases the executeMessage is called with
mInputMethodSession == null. For the messages

DO_UPDATE_SELECTION, DO_APP_PRIVATE_COMMAND

memory is leaked. This commit recycles the args freeing
the allocated memory.
 2013-08-11 10:23:59 +02:00
Marco Nelissen
7ffbcb2892 am ca5d99ac: Merge "Guarantee that all db related files are deleted together." 
* commit 'ca5d99ac41f00c282b9101d9b84da0338f15798e':
  Guarantee that all db related files are deleted together.
 2013-08-07 08:34:17 -07:00
Marco Nelissen
ca5d99ac41 Merge "Guarantee that all db related files are deleted together." 2013-08-07 15:30:51 +00:00
jangwon.lee
740c1dd97e Guarantee that all db related files are deleted together. 
When deleting a db file, all db related files has to be deleted together
like journal, wal, shm etc.

Change-Id: I49d4581673d03fe669e9e0eaa2b50f7b9d3c34a4
Signed-off-by: jangwon.lee <jangwon.lee@lge.com>
 2013-08-07 09:50:43 +09:00
Wink Saville
9fe49fc56e am 523db46f: Merge "Set subscription_mode in the database to a default value" 
* commit '523db46f6981a40e12007dbbe629bbdc47f861ba':
  Set subscription_mode in the database to a default value
 2013-08-05 17:20:13 -07:00
Wink Saville
523db46f69 Merge "Set subscription_mode in the database to a default value" 2013-08-06 00:10:03 +00:00
Dianne Hackborn
c8911ddd48 am 373a2f15: am 607b414d: Add new app ops method to reset all op modes. 
* commit '373a2f15667956ff8a00ba59b42972b9c930af92':
  Add new app ops method to reset all op modes.
 2013-08-02 19:32:13 -07:00
Dianne Hackborn
607b414d04 Add new app ops method to reset all op modes. 
Change-Id: I5ee6764de8dc31d812e5a788914ab0099bbef4c0
 2013-08-02 19:06:25 -07:00
Jean-Baptiste Queru
ae311f4c5f am 17548b3c: Revert "be more robust with handling unknown sensors" 
* commit '17548b3c70fe4f29d33367a61300f5323f5efe99':
  Revert "be more robust with handling unknown sensors"
 2013-08-02 17:42:02 -07:00