Dianne Hackborn
4bde299148
am 14a0ec03: am 022cfcda: Merge "Fix issue #17414533 : update batterystats occasionally takes a couple..." into lmp-dev
...
* commit '14a0ec0324a9aa5ce7bc2c767c744092fd128143':
Fix issue #17414533 : update batterystats occasionally takes a couple...
2014-09-11 01:18:16 +00:00
Dianne Hackborn
24d8c17bdb
am f6f453d1: am b4ee4428: Merge "Fix issue #17428001 : Fix revokeUriPermissions" into lmp-dev
...
* commit 'f6f453d1baa77d3bed97936ffbe177d15055c8e8':
Fix issue #17428001 : Fix revokeUriPermissions
2014-09-11 01:18:09 +00:00
Lajos Molnar
40449c70d6
am b9414beb: am 3b22910c: Merge "add android.util.SizeF.parseSizeF()" into lmp-dev
...
* commit 'b9414beb66ef9ca14bc606256f3af781c8124901':
add android.util.SizeF.parseSizeF()
2014-09-11 01:18:01 +00:00
Dianne Hackborn
023b6812ab
Merge "Fix issue #17414533 : update batterystats occasionally takes a couple..." into lmp-dev
2014-09-11 00:56:41 +00:00
Dianne Hackborn
547f6e1803
Merge "Fix issue #17428001 : Fix revokeUriPermissions" into lmp-dev
2014-09-11 00:55:25 +00:00
Lajos Molnar
5b54c9fb2a
Merge "add android.util.SizeF.parseSizeF()" into lmp-dev
2014-09-11 00:55:06 +00:00
Matthew Williams
03a4da6e8e
Add flag to JobParameters for job expired
...
BUG: 17424511
Introduce an "isOverrideDeadlineExpired" which will allow clients
to know when they are being run due to an expiry.
Nb that we check deadline expiry by checking that the constraints on
the job are not satisfied at execution time. Really this is the same
thing, as a job will not be run without its constraints being met,
unless the job has expired.
Change-Id: I4b91e5b5eadccabd91296d5a5ca66b859dbfaf5c
2014-09-10 17:32:18 -07:00
Paul Jensen
07ed07459a
Make Network.openConnection() share HttpHandlers not OkHttpClients.
...
HttpHandler and HttpsHandler classes have a lot of bug fixes baked into
them that the Network.openConnection() API should be using, for example
disabling SPDY support.
bug:17420465
Change-Id: I9f1472753a542d1dd6bffde3a60c37a9145098aa
2014-09-11 00:25:50 +00:00
Amith Yamasani
8cd28b57ed
Apply cross-user restrictions to Shell
...
Even though Shell user is allowed to perform cross-user actions,
lock that path down if the target user has restrictions imposed by
the profile owner device admin that prevents access via adb.
If the profile owner has imposed DISALLOW_DEBUGGING_FEATURES, don't
allow the shell user to make the following types of calls:
start activities, make service calls, access content providers,
send broadcasts, block/unblock packages, clear user data, etc.
Bug: 15086577
Change-Id: I9669fc165953076f786ed51cbc17d20d6fa995c3
2014-09-10 17:15:06 -07:00
Yigit Boyar
e91f7c0219
Add support for default content description in DecorToolbar
...
Bug: 16888338
Change-Id: I0f3f8fcd39cfd29d239801392dd712869749aecf
2014-09-10 17:12:28 -07:00
Dianne Hackborn
652973fca8
Fix issue #17414533 : update batterystats occasionally takes a couple...
...
...hundred milliseconds.
Rework the locking so that no critical paths block on the cpu collection.
Change-Id: Ie615a033f7f8b523b67abee62c581d1a8fce324c
2014-09-10 17:11:22 -07:00
Alan Viverette
5878076456
Use Calendar day of week rather than Time in SimpleMonthView
...
BUG: 17377360
Change-Id: I685f35b760c049edaa8934eccaf5ce1bbf326cf2
2014-09-10 17:09:13 -07:00
Alan Viverette
86f062d98a
am ba870607: am 78f863c7: Merge "Fix docs and nulling behavior for TextView.setCompoundDrawables" into lmp-dev
...
* commit 'ba87060785fbb90ba7d0777a3938a1b95d3ee5a6':
Fix docs and nulling behavior for TextView.setCompoundDrawables
2014-09-10 23:51:39 +00:00
Craig Stout
e988ee1eb2
Omit appearing views that have a parent that is also appearing.
...
b/17460766
Change-Id: Ib3fe619e271688c93a5cd4cb4d557e6cca5baa34
2014-09-10 23:44:30 +00:00
Alan Viverette
6b398e03c7
am 1c19026d: am 8b5ef83e: Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev
...
* commit '1c19026dadb9d6013f48901aaf1e6451b42f0977':
Make SearchView styles public, remove public Holo styles added in L
2014-09-10 23:38:16 +00:00
Alan Viverette
593f2d33bb
Merge "Fix docs and nulling behavior for TextView.setCompoundDrawables" into lmp-dev
2014-09-10 23:31:04 +00:00
Alan Viverette
7ff0270e7d
Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev
2014-09-10 23:29:13 +00:00
Dianne Hackborn
192679a7d3
Fix issue #17428001 : Fix revokeUriPermissions
...
You can now revoke permissions that were granted to you.
Change-Id: I9a1872059edc715b10bbd2d653e45420d43331c3
2014-09-10 16:20:24 -07:00
Alan Viverette
362f984df3
Make SearchView styles public, remove public Holo styles added in L
...
We shouldn't adding styles for a deprecated theme. Also this cleans up
the removed public resources for easier deletion later.
BUG: 17455273
Change-Id: I2c5caf354aab91463702f25c38f0dd29c153ba44
2014-09-10 16:05:35 -07:00
Xin Guan
2bcb97bfb5
Using the correct package name for ContentResolver
...
Change-Id: I0518391f7262c78043fbd42ddfefef0f2451382c
2014-09-10 15:19:16 -07:00
George Mount
11aa55502e
am 86d1c5d3: am 0b46b913: Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev
...
* commit '86d1c5d370576447d7c7c713bf0f258023a1c3d4':
Fix ArrayIndexOutOfBoundsException.
2014-09-10 21:55:20 +00:00
Tao Bai
96bca16a43
am cdad4651: am 3350edac: Merge "Revise createIntent and parseResult API." into lmp-dev
...
* commit 'cdad4651a1e93b0cfe2b199e39e5583ce9a19454':
Revise createIntent and parseResult API.
2014-09-10 21:55:15 +00:00
Craig Mautner
c787572762
am 99a902ed: am cef60b6a: Merge "Wait for animation complete before completing boot" into lmp-dev
...
* commit '99a902ed763df87484342899ebe33aa3744be420':
Wait for animation complete before completing boot
2014-09-10 21:55:05 +00:00
George Mount
9b727adc6c
am 0b46b913: Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev
...
* commit '0b46b9133b6c7d19c316d9d8ae472aafdfce4029':
Fix ArrayIndexOutOfBoundsException.
2014-09-10 21:51:54 +00:00
Tao Bai
a0df890b46
am 3350edac: Merge "Revise createIntent and parseResult API." into lmp-dev
...
* commit '3350edacefea92e2dfb5ad07a7b719334db8f157':
Revise createIntent and parseResult API.
2014-09-10 21:51:50 +00:00
George Mount
05c4f7ad76
Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev
2014-09-10 21:47:58 +00:00
Craig Mautner
9830962083
am cef60b6a: Merge "Wait for animation complete before completing boot" into lmp-dev
...
* commit 'cef60b6ac6e490803a1b14d4a4214e097cc5d269':
Wait for animation complete before completing boot
2014-09-10 21:46:57 +00:00
Tao Bai
bebc56209d
Merge "Revise createIntent and parseResult API." into lmp-dev
2014-09-10 21:43:04 +00:00
George Mount
2e9616354c
am 7726c740: am b74b8d49: Merge "Move capturing entering views until just before transition." into lmp-dev
...
* commit '7726c7408402872e57c36bc23add1f387ff5eb71':
Move capturing entering views until just before transition.
2014-09-10 21:38:34 +00:00
Chet Haase
da789748f3
am 969628cd: am 804df9eb: Use constant state in AnimatedVectorDrawable
...
* commit '969628cdad8f3ba8581c01c0ffbf2b224196e979':
Use constant state in AnimatedVectorDrawable
2014-09-10 21:38:29 +00:00
Craig Mautner
ebcd9189e3
Merge "Wait for animation complete before completing boot" into lmp-dev
2014-09-10 21:33:43 +00:00
George Mount
d56c779602
am b74b8d49: Merge "Move capturing entering views until just before transition." into lmp-dev
...
* commit 'b74b8d498f584dc5b51b67190da45e266f95edf3':
Move capturing entering views until just before transition.
2014-09-10 21:32:08 +00:00
Chet Haase
f4e67d69c7
am 804df9eb: Use constant state in AnimatedVectorDrawable
...
* commit '804df9eb62ed13668aacbd1609640a92846932f9':
Use constant state in AnimatedVectorDrawable
2014-09-10 21:26:49 +00:00
George Mount
4245e161c6
Merge "Move capturing entering views until just before transition." into lmp-dev
2014-09-10 21:26:23 +00:00
Chet Haase
6f6578e81c
Use constant state in AnimatedVectorDrawable
...
Complex animated vector drawables can be expensive to load due to
sub-optimal parsing of the String-based pathData. Suffering that penalty
every time the same drawable is loaded (such as material-themed
ProgressBars) is painful.
The new approach caches constant state of both the VectorDrawable (including
the pathData geometry) and the animators (which includes potentially expensive
path-based interpolators).
issue #17366831 Material ProgressBar taking 200+ms to inflate
Change-Id: Iba3b541e24cfce8c07f5aa9fe6aa7d7b92b2fe1c
2014-09-10 21:21:53 +00:00
Mathieu Chartier
baaf9a246d
am 410d0de7: am 6a593012: Merge "Change EmptyArray System.identityHashCode to Object.hashCode." into lmp-dev
...
* commit '410d0de763e469c521cd1467e822257c3dec2838':
Change EmptyArray System.identityHashCode to Object.hashCode.
2014-09-10 21:16:54 +00:00
Raph Levien
03d291fd5b
am fff6aab7: am a31b4f03: Merge "Remove auto spaceifying behavior on paste" into lmp-dev
...
* commit 'fff6aab7826321c6005987ef4bfc88ae695ac0aa':
Remove auto spaceifying behavior on paste
2014-09-10 21:16:49 +00:00
Mathieu Chartier
aa7ac9902a
am 6a593012: Merge "Change EmptyArray System.identityHashCode to Object.hashCode." into lmp-dev
...
* commit '6a5930128cbd3fa5dace9262ee6cefa7db53d378':
Change EmptyArray System.identityHashCode to Object.hashCode.
2014-09-10 21:05:29 +00:00
Raph Levien
968882e760
am a31b4f03: Merge "Remove auto spaceifying behavior on paste" into lmp-dev
...
* commit 'a31b4f03f6a98edcd8ae97900e9b1b24957ae4e0':
Remove auto spaceifying behavior on paste
2014-09-10 21:05:25 +00:00
Mathieu Chartier
1b848d4894
Merge "Change EmptyArray System.identityHashCode to Object.hashCode." into lmp-dev
2014-09-10 21:02:26 +00:00
Raph Levien
20dbc370e3
Merge "Remove auto spaceifying behavior on paste" into lmp-dev
2014-09-10 20:55:51 +00:00
Jon Miranda
7296d609f9
am a8ced922: am cfb0664e: Merge "Tries to resolve reference resource names instead of its data." into lmp-dev
...
* commit 'a8ced9220ac8f946d5bc5d1584981434eecb562b':
Tries to resolve reference resource names instead of its data.
2014-09-10 20:53:25 +00:00
Jon Miranda
90981b1311
am cfb0664e: Merge "Tries to resolve reference resource names instead of its data." into lmp-dev
...
* commit 'cfb0664eb37e09ed352991f65dc7135ba00f5fa6':
Tries to resolve reference resource names instead of its data.
2014-09-10 20:43:05 +00:00
Jon Miranda
83e3ec9d4e
Merge "Tries to resolve reference resource names instead of its data." into lmp-dev
2014-09-10 20:34:08 +00:00
Eino-Ville Talvala
7c715ae007
am 6b63cd11: am 90229edc: Merge "Camera2: Allow captures right after abort" into lmp-dev
...
* commit '6b63cd118f2c3a82453c30618339092fa5d30323':
Camera2: Allow captures right after abort
2014-09-10 20:04:08 +00:00
Mathieu Chartier
b4e5061fd6
Change EmptyArray System.identityHashCode to Object.hashCode.
...
Equivalent behavior, improves performance since
Object.hashCode has a fast path in the java side that does not
require JNI.
According to traceview sampling profiler:
Calendar had 6.8% time in System.identityHashCode during launch.
0.4% time in System.identityHashCode after the change.
Bug: 16828525
Change-Id: I1ed1d1283a990f990b0d4352cc1f4822b1dadf7b
2014-09-10 12:57:29 -07:00
Eino-Ville Talvala
b8dbb01409
am 90229edc: Merge "Camera2: Allow captures right after abort" into lmp-dev
...
* commit '90229edc689b3faebe215ce4841d1bf39d848bb5':
Camera2: Allow captures right after abort
2014-09-10 19:52:53 +00:00
Eino-Ville Talvala
657d30e7f4
Merge "Camera2: Allow captures right after abort" into lmp-dev
2014-09-10 19:48:21 +00:00
Robert Greenwalt
9fd4d3ce5b
am 5ad894d6: am eb843b14: Merge "Don\'t accept score below 0." into lmp-dev
...
* commit '5ad894d6a1e24949590ca261f303db190043ca70':
Don't accept score below 0.
2014-09-10 19:47:50 +00:00
Robert Greenwalt
e2d31a26f0
am eb843b14: Merge "Don\'t accept score below 0." into lmp-dev
...
* commit 'eb843b1461bba376be9dd9448bff1d8b06e25e59':
Don't accept score below 0.
2014-09-10 19:37:18 +00:00