Joe Malin
7096a17e95
am 718c7484: am f0f5efbe: Android Training: Run in a Background Service
...
* commit '718c7484cf008d45f8501ae7d0cd57b31f935934':
Android Training: Run in a Background Service
2012-12-13 16:16:54 -08:00
Joe Malin
718c7484cf
am f0f5efbe: Android Training: Run in a Background Service
...
* commit 'f0f5efbea206fd0fbac655519f3f535620ed74cc':
Android Training: Run in a Background Service
2012-12-13 16:15:36 -08:00
Svetoslav Ganov
60fba77035
Simplification of the Pools implementation.
...
Now instead of a link list of holder objects the pool is backed by
an array of the max size.
Change-Id: Iad1f4f2766d42e8c438cc8efbc72e1e5756b0baf
2012-12-13 16:04:38 -08:00
Jeff Sharkey
6fd651ebf2
Merge "Move DRM to CloseGuard, add DrmOutputStream."
2012-12-13 15:39:10 -08:00
The Android Automerger
a347169a6c
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-13 15:30:50 -08:00
Adam Cohen
50f3d1bae8
Adding simple ArrayList API for collection widgets
...
Change-Id: I4d6c909d1d2c0bdd1ddc8329445cea0e78a5ce7c
2012-12-13 14:52:30 -08:00
Joe Malin
f0f5efbea2
Android Training: Run in a Background Service
...
Change-Id: I002af57c65eccd0a624e00ef4b1607469199ce6b
2012-12-13 14:32:19 -08:00
Stephen Hines
bd008614aa
Merge "Turn off IP2."
2012-12-13 14:28:29 -08:00
Stephen Hines
bc897302af
Turn off IP2.
...
Change-Id: I1d45b0077c1a57c74e36fa8df45428b06a454253
2012-12-13 14:26:12 -08:00
Jeff Sharkey
f67c8a9685
Move DRM to CloseGuard, add DrmOutputStream.
...
Switch DrmManagerClient to using CloseGuard to better track leaked
resources. Add DrmOutputStream which applies DRM transformation as
data is written, similar to FilterOutputStream. Also writes DRM
headers before closing.
Change-Id: Ic106a3e6f6ff666e4dda484fbd234a0849eec8c0
2012-12-13 13:51:40 -08:00
Fabrice Di Meglio
7345f24ff8
am 5780e196: am 5c0d6f99: am 9de88dad: Merge "Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale" into jb-mr1.1-dev
...
* commit '5780e196806b3741786b212866435593990f97ee':
Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale
2012-12-13 12:35:14 -08:00
Fabrice Di Meglio
5780e19680
am 5c0d6f99: am 9de88dad: Merge "Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale" into jb-mr1.1-dev
...
* commit '5c0d6f9980ed4684cbeefc28036dd9eeac474375':
Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale
2012-12-13 12:33:35 -08:00
Fabrice Di Meglio
5c0d6f9980
am 9de88dad: Merge "Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale" into jb-mr1.1-dev
...
* commit '9de88dad29d89ec81c5e6b0df5aa92a04c8ce781':
Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale
2012-12-13 12:31:17 -08:00
Fabrice Di Meglio
9de88dad29
Merge "Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale" into jb-mr1.1-dev
2012-12-13 12:28:24 -08:00
Joe Fernandez
33b7978cf4
am 3042da88: am b2aa3a74: am 54091f87: am 538c8d0a: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev
...
* commit '3042da88095760005a4a2424f188cb0392ab064a':
docs: NDK r8d Release Notes
2012-12-13 12:23:50 -08:00
Joe Fernandez
3042da8809
am b2aa3a74: am 54091f87: am 538c8d0a: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev
...
* commit 'b2aa3a74754299488acdff3843763f46ca571d2e':
docs: NDK r8d Release Notes
2012-12-13 12:20:09 -08:00
Joe Fernandez
2398d4d982
am 1f69c3b2: am 86841bd5: am 700f9ea3: am 82703ea4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev
...
* commit '1f69c3b27658d00b6b581e8ecdd14910fbc25053':
docs: SDK r21.0.1 Release Notes
2012-12-13 12:19:36 -08:00
Joe Fernandez
b2aa3a7475
am 54091f87: am 538c8d0a: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev
...
* commit '54091f8730850772606ab2d4b4591bb902c52b44':
docs: NDK r8d Release Notes
2012-12-13 12:18:00 -08:00
Joe Fernandez
1f69c3b276
am 86841bd5: am 700f9ea3: am 82703ea4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev
...
* commit '86841bd5c1d537da40e076e6850a09bdc884ded5':
docs: SDK r21.0.1 Release Notes
2012-12-13 12:17:31 -08:00
Joe Fernandez
54091f8730
am 538c8d0a: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev
...
* commit '538c8d0a467187008b5e2249fdbea153d598f462':
docs: NDK r8d Release Notes
2012-12-13 12:15:51 -08:00
Joe Fernandez
86841bd5c1
am 700f9ea3: am 82703ea4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev
...
* commit '700f9ea300f92da69800a48a2325a7f93a82e8cb':
docs: SDK r21.0.1 Release Notes
2012-12-13 12:15:24 -08:00
Joe Fernandez
538c8d0a46
Merge "docs: NDK r8d Release Notes" into jb-mr1-dev
2012-12-13 12:14:03 -08:00
Joe Fernandez
700f9ea300
am 82703ea4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev
...
* commit '82703ea4e842f59bda38cfb101ebaa3a8986aae3':
docs: SDK r21.0.1 Release Notes
2012-12-13 12:13:16 -08:00
Joe Fernandez
82703ea4e8
Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev
2012-12-13 12:10:58 -08:00
Scott Main
933cf8d3d2
am 2a87c9da: am c49ffcde: am f83ab33c: am 095d6947: docs: explain that layout height/width must be used to override include layouts
...
* commit '2a87c9da129d23930a4e5fc7c7a34d933129840d':
docs: explain that layout height/width must be used to override include layouts
2012-12-13 11:40:14 -08:00
Scott Main
2a87c9da12
am c49ffcde: am f83ab33c: am 095d6947: docs: explain that layout height/width must be used to override include layouts
...
* commit 'c49ffcdee87d185c6857bdad94f7cf53f04f6a65':
docs: explain that layout height/width must be used to override include layouts
2012-12-13 11:38:19 -08:00
Scott Main
c49ffcdee8
am f83ab33c: am 095d6947: docs: explain that layout height/width must be used to override include layouts
...
* commit 'f83ab33c57f22f040fdb6ae546a3aae39a1b2b4c':
docs: explain that layout height/width must be used to override include layouts
2012-12-13 11:36:23 -08:00
Scott Main
f83ab33c57
am 095d6947: docs: explain that layout height/width must be used to override include layouts
...
* commit '095d69474b8d9fbe2507f6015d0ef6821af31ae0':
docs: explain that layout height/width must be used to override include layouts
2012-12-13 11:34:14 -08:00
Scott Main
095d69474b
docs: explain that layout height/width must be used to override include layouts
...
Change-Id: I7ee63f2f05b2e9a8cd424dfb2e7c9bead9d5efc6
2012-12-13 10:59:58 -08:00
Joe Fernandez
15776a22d5
docs: SDK r21.0.1 Release Notes
...
Change-Id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
2012-12-13 10:59:32 -08:00
Nick Kralevich
abe998c5e0
Remove dead code.
...
Android no longer supports a security manager.
System.getSecurityManager() always returns null.
Change-Id: Id44ae8e100da901f2e3054dab905376423a8ff5b
2012-12-13 10:49:28 -08:00
Joe Fernandez
045563cf60
docs: NDK r8d Release Notes
...
Change-Id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696
2012-12-13 10:37:57 -08:00
Przemyslaw Szczepaniak
b46533732c
Set default language in new TTS clients.
...
A recent change altered semantics of getLanguage call to return client
language instead of service language. This solved problems
with interferences between two clients using different lanaguages.
This change created a bug - new TTS client instance have no language set.
Since reading user preferences requires additional permissions I've
added new tts service method - getClientDefaultLanguage that will return
user preferences.
I've also added new client method, getDefaultLanguage, that allow easy
access to this data.
Bug: 7666482
Change-Id: Ieb7d2ba3a99d20c513add97f054874720a1cd82e
2012-12-13 03:21:30 -08:00
Jeff Brown
d90a56fadc
Merge "Track app and display wakelocks separately."
2012-12-12 16:49:30 -08:00
Jeff Brown
27f7a866f5
Track app and display wakelocks separately.
...
Change the power manager to use two different kernel wakelocks
to distinguish between an application or the display keeping the
CPU alive. This may help make the output of "dumpsys batteryinfo"
easier to interpret.
Bug: 7726759
Change-Id: Iaff96ad74030d00200617b459679ea16390a8da5
2012-12-12 16:20:17 -08:00
Craig Mautner
6cf1a66348
Merge "Call adjustWallpaperWindowsLocked once per pass."
2012-12-12 15:35:57 -08:00
The Android Automerger
978d1e51ac
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-12 15:06:12 -08:00
Stephen Hines
a52b503b2e
Merge "Compatibility lib changes for IP2."
2012-12-12 15:02:54 -08:00
Nick Kralevich
0490f02eb7
Merge "Remove unused code."
2012-12-12 12:43:36 -08:00
Nick Kralevich
ddb622e728
Merge "Add new protected broadcasts"
2012-12-12 12:41:13 -08:00
Fabrice Di Meglio
3509935919
Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale
...
aapt is not generating the correct CONFIG_LAYOUTDIR bit when a Drawable has a
LTR and RTL version. It was generating instead the wrong CONFIG_SCREEN_LAYOUT bit.
This was linked to the fact that the layout direction bits are contained into the
screen layout bit.
So now make sure that we are generating the correct CONFIG_LAYOUTDIR bit.
Change-Id: If17c84d31e6c128721ed97ee6711660b131bf941
2012-12-12 11:52:03 -08:00
Amith Yamasani
912f01865a
am 68c30860: am 73f24ae1: am 9a147340: Merge "Don\'t update global table when upgrading secondary users\' database." into jb-mr1.1-dev
...
* commit '68c308607b01bafd31c91572a81f4563e2199260':
Don't update global table when upgrading secondary users' database.
2012-12-12 11:46:41 -08:00
Amith Yamasani
68c308607b
am 73f24ae1: am 9a147340: Merge "Don\'t update global table when upgrading secondary users\' database." into jb-mr1.1-dev
...
* commit '73f24ae1d9992cf70cb05bc319d12478b2c49566':
Don't update global table when upgrading secondary users' database.
2012-12-12 11:43:21 -08:00
Amith Yamasani
73f24ae1d9
am 9a147340: Merge "Don\'t update global table when upgrading secondary users\' database." into jb-mr1.1-dev
...
* commit '9a1473406f634ea541bd1643dc70d9aae8c10e77':
Don't update global table when upgrading secondary users' database.
2012-12-12 11:41:14 -08:00
Amith Yamasani
9a1473406f
Merge "Don't update global table when upgrading secondary users' database." into jb-mr1.1-dev
2012-12-12 11:39:18 -08:00
Baligh Uddin
ca059d6d1f
Merge "Import translations. DO NOT MERGE"
2012-12-12 11:34:33 -08:00
Baligh Uddin
a60f5545ca
am cd281b79: (-s ours) am 1858bfd1: am 90e41469: Import translations. DO NOT MERGE
...
* commit 'cd281b7929b208126ccc17c7cca4aeedf934b3ea':
Import translations. DO NOT MERGE
2012-12-12 11:28:12 -08:00
Baligh Uddin
cd281b7929
am 1858bfd1: am 90e41469: Import translations. DO NOT MERGE
...
* commit '1858bfd1a5d951b8c14f81b11172dfed84f5d87f':
Import translations. DO NOT MERGE
2012-12-12 11:26:13 -08:00
Baligh Uddin
75e72013bc
Import translations. DO NOT MERGE
...
Change-Id: I2aacaa12b308eaa3813d6793a78ec24177bc88fc
Auto-generated-cl: translation import
2012-12-12 11:24:31 -08:00
Baligh Uddin
f0a2ae27a7
am 47d2db68: (-s ours) am f1c6f1d3: Import translations. DO NOT MERGE
...
* commit '47d2db689d52ead99799272b104cf6c8cd8a889a':
Import translations. DO NOT MERGE
2012-12-12 11:24:29 -08:00