Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63,756 Commits 3 Branches 0 Tags
830228ef8d0f474c2dbbe6ebae2a5d3fd9ecdb55
Commit Graph

63756 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Colonna
830228ef8d am 09a56563: am 04217efb: Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0 
* commit '09a56563cea260f12b5606837f5b01420b920170':
  Fix 5514230: preventing null window token from occurring
 2011-11-09 18:59:50 +00:00
Gilles Debunne
4eddb9356a am 76bb11ca: Merge "Bug 5575396: close spell session on language change" into ics-mr1 
* commit '76bb11ca642556673249a6ef8b84ab2813deaa87':
  Bug 5575396: close spell session on language change
 2011-11-09 18:59:45 +00:00
Jeff Sharkey
ba83524338 am 630a13bd: Merge "Bootstrap stats before registering listeners." into ics-mr1 
* commit '630a13bdd88723599a7617ca4df20ab923e7ffbb':
  Bootstrap stats before registering listeners.
 2011-11-09 18:59:40 +00:00
Jeff Sharkey
3c865c0a51 am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1 
* commit '4c48d2ff6937e1e3a2fb93cc4cc29324b20542a5':
  Make operation counts monotonically increase.
 2011-11-09 18:59:38 +00:00
Jeff Sharkey
5d528576ef am 2048789c: Merge "Dispatch alerts through background thread." into ics-mr1 
* commit '2048789c64d30b0d3c42c4df7e705f14b7295e10':
  Dispatch alerts through background thread.
 2011-11-09 18:59:37 +00:00
Jeff Sharkey
dcb3b6ad57 am f3882914: Merge "Make policy data enabled flag static." into ics-mr1 
* commit 'f3882914e668501ee1dabd42207ed18348050c14':
  Make policy data enabled flag static.
 2011-11-09 18:59:35 +00:00
Daniel Sandler
cc106d9d87 am da738d63: Merge "Add day of week." into ics-mr1 
* commit 'da738d638cc2fee29d5936f21c6eadbcf173a718':
  Add day of week.
 2011-11-09 18:59:34 +00:00
Mathias Agopian
21e3a16e34 am e4a1bafb: Merge "decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes." into ics-mr1 
* commit 'e4a1bafba351a1b4cea18af3442412de03dd4d89':
  decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes.
 2011-11-09 18:59:27 +00:00
Dianne Hackborn
0126a4a7f2 am cd489c4c: Merge "Don\'t crash if there is no connectivity service." into ics-mr1 
* commit 'cd489c4ce59c134c384238cbb613ede34f28189c':
  Don't crash if there is no connectivity service.
 2011-11-09 18:59:19 +00:00
Svetoslav Ganov
f32985381c am 1bef480b: Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1 
* commit '1bef480b223f03d0fc866f08ca101a07ead89bc2':
  NumberPicker incorectly enforcing minimal width and height.
 2011-11-09 18:59:14 +00:00
Jeff Sharkey
ebf32009ce am ccdeb428: Merge "Avoid inconsistent state when remove fails." into ics-mr1 
* commit 'ccdeb428ef541bab1bbc6ee3e33c4fb6ccbec42a':
  Avoid inconsistent state when remove fails.
 2011-11-09 18:59:11 +00:00
Jeff Brown
6f551dd14a am bc0b010e: Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1 
* commit 'bc0b010ecc7254b0e2c7a0268e5242557579b471':
  Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662
 2011-11-09 18:59:01 +00:00
Mathias Agopian
bd35fc2590 am 393e2c1f: Merge "SensorService now always clamps the requested rate" into ics-mr1 
* commit '393e2c1f7aad37e7851643df22e4810996c26d1f':
  SensorService now always clamps the requested rate
 2011-11-09 18:58:58 +00:00
Jason Simmons
efae3d24bd Merge "resolved conflicts for merge of 3af8b88d to ics-aah" into ics-aah 2011-11-09 10:57:19 -08:00
Mike Lockwood
43adbae803 Merge "NetworkTimeUpdateService: Schedule NTP on ethernet connect as well as wifi" into ics-aah 2011-11-09 10:55:26 -08:00
Mike Lockwood
0342a420a4 NetworkTimeUpdateService: Schedule NTP on ethernet connect as well as wifi 
Change-Id: I936fd9a8119ee361ec0afde60f7931c58ffdd524
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-11-09 10:49:29 -08:00
Jason Simmons
f981686779 resolved conflicts for merge of 3af8b88d to ics-aah 
Change-Id: I2b68cd7c904e68a16565b7274560e7105c643c87
 2011-11-09 10:08:21 -08:00
Brian Colonna
09a56563ce am 04217efb: Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0 
* commit '04217efb8eaebdbd846671a2f743fa3e960b5dde':
  Fix 5514230: preventing null window token from occurring
 2011-11-09 15:35:12 +00:00
Michael Kolb
d8883f5129 am a4293ba1: Merge "Remove flicker from WebTextView" into ics-mr1 
* commit 'a4293ba1a0f1129d5879ae9eda45292ff357e20c':
  Remove flicker from WebTextView
 2011-11-09 14:37:36 +00:00
Jamie Gennis
13aeb48dcf am d211b488: Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1 
* commit 'd211b4882a662409b85a1f90c71e28faa9c54464':
  SurfaceTexture: unhide setDefaultBufferSize
 2011-11-09 14:37:29 +00:00
Jamie Gennis
08aa0b5742 am 911263dc: Merge changes I18e5e789,I5cbaae2d into ics-mr1 
* commit '911263dc5df48b89e8f9010fb74dfe2649bdc442':
  EGL: implement loading and saving the cache
  EGL: use an in-memory the blob cache
 2011-11-09 14:37:27 +00:00
Mathias Agopian
3c8f426802 am 95482b61: Merge "Fix an issue where we could wait for a non-existing transaction" into ics-mr1 
* commit '95482b61c348fc54bf44a96a8b73011c90b40520':
  Fix an issue where we could wait for a non-existing transaction
 2011-11-09 14:37:24 +00:00
Irfan Sheriff
70b1999ad5 am 59c73b92: Merge "Convert soft ap config store to state machine" into ics-mr1 
* commit '59c73b92a9ef8df5d4873bc36f05b776c3a476bc':
  Convert soft ap config store to state machine
 2011-11-09 14:37:22 +00:00
Dave Santoro
b7a262cdc1 am b78ae752: Merge "Unhide social stream APIs for Contacts." into ics-mr1 
* commit 'b78ae7524eecbca01a53994d6872202633c8341b':
  Unhide social stream APIs for Contacts.
 2011-11-09 14:37:19 +00:00
Adam Powell
2690e48d1f am 650a3e88: Merge "Fix the action bar menu layout to use the correct divider drawable." into ics-mr1 
* commit '650a3e8894c6d26b258d26bdec856fde7aba43d6':
  Fix the action bar menu layout to use the correct divider drawable.
 2011-11-09 14:37:17 +00:00
Wei Huang
bb28878666 am ea50748b: Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1 
* commit 'ea50748b546e7dc21dc06195af5f0a8f2b812417':
  Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA.
 2011-11-09 14:37:14 +00:00
Matthew Xie
afb3fa6c96 am 48542eb3: Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 
* commit '48542eb39e55f2d0e2a79d43e696ffb2acb67b5c':
  Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp
 2011-11-09 14:37:11 +00:00
Dianne Hackborn
ad34155e35 am 665e105f: Merge "Cleanup remote execution of perf tests." into ics-mr1 
* commit '665e105f145fcb27a54d53c6c9382bebf50a56d7':
  Cleanup remote execution of perf tests.
 2011-11-09 14:37:10 +00:00
The Android Open Source Project
9594b4a558 am 6dee1a9d: Reconcile with ics-mr0-release 
* commit '6dee1a9d046458134fb019669b5ffe7911dcdb29':
 2011-11-09 14:37:00 +00:00
Adam Cohen
87ce25a772 am 75b20380: Merge "Making default widget padding public API" into ics-mr1 
* commit '75b2038004f3338c68c9a0e89b29a31e10b237da':
  Making default widget padding public API
 2011-11-09 14:36:57 +00:00
Gilles Debunne
76bb11ca64 Merge "Bug 5575396: close spell session on language change" into ics-mr1 2011-11-09 00:26:46 -08:00
Jeff Sharkey
630a13bdd8 Merge "Bootstrap stats before registering listeners." into ics-mr1 2011-11-08 23:43:58 -08:00
Jeff Sharkey
4c48d2ff69 Merge "Make operation counts monotonically increase." into ics-mr1 2011-11-08 23:43:38 -08:00
Jeff Sharkey
2048789c64 Merge "Dispatch alerts through background thread." into ics-mr1 2011-11-08 23:43:23 -08:00
Jeff Sharkey
f3882914e6 Merge "Make policy data enabled flag static." into ics-mr1 2011-11-08 23:43:12 -08:00
Daniel Sandler
da738d638c Merge "Add day of week." into ics-mr1 2011-11-08 20:35:45 -08:00
Jeff Sharkey
3359aca765 Bootstrap stats before registering listeners. 
Also move ISE to handled NonMonotonicException.

Bug: 5570872
Change-Id: I793f349287ef5589185f117dfbec6f1fad73a661
 2011-11-08 18:24:12 -08:00
Mathias Agopian
e4a1bafba3 Merge "decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes." into ics-mr1 2011-11-08 18:01:21 -08:00
Dianne Hackborn
cd489c4ce5 Merge "Don't crash if there is no connectivity service." into ics-mr1 2011-11-08 17:58:26 -08:00
Jeff Sharkey
7e25b0ea88 Dispatch alerts through background thread. 
Bug: 5557659
Change-Id: Icc3ad476a98ec3430b33f915723ffcc36ccbfae7
 2011-11-08 17:41:26 -08:00
Joe Onorato
1e2c0d231e Merge "For events, require that the parameters be marked in." into ics-aah 2011-11-08 17:36:35 -08:00
Jeff Sharkey
4abb1b8ef6 Make operation counts monotonically increase. 
Bug: 5585704
Change-Id: I5247a68acdb209a4ef0f5aac18944595c295e6ca
 2011-11-08 17:35:28 -08:00
Joe Onorato
2037c2585c For events, require that the parameters be marked in. 
(because they won't work otherwise)

Change-Id: I77f370ca1bc381ea07fc2854d2a90d8138ca1796
 2011-11-08 17:35:09 -08:00
Dianne Hackborn
d4d32c594f Don't crash if there is no connectivity service. 
Change-Id: I5f991896125fda22ff99b98a6aca244adbb17449
 2011-11-08 17:33:59 -08:00
Svetoslav Ganov
1bef480b22 Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1 2011-11-08 17:33:49 -08:00
Jeff Sharkey
ccdeb428ef Merge "Avoid inconsistent state when remove fails." into ics-mr1 2011-11-08 17:27:03 -08:00
Jeff Brown
bc0b010ecc Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1 2011-11-08 17:22:06 -08:00
Mathias Agopian
393e2c1f7a Merge "SensorService now always clamps the requested rate" into ics-mr1 2011-11-08 17:20:59 -08:00
Mathias Agopian
47f1fe5285 decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes. 
the intent here is to save power.

Change-Id: I6cc1cae865cc46551afcfcec9ca03faaa5b6936f
 2011-11-08 17:19:55 -08:00
Jeff Sharkey
3f3115b277 Make policy data enabled flag static. 
For devices with both CDMA and GSM stack, ConnectivityService only
connects with the GSM variant.  Making this flag static communicates
the policy state between all DCT.

Bug: 5586935
Change-Id: Iff0384027303470dd382d5173558d2d091ce4bf6
 2011-11-08 17:15:46 -08:00