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

80608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mike wakerly
1022b9999d Merge "Fix typo in UsbManager javadoc." into jb-dev 2012-08-09 16:47:11 -07:00
Scott Main
4b4bd1b345 am 607079d8: docs: SDK r20.0.3, Support Library r10 Release Notes plus some OCD cleanup to the ADT install steps 
* commit '607079d8098f3bf6632913a6edd0bc6d6f9167d7':
  docs: SDK r20.0.3, Support Library r10 Release Notes plus some OCD cleanup to the ADT install steps
 2012-08-09 16:43:18 -07:00
Scott Main
cb0b2df114 fix misc doc bugs from external issues 
Change-Id: I11b1d524dd2159b58c65d3ef7a76af15624ae365
 2012-08-09 16:38:12 -07:00
mike wakerly
0099d67d68 Fix typo in UsbManager javadoc. 
Closes http://b.android.com/32863

Change-Id: I8fc03ee70209413f279f606b393e79c12ee9c0d2
 2012-08-09 16:31:26 -07:00
Scott Main
607079d809 docs: SDK r20.0.3, Support Library r10 Release Notes 
plus some OCD cleanup to the ADT install steps

Change-Id: I760ddb284da2a3f53741b75d6ff0e02af8181c9a
 2012-08-09 14:13:22 -07:00
The Android Automerger
7534553d4c merge in jb-mr0-release history after reset to jb-dev 2012-08-09 11:37:03 -07:00
Wink Saville
eb2257ccc9 am 6f2361e7: Merge "Telephony: Dynamically instantiate IccCard" 
* commit '6f2361e7a97329feba7ac19b1a2635e315f73021':
  Telephony: Dynamically instantiate IccCard
 2012-08-08 17:09:26 -07:00
Wink Saville
6f2361e7a9 Merge "Telephony: Dynamically instantiate IccCard" 2012-08-08 16:36:34 -07:00
Andrii Beregovenko
d5857291cb WifiWatchdog: handle exception from ArpPeer 
Sometimes IllegalArgumantException can happen in constructor of ArpPeer
class when IPv6 address is provided. This causes crash of systemserver.

Fixing it by adding appropriate exception handler

Change-Id: I4bb7bbca790745a1bf56ece96dd91b84b1f70cad
Signed-off-by: Andrii Beregovenko <a.beregovenko@ti.com>
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
 2012-08-08 16:44:02 -05:00
Jean-Baptiste Queru
e5c46faefb am 6d0dd51e: Merge "Return early when checking divider before child zero." 
* commit '6d0dd51ebb170a89bea614a558b96f1dff3e7723':
  Return early when checking divider before child zero.
 2012-08-08 14:04:08 -07:00
Jean-Baptiste Queru
807c7ae00b am 7835d4fb: Merge "Fix SurfaceView notifies on invalid surfaces." 
* commit '7835d4fb4e99bac698599a269ce7f84f2de1fb46':
  Fix SurfaceView notifies on invalid surfaces.
 2012-08-08 14:04:02 -07:00
Jean-Baptiste Queru
05e97e81a5 am 0be33f2d: Merge "Add shortcut to avoid potential divide by zero in some case" 
* commit '0be33f2d522f76f48062a59ddb520815a0851875':
  Add shortcut to avoid potential divide by zero in some case
 2012-08-08 14:03:58 -07:00
Jean-Baptiste Queru
6d0dd51ebb Merge "Return early when checking divider before child zero." 2012-08-08 13:20:07 -07:00
Jean-Baptiste Queru
7835d4fb4e Merge "Fix SurfaceView notifies on invalid surfaces." 2012-08-08 13:20:00 -07:00
Jean-Baptiste Queru
0be33f2d52 Merge "Add shortcut to avoid potential divide by zero in some case" 2012-08-08 13:17:26 -07:00
Jean-Baptiste Queru
bce4135879 am 9ab84c20: Merge "Fix wrong count return for getPhoneSignalStrengthCount" 
* commit '9ab84c203fea0521135e0b0983aa15ce1afdc5ec':
  Fix wrong count return for getPhoneSignalStrengthCount
 2012-08-08 13:08:31 -07:00
Jean-Baptiste Queru
749135722c am 6fb8fe9a: Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)" 
* commit '6fb8fe9aba75681509d84f68d536ed78d292bd44':
  StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)
 2012-08-08 13:08:27 -07:00
Jean-Baptiste Queru
6736cca08d am 52410be8: Merge "mediacodec: Don\'t suggest calling getOutputFormat() immediately" 
* commit '52410be8ec092bfa7e84f2d8facdc161d6107ac3':
  mediacodec: Don't suggest calling getOutputFormat() immediately
 2012-08-08 13:08:21 -07:00
Jean-Baptiste Queru
9ab84c203f Merge "Fix wrong count return for getPhoneSignalStrengthCount" 2012-08-08 12:59:06 -07:00
Katie McCormick
be3d2cf10b am 2f8cc17f: cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2 
* commit '2f8cc17f5fbc2e05ac0889fbbddf4e530750087b':
  cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2
 2012-08-08 12:14:24 -07:00
Jean-Baptiste Queru
6fb8fe9aba Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)" 2012-08-08 12:06:26 -07:00
Jean-Baptiste Queru
52410be8ec Merge "mediacodec: Don't suggest calling getOutputFormat() immediately" 2012-08-08 12:06:03 -07:00
Jean-Baptiste Queru
c1c55afb47 am e67f8c8c: Merge "Normalize output from aapt d xmltree" 
* commit 'e67f8c8c279e20fff5f426eccd062b709e6280ed':
  Normalize output from aapt d xmltree
 2012-08-08 12:01:35 -07:00
Katie McCormick
2f8cc17f5f cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2 
Change-Id: I55d8668f4065129c844ada239f268a6621df4780
 2012-08-08 11:27:09 -07:00
Jean-Baptiste Queru
e67f8c8c27 Merge "Normalize output from aapt d xmltree" 2012-08-08 11:21:29 -07:00
Jean-Baptiste Queru
64ed6b2cfa am d77d17c2: Merge "Fix cursor memory leak" 
* commit 'd77d17c28d6f120ceb648747c7e2ef1a50215700':
  Fix cursor memory leak
 2012-08-08 10:54:04 -07:00
Jean-Baptiste Queru
425d13a0ae am 2278e60c: Merge "Adds missing Bluetooth as network type." 
* commit '2278e60c39f937b6eee14fbf0094d4be92d7f06b':
  Adds missing Bluetooth as network type.
 2012-08-08 10:53:52 -07:00
Jean-Baptiste Queru
d77d17c28d Merge "Fix cursor memory leak" 2012-08-08 10:44:50 -07:00
Jean-Baptiste Queru
2278e60c39 Merge "Adds missing Bluetooth as network type." 2012-08-08 10:43:20 -07:00
Alex Yakavenka
a6ce25cbbb Telephony: Dynamically instantiate IccCard 
Add required constant for Dct

Change-Id: I61cafee25cb40fe7de606a78566f93dfee523c73
 2012-08-08 10:30:11 -07:00
Peter Ng
ed12067b08 updated downloads for styleguide 
-new illustrator stencil

Bug: 6548259
Bug: 6948358

Change-Id: Idd5b590426ba2234c7bcc40a5e9e75464ec10723
 2012-08-07 21:50:22 -07:00
Peter Ng
252d23d8bb Revert "Group revert of the following commits for design docs:" 
This reverts commit c9506415d533c61a9607c5b61a1993747bafb406.
 2012-08-07 20:19:10 -07:00
The Android Open Source Project
02c9991834 Reconcile with jb-mr0-release - do not merge 
Change-Id: I79a1cf96dc3fb5ead2ace604370cbaed2d1bc534
 2012-08-07 14:59:03 -07:00
Scott Main
9e28fa459b am 0d3a1277: Merge "docs: fix hdef variable" into jb-dev 
* commit '0d3a127742b56a9aae9c9c018b7042f49902db8a':
  docs: fix hdef variable
 2012-08-07 14:04:09 -07:00
Scott Main
a8583c2934 am 40eee61e: docs: fix broken links and update sitemap text file 
* commit '40eee61e25fb887f5267686f8a0a7c5bd9f95769':
  docs: fix broken links and update sitemap text file
 2012-08-07 14:04:04 -07:00
Scott Main
0d3a127742 Merge "docs: fix hdef variable" into jb-dev 2012-08-07 14:01:34 -07:00
Scott Main
b111b5785e docs: fix hdef variable 
Change-Id: I737258d454f426506e529e3d48fefb1397b9e8d3
 2012-08-07 13:59:12 -07:00
Elliott Hughes
4b4b44381b am 33c5670b: Merge "Fewer warnings in aidl generated code." 
* commit '33c5670b315810f1f3dc66fe8cd38f7b3e05f3ac':
  Fewer warnings in aidl generated code.
 2012-08-07 13:18:53 -07:00
The Android Automerger
9ec5855611 merge in jb-mr0-release history after reset to jb-dev 2012-08-07 13:01:14 -07:00
Elliott Hughes
33c5670b31 Merge "Fewer warnings in aidl generated code." 2012-08-07 12:19:22 -07:00
Elliott Hughes
b327c41e12 Fewer warnings in aidl generated code. 
Bug: http://code.google.com/p/android/issues/detail?id=19196
Change-Id: If054e60c19dc73fe32f55d0fa1054309565a6de6
 2012-08-07 10:34:02 -07:00
bo huang
3b60dacb4e MtpStorage: correct the size of reserve space for MTP 
According to description in frameworks/base/core/res/res/xml/storage_list.xml,
"mtpReserve: (integer) number of megabytes of storage MTP should reserve for free storage".
Mtpstorage class use it directly and doesn't change it to correct size in megabyes.
Mtp initor can not get correct storage information from android.

Change-Id: Icf59eb1eb478e67ea5990be96a9decb41aa55504
Signed-off-by: Bo Huang <bo.b.huang@intel.com>
Signed-off-by: Jack Ren<jack.ren@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
 2012-08-07 13:02:59 +08:00
Scott Main
40eee61e25 docs: fix broken links 
and update sitemap text file

Change-Id: I6982c3f029c46135ae856b8484d906c2882bad3a
 2012-08-06 18:04:23 -07:00
Scott Main
d7cb30484b am ea837561: Merge "docs: add downloads directory with initial set of current files. This directory is not included in the final docs output, but is merely here as a "master" source for the downloadable bits that we upload and serve from elsewhere, such as from Google 
* commit 'ea8375617e0d9099dc156a12989277d320eab1ca':
  docs: add downloads directory with initial set of current files. This directory is not included in the final docs output, but is merely here as a "master" source for the downloadable bits that we upload and serve from elsewhere, such as from Google Cloud Storage.
 2012-08-06 17:01:28 -07:00
Scott Main
ea8375617e Merge "docs: add downloads directory with initial set of current files. This directory is not included in the final docs output, but is merely here as a "master" source for the downloadable bits that we upload and serve from elsewhere, such as from Google Cloud Storage." into jb-dev 2012-08-06 16:57:58 -07:00
Scott Main
bd24f5cca5 am 53b0fda5: misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page 
* commit '53b0fda5fd7c532fc1d93abd5f8a85276821cc6d':
  misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc  code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page
 2012-08-06 15:48:08 -07:00
Scott Main
53b0fda5fd misc doc bugs. 
Fix sdk samples path
Fix method signature in fragment doc code snippet
Fix typo in a11y javadoc  code snippet
Fix markup error in brands page
Fix markup error on content providers doc
Fix typo on about>start page

Change-Id: Ie2a528dd4fbd19e5cb1c0844f6fc6272669c8ab9
 2012-08-06 15:43:01 -07:00
The Android Open Source Project
a82220fef7 Reconcile with jb-release - do not merge 
Change-Id: Iac015880fd7dbb0dd4a55a8dbacae37d55981e8b
 2012-08-06 13:50:10 -07:00
Robert Greenwalt
f959d1084e Fix a logging NPE problem 
bug:6864064
Change-Id: I3237e55cb164462b9616515b0de009bf687f1dca
 2012-08-06 13:09:55 -07:00
Chuanxia Dong
6614bb6579 StorageManager: fix issue that GREF has increased to 2011 in system server with intel stress test. 
Issue description:
When run ICS stress test, always meet GREF issue. one of contributor is MountService$MountServiceBinderListener.
log info
19:21:11.609   222 24316 W dalvikvm:        24 of com.android.server.am.ActivityManagerService$AppDeathRecipient (24 unique instances)
19:21:11.609   222 24316 W dalvikvm:       479 of com.android.server.MountService$MountServiceBinderListener (479 unique instances)
19:21:11.619   222 24316 W dalvikvm:         7 of com.android.server.accessibility.AccessibilityManagerService$6 (7 unique instances)
Note: PID 222 is system server.

Issue alaysis:
Everyone can call getSystemService(Context.STORAGE_SERVICE) to get service.
When other service get StorageManager, StorageManager will new MountServiceBinderLister and
register a listener in MountService, which won't be unregistered. It's easy to generate a lot of
instance of unused MountService$MountServiceBinderListener in system server.

Issue fix:
So change the policy to be:
1. Doesn't new MountServiceBinderLister in construction.
2. when other service needs to register listener in StorageManager,
StorageManager will register listener with MountService.
3. When other service needs to unregister listener in StorageManager,
if there is no more other listeners in StorageManager, StorageManager
will unregister listener in MountService.

Change-Id: Iaaf889f44a1a5f62b9f65b3ab1b486c9b7dcaf7f
Author: Chuanxiao Dong <chuanxiao.dong@intel.com>
Signed-off-by: Bo Huang <bo.b.huang@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: Bruce Beare  <bruce.j.beare@intel.com>
 2012-08-06 14:53:17 +08:00