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

61634 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kristian Monsen
a3c157eef0 Removing the ability to get native instrumentation as part of nav dump 
This is to be able to remove ANDROID_INSTRUMENTATION code.

Note that it would only print useful information if webcore
was compiled with ANDROID_INSTRUMENTATION on.

There is an open bug for problems with ANDROID_INSTRUMENTATION:
http://b/issue?id=2816327

Needs Browser CL:
https://android-git.corp.google.com/g/#/c/149442

Change-Id: Ie8c3c3a08a8bb15936831e25faac3155906bae70
 2011-11-11 16:11:36 +00:00
Gilles Debunne
33c25e4933 Merge "Bug 5575396: close spell session on language change" 2011-11-10 02:10:45 -08:00
John Reck
e9a291e781 am 0e17f653: am 36a7f2a9: Merge "Fix determining find on page overlap" into ics-mr1 
* commit '0e17f65312e57c7f1489010284987c505142b778':
  Fix determining find on page overlap
 2011-11-10 05:42:49 +00:00
The Android Open Source Project
820eb97c7b am ef725e83: am eae6c997: Reconcile with ics-mr0-release 
* commit 'ef725e83acce5fc7904a5a47aac501fc0e8ea3c6':
 2011-11-10 05:42:44 +00:00
Jean-Michel Trivi
d43759f0bc am 036da419: am 20cf0916: Merge "Bug 5585323 New system permission for media decode" into ics-mr1 
* commit '036da41922c936d25b36fbc4b5927a0097ece330':
  Bug 5585323 New system permission for media decode
 2011-11-10 05:42:39 +00:00
David Brown
17fe6c8d07 am 6e82e95c: am b6b44cef: am 59882fb8: Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0 
* commit '6e82e95c08bd1e2c46837e9ddb8759e5ca977f84':
  Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()
 2011-11-10 01:11:37 +00:00
Glenn Kasten
f8a0a30375 am 874641f1: am f2c2b1c4: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0 
* commit '874641f1331f3b37e8b2d930ed942fb6ca522501':
 2011-11-10 01:11:35 +00:00
Jake Hamby
f56b5bb074 am 0fc2847b: am 9c5c97f6: am fee5f29b: Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0 
* commit '0fc2847bd5ad1997e04c73e33a258511d5388569':
 2011-11-10 01:11:34 +00:00
Eric Laurent
b755d53024 am db7d79e6: am 2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1 
* commit 'db7d79e6f1e1860a9bfe4756a03c753435fd0ddf':
  Fix regression for SoundPool playback
 2011-11-10 01:11:28 +00:00
Brian Colonna
a8a1bf7ab1 am c8c5bc44: am 09a56563: am 04217efb: Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0 
* commit 'c8c5bc443fe63e96c91fc96bf8db8ce7dd177073':
 2011-11-10 01:11:26 +00:00
Marco Nelissen
567354474f Bug 5575396: close spell session on language change 
Cherry pick change 8b67db17ec91956023e25674efe28a1f5ca970c8 from ics-mr1

Change-Id: I8166859e435f034535510a36772644cde3923cd9
 2011-11-09 16:07:33 -08:00
Gilles Debunne
cbf9d14012 am 7e7b4e7c: (-s ours) am 76bb11ca: Merge "Bug 5575396: close spell session on language change" into ics-mr1 
* commit '7e7b4e7c822e7c9aacbe4add52511079cff757cc':
  Bug 5575396: close spell session on language change
 2011-11-10 00:03:56 +00:00
George Mount
a2c9f2707b Merge "Set the initial scroll position for RTL." 2011-11-09 15:15:42 -08:00
Andreas Huber
b516b96d88 Merge "Instead of asserting, remove active streams if their sockets return failure" 2011-11-09 14:47:51 -08:00
George Mount
e263bc1a36 Set the initial scroll position for RTL. 
Bug 5268793
 Webkit knows about the correct initial position for web pages.
 On initial show, scroll to the webkit position.

 External WebKit CL: I6a91b97f

Change-Id: I2537b84a30a26a79a8a0f23fe62b9ed757f9c5a4
 2011-11-09 14:43:55 -08:00
Andreas Huber
05079be184 Instead of asserting, remove active streams if their sockets return failure 
Change-Id: Ic5cc786f718cf921876b181927cf1b03e8373ff1
related-to-bug: 5593654
 2011-11-09 14:26:43 -08:00
Jeff Sharkey
5cc8b1f0fd am 33e3710a: am 630a13bd: Merge "Bootstrap stats before registering listeners." into ics-mr1 
* commit '33e3710aafb68125f05ab30d61e324c894f0a3bb':
  Bootstrap stats before registering listeners.
 2011-11-09 21:51:40 +00:00
Jeff Sharkey
c592a57f3f am 489b4312: am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1 
* commit '489b431273500db81d35ed43440915187c238f92':
  Make operation counts monotonically increase.
 2011-11-09 21:51:38 +00:00
Jeff Sharkey
e94d9e1e42 am 028fe5a7: am 2048789c: Merge "Dispatch alerts through background thread." into ics-mr1 
* commit '028fe5a715d8f9d78154e482dc46b27f97f94e53':
  Dispatch alerts through background thread.
 2011-11-09 21:51:37 +00:00
Jeff Sharkey
629cb84fda am cef1300e: am f3882914: Merge "Make policy data enabled flag static." into ics-mr1 
* commit 'cef1300ebd6bc88e93ee1420e5fec359531533d2':
  Make policy data enabled flag static.
 2011-11-09 21:51:35 +00:00
Daniel Sandler
bec9f9e47f am f01a9c04: am da738d63: Merge "Add day of week." into ics-mr1 
* commit 'f01a9c0476191b3bbd9553c10421a1fee3c92353':
  Add day of week.
 2011-11-09 21:51:33 +00:00
Mathias Agopian
e55418beaf am a508f056: am e4a1bafb: Merge "decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes." into ics-mr1 
* commit 'a508f056d0b5a439b9436604824739049fd25be6':
  decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes.
 2011-11-09 21:51:32 +00:00
Dianne Hackborn
1284a49315 am 0141b727: am cd489c4c: Merge "Don\'t crash if there is no connectivity service." into ics-mr1 
* commit '0141b7275e4597e5944752d4f4ea3707c2b4f465':
  Don't crash if there is no connectivity service.
 2011-11-09 21:51:30 +00:00
Svetoslav Ganov
1002b62243 am cc03abe1: am 1bef480b: Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1 
* commit 'cc03abe1fc51a62e65f22944c3a4cba5dd3c34d3':
  NumberPicker incorectly enforcing minimal width and height.
 2011-11-09 21:51:28 +00:00
Jeff Sharkey
9aed14ef79 am 79c4ad17: am ccdeb428: Merge "Avoid inconsistent state when remove fails." into ics-mr1 
* commit '79c4ad17f966d0ccf24d94fdcbc6d3f83e359604':
  Avoid inconsistent state when remove fails.
 2011-11-09 21:51:26 +00:00
Jeff Brown
97c9e987ba am 0816b0c8: am bc0b010e: Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1 
* commit '0816b0c871ea93ffbcd3c60151d067dcfcebc1ac':
  Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662
 2011-11-09 21:51:25 +00:00
Mathias Agopian
e6b5e2452c am 64370354: am 393e2c1f: Merge "SensorService now always clamps the requested rate" into ics-mr1 
* commit '6437035400ae63a6f3eb2e375cb979bdd0037ba0':
  SensorService now always clamps the requested rate
 2011-11-09 21:51:23 +00:00
Dianne Hackborn
6238667682 am 3b2681ba: am 3af8b88d: Merge "Add drop box reports of low memory." into ics-mr1 
* commit '3b2681bad989013154f90c4b9c31f074af1f822c':
  Add drop box reports of low memory.
 2011-11-09 21:51:21 +00:00
Michael Kolb
35d17ec7c1 am 3a77503c: am a4293ba1: Merge "Remove flicker from WebTextView" into ics-mr1 
* commit '3a77503ca16253a702977a11406aec7a332837cb':
  Remove flicker from WebTextView
 2011-11-09 21:51:19 +00:00
Jamie Gennis
d26d4cefad am 7e6c75f5: am d211b488: Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1 
* commit '7e6c75f5a57b42edf22ce4e2cf144016252066c5':
  SurfaceTexture: unhide setDefaultBufferSize
 2011-11-09 21:51:17 +00:00
Jamie Gennis
dfef67374a am 3cb007e4: am 911263dc: Merge changes I18e5e789,I5cbaae2d into ics-mr1 
* commit '3cb007e44db1e169747528f62a118575f3b04d56':
  EGL: implement loading and saving the cache
  EGL: use an in-memory the blob cache
 2011-11-09 21:51:16 +00:00
Mathias Agopian
bad5664a98 am 0170810c: am 95482b61: Merge "Fix an issue where we could wait for a non-existing transaction" into ics-mr1 
* commit '0170810ce468d1b028cb65027ebc33f1375f5d3f':
  Fix an issue where we could wait for a non-existing transaction
 2011-11-09 21:51:14 +00:00
Irfan Sheriff
af139db574 am 1c9126c6: am 59c73b92: Merge "Convert soft ap config store to state machine" into ics-mr1 
* commit '1c9126c64b56b6465fd551680461caed2e1ea20d':
  Convert soft ap config store to state machine
 2011-11-09 21:51:12 +00:00
JP Abgrall
41a3bdcbef am b4a96805: Merge branch \'ics-mr1-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp 
* commit 'b4a96805d69b1f6281ece568b07927da2dd50872':
 2011-11-09 21:51:10 +00:00
Dave Santoro
941c6f7f71 am 8e2c5113: am b78ae752: Merge "Unhide social stream APIs for Contacts." into ics-mr1 
* commit '8e2c51137cdd1917d36c3a78ff6c1a42cc8ea402':
  Unhide social stream APIs for Contacts.
 2011-11-09 21:51:08 +00:00
Adam Powell
c55a4262f3 am b7dc4a33: am 650a3e88: Merge "Fix the action bar menu layout to use the correct divider drawable." into ics-mr1 
* commit 'b7dc4a33166bd24cc1ce5fa8c3ef27618a54e274':
  Fix the action bar menu layout to use the correct divider drawable.
 2011-11-09 21:51:06 +00:00
Wei Huang
fc2cc318ba am e64022ca: am ea50748b: Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1 
* commit 'e64022ca65e36c743eca260f05f245fe9d90f80c':
  Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA.
 2011-11-09 21:51:04 +00:00
Matthew Xie
ea57ede544 am 3a6f9ded: am 48542eb3: Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 
* commit '3a6f9ded543db6cb7a2842540a2b67b0356b21ae':
  Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp
 2011-11-09 21:51:01 +00:00
Dianne Hackborn
bd958e4428 am 03507014: am 665e105f: Merge "Cleanup remote execution of perf tests." into ics-mr1 
* commit '0350701422eb484d57c5c3bb1e8fa72f03ab280b':
  Cleanup remote execution of perf tests.
 2011-11-09 21:50:59 +00:00
The Android Open Source Project
9ab35b10ec am 5a903cd0: am 6dee1a9d: Reconcile with ics-mr0-release 
* commit '5a903cd0b6e7c52ffeb01aadfc55eb78e4fa72e6':
 2011-11-09 21:50:56 +00:00
Adam Cohen
dcf7cf4ca4 am 068b7f02: am 75b20380: Merge "Making default widget padding public API" into ics-mr1 
* commit '068b7f02a35e969c1607f8a35c422c93ee72c8a3':
  Making default widget padding public API
 2011-11-09 21:50:54 +00:00
Glenn Kasten
714211068e am bb1b7d5c: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0 
* commit 'bb1b7d5cb3c5502484269bfd0cdcd0d5a6d6bfad':
  Bug 5478024 drop after decode if can't drop before
 2011-11-09 21:19:00 +00:00
Jake Hamby
7aa2376609 am 2c6539e8: am fee5f29b: Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0 
* commit '2c6539e83ea80c62ee1a299fb686b4bdf043bfa7':
  Fix exception when sending multi-page SMS with Turkish characters.
 2011-11-09 21:18:56 +00:00
Brian Colonna
1ae5b71a95 resolved conflicts for merge of 7cf1eeb9 to master 
Change-Id: Id125e315e24ced927f3a500135af7e5aff50cfa2
 2011-11-09 16:13:51 -05:00
Robert Greenwalt
75f9808e55 am 604019c8: Merge "Fix build." into ics-mr1 
* commit '604019c8d45b8c56cf48b03dbd92cfbdd29c48c1':
  Fix build.
 2011-11-09 19:34:50 +00:00
Adam Powell
c31c42abb6 am 8689afbd: Merge "Fix bug 5544103 - Spinner text doesn\'t look dimmed when disabled" into ics-mr1 
* commit '8689afbd63db3b1af6058709da843ea9d6433b21':
  Fix bug 5544103 - Spinner text doesn't look dimmed when disabled
 2011-11-09 19:34:47 +00:00
Danielle Millett
77c7b4ddeb am b9b08257: Merge "Showing a congratulations screen after choosing face unlock backup lock" into ics-mr1 
* commit 'b9b08257370d244b4bccc4e243dda3c4daf4b0af':
  Showing a congratulations screen after choosing face unlock backup lock
 2011-11-09 19:34:44 +00:00
Steve Block
d951473859 Merge "Clean up JavaDoc for WebView.addJavascriptInterface()" 2011-11-09 09:43:53 -08:00
John Reck
0e17f65312 am 36a7f2a9: Merge "Fix determining find on page overlap" into ics-mr1 
* commit '36a7f2a9adfa21ec31f00d496fef82e68931c860':
  Fix determining find on page overlap
 2011-11-09 17:30:39 +00:00
John Reck
36a7f2a9ad Merge "Fix determining find on page overlap" into ics-mr1 2011-11-09 09:28:11 -08:00