John Spurlock
4393a7d264
am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan.
...
* commit 'c0d849348ae9fb36e725d0644a4927e2e5146295':
Fix typo in TtsSpan.
2015-06-15 22:39:12 +00:00
John Spurlock
076c599feb
am 1ad5c813: Fix typo in TtsSpan.
...
* commit '1ad5c813211d4d855a0d5396855c80653480aaa4':
Fix typo in TtsSpan.
2015-06-15 22:11:30 +00:00
John Spurlock
1ad5c81321
Fix typo in TtsSpan.
...
Change-Id: Ic32f141f0c51ee3bee8fd71464f104ef725de880
2015-06-15 17:24:57 +00:00
Filip Gruszczynski
94476be6a4
am 88bc9753: Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev
...
* commit '88bc9753c30c9ab3c92d074ae49520cfa2258b16':
DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes
2015-06-12 16:29:39 +00:00
Doris Liu
629ba0e2b3
DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes
...
This fix is to take advantage of ArrayMap, which is a key-value
mapping data structure that is more memory efficient than HashMap.
Bug: 11604254
Change-Id: I57006880de570a4d7f3899e274cf0a06355d116b
(cherry picked from commit d7444427d9
2015-06-10 22:54:09 +00:00
Filip Gruszczynski
93634166c8
am d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev
...
* commit 'd88e4d50d6198233883a69313fdee2c1a6fff7ca':
ActivityView: set surface on a background thread.
2015-06-02 22:36:42 +00:00
Filip Gruszczynski
d88e4d50d6
Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev
2015-06-02 22:26:39 +00:00
Jeff Brown
65f6996add
am eb4bd19e: Terminate loop properly when cursor window is full. DO NOT MERGE
...
* commit 'eb4bd19ef09b2c277347b08c4a050f01f686c9c2':
Terminate loop properly when cursor window is full. DO NOT MERGE
2015-06-02 03:33:31 +00:00
Jeff Brown
eb4bd19ef0
Terminate loop properly when cursor window is full. DO NOT MERGE
...
The existing code exits the column-filling loop immediately but
may continue to try to fill rows. Ordinarily this should fail
too but it's possible for the process to continue and then
blow up a little later. Fixed this problem by exiting the row-
filling loop promptly.
Bug: 21406130
Change-Id: Ifab59188d5d1b40f3c1f5c97604dd48da71bf37b
(cherry picked from commit bb8c841e90
2015-06-02 00:00:34 +00:00
Filip Gruszczynski
2df62bf0dd
ActivityView: set surface on a background thread.
...
ActivityView shouldn't set the surface on the main thread, because it's
a binder call and causes jank. Instead it should delegate the call to a
background thread and let it do the work there.
Bug: 15752100
Change-Id: I6f2764c93dfb8f3e00d79f0e97d4a6688b6fdd8f
2015-06-01 13:24:12 -07:00
Filip Gruszczynski
47249f2a9e
am cb89ac84: Merge "Support for devices with a chin." into cw-d-mr1-dev
...
* commit 'cb89ac84c621e047d81873428325dfd747b90a6b':
Support for devices with a chin.
2015-05-20 22:54:14 +00:00
Filip Gruszczynski
3e11bf33a6
Support for devices with a chin.
...
Information about the chin is now part of the config.xml instead of the
theme. It is retrieved by WindowManagerService and passed to the clients
as insets. Clients can adjust their behavior in a way that makes it
invisible to the user, that part of the surface doesn't actually exist.
Bug: 19908853
Change-Id: Iedf57bf3c848201b854f91ffeb3b59187d375c1f
2015-05-20 14:20:30 -07:00
Yigit Boyar
21cdbd298d
Revert "Make VPA.setInterpolator(null) unset the interpolator."
...
This reverts commit 58ae164100
2015-05-18 23:38:41 +00:00
Vladislav Kaznacheev
58ae164100
Make VPA.setInterpolator(null) unset the interpolator.
...
Bug:21199392
Change-Id: Iae4b82254ddf6b60d442258e79ff0ea4d54c0a4d
2015-05-15 13:01:32 -07:00
John Reck
951f23478d
am d955dceb: am 862540cd: Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev
...
* commit 'd955dceb4f38f214e62024e808b2b1a21be41940':
Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
2015-05-14 01:05:47 +00:00
John Reck
d955dceb4f
am 862540cd: Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev
...
* commit '862540cdb11a7128ae1fd670136f398645b4af7b':
Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
2015-05-14 00:51:07 +00:00
John Reck
862540cdb1
Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev
2015-05-14 00:40:45 +00:00
John Reck
e869835d6a
am a5b28b92: am 69355eaa: Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev
...
* commit 'a5b28b92b14d0949d43be6198fedc31872ad07f6':
DO NOT MERGE Backport of limited jank-tracking metrics
2015-05-13 22:07:15 +00:00
John Reck
a5b28b92b1
am 69355eaa: Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev
...
* commit '69355eaa1c1f4bfc961d5dd9fdb0f3817d36d5f0':
DO NOT MERGE Backport of limited jank-tracking metrics
2015-05-13 21:52:50 +00:00
John Reck
25607a6642
Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
...
This reverts commit 2614bd225f
2015-05-13 21:42:28 +00:00
John Reck
69355eaa1c
Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev
2015-05-13 21:42:13 +00:00
Wale Ogunwale
cc9c597dad
am d639a453: am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""
...
* commit 'd639a4532417bf605f03b3b5efdb3a9e1cbe6661':
Revert "[ActivityManager] Improve multi-thread access the same provider"
2015-04-24 22:26:08 +00:00
Wale Ogunwale
4cdc7e842d
am e2047da6: am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider""
...
* commit 'e2047da6f3f21fc702d35b7d1c4e9bb62c963dac':
Revert "Clean-up state if we have an exception when acquiring provider"
2015-04-24 22:26:04 +00:00
Wale Ogunwale
d639a45324
am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""
...
* commit 'e60077e62a441dbcc132b2abb35d998ab48d261c':
Revert "[ActivityManager] Improve multi-thread access the same provider"
2015-04-24 22:15:02 +00:00
Wale Ogunwale
e2047da6f3
am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider""
...
* commit 'd9bf26522b930a8d5d25f6e28c390e39fee6d0b2':
Revert "Clean-up state if we have an exception when acquiring provider"
2015-04-24 22:14:56 +00:00
Wale Ogunwale
1d646128b2
Revert "[ActivityManager] Improve multi-thread access the same provider"
...
This reverts commit 57307b21cb
2015-04-24 14:45:14 -07:00
Wale Ogunwale
67fe0a450c
Revert "Clean-up state if we have an exception when acquiring provider"
...
This reverts commit 73e239bdc9
2015-04-24 14:44:54 -07:00
Svet Ganov
2fd6dda03e
am f33489c6: am d24cc193: am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
...
* commit 'f33489c6bda49cf930cb06601625ddf792d41fe7':
DO NOT MERGE Don't take flags when creating app widget config activity.
2015-04-23 22:19:04 +00:00
Joe Fernandez
1009c8de23
am 92ae292e: Merge "docs: Add text to JavaDocs regarding browser file access vulnerability" into lmp-mr1-ub-docs
...
* commit '92ae292e864287abcb1a78c117263f64b303b885':
docs: Add text to JavaDocs regarding browser file access vulnerability
2015-04-23 17:45:19 +00:00
Svet Ganov
f33489c6bd
am d24cc193: am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
...
* commit 'd24cc19343073294b3376f825bdc0d54a8d692f1':
DO NOT MERGE Don't take flags when creating app widget config activity.
2015-04-23 15:43:01 +00:00
Svet Ganov
d24cc19343
am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
...
* commit 'db672b6cde256e27c1188c7e99f23e5a65252ba4':
DO NOT MERGE Don't take flags when creating app widget config activity.
2015-04-23 15:30:43 +00:00
Svet Ganov
db672b6cde
am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
...
* commit '00e91901fd1dd007de196ada04e3fc2f79e1be73':
DO NOT MERGE Don't take flags when creating app widget config activity.
2015-04-23 15:18:10 +00:00
Joe Fernandez
22b5ba8c01
docs: Add text to JavaDocs regarding browser file access vulnerability
...
b/17420682
Change-Id: Ic03b51778280570be65ae933fd906b140acdf023
2015-04-22 17:29:12 -07:00
Justin Koh
ba75135a80
am 2aa3905c: Merge "DO NOT MERGE: The ValueAnimator\'s state need to be totally reset during clone." into lmp-mr1-modular-dev
...
* commit '2aa3905cb0cc595783ab43b0bc7a4b3818003958':
DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
2015-04-22 00:43:16 +00:00
ztenghui
059451e185
am 23606598: DO NOT MERGE: Reset the Node status when clone.
...
* commit '23606598244c2a297d994895eaf631b240d33242':
DO NOT MERGE: Reset the Node status when clone.
2015-04-22 00:43:08 +00:00
Justin Koh
2aa3905cb0
Merge "DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone." into lmp-mr1-modular-dev
2015-04-22 00:31:00 +00:00
Andreas Gampe
fb861b6c8d
am 31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection"
...
* commit '31fb202e6f6687f86ec4fc33b18aafacbf67c797':
Frameworks/base: Compile-time optimize SQLiteConnection
2015-04-21 23:59:57 +00:00
Andreas Gampe
31fb202e6f
Merge "Frameworks/base: Compile-time optimize SQLiteConnection"
2015-04-21 23:31:51 +00:00
Mathieu Chartier
765d7c3048
am ba6783b6: Merge "Update getExportedPropertyMethods to new reflection API"
...
* commit 'ba6783b69a34b05123d1e3da51e6a11a9e0ca115':
Update getExportedPropertyMethods to new reflection API
2015-04-21 23:26:49 +00:00
Mathieu Chartier
ba6783b69a
Merge "Update getExportedPropertyMethods to new reflection API"
2015-04-21 23:03:35 +00:00
Andreas Gampe
4f47b40e05
Frameworks/base: Compile-time optimize SQLiteConnection
...
Do not cache compiled regular expression and date formatter. Both
cannot be compile-time created, are expensive at preloading time,
and only used in the rare case of dumping the connection (mainly
on errors).
Bug: 19498458
Bug: 19542228
Change-Id: Ia38491a3f852ccf699b815ff05289b338e932f2a
2015-04-21 16:01:00 -07:00
ztenghui
612e5cdec6
DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
...
b/20119270
Change-Id: I26365b38e4a9712227aaec6f08f32025dab82ac7
(cherry picked from commit 26e9a19900
2015-04-21 21:26:53 +00:00
ztenghui
2360659824
DO NOT MERGE: Reset the Node status when clone.
...
b/20457797
Change-Id: I5f1b0e2238fdc4a69a9c09c1e6e0272f7ede3685
2015-04-21 20:31:58 +00:00
Mathieu Chartier
a8a6516f62
Update getExportedPropertyMethods to new reflection API
...
Bug: 19264997
Change-Id: Ife79c469fdb09f30e3aefcfc3e0ce5ed32303fce
2015-04-21 11:52:10 -07:00
Kris Giesing
6c97440849
DO NOT MERGE Revert "Load libraries directly from apk"
...
This reverts commit dec4688f40
2015-04-20 14:15:59 -07:00
Kris Giesing
e863712afc
DO NOT MERGE Revert "Add android.net.IpPrefix#contains()"
...
This reverts commit acc8c09d3a
2015-04-20 14:15:43 -07:00
Svet Ganov
68e6b5055b
DO NOT MERGE Don't take flags when creating app widget config activity.
...
bug:19618745
Change-Id: I7973ebfc67ebf52f14890dda9eb891a7b8a5a095
2015-04-20 17:16:38 +00:00
Martijn Coenen
cb4776254c
am e386f7f5: Merge "Expose peer LLCP version in NDEF callbacks."
...
* commit 'e386f7f5108e9c2aa7547394f23d5936d7993cfe':
Expose peer LLCP version in NDEF callbacks.
2015-04-17 07:25:27 +00:00
Martijn Coenen
e386f7f510
Merge "Expose peer LLCP version in NDEF callbacks."
2015-04-17 07:02:59 +00:00
Filip Gruszczynski
47e743b9e2
am 4544b927: Hold a wake lock while dozing when wallpaper draws.
...
* commit '4544b927d7f3575bf609490b42d521a12bf95a07':
Hold a wake lock while dozing when wallpaper draws.
2015-04-17 00:59:39 +00:00
