Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,131 Commits 3 Branches 0 Tags
06ab9875c19b36ed24a21310ca5dec3ada2a6b7b
Commit Graph

61131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
06ab9875c1 Merge "Slight change to the unwinder API." 2011-11-04 20:06:42 -07:00
Doug Zongker
e2d58e95a0 close input streams obtained from otacerts zip file 
Quells a StrictMode warning from OTA verification.

Change-Id: Ie3e4c345551d1925fcc37c3ae9ce5c45713be93a
 2011-11-04 14:11:12 -07:00
The Android Open Source Project
7b95eba9f4 am 8242cc49: Reconcile with ics-mr0-release ics-factoryrom-2-release 
* commit '8242cc49a90aa13a4830a735438b6e3cf73ea0f0':
  Revert "Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0"
  Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
  Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
  Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
 2011-11-04 15:01:30 +00:00
The Android Open Source Project
8242cc49a9 Reconcile with ics-mr0-release ics-factoryrom-2-release 
Change-Id: I81cf3b3994cb9a1c18fca3ce0049e09402543086
 2011-11-04 07:56:43 -07:00
Wink Saville
c430b70b5a am 9ca0f122: am e4ca9242: Fix the build. 
* commit '9ca0f1222711b4cce1de56c6623790165870392a':
  Fix the build.
 2011-11-04 12:04:09 +00:00
Dave Burke
dc858596b2 am 43e72b1f: (-s ours) am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0 
* commit '43e72b1f5692dd9e220158001317c2abc0ecafcf':
  DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
 2011-11-04 12:04:08 +00:00
Wink Saville
cc27a93947 am 8b771243: am 3d708451: Merge "Separate data stall detection and recovery from net stats." into ics-mr0 
* commit '8b77124395713de5e09c9b56fac03c244513dc25':
  Separate data stall detection and recovery from net stats.
 2011-11-04 12:04:06 +00:00
Wink Saville
9ca0f12227 am e4ca9242: Fix the build. 
* commit 'e4ca92421cc07c2f7f152b774dd1ac7a8944028b':
  Fix the build.
 2011-11-04 11:59:29 +00:00
Dave Burke
43e72b1f56 am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0 
* commit '32b5a7eeaf758fad0c24131603cdd54cd2883a58':
  DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
 2011-11-04 11:59:27 +00:00
Wink Saville
8b77124395 am 3d708451: Merge "Separate data stall detection and recovery from net stats." into ics-mr0 
* commit '3d7084519b03da0681da13fb8d7d4a0914d11646':
  Separate data stall detection and recovery from net stats.
 2011-11-04 11:59:25 +00:00
Katie McCormick
91dcf4e11d am 6d77ad80: am 6c5951bf: Doc change: Updating device-admin with camera info. 
* commit '6d77ad80375a82b97aefb7d5ab547a2944135edf':
  Doc change: Updating device-admin with camera info.
 2011-11-04 11:34:16 +00:00
Katie McCormick
6d77ad8037 am 6c5951bf: Doc change: Updating device-admin with camera info. 
* commit '6c5951bf9798369d335096f1f73ee1299cf903ff':
  Doc change: Updating device-admin with camera info.
 2011-11-04 11:28:39 +00:00
Ken Wakasa
988af0861e am 943f6d0b: Merge "Turn off the spell checker when the spell checker is disabled in the settings" into ics-mr1 
* commit '943f6d0b33f599ed00b76c59b4a4b4c41d0e66f2':
  Turn off the spell checker when the spell checker is disabled in the settings
 2011-11-04 08:05:44 +00:00
Ken Wakasa
943f6d0b33 Merge "Turn off the spell checker when the spell checker is disabled in the settings" into ics-mr1 2011-11-04 01:02:12 -07:00
Wink Saville
e4ca92421c Fix the build. 
Needed to update EventLogTags.logtags

Change-Id: Ie7d13e012c52778892167380f4fd273f67bb7d62
 2011-11-03 23:16:55 -07:00
Dave Burke
32b5a7eeaf Merge "DO NOT MERGE Poll input data with a small timeout and don't consume a full core." into ics-mr0 2011-11-03 21:59:20 -07:00
Wink Saville
3d7084519b Merge "Separate data stall detection and recovery from net stats." into ics-mr0 2011-11-03 21:26:35 -07:00
Wink Saville
2861d23d66 Separate data stall detection and recovery from net stats. 
Also use the AlarmManager instead of messages so the delays
are consistent whether sleeping or not.

Bug: 5534004
Change-Id: I24118b30214dddf8183c1200a89555d6c528e606
 2011-11-03 18:52:58 -07:00
Andreas Huber
efa4015ae3 DO NOT MERGE Poll input data with a small timeout and don't consume a full core. 
Change-Id: I3c288698920fe6ead0df24a52330483609821a41
related-to-bug: 5549263
 2011-11-03 18:15:43 -07:00
Jeff Brown
67406a46d1 Slight change to the unwinder API. 
Change-Id: I5424de76a21b74842e004e0281936b3f492d3c7a
 2011-11-03 17:30:54 -07:00
Irfan Sheriff
a25b1a272c am a3d9eba1: Merge "Reset IP failure counter on a success" into ics-mr1 
* commit 'a3d9eba10461158a52acfc2a0324696b25db761f':
  Reset IP failure counter on a success
 2011-11-03 23:10:04 +00:00
Katie McCormick
6c5951bf97 Doc change: Updating device-admin with camera info. 
Change-Id: I5a5bf50b1362346f0a245ee40248a62a3c94a879
 2011-11-03 16:07:05 -07:00
Irfan Sheriff
a3d9eba104 Merge "Reset IP failure counter on a success" into ics-mr1 2011-11-03 16:06:07 -07:00
Christopher Tate
b50d9bb630 am 4fdad1af: Merge "Add persistent property to disable strict mode" into ics-mr1 
* commit '4fdad1af53ea46892f477185ff93d4182b7aadf9':
  Add persistent property to disable strict mode
 2011-11-03 23:04:43 +00:00
Christopher Tate
4fdad1af53 Merge "Add persistent property to disable strict mode" into ics-mr1 2011-11-03 15:59:47 -07:00
Mangesh Ghiware
b536cd923a am 69957172: Merge "Update fix to restore view and text wrap scales." into ics-mr1 
* commit '69957172fa8336e01a9ff07ab34deca2c553f0b4':
  Update fix to restore view and text wrap scales.
 2011-11-03 22:40:56 +00:00
Mangesh Ghiware
69957172fa Merge "Update fix to restore view and text wrap scales." into ics-mr1 2011-11-03 15:35:23 -07:00
Dianne Hackborn
c5037af088 am e0ad4746: Merge "Some optimizations for view inflation." into ics-mr1 
* commit 'e0ad47465ededb16c6cd60524acd6941a8ce0bd8':
  Some optimizations for view inflation.
 2011-11-03 22:19:36 +00:00
Dianne Hackborn
e0ad47465e Merge "Some optimizations for view inflation." into ics-mr1 2011-11-03 15:16:11 -07:00
Kenny Root
88b15749d2 am e24ac4b2: Merge "Update GET_UNINSTALLED_PACKAGES flag documentation" into ics-mr1 
* commit 'e24ac4b219a582f1a99465551b1fd76345553b22':
  Update GET_UNINSTALLED_PACKAGES flag documentation
 2011-11-03 21:51:15 +00:00
Kenny Root
e24ac4b219 Merge "Update GET_UNINSTALLED_PACKAGES flag documentation" into ics-mr1 2011-11-03 14:47:07 -07:00
Scott Main
56b97b8443 am cbf1437c: am 95142919: docs: dashboard update for 11/3 
* commit 'cbf1437c9dc3080d4faa79be8612c3ef7387515e':
  docs: dashboard update for 11/3
 2011-11-03 21:10:49 +00:00
Scott Main
cbf1437c9d am 95142919: docs: dashboard update for 11/3 
* commit '9514291901e3a1274e30c2e809ad38e22e7f662e':
  docs: dashboard update for 11/3
 2011-11-03 21:06:29 +00:00
Scott Main
9514291901 docs: dashboard update for 11/3 
Change-Id: I06428f0a6ae1d905058338bc9bbc584035af1a5f
 2011-11-03 13:56:55 -07:00
Mangesh Ghiware
e59e301ca0 Update fix to restore view and text wrap scales. 
Fixes bug 5544556: All email content is wrapped prematurely.

Previous change (I5a22dd20) didn't take a few other cases of
mViewScale>0 into account.

Change-Id: I4f9578f3558f026c472492ac07d19004416dc228
 2011-11-03 13:21:18 -07:00
Marco Nelissen
a4e702c2da am f51f1bd9: Verify we actually have valid utf8 metadata 
* commit 'f51f1bd9d42d0dd55c120bfb83ed113b61e5c3ca':
  Verify we actually have valid utf8 metadata
 2011-11-03 20:18:37 +00:00
Christopher Tate
bc6f0ce8be Add persistent property to disable strict mode 
Setting persist.sys.strictmode.disable to 'true' will disable strict
mode on eng/userdebug builds where it is turned on by default.
Explicitly enabling it in the Settings UI will override this, so
it's still possible to toggle it there even when this property
has been set on the device.

Change-Id: Ifd971f948fb2f803d509c2a06112c4bb932a5b1f
 2011-11-03 13:16:27 -07:00
Marco Nelissen
f51f1bd9d4 Verify we actually have valid utf8 metadata 
Before calling NewStringUTF, check that the metadata value is actually
valid utf-8, and replace the offending characters with "?" if it is not.
b/5534491

Change-Id: I43de4307e739ae0b7d4177937ed33aa1dfb90d98
 2011-11-03 13:12:16 -07:00
Jamie Gennis
a0337b4082 am c5ce130f: Merge "SurfaceTexture: various logging improvements" into ics-mr1 
* commit 'c5ce130f658303299bf55091373951f7fd33ae36':
  SurfaceTexture: various logging improvements
 2011-11-03 18:57:21 +00:00
Jamie Gennis
94c10c4c8b am 236aea35: Merge changes Ibc99cb1c,Ie1f4f6f8 into ics-mr1 
* commit '236aea3579787961fdd41d87574760b63323c0c1':
  BlobCache: implement cache serialization
  BlobCache: remove the mutex locking
 2011-11-03 18:55:14 +00:00
Jamie Gennis
c5ce130f65 Merge "SurfaceTexture: various logging improvements" into ics-mr1 2011-11-03 11:51:38 -07:00
Jamie Gennis
236aea3579 Merge changes Ibc99cb1c,Ie1f4f6f8 into ics-mr1 
* changes:
  BlobCache: implement cache serialization
  BlobCache: remove the mutex locking
 2011-11-03 11:51:23 -07:00
Jeff Sharkey
f55ce39224 am 3f9ce4c2: Merge "Verify AppWidget ownership during update." into ics-mr1 
* commit '3f9ce4c22ae9b4f0f2208c29f8c93d6ad652a1dc':
  Verify AppWidget ownership during update.
 2011-11-03 18:49:05 +00:00
Teng-Hui Zhu
87d872cd50 am 76b06759: Merge "Create GL texture when it is missing for video layer" into ics-mr1 
* commit '76b067590b2e9dc403c9edac58e414468c5e1104':
  Create GL texture when it is missing for video layer
 2011-11-03 18:46:41 +00:00
Jeff Sharkey
3f9ce4c22a Merge "Verify AppWidget ownership during update." into ics-mr1 2011-11-03 11:43:52 -07:00
Teng-Hui Zhu
76b067590b Merge "Create GL texture when it is missing for video layer" into ics-mr1 2011-11-03 11:43:16 -07:00
Jeff Sharkey
933decaa5e Verify AppWidget ownership during update. 
Bug: 5563081
Change-Id: I528ec944d404989bb21b32ef01feb3d35e23d3ad
 2011-11-03 11:26:11 -07:00
Andreas Huber
57f2887c33 am e395f645: Poll input data with a small timeout and don\'t consume a full core. 
* commit 'e395f645aa4c30a4fad8beb3da6f8fad72338617':
  Poll input data with a small timeout and don't consume a full core.
 2011-11-03 18:12:39 +00:00
Andreas Huber
e395f645aa Poll input data with a small timeout and don't consume a full core. 
Change-Id: I3c288698920fe6ead0df24a52330483609821a41
related-to-bug: 5549263
 2011-11-03 11:00:21 -07:00
Kenny Root
685f490eff Update GET_UNINSTALLED_PACKAGES flag documentation 
Change-Id: I483b84f07836e6ad96c75e7dd3a86633cb29db22
 2011-11-03 10:13:29 -07:00