Salvador Martinez
23af0c020b
Added error handling to settings suggestions list
...
am: 18bf581c77
2016-08-24 18:22:05 +00:00
Salvador Martinez
ed004e2958
Merge "Added error handling to settings suggestions list" into nyc-dev
2016-08-24 18:17:40 +00:00
Alan Viverette
550e677563
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev
...
am: 462f29f77f
2016-08-24 17:37:54 +00:00
Alan Viverette
387ebba861
Avoid potential re-entry as a result of child mutation
...
am: 66b3a0d1aa
2016-08-24 17:37:51 +00:00
TreeHugger Robot
462f29f77f
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev
2016-08-24 17:27:09 +00:00
Salvador Martinez
18bf581c77
Added error handling to settings suggestions list
...
The suggestions list in the summary page of the
settings app could sometimes cause a crash due to
an uncaught exception. Tis fixed now.
Bug: 30656840
Change-Id: If79f53e6a8c17a81653228d613797e94c473d410
(cherry picked from commit 60d92b3b83
2016-08-24 16:43:22 +00:00
Sergio Giro
263820bb2c
frameworks/base: add changes coming from aosp
...
am: 29835cc56e
2016-08-24 15:39:00 +00:00
Sergio Giro
5d4732555d
Merge "javax.crypto.spec: update PBEParameterSpec to Java 8"
2016-08-24 14:54:47 +00:00
Sergio Giro
c7f97dbd57
Merge "javax.crypto: update classes in javax.crypto (part 2)"
2016-08-24 14:54:17 +00:00
Sergio Giro
5b24bccbc8
Merge "java.security.spec: add public field in MGF1ParameterSpec"
2016-08-24 14:53:42 +00:00
Sergio Giro
29835cc56e
frameworks/base: add changes coming from aosp
...
Corresponding to aosp changes:
https://android-review.googlesource.com/261231
https://android-review.googlesource.com/261194
https://android-review.googlesource.com/261211
Change-Id: I13caa90b7f97d5aa447050f89a5312d22db3d277
2016-08-24 15:45:02 +01:00
David Christie
a2399b45e2
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev
...
Change-Id: Ic44c577ef364bf81dd1e30b50c71718d4910eb10
2016-08-23 16:19:51 -07:00
John Reck
f929ef6cbd
resolve merge conflicts of 24e38ab to stage-aosp-master
...
am: 621fb590e3
2016-08-23 22:56:52 +00:00
John Reck
621fb590e3
resolve merge conflicts of 24e38ab to stage-aosp-master
...
Change-Id: I02db3eb317ccb182b563ec9350a116bd5de063b6
2016-08-23 15:10:47 -07:00
Sergio Giro
0a7e139090
javax.crypto.spec: update PBEParameterSpec to Java 8
...
Pulling upstream changes from OpenJDK version jdk8u60 for
PBEParameterSpec.
Added new constructor allowing an AlgorithmParameterSpec and the
corresponding getter getParameterSpec.
This CL finishes the port of this package.
Change-Id: I02d463285e185fcb4031a5266d2857b1530159b7
Test: make droid docs, vogar PBEParameterSpecTest
Bug: 29631070
2016-08-23 22:08:13 +01:00
Jakub Pawlowski
d0a0ae349c
Merge "Add WorkSource to BLE scanning API"
2016-08-23 21:07:32 +00:00
Sergio Giro
99b208632e
javax.crypto: update classes in javax.crypto (part 2)
...
Pulling upstream changes from OpenJDK version jdk8u60 for
SecretKey, SecretKeyFactory and SecretKeyFactorySpi.
- SecretKey now extends javax.security.auth.Destroyable
- Second parameter of SecretKeyFactory#getKeySpec is now Class<?>
instead of Class
- Second parameter of SecretKeyFactorySpi#engineGetKeySpec is now
Class<?> instead of Class
This commit also contains cosmetic JavaDoc changes like
- Use of @code in place of <code> tags.
- Tidied up casts/generics.
Note not all classes in javax.crypto are updated: CipherInputStream,
CipherOutputStream, CipherSpi have changes that deserve a separate CL.
All API changes in the package are ported.
Change-Id: Iaa0ce3e34f9f73260e7b66db601b5cb1462aa854
Test: make droid docs
Bug: 29631070
2016-08-23 21:27:45 +01:00
Sergio Giro
86aa7c6157
java.security.spec: add public field in MGF1ParameterSpec
...
Pulling upstream changes from OpenJDK version jdk8u60 for
MGF1ParameterSpec.
Adding a public field for SHA224, defined in the same way
as existing ones for other SHA functions.
This completes the update of this package for jdk8u60.
Change-Id: I2416fb73050336a4a741c22bad3f2d740715647b
Test: make droid docs
Bug: 29631070
2016-08-23 20:33:24 +01:00
Julius D'souza
7914092ded
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am: 3275a3a5a5 -s ours am: d5bf4039a9 -s ours
...
am: b2507eb7b7
2016-08-23 17:21:20 +00:00
Julius D'souza
b2507eb7b7
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am: 3275a3a5a5 -s ours
...
am: d5bf4039a9
2016-08-23 16:52:24 +00:00
Julius D'souza
d5bf4039a9
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support
...
am: 3275a3a5a5
2016-08-23 16:45:41 +00:00
Scott Main
759c2855e8
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev
...
am: 77917a835f
2016-08-23 15:47:18 +00:00
smain@google.com
b5971ef610
add workaround for annotations dependency conflict with espresso
...
am: eee3518d11
2016-08-23 15:47:14 +00:00
Scott Main
77917a835f
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev
2016-08-23 15:42:03 +00:00
Yang Ni
460c01f2ec
Updated user document for Single-Source RenderScript
...
am: c069ed7f8c
2016-08-23 01:38:48 +00:00
Yang Ni
c069ed7f8c
Updated user document for Single-Source RenderScript
...
Bug: 29875503
Bug: 29879448
Added a section introducing the new single-source feature.
Local staging:
http://yangni.mtv.corp.google.com/guide/topics/renderscript/compute.html
This updates
https://developer.android.com/guide/topics/renderscript/compute.html
Change-Id: I62dda3ab60b1678a9580fd2873f64f33d9696e13
2016-08-22 23:33:13 +00:00
Sudheer Shanka
a0994c6d58
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a3af5c6207 am: 21ef672cab am: e0d1ff1c42 -s ours am: b31a6955a4 -s ours
...
am: 52d0f48f80
2016-08-22 22:38:23 +00:00
Sudheer Shanka
52d0f48f80
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a3af5c6207 am: 21ef672cab am: e0d1ff1c42 -s ours
...
am: b31a6955a4
2016-08-22 22:33:15 +00:00
Sudheer Shanka
f21534a288
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9
...
am: 6a50270944
2016-08-22 22:33:10 +00:00
Sudheer Shanka
6a50270944
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours
...
am: bbbb514bc9
2016-08-22 22:28:24 +00:00
Sudheer Shanka
b31a6955a4
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a3af5c6207 am: 21ef672cab
...
am: e0d1ff1c42
2016-08-22 22:19:10 +00:00
Sudheer Shanka
bbbb514bc9
resolve merge conflicts of 270947f to klp-modular-dev
...
am: 76c4b2a7b6
2016-08-22 22:19:06 +00:00
Sudheer Shanka
e0d1ff1c42
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a3af5c6207
...
am: 21ef672cab
2016-08-22 22:11:52 +00:00
John Reck
24e38ab322
Merge "Fix native memory leak caused by small HWUI path cache creation"
2016-08-22 21:48:31 +00:00
Ajay Panicker
3cc3bd3f93
Merge "Allow getResponseCode to block if response hasn't been received from remote" am: 834e5ce170
...
am: b987832918
2016-08-22 20:57:26 +00:00
Ajay Panicker
b987832918
Merge "Allow getResponseCode to block if response hasn't been received from remote"
...
am: 834e5ce170
2016-08-22 20:47:48 +00:00
Treehugger Robot
834e5ce170
Merge "Allow getResponseCode to block if response hasn't been received from remote"
2016-08-22 20:34:14 +00:00
Alan Viverette
66b3a0d1aa
Avoid potential re-entry as a result of child mutation
...
Don't set the callback until we're all done making changes.
Bug: 30902893
Change-Id: Ia1560692a83ecb2c50f5e77fa4d1e8155a78a204
(cherry picked from commit b46ba3b2b0
2016-08-22 20:00:30 +00:00
Dirk Dougherty
a4b49bf99c
Doc change: intl page updates for final n release.
...
am: e816f1f542
2016-08-22 18:58:44 +00:00
Adam Lesinski
401c208db8
Add WorkSource to BLE scanning API
...
This will allow apps that do work on behalf of others to correctly blame
those apps for the power implications of BLE scanning.
Bug:22718669
Change-Id: I1cbca8cf7bbe1ec5b804228f466fd9dd6fc68183
2016-08-22 11:40:23 -07:00
Julius D'souza
3275a3a5a5
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support
...
Bug: 18572096
Change-Id: Ie0ff1990b8f4a3d435328834871f04a6e2bd5e97
2016-08-22 11:40:03 -07:00
Ajay Panicker
f8c2ad085b
Allow getResponseCode to block if response hasn't been received from remote
...
Bug: 30645605
Change-Id: I9854ccbe98ace6d5490cb99586ca36379f5a1db1
2016-08-22 18:25:14 +00:00
Dirk Dougherty
e816f1f542
Doc change: intl page updates for final n release.
...
Change-Id: I11445717cf49438ba5a04b50245209161740d4b0
2016-08-22 01:13:59 -07:00
caiqinl
4b505376cb
Fix native memory leak caused by small HWUI path cache creation
...
HWUI calculates the texture size as w*h*bpp. In some cases, the
calculated path cache is small, but the actual memory allocated
in driver is 4k/8k/16k, much bigger than HWUI calculates.
Example: a 5*65 alpha texture, HWUI think it is 5*65*1 = 325 bytes,
but driver allocates 8K. An app can allocates up to 32M path textures,
which actually consumes 32M*(8*1024/325) = 806M memory.
Here we limit the number of path texture in the cache to 256, it
should be a pretty generous global limit.
Change-Id: I890819b73bb0b7f63e96bc3d9d0ff9469c16838c
2016-08-22 11:22:43 +05:30
Dirk Dougherty
cf75a1a333
Doc change: updates for final N landing page and related resources.
...
am: b0ca00431f
2016-08-20 06:06:23 +00:00
Dirk Dougherty
b0ca00431f
Doc change: updates for final N landing page and related resources.
...
Change-Id: Ieeb3dd74a889d6c0118e4ca8575abdaddcde7e73
2016-08-19 19:38:47 -07:00
David Friedman
b7a027fe93
Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev
...
am: 410ae5b004
2016-08-19 21:33:23 +00:00
David Friedman
4049b545e0
Docs: Adding information to Building-for-Billions landing page.
...
am: cbaf3f9986
2016-08-19 21:33:19 +00:00
David Friedman
8c1506d6a4
Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev
...
am: 162a0005ac
2016-08-19 21:33:14 +00:00
David Friedman
e6f58106a5
Docs: Adds a redirect to make it easier to access Performance section on DAC.
...
am: 196cb73dbb
2016-08-19 21:33:11 +00:00
