128603 Commits

Author SHA1 Message Date
Mark Salyzyn
5b6da1aee8 jni: binder ptrdiff_t compile issues
Change-Id: Ibdd82479d3f9fb53cf1d6793c4f7353e8f1c3646
2014-04-17 17:25:36 -07:00
John Spurlock
cbdf956b42 Merge "Revert "Fix broken status bar when activity is showing above keyguard"" 2014-04-18 00:13:56 +00:00
Christopher Tate
0153487d01 Merge "Support per-package lib dirs for bundled apps" 2014-04-18 00:02:44 +00:00
Jianing Wei
abb7a88697 Merge "Camera2 API: fix wrong logic in handling last frame number." 2014-04-18 00:00:12 +00:00
Christopher Tate
addfbdc09c Support per-package lib dirs for bundled apps
Bundled apps can now use /system/lib/apkname or /system/lib64/apkname
in addition to the (globally shared) /system/lib and /system/lib64
directories.  Note that when an app is updated post hoc the update APK
will look to its normal library install directory in
/data/data/[packagename]/lib, so such updates must include *all*
needed libraries -- the private /system/lib/apkname dir will not be in
the path following such an update.

"apkname" here is the base name of the physical APK that holds the
package's code.  For example, if a 32-bit package is resident on disk
as /system/priv-app/SettingsProvider.apk then its app-specific lib
directory will be /system/lib/SettingsProvider

Bug 13170859

Change-Id: Ic44cc75312f33d2f5d402a1c261b2eca3fe8badc
2014-04-17 16:54:16 -07:00
John Spurlock
2e50f28f41 Revert "Fix broken status bar when activity is showing above keyguard"
This reverts commit 25ab3d94387597a24619723df687214320f17e76.

Change-Id: I7dba397a9fe09d70b87ff4e638805c010c192599
2014-04-17 23:45:50 +00:00
Mark Salyzyn
8a61140034 am dc500d2d: am 4037847c: am 73258630: Merge "jni: binder 64-bit compile issues"
* commit 'dc500d2d567b37c620308bc8f0b0928eba4a2f5b':
  jni: binder 64-bit compile issues
2014-04-17 23:33:58 +00:00
Stephen Hines
9deecdc88f am fc45b664: am f0aa4cc0: am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."
* commit 'fc45b664d421553042629d24086a144761c7b5e1':
  Fix improper use of JNI_ABORT for operations where Java objects are written.
2014-04-17 23:33:54 +00:00
Mindy Pereira
cbc7168e55 am 03f7f442: am cb54f978: Merge "Update window alpha at the same time as translating" into klp-modular-dev
* commit '03f7f44250faea2db0147f43b6699436e540889d':
  Update window alpha at the same time as translating
2014-04-17 23:33:33 +00:00
Mark Salyzyn
dc500d2d56 am 4037847c: am 73258630: Merge "jni: binder 64-bit compile issues"
* commit '4037847c0251a15ea88012a8405d0688c8b1ac53':
  jni: binder 64-bit compile issues
2014-04-17 23:22:34 +00:00
Stephen Hines
fc45b664d4 am f0aa4cc0: am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."
* commit 'f0aa4cc0f257448f76e9d90b97abf9682e930fbf':
  Fix improper use of JNI_ABORT for operations where Java objects are written.
2014-04-17 23:22:09 +00:00
Vinit Deshapnde
0d870c11e5 am 734ccfbc: (-s ours) am 2585e15e: am 72358802: am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev
* commit '734ccfbc7b29a136e09e6a2ae788673fbd52f3b4':
  Don't reset country code once it is persisted
2014-04-17 23:21:25 +00:00
Jeff Brown
aaea4d3a48 am 18a69b93: am 8e1e4006: Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev
* commit '18a69b936afa6bdb8c65b6b582989c4dcdac45ee':
  Add support for dynamically setting the virtual display surface.
2014-04-17 22:59:59 +00:00
Simon Wilson
3e2cb07d52 am ef059b03: am 3c8bbe24: Check that mRemotePlayer is not null before use
* commit 'ef059b039407610fa00e6463b8354cbcc21b6ee9':
  Check that mRemotePlayer is not null before use
2014-04-17 22:59:55 +00:00
Mark Salyzyn
4037847c02 am 73258630: Merge "jni: binder 64-bit compile issues"
* commit '7325863013e5c34d493e4e92ecadf4fea87554e7':
  jni: binder 64-bit compile issues
2014-04-17 22:57:25 +00:00
Mindy Pereira
03f7f44250 am cb54f978: Merge "Update window alpha at the same time as translating" into klp-modular-dev
* commit 'cb54f978b565459210e80054e95becd1f8cae173':
  Update window alpha at the same time as translating
2014-04-17 22:57:23 +00:00
Mindy Pereira
cb54f978b5 Merge "Update window alpha at the same time as translating" into klp-modular-dev 2014-04-17 22:53:24 +00:00
Mark Salyzyn
7325863013 Merge "jni: binder 64-bit compile issues" 2014-04-17 22:52:58 +00:00
Mark Salyzyn
cfd91e7852 jni: binder 64-bit compile issues
Change-Id: I8a3083e7e9389bbb84c2dd061fef059e0595800d
2014-04-17 15:40:01 -07:00
Jason Sams
53ad398074 Merge "Unhide RenderScript resize intrinsic" 2014-04-17 22:34:22 +00:00
RoboErik
0a57a1112f Merge "Add RouteProviders to the new Media APIs" 2014-04-17 22:13:30 +00:00
Jianing Wei
5a4b02be33 Camera2 API: fix wrong logic in handling last frame number.
Change-Id: I23bdceada2460238c1e7fc45524ae491268b4243
2014-04-17 15:12:26 -07:00
Vinit Deshapnde
734ccfbc7b am 2585e15e: am 72358802: am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev
* commit '2585e15ef722c7bd8c320e57ded8ad67da121245':
  Don't reset country code once it is persisted
2014-04-17 22:03:16 +00:00
RoboErik
07c7077c54 Add RouteProviders to the new Media APIs
Compiles and works with OneMedia. This currently is a rough test of
the system for finding, connecting to, and sending messages to routes.
This will just connect to the first route it finds when a request to
open the route picker is made (and disconnect when another request is
made).

Change-Id: I5de5521a079471b9e02664be4654c0591dfd9a6d
2014-04-17 15:02:33 -07:00
Vinit Deshapnde
2585e15ef7 am 72358802: am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev
* commit '72358802d6135c633dd158f44b988e4f4075e6fd':
  Don't reset country code once it is persisted
2014-04-17 21:57:12 +00:00
Jeff Brown
18a69b936a am 8e1e4006: Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev
* commit '8e1e40066bae030d6a6e8f3f3f8f69ccd6ec1848':
  Add support for dynamically setting the virtual display surface.
2014-04-17 21:53:34 +00:00
Mindy Pereira
b0ea484615 Update window alpha at the same time as translating
Note: algorithm for alpha per progress may be updated
This is a first pass proof of concept

Change-Id: Ia043200ea737ff9d132e350449e17ba0fde10d65
2014-04-17 14:53:24 -07:00
Jeff Brown
8e1e40066b Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev 2014-04-17 21:49:49 +00:00
Simon Wilson
ef059b0394 am 3c8bbe24: Check that mRemotePlayer is not null before use
* commit '3c8bbe245e7b0f937c36620c1427726fe9de50a6':
  Check that mRemotePlayer is not null before use
2014-04-17 21:33:44 +00:00
Chris Craik
c306ad61a7 Add convenience methods to encourage usage of ALL_SAVE_FLAG
Change-Id: I7a3bb2b83ca0463282764898e755b5f1a71ac557
2014-04-17 14:28:18 -07:00
Simon Wilson
3c8bbe245e Check that mRemotePlayer is not null before use
Bug: 14138829
Change-Id: Ie7ddb54ef3b82b9566ac41d4f0ff335976d3c907
2014-04-17 14:16:52 -07:00
Jason Sams
18033abaaf Unhide RenderScript resize intrinsic
Change-Id: I450c83ad00bcb7d999aaf7d4bd7ea88d63ab8fea
2014-04-17 13:52:26 -07:00
Zhijun He
f60194b115 Merge "Camera2: Update sync.frameNumber tag" 2014-04-17 20:40:19 +00:00
Zhijun He
4f91e2a459 Camera2: Update sync.frameNumber tag
This is from the type mismapping bug fix in metadata generation.

Change-Id: Icaa9916e00e76b30cdc5688c3d3b7e9cadf84794
2014-04-17 13:20:21 -07:00
Jorim Jaggi
bf19fa4fe6 Merge "Move bouncer to the bottom, but only on phones." 2014-04-17 19:57:25 +00:00
Jorim Jaggi
9a6eba3ce7 Move bouncer to the bottom, but only on phones.
Change-Id: Ibe03964a10a8cab9e179ff0618a6ed312c8b1b4a
2014-04-17 21:44:53 +02:00
Jason Sams
c99a9b28ef am 5170476c: am a4af5726: am 112d1b94: Merge "Add BiCubic resize instrinsic"
* commit '5170476c5bf470b57616380aa7b15b44e5a24bea':
  Add BiCubic resize instrinsic
2014-04-17 19:36:40 +00:00
Baligh Uddin
61e3991bf6 am 177d9b9a: (-s ours) am b279f527: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '177d9b9a25296d9cbe0f96497a8abf2fe28aa1da':
  Import translations. DO NOT MERGE
2014-04-17 19:36:15 +00:00
Griff Hazen
d36e8df724 am 84f4adc9: Merge commit \'59dfbb91\' into klp-modular-dev-plus-aosp
* commit '84f4adc9a5e3cc818ed972dc7fecbafb131a779a':
  Fix build [DO NOT MERGE]
2014-04-17 19:36:04 +00:00
Scott Main
1b866eeb58 am 2b7345e4: am b04f3f74: am cb38ee51: am a106923e: Merge "add image itemprop to specify image for search result snippet" into klp-docs
* commit '2b7345e4e3eaa7fcf2f24ba4d03ae00a265adedc':
  add image itemprop to specify image for search result snippet
2014-04-17 19:35:31 +00:00
Ricardo Cervera
004263eda2 am f162266c: am f64feec2: am 4aa68e97: am dc9ca02c: docs: Watermark images with easter eggs
* commit 'f162266cc44aa83e6a5b95fc4f629c80cf603416':
  docs: Watermark images with easter eggs
2014-04-17 19:35:20 +00:00
Ricardo Cervera
a3b13847b0 docs: Added the play from search intent. Bug: 13473141.
Change-Id: Icf483b5e0446e064b32a782717408484d5806859
2014-04-17 12:31:18 -07:00
Raph Levien
0613657426 Merge changes Ia693f512,If3b7d41f
* changes:
  Enable elegant text metrics in Quantum theme
  Add elegantTextHeight text appearance attribute
2014-04-17 19:21:14 +00:00
Jorim Jaggi
56d46cc95f Merge "Fix global screen rotation issue." 2014-04-17 19:08:37 +00:00
Vinit Deshapnde
72358802d6 am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev
* commit '45e746766676681e4e191d0b7e521b8b3f6c284c':
  Don't reset country code once it is persisted
2014-04-17 18:59:54 +00:00
Vinit Deshapnde
45e7467666 Merge "Don't reset country code once it is persisted" into klp-dev 2014-04-17 18:54:58 +00:00
Jorim Jaggi
ca36cf7bca Fix global screen rotation issue.
Bug: 14080683
Change-Id: I0144faafa0e01c14c8c8e6a6c9fc81a10d25f47d
2014-04-17 20:49:30 +02:00
Jorim Jaggi
b91dfd95b1 Merge "Fix not being able to unlock SIM PIN." 2014-04-17 18:23:05 +00:00
Stephen Hines
f0aa4cc0f2 am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."
* commit 'a48985349cb26757b6c4be18acc496ab6d1110e5':
  Fix improper use of JNI_ABORT for operations where Java objects are written.
2014-04-17 18:20:47 +00:00
Jorim Jaggi
fa9189fd74 Fix not being able to unlock SIM PIN.
Bug: 14120902
Change-Id: I812d9679000242eabea617ea75cf8355d16926b2
2014-04-17 20:17:30 +02:00