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

52038 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Komalo
1b52806e21 Makes SSLCertificateSocketFactory more flexible 
Specifically, this adds support for specifying custom
{Trust,Key}Managers in the socket factory.

Change-Id: I1fdf6587064c71ae0520f73821923dcad8d140ad
 2011-06-06 15:10:33 -07:00
John Reck
f7445916c5 Merge "Delay set picture if necessary" 2011-06-06 09:25:44 -07:00
Glenn Kasten
a093ca9c73 Merge "Remove dead code related to gettid" 2011-06-06 09:12:05 -07:00
Marco Nelissen
5ca271efe9 Merge "Add WebP Mime-Type support in Android Media File" 2011-06-06 08:21:07 -07:00
Shih-wei Liao
40f4efe712 Merge "Fix the false-alarm bug when we skip to the end, which should be OK." 2011-06-05 00:58:40 -07:00
Shih-wei Liao
6e66725e1c Fix the false-alarm bug when we skip to the end, which should be OK. 
Fix the bug b/4540617.

Change-Id: I64a77b8c5d89bcd35f81d196928a671c954e9a28
 2011-06-05 00:56:22 -07:00
John Reck
83e5929d4c Delay set picture if necessary 
Normally this wouldn't happen as a new picture should come after
 webcore has initialized. However, now that a view state can be loaded,
 setting a new picture needs to be delayed until after everything has
 initialized.

Change-Id: I823bc17eb939eab0436d7a398ebcbe849c0fb945
 2011-06-04 19:50:29 -07:00
Wink Saville
f9f805c367 Merge "resolved conflict for merge of fc51aaec to master" 2011-06-04 08:19:00 -07:00
Daniel Sandler
f81c70944a Merge "Fix the status bar test app." 2011-06-04 07:38:08 -07:00
Wink Saville
1b9a6a6e58 resolved conflict for merge of fc51aaec to master 
Change-Id: Iee4d9ecc946dd1bbf114a70ad32db0fe47a027df
 2011-06-04 07:31:35 -07:00
Wink Saville
fc51aaec82 am 6ff5ba00: Merge "Add FileUtils.checksumCrc32" into honeycomb-LTE 
* commit '6ff5ba00b07b32f3c82bce2c412e5e8f30c202bc':
  Add FileUtils.checksumCrc32
 2011-06-04 06:24:40 -07:00
Wink Saville
6ff5ba00b0 Merge "Add FileUtils.checksumCrc32" into honeycomb-LTE 2011-06-04 06:15:21 -07:00
Svetoslav Ganov
c321c19fc9 Fixing a bug I introduced during my last merge. 
Change-Id: I6474ca94a6ef9bd17a5670a4baa51673f3c2f5d0
 2011-06-03 19:49:00 -07:00
Romain Guy
8cdda44235 Merge "Measure text with the appropriate text encoding. Bug #4546327" 2011-06-03 18:52:41 -07:00
Romain Guy
67ffc36a79 Measure text with the appropriate text encoding. 
Bug #4546327

Change-Id: I8eb593b03a81145e08be92579706ddd775feb0a2
 2011-06-03 18:51:11 -07:00
Dianne Hackborn
3267d356d1 am 7e5ca578: am b4815f47: am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2 
* commit '7e5ca5781b406d4f862254dad1758b91ce89f896':
  Fix to not lose state when saving a deactivated fragment.
 2011-06-03 18:02:10 -07:00
Roman Nurik
1d3a5c1133 am 16475a3a: am 07613835: am e7d60078: Add old blog posts as articles, batch 1 
* commit '16475a3a40beac982886ce6bc300f4ffe29f581d':
  Add old blog posts as articles, batch 1
 2011-06-03 18:02:01 -07:00
Dianne Hackborn
29bf330727 am e826feb6: am dddd6b15: am 185e3e24: Fix when managed cursors are required. 
* commit 'e826feb66c2a3690716136c24926606eafe827dc':
  Fix when managed cursors are required.
 2011-06-03 18:01:57 -07:00
Robert Greenwalt
1e36ddabed am 89c1eb8e: am 80a19e67: Merge "Promote Telephony\'s isDataPossible." into honeycomb-LTE 
* commit '89c1eb8edcf2920b4f72e2ca63817a901e2340d7':
  Promote Telephony's isDataPossible.
 2011-06-03 18:01:46 -07:00
Dianne Hackborn
7e5ca5781b am b4815f47: am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2 
* commit 'b4815f47e6d612da6e2d0650a2d8f103626e3ec7':
  Fix to not lose state when saving a deactivated fragment.
 2011-06-03 17:57:33 -07:00
Dianne Hackborn
b4815f47e6 am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2 
* commit 'bd754205d0b59315582855329649dad925a04b82':
  Fix to not lose state when saving a deactivated fragment.
 2011-06-03 17:54:28 -07:00
Dianne Hackborn
bd754205d0 Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2 2011-06-03 17:52:23 -07:00
James Dong
d4c6a5be80 Merge "Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.h" 2011-06-03 17:43:20 -07:00
James Dong
b571a7a053 Merge "Initial-checkin for ON2 Software AVC/H264 decoder" 2011-06-03 17:42:31 -07:00
Roman Nurik
16475a3a40 am 07613835: am e7d60078: Add old blog posts as articles, batch 1 
* commit '076138357027189f1bb90caf8c2e1a09497d78ac':
  Add old blog posts as articles, batch 1
 2011-06-03 17:40:11 -07:00
Christopher Tate
d00ea44b31 Merge "Respect android:allowBackup="false" during full backup & restore" 2011-06-03 17:39:27 -07:00
John Wang
03133d50a3 am 0b1923ce: am 3b71239a: Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE 
* commit '0b1923ce512d278336aab0c780d439b655e29b1c':
  Add supplyPuk to do SIM puk unlock.
 2011-06-03 17:35:46 -07:00
Dianne Hackborn
1333276c7a Fix to not lose state when saving a deactivated fragment. 
Also deactivating a fragment shouldn't put it in the exiting state.

Change-Id: I514f3589ee7bbbee131cd7b4a48803e99b212bd0
 2011-06-03 17:34:45 -07:00
Kazuhiro Ondo
cd11cc711a am 76273dd1: am 77c94113: Data recovery failure due to apn/dc state stuck in "disconnecting" 
* commit '76273dd16d856f98de3f063a6c04caad2d374728':
  Data recovery failure due to apn/dc state stuck in "disconnecting"
 2011-06-03 17:34:08 -07:00
Daniel Sandler
2b73a0f6c1 am 58f48edd: (-s ours) am f5699b82: am b4b44bd3: DO NOT MERGE. Restore status bar on phones. 
* commit '58f48edd21aa6f50886e68ef23d801027e96ec01':
  DO NOT MERGE. Restore status bar on phones.
 2011-06-03 17:33:45 -07:00
Roman Nurik
0761383570 am e7d60078: Add old blog posts as articles, batch 1 
* commit 'e7d6007872af7f27b62bfb46aadf2b7a07c0eac0':
  Add old blog posts as articles, batch 1
 2011-06-03 17:27:03 -07:00
Jeff Brown
371790b774 resolved conflicts for merge of 955e8d79 to master 
Change-Id: I90b0d523053d173b7df60ebc975de65ab387ff18
 2011-06-03 17:24:05 -07:00
Jeff Brown
475a052341 Merge "Use pointer mode instead of spots for SEMI_MT touch pads." 2011-06-03 17:12:07 -07:00
Jeff Brown
b12682270a Use pointer mode instead of spots for SEMI_MT touch pads. 
The spot-based presentation relies on being able to accurately
locate and distinguish two or more fingers on the touch pad.
We can still do gesture recognition without distinct multitouch
but it doesn't make sense to show spots because we can't be sure
that the spots will appear in the right places.

Change-Id: Ia282d77000bf3b50d395273a1f0ac0bbe55b3c6f
 2011-06-03 17:08:09 -07:00
Wink Saville
6d25a990af Add FileUtils.checksumCrc32 
Change-Id: Ic6bffcb66554d7af38cea68648d9431fda8ef10d
 2011-06-03 17:03:51 -07:00
Roman Nurik
e7d6007872 Add old blog posts as articles, batch 1 
Change-Id: Ibe1bcf1ceef2eb1a1b4bc0c1b2451ed69838ee3a
 2011-06-03 16:45:00 -07:00
Andy Stadler
ed6d773ad2 am daac9dd9: (-s ours) am c22d145a: am 3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2 
* commit 'daac9dd9742c3a1eaeee339c4d21e6f2dc758923':
  DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()
 2011-06-03 16:35:21 -07:00
Wink Saville
da3505993c am 3699c3d7: am 5b4e2440: Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE 
* commit '3699c3d7c8a450cc39fd1c3db23b64208bd43353':
  Refactor ServiceStateTracker handling of radio technology.
 2011-06-03 16:35:08 -07:00
Dianne Hackborn
e826feb66c am dddd6b15: am 185e3e24: Fix when managed cursors are required. 
* commit 'dddd6b15d5274a6138facec9f553336fac5f6de6':
  Fix when managed cursors are required.
 2011-06-03 16:27:36 -07:00
Dianne Hackborn
dddd6b15d5 am 185e3e24: Fix when managed cursors are required. 
* commit '185e3e243ee1da136bcace854026b8abaf0c4c86':
  Fix when managed cursors are required.
 2011-06-03 16:23:15 -07:00
satok
04a5a95450 am 75273707: (-s ours) am e10de072: am be96408b: (Do not merge) Backport a fix for InputMethodManager.java 
* commit '752737076dd0424998b8399e82af00bf745ba22f':
  (Do not merge) Backport a fix for InputMethodManager.java
 2011-06-03 16:22:04 -07:00
Dianne Hackborn
3c43ced841 resolved conflicts for merge of d247ee41 to master 
Change-Id: I49bd932f5019ce0608e2661d5cb7f24b6122dcba
 2011-06-03 16:16:55 -07:00
Glenn Kasten
6af763bec7 Remove dead code related to gettid 
The gettid system call is always available now.

Change-Id: Ib78b41781eda182dc8605daf456bbea7ff7c2dc0
 2011-06-03 16:12:37 -07:00
Wink Saville
ed1a9022a1 am 14751014: am 2e543dc1: Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE 
* commit '147510145f7b619f86a71065f2d62f444aee7f3d':
  CdmaLte: Use SPN from SIM card if SIM card is presend
 2011-06-03 15:55:25 -07:00
Wink Saville
3144ca294b am ade2a546: am 1076f5ff: Merge "Read CSIM records in LTE on CDMA mode" into honeycomb-LTE 
* commit 'ade2a5467c8f6fbb115df6a1e5730758db4e620c':
  Read CSIM records in LTE on CDMA mode
 2011-06-03 15:55:20 -07:00
Jeff Brown
ccfcf3ba6c Merge "resolved conflicts for merge of ca2b552d to master" 2011-06-03 15:51:56 -07:00
Jeff Brown
7218d830e2 resolved conflicts for merge of ca2b552d to master 
Change-Id: I2f3693a59042ac5aa2d7bcdc3a504c78dc99a18b
 2011-06-03 15:50:27 -07:00
John Reck
5944b6a42b Merge "Prevent WebKit updates in loadViewState case" 2011-06-03 15:46:35 -07:00
Robert Greenwalt
89c1eb8edc am 80a19e67: Merge "Promote Telephony\'s isDataPossible." into honeycomb-LTE 
* commit '80a19e67d1cd3710dbbfa52767a994512d20f694':
  Promote Telephony's isDataPossible.
 2011-06-03 15:46:08 -07:00
Robert Greenwalt
80a19e67d1 Merge "Promote Telephony's isDataPossible." into honeycomb-LTE 2011-06-03 15:42:48 -07:00