Eino-Ville Talvala
948e200e2d
am 9fac8a6a: Merge "Renderscript: Allow YUV_420_888 as a YUV type." into klp-dev
...
* commit '9fac8a6a4a47bf7b72d6c759c6f605b1806f925a':
Renderscript: Allow YUV_420_888 as a YUV type.
2013-08-20 17:38:10 -07:00
Eino-Ville Talvala
9fac8a6a4a
Merge "Renderscript: Allow YUV_420_888 as a YUV type." into klp-dev
2013-08-21 00:36:45 +00:00
Scott Main
53ac31cb15
am e9d372a1: am fdc3c0ef: am 1b3f1533: am 414905b7: update samples nav for new script
...
* commit 'e9d372a1fa6af81cff038d7da60e4d67e54f71d3':
update samples nav for new script
2013-08-20 17:25:57 -07:00
Scott Main
e9d372a1fa
am fdc3c0ef: am 1b3f1533: am 414905b7: update samples nav for new script
...
* commit 'fdc3c0ef90fa4b8c6130714b71b478c1e7a25a91':
update samples nav for new script
2013-08-20 17:23:48 -07:00
Scott Main
fdc3c0ef90
am 1b3f1533: am 414905b7: update samples nav for new script
...
* commit '1b3f1533ce6b3799fb90b7d73e3bef3ddce4abce':
update samples nav for new script
2013-08-20 17:20:39 -07:00
Scott Main
1b3f1533ce
am 414905b7: update samples nav for new script
...
* commit '414905b7044b10b7231f13584bf26e7c8c3e1e12':
update samples nav for new script
2013-08-20 17:17:34 -07:00
Scott Main
414905b704
update samples nav for new script
...
Change-Id: I4b357f1edf2d8e3eb7b3810103c60d3fd470e113
2013-08-20 17:07:05 -07:00
Svetoslav Ganov
a8a34453a2
am 5cdaf8c3: Merge "Fix build" into klp-dev
...
* commit '5cdaf8c3e5298849ceba25483f510ce924ea8d95':
Fix build
2013-08-20 16:59:46 -07:00
Svetoslav Ganov
5cdaf8c3e5
Merge "Fix build" into klp-dev
2013-08-20 23:58:13 +00:00
Svetoslav Ganov
3bf7976e78
Fix build
...
Change-Id: Iff815dd264008c005995ab8a95b442dad7aca18e
2013-08-20 16:40:57 -07:00
Jason Monk
a9e12e03f3
am ff796e5a: Merge "Change PacProcessor to Android Service" into klp-dev
...
* commit 'ff796e5a24481febd8c07b1a6a3c3eda0e3fd88b':
Change PacProcessor to Android Service
2013-08-20 16:37:45 -07:00
Jason Monk
ff796e5a24
Merge "Change PacProcessor to Android Service" into klp-dev
2013-08-20 23:35:26 +00:00
Alan Viverette
cd38fdb2de
am 59bbba7c: Merge "Add implicit parent dependency for Preferences" into klp-dev
...
* commit '59bbba7c37f2ce7b7fd00aef87b49d681b4a3a79':
Add implicit parent dependency for Preferences
2013-08-20 16:31:07 -07:00
Alan Viverette
59bbba7c37
Merge "Add implicit parent dependency for Preferences" into klp-dev
2013-08-20 23:28:16 +00:00
Christopher Tate
4a359c4557
am 439c9f5b: Merge "Make "low ram device" a readonly system property" into klp-dev
...
* commit '439c9f5bf3e1cee8a4b48c942c72b9f7bfef9884':
Make "low ram device" a readonly system property
2013-08-20 16:01:05 -07:00
Christopher Tate
439c9f5bf3
Merge "Make "low ram device" a readonly system property" into klp-dev
2013-08-20 22:59:39 +00:00
Selim Gurun
8937c0bb56
am 22df87b6: Merge "Added the callback signal." into klp-dev
...
* commit '22df87b669e7e1d53a8b6418c23f56443caac7e9':
Added the callback signal.
2013-08-20 15:48:04 -07:00
Selim Gurun
22df87b669
Merge "Added the callback signal." into klp-dev
2013-08-20 22:41:53 +00:00
Selim Gurun
fc3f4ee8a0
Added the callback signal.
...
Bug:10190508
Change-Id: I52b327e0724938e1de7ce7550d26563364ff1589
2013-08-20 15:18:31 -07:00
Sandeep Siddhartha
46b57ce3a1
am aed96e1b: Merge "Add hotword detection in insecure keyguard" into klp-dev
...
* commit 'aed96e1b2bedc9db82462cde37a811a0e7aee05f':
Add hotword detection in insecure keyguard
2013-08-20 14:44:20 -07:00
Sandeep Siddhartha
aed96e1b2b
Merge "Add hotword detection in insecure keyguard" into klp-dev
2013-08-20 21:41:44 +00:00
Jason Monk
9ced3cd9d6
Change PacProcessor to Android Service
...
This switches the PacProcessor over to an Android Service. The service
is bound and unbound by the PacManager, which also adds it to the
ServiceManager, allowing for Context-Free access by the PacProxySelector
in all DVMs.
bug:10182711
Change-Id: Id1ff7660be56e8976cdcccd76e041feb47a17a61
2013-08-20 17:36:39 -04:00
Christopher Tate
2f61f91491
Make "low ram device" a readonly system property
...
This lets components outside the Zygote / Android resource regime
know whether this is considered a "low ram" device.
Set the property [ro.config.low_ram] to "true" if the device is to be
considered low-ram. Any other property string (or its absence) will
be interpreted as meaning this is a normal larger-ram device. The
"true" string must be all lower case.
Bug 10131789
Change-Id: I15332d169b4aa4eaa0a6c1952787af0b03d23a6b
2013-08-20 14:35:56 -07:00
Andy McFadden
272f8bba47
am 59210de1: Merge "Avoid crashing in unlockCanvasAndPost" into klp-dev
...
* commit '59210de17c840bb60fc1c623250df8f39ebba132':
Avoid crashing in unlockCanvasAndPost
2013-08-20 14:29:06 -07:00
Andy McFadden
59210de17c
Merge "Avoid crashing in unlockCanvasAndPost" into klp-dev
2013-08-20 21:27:07 +00:00
Matthew Xie
6a088c4c0f
am ec850cd6: Merge "Update comments" into klp-dev
...
* commit 'ec850cd6c60a4ab6c3a08df603e3c9ca3150a9fc':
Update comments
2013-08-20 14:22:34 -07:00
Matthew Xie
ec850cd6c6
Merge "Update comments" into klp-dev
2013-08-20 21:18:30 +00:00
Sandeep Siddhartha
f4d922b2d9
Add hotword detection in insecure keyguard
...
- This talks to a service that's implemented by the Search app
- The AIDL interface may be moved to the framework in a later CL
Change-Id: I26553e46f7d17ba4ac7a952c871b28b261cba975
2013-08-20 14:17:02 -07:00
Jason Monk
3a8acf0a5a
am b7ac0d02: Merge "Fix ProxyHandler to only run when needed" into klp-dev
...
* commit 'b7ac0d02d666fb3483b42c291cd3a193d7ca8154':
Fix ProxyHandler to only run when needed
2013-08-20 14:15:33 -07:00
Jason Monk
b7ac0d02d6
Merge "Fix ProxyHandler to only run when needed" into klp-dev
2013-08-20 21:13:24 +00:00
John Du
b7b7d7a05c
Update comments
...
bug 10152994
Change-Id: I05bbd917ebd0d140e0894f8bf7e43d0fc77378c8
2013-08-20 14:03:28 -07:00
Fabrice Di Meglio
264ec5053f
am 841cd860: Merge "Fix bug #10409069 Spinner Drawable is not mirrored in RTL mode" into klp-dev
...
* commit '841cd8609b10f6683c258bc9afac362198b41ccd':
Fix bug #10409069 Spinner Drawable is not mirrored in RTL mode
2013-08-20 13:53:22 -07:00
Fabrice Di Meglio
841cd8609b
Merge "Fix bug #10409069 Spinner Drawable is not mirrored in RTL mode" into klp-dev
2013-08-20 20:51:02 +00:00
Svetoslav
be88e35d61
am d3092167: Merge "Implemented advanced printer selection and API refactoring." into klp-dev
...
* commit 'd30921672ca3022107ce63f750b0f35ab224af4b':
Implemented advanced printer selection and API refactoring.
2013-08-20 13:46:16 -07:00
Svetoslav
d30921672c
Merge "Implemented advanced printer selection and API refactoring." into klp-dev
2013-08-20 20:42:05 +00:00
Matthew Xie
74f5c5d37f
am 23657458: Merge "Change abortReliableWrite(BluetoothDevice) to abortReliableWrite()" into klp-dev
...
* commit '2365745855ac4725949ebe9bae72fdc0613bb94f':
Change abortReliableWrite(BluetoothDevice) to abortReliableWrite()
2013-08-20 12:50:38 -07:00
Matthew Xie
2365745855
Merge "Change abortReliableWrite(BluetoothDevice) to abortReliableWrite()" into klp-dev
2013-08-20 19:47:29 +00:00
Fabrice Di Meglio
b002febec5
Fix bug #10409069 Spinner Drawable is not mirrored in RTL mode
...
- add missing android:autoMirrored="true" on corresponding StateList
Change-Id: Iea6930089f33061f2cf0ae83739bb8b3356f1e1b
2013-08-20 12:34:29 -07:00
Jason Monk
433ba46fcc
Fix ProxyHandler to only run when needed
...
Changes ProxyHandler service to only be active when needed for PAC services.
Bug: 10260877
Change-Id: If42e53e805488fd08381baa96409ba3027661c70
2013-08-20 15:27:51 -04:00
Tom O'Neill
eeab4fc9e3
am fd952994: Fix build: remove obsolete TODO
...
* commit 'fd95299415b0d013ee3c8b79e1398cb85cfa684f':
Fix build: remove obsolete TODO
2013-08-20 12:05:49 -07:00
Tom O'Neill
fd95299415
Fix build: remove obsolete TODO
...
Change-Id: Ie8ef50450a8c415deba9b71607bec89e72db9227
2013-08-20 11:54:02 -07:00
Maggie Benthall
cd3e6f9907
am 1cd230a5: Merge "Add methods for managing CAs to DevicePolicyManager(Service)" into klp-dev
...
* commit '1cd230a552bcc4196b546321b670e084e643c8d5':
Add methods for managing CAs to DevicePolicyManager(Service)
2013-08-20 11:38:37 -07:00
Maggie Benthall
1cd230a552
Merge "Add methods for managing CAs to DevicePolicyManager(Service)" into klp-dev
2013-08-20 18:35:08 +00:00
Tim Murray
816f3058bd
am cf8e6778: Merge "Handle updates to C++ API." into klp-dev
...
* commit 'cf8e6778c28319b6c5357a43831ebf1a41b56e96':
Handle updates to C++ API.
2013-08-20 11:30:38 -07:00
Maggie Benthall
da51e68e58
Add methods for managing CAs to DevicePolicyManager(Service)
...
Guard install/uninstall by enforcing that the caller have the new system-only permission MANAGE_CA_CERTIFICATES.
Also include API methods for asking whether there are any User CA certs
installed, or if one by a particular name is installed in the keystore.
CA certs will be installed via KeyChain into the TrustedCertificateStore.
Bug: 8232670
Change-Id: I17b47a452e72eb4fe556dc6db823a46c6e854be8
2013-08-20 14:30:36 -04:00
Chong Zhang
ce063ca19b
am ea18a8db: Merge "MediaPlayer: add listener for subtitle data" into klp-dev
...
* commit 'ea18a8db653a0846187aba6116936b3738fa3f33':
MediaPlayer: add listener for subtitle data
2013-08-20 11:27:05 -07:00
Chong Zhang
1cb4d42c56
am a3132d97: Merge "MediaPlayer.TrackInfo: add getFormat() method" into klp-dev
...
* commit 'a3132d975b218b3d973711ebf347da3c433a9afb':
MediaPlayer.TrackInfo: add getFormat() method
2013-08-20 11:27:02 -07:00
Tim Murray
cf8e6778c2
Merge "Handle updates to C++ API." into klp-dev
2013-08-20 18:27:01 +00:00
Chong Zhang
ea18a8db65
Merge "MediaPlayer: add listener for subtitle data" into klp-dev
2013-08-20 18:25:05 +00:00
Andy McFadden
ed55c8db1c
Avoid crashing in unlockCanvasAndPost
...
It's possible to update the native surface pointer while the
surface is locked (via lockCanvas). This leads to a surprise when
the surface is unlocked. Avoid the surprise by tracking the
locked surface separately.
Bug 10289713
Change-Id: I84346c952be859bbd91ceae7df07b91dabe0948e
2013-08-20 11:23:17 -07:00