Svetoslav
605775c4ed
resolved conflicts for merge of ba35cf7a to master
...
Change-Id: Id9e6fa12056fc6cef7b77c70c73591dfc82e70a9
2013-08-20 18:18:14 -07:00
Svetoslav Ganov
ba35cf7a88
am b4f6a01d: Adding a clean spec step for removed aidl files
...
* commit 'b4f6a01d51612b9e50dffd95905e9c9add79b5d8':
Adding a clean spec step for removed aidl files
2013-08-20 18:04:50 -07:00
Selim Gurun
6fd5e5503b
Merge "Fix build break in master/chromium-dev"
2013-08-21 01:01:14 +00:00
Svetoslav Ganov
b4f6a01d51
Adding a clean spec step for removed aidl files
...
Change-Id: I350bf6c0dfae116898b13c9f2570c7263eff1814
2013-08-20 17:59:01 -07:00
Selim Gurun
d6f46a206a
Fix build break in master/chromium-dev
...
A cleanspec is needed in frameworks/base. Add it.
Change-Id: I205cbab5e52db0a5f4841c4f072479972907f0ca
2013-08-20 17:55:08 -07:00
Tom O'Neill
b8fbe8d74f
am 1e698982: am a37e2346: Merge "Warn that SettingInjectorService must be fast" into klp-dev
...
* commit '1e698982c9277c291e8eeedf1e80d7905040e421':
Warn that SettingInjectorService must be fast
2013-08-20 17:51:49 -07:00
Tom O'Neill
1e698982c9
am a37e2346: Merge "Warn that SettingInjectorService must be fast" into klp-dev
...
* commit 'a37e2346f8856e541cd1f4aa3546b5ac2fa5262b':
Warn that SettingInjectorService must be fast
2013-08-20 17:49:49 -07:00
Tom O'Neill
a37e2346f8
Merge "Warn that SettingInjectorService must be fast" into klp-dev
2013-08-21 00:47:32 +00:00
Eino-Ville Talvala
4e802a78e6
am 948e200e: am 9fac8a6a: Merge "Renderscript: Allow YUV_420_888 as a YUV type." into klp-dev
...
* commit '948e200e2d281c4547faac2f2a429c4aa73a010b':
Renderscript: Allow YUV_420_888 as a YUV type.
2013-08-20 17:40:07 -07:00
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
f95609b9af
am 53ac31cb: am e9d372a1: am fdc3c0ef: am 1b3f1533: am 414905b7: update samples nav for new script
...
* commit '53ac31cb151aa7cde119fff897fa340cf4c057dc':
update samples nav for new script
2013-08-20 17:27:52 -07: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
Selim Gurun
b7a3740773
Revert "Added the callback signal."
...
Change-Id: I18de018060f80f85e0534a069b2f5c6ecd2c8177
(cherry picked from commit f295ad0c50e56a358bba53ca3861f4558479da8e)
2013-08-21 00:16:57 +00:00
Scott Main
414905b704
update samples nav for new script
...
Change-Id: I4b357f1edf2d8e3eb7b3810103c60d3fd470e113
2013-08-20 17:07:05 -07:00
Svetoslav Ganov
2b07a532f0
am a8a34453: am 5cdaf8c3: Merge "Fix build" into klp-dev
...
* commit 'a8a34453a26fa8d852ecddaea1225e3ac9b25045':
Fix build
2013-08-20 17:01:36 -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
61832149eb
am a9e12e03: am ff796e5a: Merge "Change PacProcessor to Android Service" into klp-dev
...
* commit 'a9e12e03f3c00522745dba0f5a80096d3c39ae43':
Change PacProcessor to Android Service
2013-08-20 16:39:32 -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
c742bf1054
am cd38fdb2: am 59bbba7c: Merge "Add implicit parent dependency for Preferences" into klp-dev
...
* commit 'cd38fdb2de55f666f6c268549d3f5bdced616fda':
Add implicit parent dependency for Preferences
2013-08-20 16:34:00 -07: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
949aa3b0f7
am 4a359c45: am 439c9f5b: Merge "Make "low ram device" a readonly system property" into klp-dev
...
* commit '4a359c45578686d52f3a27cad530f78dcaa032ca':
Make "low ram device" a readonly system property
2013-08-20 16:02:50 -07: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
fab1a141d3
am 8937c0bb: am 22df87b6: Merge "Added the callback signal." into klp-dev
...
* commit '8937c0bb56633beee6b7547367fcf74be7c59544':
Added the callback signal.
2013-08-20 15:49:51 -07: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
7fc4461bd6
am 46b57ce3: am aed96e1b: Merge "Add hotword detection in insecure keyguard" into klp-dev
...
* commit '46b57ce3a1738e1907998463377e8a5bcba3664e':
Add hotword detection in insecure keyguard
2013-08-20 14:46:27 -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
e435e646fe
am 272f8bba: am 59210de1: Merge "Avoid crashing in unlockCanvasAndPost" into klp-dev
...
* commit '272f8bba47dadcf560cf1a11749cf61cbe367a83':
Avoid crashing in unlockCanvasAndPost
2013-08-20 14:31:07 -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
bdbfd0eb9e
am 6a088c4c: am ec850cd6: Merge "Update comments" into klp-dev
...
* commit '6a088c4c0f0024f056ce0b6596ebaf6fe4e8f5aa':
Update comments
2013-08-20 14:25:34 -07:00
Matthew Xie
6a088c4c0f
am ec850cd6: Merge "Update comments" into klp-dev
...
* commit 'ec850cd6c60a4ab6c3a08df603e3c9ca3150a9fc':
Update comments
2013-08-20 14:22:34 -07:00
Jason Monk
0218d87846
am 3a8acf0a: am b7ac0d02: Merge "Fix ProxyHandler to only run when needed" into klp-dev
...
* commit '3a8acf0a5acdf31767a2f73ff83d616eed6f1f22':
Fix ProxyHandler to only run when needed
2013-08-20 14:18:48 -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