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

106356 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
90e42717e5 Merge changes I5d2be3c5,I9017256b 
* changes:
  Add argument to binder call to check key types
  Use hostname verifier directly instead of instance
 2013-09-10 18:50:02 +00: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
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
6110d16b8d Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." 2013-08-30 22:17:12 +00: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
39e885dc82 Merge "Make MeasuredText.sCached field final" 2013-08-30 05:01:55 +00:00
Kenny Root
85b666c3b6 Merge "Use core-tests-support instead of core-tests" 2013-08-29 21:49:32 +00: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
6b34ab3f1a Merge "Merge MPSE and SPSE Chunk handlers for ddms." 2013-08-28 01:14:26 +00:00
Jeff Hao
366291e283 Merge "Add frameworks support for sample profiling from traceview gui." 2013-08-28 01:14:20 +00: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
Chris Craik
3c0624aa1a Merge "Forward compatibility fix" 2013-08-27 18:07:49 +00:00
Chris Craik
28fe1ee579 Forward compatibility fix 
Change-Id: Ib031372d43881a9bb7af1e51fb2c7cf55e03a326
 2013-08-27 10:55:44 -07:00
Victoria Lease
1b8c33c614 Merge "Forward compatibility fixes" 2013-08-27 16:52:33 +00:00
John Reck
e982b7231f Forward compatibility fixes 
Change-Id: Iaf387a10c387e5e157bb16d120a1e033b3d1a6e8
 2013-08-26 16:53:40 -07:00
Elliott Hughes
f39abeb4c4 Merge "The VM handles blocking SIGPIPE." 2013-08-21 22:35:28 +00:00
Elliott Hughes
437e76208d The VM handles blocking SIGPIPE. 
We don't need this any more.

Bug: 10211309
Change-Id: I8be0071d50296974e3861f8af9d2bae4f5678d5a
 2013-08-21 13:56:15 -07:00
Elliott Hughes
ecdf20d4fe Merge "Fix NPE in DateFormat.is24HourFormat." 2013-08-16 21:14:19 +00: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
82461951c3 Merge "DateUtils should use the user's 12/24-hour preference, not the locale's." 2013-08-14 22:26:13 +00: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
Elliott Hughes
a0b320a66f Merge "Remove possible leak when exception occurred." 2013-08-09 21:58:37 +00:00
Marco Nelissen
e8acd367ac Merge "When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together." 2013-08-07 15:39:39 +00: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
523db46f69 Merge "Set subscription_mode in the database to a default value" 2013-08-06 00:10:03 +00:00
Elliott Hughes
8a736129fa Merge "If graphics wants ASCII lowercasing, it needs to ask for it." 2013-08-05 18:01:33 +00:00
Jean-Baptiste Queru
17548b3c70 Revert "be more robust with handling unknown sensors" 
This reverts commit 80ba0a6baec17d5ac5a1e6f9e4b84f7d013d07e6.
 2013-08-02 17:31:54 -07:00
Jean-Baptiste Queru
83485dc920 Merge "be more robust with handling unknown sensors" 2013-08-03 00:13:24 +00:00
Elliott Hughes
60ae2617b4 Merge "If frameworks wants ASCII casing, it should explicity ask for it." 2013-08-02 22:13:07 +00:00
Elliott Hughes
cb64d43062 If frameworks wants ASCII casing, it should explicity ask for it. 
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Iaab02e718a7be7bda22e626dca05d79bfd2a8fc4
 2013-08-02 15:12:32 -07:00
Mathias Agopian
80ba0a6bae be more robust with handling unknown sensors 
- add support for new sensors (post 4.3)
- don't crash when encountering an unknown sensor type
- clean-up

Bug: 9683153
Change-Id: Iecd883e8a7d0297be1bd2bd4f00c5cc3ffcbccfe
 2013-08-02 13:49:41 -07:00
Elliott Hughes
32c308a5f2 Merge "If media wants ASCII lowercasing, it needs to ask for it." 2013-08-02 17:24:41 +00:00
Elliott Hughes
dcb1a58cf9 If media wants ASCII lowercasing, it needs to ask for it. 
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Use toLowerCase(Locale.ROOT) if you want ASCII for machine consumption,
and use toLowerCase(Locale.getDefault()) if you want the user's locale's
casing rules for human consumption.

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Id9005a17e34217a81bef3b40031b9e2e6272f45d
 2013-08-02 10:03:53 -07:00
Elliott Hughes
20c911ba07 Merge "When wifi wants ASCII lowercasing, it needs to ask for it." 2013-08-02 16:39:59 +00:00
Elliott Hughes
aeb60fb86f If graphics wants ASCII lowercasing, it needs to ask for it. 
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: I13c106985302335dbb15bb9176d35ec6b4546d4e
 2013-08-02 09:31:11 -07:00
Elliott Hughes
ee00b353a4 When wifi wants ASCII lowercasing, it needs to ask for it. 
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Ibf25d0bbc76015cf8353ec01ab2b743cbc2bde67
 2013-08-02 09:07:54 -07:00
Naveen Kalla
b4d485c184 Set subscription_mode in the database to a default value 
If ro.telephony.default_cdma_sub is set, use that to set the
default CDMA subscription source in the database. If that is not set
use the default preferred value defined in the source code.

Change-Id: I11fff596a5fe721c64f192c889672326517dc43d
 2013-08-01 18:03:42 -07:00
Elliott Hughes
c67b2ed502 Merge changes I80eaecff,Ia2b4f79b 
* changes:
  Switch Process.myTid over to the libcore JNI too.
  Replace native Process getpid/getuid with calls to libcore equivalents.
 2013-08-01 00:49:09 +00:00
Elliott Hughes
6d4b1e24ae Switch Process.myTid over to the libcore JNI too. 
Change-Id: I80eaecff014fabf809f4be3c9ee8b26aa64bf0cf
 2013-07-31 17:38:11 -07:00
Jeff Hao
406ec15647 Replace native Process getpid/getuid with calls to libcore equivalents. 
The Process natives were getting called were getting called while
handling a jdwp packet before the vm had a chance to register them.

(cherry-pick of 5bce6a308fc8a3c1e449cf905b8b6e8ace4ef3e2.)

Change-Id: Ia2b4f79b11e427283a712b2d0c52948f394640bf
 2013-07-31 17:19:23 -07:00
jangwon.lee
3ed02535fd When deleting a db file, 
Context.deleteDatabase() has to be called instead of File.delete()
to guarantee all db related files
like journal, wal, shm, etc are deleted together.

Signed-off-by: jangwon.lee<jangwon.lee@lge.com>

Change-Id: I3c3d7dfa13ffbe709ab7d8a5c7cfe6cfa2864fea
 2013-07-31 07:18:25 +00:00
Jean-Baptiste Queru
f2d643cfc7 Merge "Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter." 2013-07-30 22:24:15 +00:00
Elliott Hughes
bfe1b80183 Merge "Update preloaded-classes" 2013-07-30 21:04:56 +00:00