David Christie
52235b844f
Merge "Add WorkSource capability to AlarmManager"
2013-07-26 18:38:40 +00:00
Craig Mautner
2982199271
Merge "Update configuration before setting override size."
2013-07-26 18:37:58 +00:00
Zhihai Xu
876d100f02
Merge "Add debug menu to enable btsnoop"
2013-07-26 18:33:43 +00:00
Oscar Rydhé
425916e4c5
Fix NullpointerException in MediaMetadataRetriever
...
According to the API documentation and the ICS implementation
the setDataSource(String) method throws an
IllegalArgumentException if path is null. In JB a
NullpointerException is thrown instead. This fix restores
the earlier behaviour.
Change-Id: Ic47baadf91076acc227d92d84f6b8d1d6ecd0c03
2013-07-26 18:18:17 +00:00
Zhihai Xu
c8a4d7d089
Merge "Revert "Bluetooth stopped working in master - "bad file descriptor"""
2013-07-26 18:15:13 +00:00
Zhihai Xu
560a523159
Revert "Bluetooth stopped working in master - "bad file descriptor""
...
This reverts commit df3cedab6fce59ce1dde4316bf63df7f7e488e23.
Change-Id: I9ffaf5580924c150145d37ec38ffde602199b7e2
2013-07-26 18:10:06 +00:00
Zhihai Xu
d4360f0c17
Merge "Bluetooth stopped working in master - "bad file descriptor""
2013-07-26 18:08:32 +00:00
Geremy Condra
350d274746
Merge "Remove unused mDnsOverridden"
2013-07-26 17:48:54 +00:00
Martijn Coenen
437d770118
Merge "Change XML-grammar for (Off)HostApduServices."
2013-07-26 16:52:55 +00:00
David Christie
02600fb66b
Add WorkSource capability to AlarmManager
...
Change-Id: Ibcff01a9f54a89fde6e7e5b7658e9a90b9a2445b
2013-07-26 09:41:59 -07:00
David Christie
701ace2e68
Merge "Add WorkSource capability to WifiManager for starting a scan."
2013-07-26 16:35:02 +00:00
Andrew Flynn
a92ce1f32d
Keyguard doesn't need new MANAGE_DEVICE_ADMINS permission
...
Accidentally added in a418cf2
Bug: 9856348
Change-Id: I662fbcc8471b529651701084a703f89dfc642279
2013-07-26 08:26:10 -07:00
John Spurlock
a381d375f3
StatusBarNotification cleanup.
...
Remove obsolete ctor and obsolete accessor comment.
Change-Id: Ib72abc8fbd2a5f9a1b82da986094667f39e0bf62
2013-07-26 10:42:56 -04:00
Mathias Agopian
2ca204e4c0
get rid of PixelFormatInfo and simplify things
...
Change-Id: I487d4eef7db0095ace4babf5bb100a8769711257
2013-07-25 19:25:10 -07:00
Colin Cross
6108dda2db
Merge "add overlays to override lowmemorykiller adjustment values"
2013-07-26 01:32:24 +00:00
Joe Fernandez
dda57de6ff
am dfad4fbd: am 3febd463: Merge "docs: NDK r9 Release Notes (w/download size fix)" into jb-mr2-ub-dev
...
* commit 'dfad4fbdde86cc5988b4f2e115d9fc20c87f468c':
docs: NDK r9 Release Notes (w/download size fix)
2013-07-25 17:50:01 -07:00
Joe Fernandez
dfad4fbdde
am 3febd463: Merge "docs: NDK r9 Release Notes (w/download size fix)" into jb-mr2-ub-dev
...
* commit '3febd463369b8595705170faf5fda52e27c8563b':
docs: NDK r9 Release Notes (w/download size fix)
2013-07-25 17:47:32 -07:00
Joe Fernandez
3febd46336
Merge "docs: NDK r9 Release Notes (w/download size fix)" into jb-mr2-ub-dev
2013-07-26 00:44:56 +00:00
Martijn Coenen
c3178e5f1c
Change XML-grammar for (Off)HostApduServices.
...
AIDs can now carry a category attribute. Clarified that
"OffHostApduService" is not bound to by Android, and may
be extended by offering service interfaces that are not
defined in the platform.
Change-Id: Idd0a3990beb927e8d81366013f53386fb46e3f9f
2013-07-25 17:43:47 -07:00
Chet Haase
b63425e4e7
Merge "Fix lazy measure logic to not use obsolete values"
2013-07-26 00:27:50 +00:00
Mathias Agopian
6f7b589171
get rid of PIXEL_FORMAT_A_8
...
Change-Id: Ia750811f08ddebdd5818da211fd03d61b75f8e97
2013-07-25 17:25:02 -07:00
Matthew Williams
09d20f3bc2
Merge "Fixed NPE in SyncRequest for Bundle.EMPTY"
2013-07-26 00:23:11 +00:00
Dianne Hackborn
5bd42924f2
Merge "Okay, I give in, add null key support to ArrayMap and ArraySet."
2013-07-26 00:16:38 +00:00
Chet Haase
1f99240c64
am d766d71a: am d547bcec: Merge "Return the actual interpolator of the ViewPropertyAnimator"
...
* commit 'd766d71a4ccb2d2a6966b2319f272f64fdcbfa7d':
Return the actual interpolator of the ViewPropertyAnimator
2013-07-25 17:04:16 -07:00
Dianne Hackborn
62d708f4dd
Okay, I give in, add null key support to ArrayMap and ArraySet.
...
Change-Id: Iac5035f9c5884a9f9d5acb38132bb128d7a55249
2013-07-25 16:53:09 -07:00
Matthew Williams
68e39c3411
Fixed NPE in SyncRequest for Bundle.EMPTY
...
Writing to bundle caller provides causes app to crash if bundle
is Bundle.EMPTY, which is backed by an unmodifiable map.
Change-Id: Ia9bdf12cddea9673bb84e0458cce8bc8027fbba5
2013-07-25 16:40:23 -07:00
Chet Haase
deababcd53
Fix lazy measure logic to not use obsolete values
...
Issue #10022821 Lazy measure broken
Change-Id: I618ed5e80291304b5430c853d51e70e09f057e4c
2013-07-25 16:06:48 -07:00
Joe Fernandez
2b7ab48dc4
docs: NDK r9 Release Notes (w/download size fix)
...
This set of release notes adds adjustments to the NDK caused by
download size restrictions.
Change-Id: I17404c19a7faed9ea6e8f3034d460bcc3f5ee003
2013-07-25 15:55:27 -07:00
David Christie
6942a1200c
Add WorkSource capability to WifiManager for starting a scan.
...
Change-Id: I011bf3b91fbddaba7ab0128bb03d27d90b8a886f
2013-07-25 15:25:07 -07:00
Christopher Tate
86b12dd735
Merge "Turn on debug logs for alarm batching"
2013-07-25 22:16:43 +00:00
JP Abgrall
ae2e26ee10
Merge "Use correct variables for the directories in CleanSpec"
2013-07-25 22:14:38 +00:00
Colin Cross
fcdad6f292
add overlays to override lowmemorykiller adjustment values
...
Add overlays config_lowMemoryKillerMinFreeKbytesAbsolute and
config_lowMemoryKillerMinFreeKbytesAdjust to allow a product to
modify the size of the lowmemorykiller minfree buckts. The absolute
overlay sets the size of the largest bucket to the specified value
and scales the smaller buckets proportionally. The adjust overlay
(which can be negative) directly adds to the size of the largest
bucket and to the the smaller buckets proportionally.
Change-Id: I0d6b7662be12fd151deb2bf9591f2c7a8b1cb6f7
2013-07-25 15:11:39 -07:00
Chet Haase
d766d71a4c
am d547bcec: Merge "Return the actual interpolator of the ViewPropertyAnimator"
...
* commit 'd547bcec5634f99195a2b12522b6977f61c40d55':
Return the actual interpolator of the ViewPropertyAnimator
2013-07-25 14:52:31 -07:00
Chet Haase
d547bcec56
Merge "Return the actual interpolator of the ViewPropertyAnimator"
2013-07-25 21:46:49 +00:00
Christopher Tate
b883dda46a
Turn on debug logs for alarm batching
...
Bug 9965704
Change-Id: I18111682664a069c2dc4fd956df49a02e2c455a8
2013-07-25 14:43:57 -07:00
Alan Viverette
a709b37eab
Show FastScroller thumb on mouse-over
...
BUG: 9484233
Change-Id: I99a37e6d582e42b9a0fae4a0fc2d4348419bfa35
2013-07-25 14:43:24 -07:00
Colin Cross
eb63254431
Merge "replace cutils/logger.h with log/logger.h"
2013-07-25 21:39:31 +00:00
Alex Ray
aff14e7008
libandroid_runtime: android_print needs NELEM def
...
NELEM is defined many places in the framework, so this gives
android_print_PdfDocument.cpp one of them (JNIHelp.h). Without this
updating an upstream library (libskia) to remove an NELEM definition
causes this file to break.
Change-Id: Ifd033f9bd92b8902b6035ec5a8381cb9debd87ce
2013-07-25 14:35:27 -07:00
Matthew Williams
c81891c125
Fixes to javadoc
...
That was breaking sdk(linux) and aosp_mips-eng (linux)
Change-Id: I1d6737baf68e004a2764d1dbee816f98a1a49be8
2013-07-25 14:27:43 -07:00
Zhihai Xu
118c85156a
Bluetooth stopped working in master - "bad file descriptor"
...
only close file descriptor which is created internally for LocalSocketImpl
bug:9960585
Change-Id: I79492a05cc7c81ae6e134058840d5ca0b7663795
2013-07-25 13:44:50 -07:00
Craig Mautner
67a60426d8
Update configuration before setting override size.
...
PhoneWindowManager.setInitialDisplaySize() uses Resources to determine
the height of the Status and Navigation bars. Previous to this CL the
Configuration was being updated after setInitialDisplaySize() was
called which caused the Status and Navigation Bar heights to use the
initial size and density and not the override values. This fix moves
the updateConfiguration after the override values are read in but
before setInitialDisplaySize() is called.
Fixes bug 9966940.
Change-Id: If5b033f520e14f32080d0f2aebbdc6bdae714f88
2013-07-25 12:29:12 -07:00
John Spurlock
9deaa286d8
Dismiss hideybars on touch outside.
...
When the system bars are revealed in auto-hiding mode, the user
should be able to dismiss them before the timeout by interacting
with the underlying activity.
Bug:8682187
Change-Id: I79169005baafda27fb5ad9c29ab1ec67600b2eb6
2013-07-25 14:42:48 -04:00
John Spurlock
620e8e5917
Merge "Remove obsolete optimization."
2013-07-25 18:23:35 +00:00
Joe Fernandez
e3b1f45425
am 240966fa: am 3d9e819c: docs: fix link bug in Support LIbrary Guide
...
* commit '240966faf796378530d9c485d6e5fdb370ba68da':
docs: fix link bug in Support LIbrary Guide
2013-07-25 10:50:58 -07:00
Joe Fernandez
240966faf7
am 3d9e819c: docs: fix link bug in Support LIbrary Guide
...
* commit '3d9e819ca879117b357fa0097c412f10f2afe37a':
docs: fix link bug in Support LIbrary Guide
2013-07-25 10:39:27 -07:00
Elliott Hughes
efaad3e2c6
resolved conflicts for merge of a35ec14f to master
...
Change-Id: Ib2eb18fe6df2e404d0bf739b300fc200ca81f539
2013-07-25 10:36:59 -07:00
Elliott Hughes
a35ec14f78
am 03bd8324: Merge "Switch DateUtils.formatDateRange over to an icu4c-based implementation."
...
* commit '03bd832461d02675d5a4c6a9c072bed18e81781e':
Switch DateUtils.formatDateRange over to an icu4c-based implementation.
2013-07-25 10:26:32 -07:00
Elliott Hughes
03bd832461
Merge "Switch DateUtils.formatDateRange over to an icu4c-based implementation."
2013-07-25 17:19:35 +00:00
Joe Fernandez
3d9e819ca8
docs: fix link bug in Support LIbrary Guide
...
external bug: http://code.google.com/p/android/issues/detail?id=58006
Change-Id: If02d17cb66dd018e49cd6b85433e93456574715e
2013-07-25 10:17:19 -07:00
John Spurlock
a5baf89102
Remove obsolete optimization.
...
Reverts JB optimization I7ae978caa1f28932ee56f65484b18330a4406b80
made obsolete by I2f9b0591d44599b07bd83f03c4e09e6dd98e1448 in MR1.
Change-Id: I8a738624f9a902648e317f2eac25fd56c3b47a46
2013-07-25 13:15:42 -04:00