32318 Commits

Author SHA1 Message Date
Michael Chan
a07ea5da07 Fixed the problem where getEntityAndIncrementCursor would always return "0" for attendeeIdentity & attendeeIdNamespace instead of the actual string.
Bug: 6798688
Change-Id: Ia3b6ee33110ecc8035c24d6340593160748849fd
2012-07-13 14:10:40 -07:00
Ying Wang
d304e8bfc7 am df523ec5: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'df523ec5780aece1f63ce05a0ae57773fef50fbf':
  Import translations. DO NOT MERGE
2012-07-13 13:41:02 -07:00
Ying Wang
df523ec578 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-07-13 13:39:39 -07:00
Chet Haase
6bcfe893d4 am 0f8e402e: Force invalidates on non-visible views. DO NOT MERGE
* commit '0f8e402e954c6e37102fa70f81a1d8ec47156338':
  Force invalidates on non-visible views. DO NOT MERGE
2012-07-13 12:16:46 -07:00
Ying Wang
3b1ca7888c Import translations. DO NOT MERGE
Change-Id: Iac7759bb253431f5b75c246938a3cc3a726c8439
Auto-generated-cl: translation import
2012-07-13 11:41:59 -07:00
Qi Wang
097fbf2e98 StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM) 2012-07-13 09:26:03 +08:00
Chet Haase
0f8e402e95 Force invalidates on non-visible views. DO NOT MERGE
An optimization prunes invalidates on views which are not inside their
parent's bounds. This works in most cases, but it is possible to run
a situation where a view has been invalidated (and is thus waiting to
be redrawn), but the pruning logic ensures that that draw call
will not happen. Further, when/if the view comes into the bounds
of its parent again, it may still not be redrawn, because now future
invalidates on the view are noop'd because it is already in an invalidated
state (and thus will not propagate invalidates up the hierarchy).

The fix is to remove the optitmization. This will cause some overhead
sending the invalidation request up to the view root, but this
overhead is minimal (and only extra for cases of out-of-bounds views),
and the more expensive part of rendering these views will still not be done
since the view root will avoid re-drawing the hierarchy when the dirty
rectangle is empty.

Issue #6813661 offscreen views don't get invalidated properly (may remain invisible when returning onscreen)

Change-Id: Ic4b439540084a7163be9afc585bea6560d073280
2012-07-12 14:40:28 -07:00
Ying Wang
d7b7c2cead am 23edefc6: Import translations. DO NOT MERGE
* commit '23edefc6c6d12dd84ff6b7bd8694b50abf0cc158':
  Import translations. DO NOT MERGE
2012-07-12 11:46:49 -07:00
Ying Wang
23edefc6c6 Import translations. DO NOT MERGE
Change-Id: I115e6356599b76597f52d5f0006d61f4324ae48b
Auto-generated-cl: translation import
2012-07-12 11:41:58 -07:00
Wink Saville
a639b311e9 Create telephony-common and mms-common
These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
   frameworks/opt/mms

telephony-common was created by moving some of
   frameworks/base/telephony
to:
   frameworks/opt/telephony

Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad
2012-07-11 16:02:08 -07:00
Ying Wang
0ddea75be4 am 04ca8e57: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '04ca8e577859235a68fa9a5268af528d547310be':
  Import translations. DO NOT MERGE
2012-07-11 13:57:43 -07:00
Ying Wang
2ba281577a Import translations. DO NOT MERGE
Change-Id: Idabf12464d73bf707daf0f870de2349731b574e2
Auto-generated-cl: translation import
2012-07-11 12:51:31 -07:00
Raph Levien
23316a1ef8 am 00139b22: Merge "Fix for bug 6716343. Use correct offset for mPos reset. DO NOT MERGE" into jb-dev
* commit '00139b2238562780d66c2ebb8a0675fbe7d896b7':
  Fix for bug 6716343. Use correct offset for mPos reset. DO NOT MERGE
2012-07-10 18:07:27 -07:00
Raph Levien
00139b2238 Merge "Fix for bug 6716343. Use correct offset for mPos reset. DO NOT MERGE" into jb-dev 2012-07-10 18:05:12 -07:00
Fabrice Di Meglio
8e136f85f7 Fix for bug 6716343. Use correct offset for mPos reset. DO NOT MERGE
The mPos field in the MeasuredText object is relative to the start of
the text (mTextStart), but the pos passed in by the caller of the
setPos() method is relative to the character sequence. When spans
overlap break boundaries and the paragraph doesn't start at 0, the
result is an out of bounds error. This fix uses the correct offset.

Change-Id: I64ef06df0eb06f75aedd25de97e9f347eeb52979
2012-07-10 14:30:45 -07:00
Romain Guy
6d2999a048 am 90752485: Properly resize paletted bitmaps when adjusting for density
* commit '907524851af0d656ba049311f7535a4ba5d2b1d2':
  Properly resize paletted bitmaps when adjusting for density
2012-07-10 13:26:49 -07:00
Romain Guy
907524851a Properly resize paletted bitmaps when adjusting for density
If an app used a GIF file in the wrong density bucket, the auto-scaling
code would not properly resize the bitmap.

This issue affects third party applications, here is the external bug
report:

http://code.google.com/p/android/issues/detail?id=34619

DO NOT MERGE

Change-Id: I7f99b28ad6e6c28bdbcb29bbbadcb215268ff710
2012-07-10 13:16:46 -07:00
Ying Wang
b8c5df8562 am 40a4ab13: Import translations. DO NOT MERGE
* commit '40a4ab130a3e3c99afb1a57e9aa30de03a89b51e':
  Import translations. DO NOT MERGE
2012-07-10 12:36:11 -07:00
Ying Wang
40a4ab130a Import translations. DO NOT MERGE
Change-Id: I8e0e293c98a3659ef6e9a07c3a62e0056f5ea4cb
Auto-generated-cl: translation import
2012-07-10 12:15:26 -07:00
Joshua Brindle
365861e3aa s/LOG/ALOG/ in HAVE_SELINUX blocks
The latest push changed LOG(E|V) to ALOG(E|V) but it was not updated in HAVE_SELINUX blocks.

Change-Id: I626588589dd00775ba29f2a256ac29e481598dc3
Signed-off-by: Joshua Brindle <jbrindle@tresys.com>
2012-07-10 11:02:01 -04:00
Håkan3 Johansson
011238bd8d Adds missing Bluetooth as network type.
The network connection type for Bluetooth is added so
that it is possible to use Bluetooth as Hotspot during
download from the Internet.

Change-Id: If8e8a3f69821beef742bc91d7a292a091861b48b
2012-07-10 15:03:54 +02:00
Catherine Liu
3f824c0e72 Fix cursor memory leak
In current code, if an application opens a cursor to access a
provider, and doesn't close that cursor, later, when this cursor
is garbage collected, it won't get closed. This will cause a memory
leak in the provider. The leaked memory can only be reclaimed when
the application with the leaked cursor was dead.

The solution is, close the cursor when it's garbage collected.

Change-Id: I786915c46d4672b6b1b37414b3bc1ff8cea2e00b
2012-07-09 16:34:58 -05:00
Adam Powell
b0f356579e am 1ab2edbc: Merge "Fix bug in parsing attributes for MediaRouteButton" into jb-dev
* commit '1ab2edbcff94d53856a87010e35ffa50ce4c0502':
  Fix bug in parsing attributes for MediaRouteButton
2012-07-09 14:15:56 -07:00
Adam Powell
1ab2edbcff Merge "Fix bug in parsing attributes for MediaRouteButton" into jb-dev 2012-07-09 14:13:54 -07:00
Romain Guy
13a3a87fa7 am dc99555d: Merge "Pass SearchView suggestion cursor exception to Log."
* commit 'dc99555d61d50820b398096bb774ee56b2500476':
  Pass SearchView suggestion cursor exception to Log.
2012-07-06 23:52:55 -07:00
Jake Wharton
73af451694 Pass SearchView suggestion cursor exception to Log.
When an error in fetching a column occurs in your suggestions cursor
adapter this will ensure the stacktrace is logged to provide more
context about what failed.

Change-Id: Iafe4918caebb9b0fb712b758b2d3ace329fd2512
2012-07-06 23:15:49 -07:00
Scott Main
480785dabb am fd516987: docs: misc bugs from external tracker
* commit 'fd516987de29a48425da5ee5aace5be40adcc674':
  docs: misc bugs from external tracker
2012-07-03 18:15:19 -07:00
Scott Main
fd516987de docs: misc bugs from external tracker
Change-Id: I02d0d82c220401ac3a1ca180e8331a0f6dcd9e50
2012-07-03 18:08:19 -07:00
Scott Main
7034ed833f am 5a883824: Merge "docs: fix document issue 27549" into jb-dev
* commit '5a883824a2e97e0ccb08b4fe30accde6542f3f39':
  docs: fix document issue 27549
2012-07-03 11:54:11 -07:00
Scott Main
5a883824a2 Merge "docs: fix document issue 27549" into jb-dev 2012-07-03 11:51:30 -07:00
Scott Main
35cb0650c0 am 399df567: docs: various link fixes and other typos from external tracker
* commit '399df5677bd116a016664a10a0da432da29e829d':
  docs: various link fixes and other typos from external tracker
2012-07-02 22:00:50 -07:00
Scott Main
15279cfc56 docs: fix document issue 27549
Change-Id: I17995fd70978657a46ccfc77fa2ae84c56a05255
2012-07-02 21:58:46 -07:00
Scott Main
399df5677b docs: various link fixes and other typos from external tracker
Change-Id: I2a107f7e16429c0fe80c5e4cb67ecfaf267db301
2012-07-02 21:47:20 -07:00
Jean-Baptiste Queru
e39d42db00 Merge "Revert "DO NOT MERGE: Remove SMS shortcode warning feature."" into jb-dev-plus-aosp 2012-07-02 14:48:48 -07:00
Jean-Baptiste Queru
5709f43dd8 Merge "Revert "DO NOT MERGE: Remove SMS shortcode warning feature."" into jb-dev-plus-aosp 2012-07-02 14:48:44 -07:00
Jean-Baptiste Queru
2a2d5e0b31 Merge "When we disconnect shutdown the StateMachine. DO NOT MERGE" into jb-dev-plus-aosp 2012-07-02 14:48:28 -07:00
Jean-Baptiste Queru
1fe7a81383 Merge "Enhance StateMachine Quitting and logging support. DO NOT MERGE" into jb-dev-plus-aosp 2012-07-02 14:48:19 -07:00
Eric Fischer
82b141e267 am c70ec659: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'c70ec659e8f63b31e11f5f0a82c638261d67056e':
  Import translations. DO NOT MERGE
2012-07-02 14:09:49 -07:00
Jean-Baptiste Queru
7ebd4bae74 Revert "DO NOT MERGE: Remove SMS shortcode warning feature."
This reverts commit 004ff5ad2aa02daff607bcf1712f3efbb84c58ca.
2012-07-02 12:36:47 -07:00
Jean-Baptiste Queru
a02bce1d5b Revert "DO NOT MERGE: Remove SMS shortcode warning feature."
This reverts commit b1fc08ca082db8ecad54c792485ff7915e3513ce.
2012-07-02 12:30:32 -07:00
Eric Fischer
a2b17b8895 Import translations. DO NOT MERGE
Change-Id: I5eae952127a0af6618ab96065cd50d78bbaea189
Auto-generated-cl: translation import
2012-07-02 12:25:39 -07:00
Wink Saville
2686b058cd When we disconnect shutdown the StateMachine. DO NOT MERGE
Need to stop the StateMachine threads and release
all resources when we disconnect.

bug: 6342470
Change-Id: Ibf7a2ebf4f7ecd667c5d95579e66ecd5086103ea
2012-07-02 10:57:16 -07:00
Wink Saville
095c58b73a Enhance StateMachine Quitting and logging support. DO NOT MERGE
Make StateMachine#quit non-conditional and remove the need to
process the SM_QUIT_CMD it is now private.

Rename halting to onHalting.

Add onQuitting

Change the message specific logging to be more generic and change
the xxxProcessedMessagesYyy methods to xxxLogRecXyy names. Also add
addLogRec(String) and addLogRec(String, State) as the generic logging
methods.

bug: 5678189
Change-Id: I22f66d11828bfd70498db625fe1be728b90478b7

Conflicts:

	services/java/com/android/server/NsdService.java
2012-07-02 10:57:11 -07:00
Ying Wang
6979f52208 am 2612de14: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '2612de14d2dcfd5a6eedf882cf5cd9ac3e6fb73a':
  Import translations. DO NOT MERGE
2012-06-29 17:53:20 -07:00
Ying Wang
2612de14d2 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-29 17:50:47 -07:00
Dianne Hackborn
a9c3846194 am bfb752f8: Merge "Fix issue #6761130: Clearing app data in settings does not clear app\'s USB storage" into jb-dev
* commit 'bfb752f8f0e4d73dc251c19d2ef79649fbbe4fd1':
  Fix issue #6761130: Clearing app data in settings does not clear app's USB storage
2012-06-29 15:43:37 -07:00
Dianne Hackborn
bfb752f8f0 Merge "Fix issue #6761130: Clearing app data in settings does not clear app's USB storage" into jb-dev 2012-06-29 15:40:18 -07:00
Dianne Hackborn
183ce028f1 Fix issue #6761130: Clearing app data in settings does not clear app's USB storage
The package manager calls to clear data / clear cache were not also
having default container service clear the data on external storage.  Now
they do.

Change-Id: Ib5e5eb6adf2cac5a4cc094cc1a02ac8cfb6a2edf
2012-06-29 15:00:21 -07:00
Christopher Tate
b69c77cd19 am 1598a508: Merge "Do not back up / restore the rotation-related settings" into jb-dev
* commit '1598a50818b638d20120f71bab01c1792ecd4b6a':
  Do not back up / restore the rotation-related settings
2012-06-29 12:42:52 -07:00
Christopher Tate
1598a50818 Merge "Do not back up / restore the rotation-related settings" into jb-dev 2012-06-29 12:40:34 -07:00