Peter Ng
ab0b9a9e4e
am 68432f76: Merge "updated downloads for styleguide -new illustrator stencil" into jb-dev
...
* commit '68432f7691085b82096518f47703d59e83cb934d':
updated downloads for styleguide -new illustrator stencil
2012-08-13 16:56:57 -07:00
Peter Ng
f059e53150
am 250da641: Merge "Revert "Group revert of the following commits for design docs:"" into jb-dev
...
* commit '250da641302aa98c91855f195cc881880aa69172':
Revert "Group revert of the following commits for design docs:"
2012-08-13 16:55:08 -07:00
Peter Ng
3e504ac717
Merge "Multiple design styleguide fixes -Changing extras to videos -new bullet item in swipeviews -new in 4.0 removal -Ui overview notification info -reppling typo fixed" into jb-dev
2012-08-13 16:53:28 -07:00
Peter Ng
68432f7691
Merge "updated downloads for styleguide -new illustrator stencil" into jb-dev
2012-08-13 16:53:28 -07:00
Peter Ng
250da64130
Merge "Revert "Group revert of the following commits for design docs:"" into jb-dev
2012-08-13 16:52:38 -07:00
Wink Saville
2605aeeb30
am b17a583a: Merge "Fix interface name for tethering"
...
* commit 'b17a583a3acc57db845993599e4de56e91d5e75a':
Fix interface name for tethering
2012-08-13 16:24:15 -07:00
Wink Saville
b17a583a3a
Merge "Fix interface name for tethering"
2012-08-13 15:37:09 -07:00
Vishal Mahaveer
a6b6556082
Fix interface name for tethering
...
Fix the interface name used in stopTethering
Change-Id: I3a8fb80c3c6cd382e7641d1735bff85d8a938ee9
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
2012-08-13 15:07:24 -07:00
git-you.kim72.gmail.com
fd20296c27
Fix Issue #35489 : drm content corruption on GB
...
If rawContent is copied into mediaBuf, readBuf is copied to wrong address.
mediaBuf should be forwarded by readBytes.
Change-Id: I4fc9c1f7f4e3d5dfe3c7e5cd92261608f6b3e248
Signed-off-by: git-you.kim72.gmail.com <you.kim72@gmail.com>
2012-08-13 15:03:48 -07:00
Peter Ng
02123630ca
Multiple design styleguide fixes
...
-Changing extras to videos
-new bullet item in swipeviews
-new in 4.0 removal
-Ui overview notification info
-reppling typo fixed
Bug: 6936546
Bug: 6936394
Bug: 6958972
Bug: 6960355
Bug: 6937850
Bug: 6937856
Bug: 6912380
Bug: 6941255
Bug: 6937723
Bug: 5836846
Bug: 6915055
Bug: 6915259
Bug: 6651973
Bug: 6937070
Bug: 6947018
Bug: 6924456
Bug: 6915152
Bug: 6936797
Bug: 6924201
Bug: 6922994
Bug: 6924137
Bug: 6907998
Bug: 6912377
Bug: 6937761
Bug: 6923664
Bug: 6946790
Bug: 6918869
Change-Id: Ic5f39fe5b9f56c911af8bde9a254007748f6530e
2012-08-13 13:22:21 -07:00
Kenny Root
0b4771e02f
am 28dba4fc: Merge "Update preloaded-classes for JB"
...
* commit '28dba4fc394f0736e1d7bdf5601382c19c08f518':
Update preloaded-classes for JB
2012-08-13 12:00:35 -07:00
Wink Saville
e0df2c4f5d
am eca64977: Merge "Telephony: Signal Strength cleanup & LTE support"
...
* commit 'eca64977041c5df0c987bdae56006ebbe86de677':
Telephony: Signal Strength cleanup & LTE support
2012-08-13 12:00:30 -07:00
Kenny Root
28dba4fc39
Merge "Update preloaded-classes for JB"
2012-08-13 11:42:07 -07:00
Kenny Root
3221bf27ff
am 438a0efc: Do not eject internal ASECs when storage unmounted
...
* commit '438a0efcfbee5dc953e8e5bbdf4cb3dbe94b3f80':
Do not eject internal ASECs when storage unmounted
2012-08-13 11:40:10 -07:00
Wink Saville
eca6497704
Merge "Telephony: Signal Strength cleanup & LTE support"
2012-08-13 11:25:49 -07:00
Jean-Baptiste Queru
82c2ff5546
am d7b9c6c3: Merge "Added missing viewport meta tag to html resources"
...
* commit 'd7b9c6c356038ebced3461bb098b6a1ea1c7b222':
Added missing viewport meta tag to html resources
2012-08-13 10:53:58 -07:00
Kenny Root
438a0efcfb
Do not eject internal ASECs when storage unmounted
...
If the incoming request is to notify of storage unmounted, don't mess
with apps that are in internal ASECs.
Bug: 6948035
Change-Id: I63ffb895c4d994ee03a5a9bd6bb23f69c88e2a87
2012-08-13 10:51:09 -07:00
Jean-Baptiste Queru
d7b9c6c356
Merge "Added missing viewport meta tag to html resources"
2012-08-13 10:38:23 -07:00
Jean-Baptiste Queru
0bf666a875
am 4da3769d: Merge "mediacodec: Don\'t crash if trying to open a codec that does not exist"
...
* commit '4da3769d30851f0b517a688a5c835715d7d0b0bf':
mediacodec: Don't crash if trying to open a codec that does not exist
2012-08-13 09:48:24 -07:00
Kenny Root
1ad8bf5660
am f0e87175: Merge "Remove useless TestRunner"
...
* commit 'f0e87175ba579b43ce7f57b2502225b4d7731b97':
Remove useless TestRunner
2012-08-13 09:48:20 -07:00
Jean-Baptiste Queru
4da3769d30
Merge "mediacodec: Don't crash if trying to open a codec that does not exist"
2012-08-13 09:30:11 -07:00
Kenny Root
f0e87175ba
Merge "Remove useless TestRunner"
2012-08-13 09:01:36 -07:00
Martin Storsjo
e68323325b
mediacodec: Don't crash if trying to open a codec that does not exist
...
Change-Id: If75e3156517993629f50622a84a9ac573fced815
2012-08-13 08:47:01 -07:00
SangWook Han
fd9cb499e5
Update preloaded-classes for JB
...
Change-Id: Id127308529d581c94bd2e911b637931156ce82c1
2012-08-12 19:46:51 +09:00
Uma Maheswari Ramalingam
a44b137648
Telephony: Signal Strength cleanup & LTE support
...
Make signal strength parsing common for all modes
Add Support to calculate LTE
level for UI signal bar display
Update the lowest of Evdo/ CDMA dbm value
in phone status instead of using only CDMA dbm
Change-Id: I41bce658c536dc30558224c8ca76d6d70afb78ee
2012-08-10 15:44:31 -07:00
Kenny Root
96ad6cb080
Remove useless TestRunner
...
InstrumentationTestRunner can enumerate the test cases to run without a
special TestRunner.
Change-Id: I5a49413440ef191f28a21034a318d9a9e3f8174b
2012-08-10 13:40:19 -07:00
Jean-Baptiste Queru
cb80cb700d
am 37548994: Merge "StorageManager: fix issue that GREF has increased to 2011 in system server with intel stress test."
...
* commit '37548994e69292932e9e2fafb7cba6c53e3a2bcd':
StorageManager: fix issue that GREF has increased to 2011 in system server with intel stress test.
2012-08-10 09:26:53 -07:00
Jean-Baptiste Queru
d2388b50a5
am 53ad027c: Merge "MtpStorage: correct the size of reserve space for MTP"
...
* commit '53ad027c46bf578e26e5db70319b17a671ce8a36':
MtpStorage: correct the size of reserve space for MTP
2012-08-10 09:26:47 -07:00
Jean-Baptiste Queru
37548994e6
Merge "StorageManager: fix issue that GREF has increased to 2011 in system server with intel stress test."
2012-08-10 09:04:05 -07:00
Jean-Baptiste Queru
53ad027c46
Merge "MtpStorage: correct the size of reserve space for MTP"
2012-08-10 09:03:42 -07:00
The Android Open Source Project
3401c2e9e1
Reconcile with jb-mr0-release - do not merge
...
Change-Id: I29880eeaee48f2f841d9bfbf21c310e495f26ddc
2012-08-10 08:34:23 -07:00
Scott Main
922e038b08
am ea31b47a: Merge "fix misc doc bugs from external issues" into jb-dev
...
* commit 'ea31b47a72a6fed1269e2ba3c29c438212322bf0':
fix misc doc bugs from external issues
2012-08-09 17:03:16 -07:00
Scott Main
ea31b47a72
Merge "fix misc doc bugs from external issues" into jb-dev
2012-08-09 17:00:52 -07:00
mike wakerly
ceff341550
am 1022b999: Merge "Fix typo in UsbManager javadoc." into jb-dev
...
* commit '1022b9999de8fb022db6923a55e37ffc7dfca176':
Fix typo in UsbManager javadoc.
2012-08-09 16:49:07 -07:00
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
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