80323 Commits

Author SHA1 Message Date
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
Wink Saville
8f82961f5a am 98853623: Merge "Telephony: Move AdnRecord.aidl into opt/telephony"
* commit '98853623bcb27155e9b030301a0cb2a987cfc612':
  Telephony: Move AdnRecord.aidl into opt/telephony
2012-08-04 08:07:54 -07:00
Wink Saville
1971df5d42 am e20a19cb: Merge "show 3G icon for CDMA/1xRTT"
* commit 'e20a19cb541f8621f04be0f3d3501f2fc51a0e82':
  show 3G icon for CDMA/1xRTT
2012-08-04 08:07:49 -07:00
Wink Saville
98853623bc Merge "Telephony: Move AdnRecord.aidl into opt/telephony" 2012-08-04 07:54:35 -07:00
Wink Saville
e20a19cb54 Merge "show 3G icon for CDMA/1xRTT" 2012-08-04 07:51:27 -07:00
Alex Yakavenka
7b3b02cb53 Telephony: Move AdnRecord.aidl into opt/telephony
Change-Id: Ib22f3e777f1cd39fb6da5b907bcec57c2c66ce3a
2012-08-03 16:47:51 -07:00
The Android Open Source Project
633233bc9e Reconcile with jb-release - do not merge
Change-Id: I586debc586c0de8fc24359daa40cbee9e58340ab
2012-08-03 13:23:27 -07:00
The Android Open Source Project
0e51c94c98 Reconcile AOSP and GOOG jb-release
Change-Id: I2cee4571848de79427356a6fcfe8da59ae34e70f
2012-08-03 12:11:54 -07:00
Daniel Sandler
4b9a8d75b8 Fix NPE on some phones at startup.
Bug: 6877589
Change-Id: I65ff37b4cf6b59a72a7aa665f252f5fb34f3b183
2012-08-03 11:28:10 -07:00
Daniel Sandler
ef5d261191 Fix 6804479: "Emergency calls only" in notification shade
Add an additional codepath to the "no connectivity" logic in
NetworkController to allow the PLMN bubble up from the
GsmServiceStateTracker, where R.string.emergency_calls_only
is returned if we're in emergency call mode.

Bug: 6804479
Change-Id: I0a77261e4393cc0dc32bae3e631ef196b2342f06
2012-08-03 11:28:04 -07:00
Jake Hamby
715da0ea91 Implement CMAS service category program results.
Correctly handle CDMA Service Category Program Data requests,
and send the SCPT response to the message center. Parcel SCPD
operations as an ArrayList instead of an array (current version
will throw ClassCastException when the array is cast).

Bug: 6853691
Change-Id: I949ea68891c78306059248832e59a593ab606e11
2012-08-03 11:27:59 -07:00
Jake Hamby
f8563f5108 Fix detection of CDMA cell broadcast messages.
The bIsServicePresent field of an incoming CDMA SMS RIL message
is not a reliable way to distinguish broadcast from point-to-point
messages on some RILs. Change CDMA SmsMessage.getMessageType() to
return MESSAGE_TYPE_BROADCAST when the service category is not 0,
and MESSAGE_TYPE_POINT_TO_POINT when the service category is 0.

Bug: 6853691
Change-Id: I0d44a8ce0bb295da5125271db90652570d655bc1
2012-08-03 11:27:49 -07:00
Robert Greenwalt
a3ed3b62d1 Fix our interpretation of apn setting's bearer.
Between ICS and JB we changed it to use TelephonyManager's network type
enumeration.  This changes it back to represent the RIL's radio
technology.  The only diff between the two is 13 and 14 are swapped,
so the change was causing problems with LTE and eHRPD.

bug:6830908
Change-Id: I85a7c8037f370f368e5cbf6dc2c9395c6889b541
2012-08-03 11:27:44 -07:00
Madan Ankapura
68cad3a0fa show 3G icon for CDMA/1xRTT
when config_showMin3G is enabled to true in a CDMA device

Change-Id: I79a4fa200dc406fc7f9f4527165046541961ef69
Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
2012-08-02 19:10:22 -07:00
Robert Greenwalt
2cb7db116f resolved conflicts for merge of 41508f05 to jb-dev-plus-aosp
Change-Id: I7232528f0f438ce9cf7759643631a250f545306e
2012-08-02 17:15:43 -07:00
Robert Greenwalt
41508f0544 Fix a logging NPE problem
bug:6864064
Change-Id: I3237e55cb164462b9616515b0de009bf687f1dca
2012-08-02 16:06:56 -07:00
Svetoslav Ganov
e1c47324fc am 9a59f6e0: Merge "Notification panel on tablet does not handle back and home key events." into jb-dev
* commit '9a59f6e02fdcabbf2debd5b836b01f7b22a4b21a':
  Notification panel on tablet does not handle back and home key events.
2012-08-02 15:19:03 -07:00
Svetoslav Ganov
9a59f6e02f Merge "Notification panel on tablet does not handle back and home key events." into jb-dev 2012-08-02 15:16:03 -07:00
Dirk Dougherty
265eea82ae am 568db47b: Merge "Doc change: add trademarks attribution." into jb-dev
* commit '568db47b770cbfaacdd54914540923258cd6f847':
  Doc change: add trademarks attribution.
2012-08-02 14:57:50 -07:00
Svetoslav Ganov
73b9c29b8b Notification panel on tablet does not handle back and home key events.
1. Notification panel on tablet does not handle back and home key events and
   as a result the notification panel stays open. Hence, after opening the
   notifications panel, pressing the back key on a keyboard will move back
   in the app instead closing the panel. Same happens for the home key.
   The expected behavior is if the panel is open the back button will dismiss
   it and the key should be consumed by the panel. The home key should hide
   the panel and the key should not be consumed by the panel so the system
   can do the right thing.

bug:6902903

Change-Id: I06e8ceea1f51b998e6703d70dcb3a24128d5a581
2012-08-02 13:44:30 -07:00
Dirk Dougherty
568db47b77 Merge "Doc change: add trademarks attribution." into jb-dev 2012-08-02 13:42:17 -07:00
Brian Carlstrom
4040fccddd am d2237dfe: Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto"
* commit 'd2237dfe7d84c36e5cc9399a444f9befb559af97':
  Change KeyStore to use Modified UTF-8 to match NativeCrypto
2012-08-02 10:32:13 -07:00
Brian Carlstrom
fb64fe1b6e am 4faeef37: (-s ours) Merge "Improve test key names to reproduce public issue"
* commit '4faeef378e9b82a4ad0fc1d4bb923af1a4f70e4e':
  Improve test key names to reproduce public issue
2012-08-02 10:32:02 -07:00
Dirk Dougherty
5baafabafd Doc change: add trademarks attribution.
Change-Id: If6fa87f1f3e65f509af9b3ed58d3497a46f815a8
2012-08-02 09:21:30 -07:00
Scott Main
80adeb535f am 5ae754c9: Merge "fix markup for gl pie" into jb-dev
* commit '5ae754c93a2c713f46e6cdbcab5ef051b5d0b600':
  fix markup for gl pie
2012-08-01 17:04:58 -07:00
Scott Main
5ae754c93a Merge "fix markup for gl pie" into jb-dev 2012-08-01 16:59:45 -07:00
Katie McCormick
27ed953f63 am 9f942089: Merge changes I9bd42a8a,I613d0b12 into jb-dev
* commit '9f94208953fc8da72140c2964bcf12ff5b485784':
  cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
  Doc update: Misc minor GCM updates.
2012-08-01 16:53:12 -07:00
Katie McCormick
9f94208953 Merge changes I9bd42a8a,I613d0b12 into jb-dev
* changes:
  cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
  Doc update: Misc minor GCM updates.
2012-08-01 16:49:38 -07:00
Scott Main
a18e0b4647 fix markup for gl pie
Change-Id: I97b40b61f70ecd720f604ceca5849b066cf89988
2012-08-01 16:31:19 -07:00
Brian Carlstrom
d2237dfe7d Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" 2012-08-01 16:30:54 -07:00
Katie McCormick
1cfe4b40d3 am 9c311279: Merge "Doc change: 4K -> 4kb" into jb-dev
* commit '9c311279726598de073314fb6059feea66957219':
  Doc change: 4K -> 4kb
2012-08-01 16:24:25 -07:00
Katie McCormick
9c31127972 Merge "Doc change: 4K -> 4kb" into jb-dev 2012-08-01 16:21:53 -07:00
Katie McCormick
510d817977 am a5e150c9: Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev
* commit 'a5e150c95c6e7c38fc8643c3615f5664e2cd4582':
  cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1
2012-08-01 16:16:22 -07:00
Katie McCormick
a65d0e78dd Doc change: 4K -> 4kb
Change-Id: Ic563436062c6bd17ba87f3b3cc4c765972b07289
2012-08-01 16:14:47 -07:00