drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,574 Commits 1 Branch 0 Tags
Commit Graph

121574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Stephen Hines
a48985349c Merge "Fix improper use of JNI_ABORT for operations where Java objects are written." 2014-04-17 18:15:38 +00:00
Vinit Deshapnde
b5ee95edf9 Don't reset country code once it is persisted 
This change simply ignores resetting of country code by cellular
networks to avoid disconnecting existing wifi connections. It also
defers setting newly found country code until after existing Wifi
connection is torn down.

Also removes some dead code related to resetting of country codes.

Bug: 13894807
Change-Id: Ie2fcfdd4b3be8ba94542772c132fb1acb6a2c683
 2014-04-17 11:05:21 -07:00
Jason Sams
5170476c5b am a4af5726: am 112d1b94: Merge "Add BiCubic resize instrinsic" 
* commit 'a4af5726c4c8c882ca65a049bfa824922609d464':
  Add BiCubic resize instrinsic
 2014-04-17 17:07:48 +00:00
Jason Sams
a4af5726c4 am 112d1b94: Merge "Add BiCubic resize instrinsic" 
* commit '112d1b94ee8456dba16842e6b964eb35aef95818':
  Add BiCubic resize instrinsic
 2014-04-17 17:02:10 +00:00
Baligh Uddin
177d9b9a25 am b279f527: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'b279f5272e2c7554aeab930ba0aabab12efff9e2':
  Import translations. DO NOT MERGE
 2014-04-17 15:53:11 +00:00
Baligh Uddin
b279f5272e Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-17 15:48:38 +00:00
Griff Hazen
84f4adc9a5 Merge commit '59dfbb91' into klp-modular-dev-plus-aosp 
Remove all changes from the merge to stop propagation.

Conflicts:
	tools/layoutlib/bridge/src/android/content/res/AssetManager_Delegate.java
 2014-04-17 02:53:18 -07:00
Stephen Hines
414fa2c93a Fix improper use of JNI_ABORT for operations where Java objects are written. 
In these RS API calls, it is possible (and very likely) that some Java objects
are written to via JNI calls into the RS driver. These writes can end up being
discarded if we specify JNI_ABORT, particularly if the Java object has been
moved due to GC. The change introduces a readonly mode for some macro calls
and updates other JNI callers to appropriately skip JNI_ABORT.

Change-Id: I8c5f2ae959b3fbc9008c9d2ac4542f2ebab29b06
 2014-04-17 01:02:42 -07:00
Deepanshu Gupta
59dfbb91ca Fix build [DO NOT MERGE] 
The branch is missing some CLs for 64-bit support. So, until they are
added, this change will fix the build.

Change-Id: Ia838caf60ca49b406101a3fb48a96afdcfb30c66
 2014-04-17 00:14:28 -07:00
Jeff Brown
92207df753 Add support for dynamically setting the virtual display surface. 
Previously, the surface that backs a virtual display had to be set
at the time when the display was created.  This change now makes
it possible to set or remove the surface later.  The virtual display
is treated as if it were "off" while no surface is attached to it.

Change-Id: Ib4fdbbb8b4ee79f0fb9ceb648f9bda4a8fa6a2ca
 2014-04-16 18:45:05 -07:00
Jason Sams
112d1b94ee Merge "Add BiCubic resize instrinsic" 2014-04-17 01:22:19 +00:00
Scott Main
2b7345e4e3 am b04f3f74: am cb38ee51: am a106923e: Merge "add image itemprop to specify image for search result snippet" into klp-docs 
* commit 'b04f3f749b565ca075066bbc1fe89153941eaa65':
  add image itemprop to specify image for search result snippet
 2014-04-17 00:28:17 +00:00
Scott Main
b04f3f749b am cb38ee51: am a106923e: Merge "add image itemprop to specify image for search result snippet" into klp-docs 
* commit 'cb38ee510abed0112aa47cb2da6bfe182400f321':
  add image itemprop to specify image for search result snippet
 2014-04-17 00:22:02 +00:00
Scott Main
cb38ee510a am a106923e: Merge "add image itemprop to specify image for search result snippet" into klp-docs 
* commit 'a106923e9add041f73ccf5f46e8584ea4302c54c':
  add image itemprop to specify image for search result snippet
 2014-04-17 00:16:54 +00:00
Scott Main
a106923e9a Merge "add image itemprop to specify image for search result snippet" into klp-docs 2014-04-17 00:14:48 +00:00
Jason Sams
464af41b28 Add BiCubic resize instrinsic 
Change-Id: Iafec3f4260bb5d3a3133b034e42dfb0a94ae9f81
 2014-04-16 17:13:09 -07:00
Ricardo Cervera
f162266cc4 am f64feec2: am 4aa68e97: am dc9ca02c: docs: Watermark images with easter eggs 
* commit 'f64feec253d0c8a124f8ab16954bf71b1f3c3e92':
  docs: Watermark images with easter eggs
 2014-04-17 00:08:41 +00:00
Ricardo Cervera
f64feec253 am 4aa68e97: am dc9ca02c: docs: Watermark images with easter eggs 
* commit '4aa68e9799bf56bd5a35a1a49b512bbafce8f5df':
  docs: Watermark images with easter eggs
 2014-04-17 00:03:33 +00:00
Ricardo Cervera
4aa68e9799 am dc9ca02c: docs: Watermark images with easter eggs 
* commit 'dc9ca02c51ecc4468e60c391f8357b5025d6eef1':
  docs: Watermark images with easter eggs
 2014-04-16 23:58:36 +00:00
Scott Main
e26817d07e add image itemprop to specify image for search result snippet 
Change-Id: I8c0ed12268318124bdb944db9048fc73284823f9
 2014-04-16 16:57:21 -07:00
Jason Sams
a09695f59c am 38f407cb: Merge "RenderScript bicubic resize intrinsic [DO NOT MERGE]" into klp-modular-dev 
* commit '38f407cb1daca91af82943c931593d11a6c84b1c':
  RenderScript bicubic resize intrinsic [DO NOT MERGE]
 2014-04-16 23:54:22 +00:00
Jason Sams
38f407cb1d Merge "RenderScript bicubic resize intrinsic [DO NOT MERGE]" into klp-modular-dev 2014-04-16 23:49:30 +00:00
Aaron Whyte
ee5d512d62 am 4980996b: Merge "Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity." into klp-modular-dev 
* commit '4980996bcc4e8065cf5dff1cf989d73face38281':
  Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity.
 2014-04-16 23:49:20 +00:00
Aaron Whyte
4980996bcc Merge "Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity." into klp-modular-dev 2014-04-16 23:45:22 +00:00
Jason Sams
d666d92b80 RenderScript bicubic resize intrinsic [DO NOT MERGE] 
Change-Id: Icebfb3137aacddce0705834c6d4d2547c709cb0a
 2014-04-16 16:41:01 -07:00
Adam Powell
3d678ad462 am 973ddaac: DO NOT MERGE Add isRound to WindowInsets 
* commit '973ddaacaef255b8659d35cfe4151dd5b7436138':
  DO NOT MERGE Add isRound to WindowInsets
 2014-04-16 23:23:02 +00:00
Adam Powell
973ddaacae DO NOT MERGE Add isRound to WindowInsets 
isRound allows a view to determine whether the window it is contained
within obscures the corners of the window content. This allows views
aware of this property to adapt their layout accordingly.

Switch ViewRootImpl to use dispatchApplyInsets instead of
fitSystemWindows.

Change-Id: Ic3e3936b73815b2593cb9720af1a309fbd18406e

Conflicts:
	core/java/android/view/ViewRootImpl.java
 2014-04-16 14:59:16 -07:00
Aaron Whyte
d1931ffc07 Allowed custom secure-adb confirmation via Activity or Service. 
It used to only be available via an Activity.

Change-Id: Id79a99a70e721f3b567e75d45ffeba779264ec1e
 2014-04-16 14:50:14 -07:00
Deepanshu Gupta
cf72f25981 Fix incorrect merge conflict to klp-modular-dev-plus-aosp 
resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp
properly, originally fixed in 35d46778f49c962c990cfc17e521aa80b9e0c016

Change-Id: I5d1abf641564ea19d283f60385d39f7670a2f22e
 2014-04-16 14:46:24 -07:00
Baligh Uddin
81cdde5631 Import translations. DO NOT MERGE 
Change-Id: I1d61ecf2601689f2598a8430fd4ea7b0d4ab80a8
Auto-generated-cl: translation import
 2014-04-16 14:32:46 -07:00
Ricardo Cervera
dc9ca02c51 docs: Watermark images with easter eggs 
Change-Id: I4ab6d614bf43419916633baa062d745f7966a5f9
 2014-04-16 14:22:38 -07:00
Jeff Brown
3ee9dc58e5 am fa72a9ea: Merge "Declare VersionCodes.KITKAT_WATCH." into klp-modular-dev 
* commit 'fa72a9eaae6170e65d9ba72720ee7b0d752f8847':
  Declare VersionCodes.KITKAT_WATCH.
 2014-04-16 20:52:24 +00:00
Jeff Brown
fa72a9eaae Merge "Declare VersionCodes.KITKAT_WATCH." into klp-modular-dev 2014-04-16 20:49:15 +00:00
Jeff Brown
1c3f332c3f Declare VersionCodes.KITKAT_WATCH. 
The constant does not have a final value yet but is useful for
documentation purposes during development.

Change-Id: Iddd9b956eff822a9a25e9df483b5bd3979189023
 2014-04-16 13:27:00 -07:00
Craig Mautner
4b81e89d9b am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev 
* commit '2fd3cb9544df1e09caa725a8d542cf2fe1df0c75':
  Fix ActivityContainer callback parcelling.
 2014-04-16 20:10:26 +00:00
Craig Mautner
2fd3cb9544 Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev 2014-04-16 20:05:31 +00:00
Craig Mautner
e3a00d745f Fix ActivityContainer callback parcelling. 
The Binder interface for passing a callback was not implemented
properly. Also the callback for ActivityContainer now has a new
API.

Change-Id: I6b719be0cb57542f022a3cc14e8f4efde60b1a50
 2014-04-16 13:03:26 -07:00
Mark Salyzyn
24dbfdaa70 am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues" 
* commit '936e87e12dd1335c6f773705fd0a7edb32bc4385':
  frameworks: 64 bit compile issues
 2014-04-16 19:51:10 +00:00
Mark Salyzyn
6c92530509 am 2760778d: jni: liblog reading error API incorrect 
* commit '2760778d7020c31f6b7c28383b0db6e0bef99754':
  jni: liblog reading error API incorrect
 2014-04-16 19:49:23 +00:00
Deepanshu Gupta
6725580a6b am 97114e60: am 13ed576e: am cda504f2: am 0aea4684: am 91f2a7cb: am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev 
* commit '97114e606219b6d44bb377410f15a0fe9732dd35':
  Improve text rendering and measurement. [DO NOT MERGE]
  Fix the measurement of text bounds. [DO NOT MERGE]
 2014-04-16 19:44:40 +00:00
Deepanshu Gupta
b873a0a3ab am 985bb326: am fa206123: am 502c83f4: am 00312846: (-s ours) am 0fe63473: am 04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev 
* commit '985bb326a6f2b63ed6ee6041654421fae098bcec':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-04-16 19:44:37 +00:00
Deepanshu Gupta
06f4c8c731 am 884f3b14: am 925b911f: am 013af337: am 4eeaa61f: (-s ours) am 87e14187: am fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev 
* commit '884f3b14c654612f922bb3927e17dfa795939594':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-04-16 19:44:34 +00:00
Deepanshu Gupta
a84a175390 am 0cffa9fe: am 43f1fe7e: am 5016f769: am b03e1176: (-s ours) am 533a52fe: am b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit '0cffa9fe6c796c69d143493aede11e3f1321262e':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-04-16 19:44:31 +00:00
Deepanshu Gupta
43e229a111 am 38f2b1ea: am 30ab17dd: am 289f1ffb: am 90b0b69c: (-s ours) am 014ac85f: am f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit '38f2b1ea4146a52f167d1a73e705590266848336':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-04-16 19:44:28 +00:00
Mark Salyzyn
936e87e12d am 5788722d: Merge "frameworks: 64 bit compile issues" 
* commit '5788722df7b73f1eff3edb95f2ead83d19603926':
  frameworks: 64 bit compile issues
 2014-04-16 19:42:11 +00:00
Mark Salyzyn
2760778d70 jni: liblog reading error API incorrect 
- return value contains -errno on error.

(cherry pick from commit b519aeca47a7b798926c00ce5c8cf730e26e75fd)

Bug: 13907124
Change-Id: I91f12db5749fac2ae8ed5b0f033d4eaf83e666f5
 2014-04-16 12:33:41 -07:00
Mark Salyzyn
5788722df7 Merge "frameworks: 64 bit compile issues" 2014-04-16 19:21:44 +00:00
Deepanshu Gupta
492090a55e am 16191f8c: resolved conflicts for merge of 0e2049cd to klp-modular-dev 
* commit '16191f8c4fe92036c8ff2eecd4e57b4642068b99':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-04-16 19:20:01 +00:00
Deepanshu Gupta
97114e6062 am 13ed576e: am cda504f2: am 0aea4684: am 91f2a7cb: am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev 
* commit '13ed576e8ec9914f65234d1616b029bdfb4e86ed':
  Improve text rendering and measurement. [DO NOT MERGE]
  Fix the measurement of text bounds. [DO NOT MERGE]
 2014-04-16 19:16:47 +00:00