OSDN Git Service
Sergio Giro [Wed, 24 Aug 2016 20:21:30 +0000 (20:21 +0000)]
Merge "javax.crypto.spec: update PBEParameterSpec to Java 8" am:
5d4732555d
am:
3b7c46af6f
Change-Id: I83f4e28e8f51cec728461e6db3c7d4ee8370b7fd
Sergio Giro [Wed, 24 Aug 2016 20:21:27 +0000 (20:21 +0000)]
Merge "javax.crypto: update classes in javax.crypto (part 2)" am:
c7f97dbd57
am:
1384be9641
Change-Id: I176a6a4d2bfc0102d2e7ce1570492fddf459cecc
Sergio Giro [Wed, 24 Aug 2016 20:21:24 +0000 (20:21 +0000)]
Merge "java.security.spec: add public field in MGF1ParameterSpec" am:
5b24bccbc8
am:
08b6a09f32
Change-Id: I6ccd70b3d20c28e54e1c7d5029cc3955bdc9e633
Jakub Pawlowski [Wed, 24 Aug 2016 20:15:35 +0000 (20:15 +0000)]
Merge "Add WorkSource to BLE scanning API" am:
d0a0ae349c -s ours
am:
2fde849eaf
Change-Id: Ie4c068313af530848f7955bdae9ce70b462d050d
Sergio Giro [Wed, 24 Aug 2016 20:11:24 +0000 (20:11 +0000)]
Merge "javax.crypto.spec: update PBEParameterSpec to Java 8"
am:
5d4732555d
Change-Id: I2cf28d3cd14a2e9de7835082c459310b9ff9679b
Sergio Giro [Wed, 24 Aug 2016 20:11:15 +0000 (20:11 +0000)]
Merge "javax.crypto: update classes in javax.crypto (part 2)"
am:
c7f97dbd57
Change-Id: Icb0abdcda06a9a7d450bc3f9af1e5dc474f1c7db
Sergio Giro [Wed, 24 Aug 2016 20:11:04 +0000 (20:11 +0000)]
Merge "java.security.spec: add public field in MGF1ParameterSpec"
am:
5b24bccbc8
Change-Id: I2fb2099cee414dc417ced879e0400cd7ff1dce3d
Jakub Pawlowski [Wed, 24 Aug 2016 20:06:47 +0000 (20:06 +0000)]
Merge "Add WorkSource to BLE scanning API"
am:
d0a0ae349c -s ours
Change-Id: I9522e2749aac82c71d08405478944346fc9d3ba1
Salvador Martinez [Wed, 24 Aug 2016 18:22:11 +0000 (18:22 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-dev
am:
ed004e2958
Change-Id: I5d65ce33e3b5e8c8f97827a48e49ddf9a437f76b
Salvador Martinez [Wed, 24 Aug 2016 18:22:05 +0000 (18:22 +0000)]
Added error handling to settings suggestions list
am:
18bf581c77
Change-Id: If17623712eeea0e1aced3acedec24c27509e3bbc
Salvador Martinez [Wed, 24 Aug 2016 18:17:38 +0000 (18:17 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-dev
Alan Viverette [Wed, 24 Aug 2016 17:37:54 +0000 (17:37 +0000)]
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev
am:
462f29f77f
Change-Id: I0ea5702480dc7289dbad31355a6e403d39ab3c90
Alan Viverette [Wed, 24 Aug 2016 17:37:51 +0000 (17:37 +0000)]
Avoid potential re-entry as a result of child mutation
am:
66b3a0d1aa
Change-Id: Ia4ece22b06ef087921e8c341ec7112fd271598f2
TreeHugger Robot [Wed, 24 Aug 2016 17:27:07 +0000 (17:27 +0000)]
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev
Salvador Martinez [Thu, 4 Aug 2016 20:37:52 +0000 (13:37 -0700)]
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
60d92b3b8390e33e069f343d6a425ab07c498d3d)
Sergio Giro [Wed, 24 Aug 2016 15:39:00 +0000 (15:39 +0000)]
frameworks/base: add changes coming from aosp
am:
29835cc56e
Change-Id: Ia89b81f3d5c1d8a4d20280355bb9d27b655098d3
Sergio Giro [Wed, 24 Aug 2016 14:54:47 +0000 (14:54 +0000)]
Merge "javax.crypto.spec: update PBEParameterSpec to Java 8"
Sergio Giro [Wed, 24 Aug 2016 14:54:17 +0000 (14:54 +0000)]
Merge "javax.crypto: update classes in javax.crypto (part 2)"
Sergio Giro [Wed, 24 Aug 2016 14:53:41 +0000 (14:53 +0000)]
Merge "java.security.spec: add public field in MGF1ParameterSpec"
Sergio Giro [Wed, 24 Aug 2016 14:45:02 +0000 (15:45 +0100)]
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
John Reck [Tue, 23 Aug 2016 22:56:52 +0000 (22:56 +0000)]
resolve merge conflicts of
24e38ab to stage-aosp-master
am:
621fb590e3
Change-Id: Ia1b617a13012a8d475feb91bfbabb6ace264a29e
John Reck [Tue, 23 Aug 2016 22:10:47 +0000 (15:10 -0700)]
resolve merge conflicts of
24e38ab to stage-aosp-master
Change-Id: I02db3eb317ccb182b563ec9350a116bd5de063b6
Sergio Giro [Tue, 23 Aug 2016 21:08:13 +0000 (22:08 +0100)]
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
Jakub Pawlowski [Tue, 23 Aug 2016 21:07:32 +0000 (21:07 +0000)]
Merge "Add WorkSource to BLE scanning API"
Sergio Giro [Tue, 23 Aug 2016 20:27:45 +0000 (21:27 +0100)]
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
Sergio Giro [Tue, 23 Aug 2016 19:29:52 +0000 (20:29 +0100)]
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
Julius D'souza [Tue, 23 Aug 2016 17:21:20 +0000 (17:21 +0000)]
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am:
3275a3a5a5 -s ours am:
d5bf4039a9 -s ours
am:
b2507eb7b7 -s ours
Change-Id: I4f63ebc686691b810538508e0959659bf2f8ae46
Julius D'souza [Tue, 23 Aug 2016 16:52:24 +0000 (16:52 +0000)]
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am:
3275a3a5a5 -s ours
am:
d5bf4039a9 -s ours
Change-Id: I4f1a0acabe5d5385af086791b906ff6f45424e59
Julius D'souza [Tue, 23 Aug 2016 16:45:41 +0000 (16:45 +0000)]
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support
am:
3275a3a5a5 -s ours
Change-Id: Iaae7763a4d744ad8a63538750c5ed3efe38161d5
Scott Main [Tue, 23 Aug 2016 15:47:18 +0000 (15:47 +0000)]
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev
am:
77917a835f
Change-Id: Id3b88a94a23de579c20757f038dd83c0645e67bc
smain@google.com [Tue, 23 Aug 2016 15:47:14 +0000 (15:47 +0000)]
add workaround for annotations dependency conflict with espresso
am:
eee3518d11
Change-Id: I8a609f9f542e2955efe333c13c065e00836c87ab
Scott Main [Tue, 23 Aug 2016 15:42:01 +0000 (15:42 +0000)]
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev
Yang Ni [Tue, 23 Aug 2016 01:38:48 +0000 (01:38 +0000)]
Updated user document for Single-Source RenderScript
am:
c069ed7f8c
Change-Id: Id8c3c8d22ea6edd78d1d5d95070cfd0ae8b112a2
Yang Ni [Wed, 29 Jun 2016 19:44:06 +0000 (12:44 -0700)]
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
John Reck [Mon, 22 Aug 2016 21:48:31 +0000 (21:48 +0000)]
Merge "Fix native memory leak caused by small HWUI path cache creation"
Ajay Panicker [Mon, 22 Aug 2016 20:57:26 +0000 (20:57 +0000)]
Merge "Allow getResponseCode to block if response hasn't been received from remote" am:
834e5ce170
am:
b987832918
Change-Id: Ie688a54c9774b269b90cd96aecfc7ef6a621bf86
Ajay Panicker [Mon, 22 Aug 2016 20:47:48 +0000 (20:47 +0000)]
Merge "Allow getResponseCode to block if response hasn't been received from remote"
am:
834e5ce170
Change-Id: I3fc5b8c49623f6054995029105c4f6712ec63674
Treehugger Robot [Mon, 22 Aug 2016 20:34:14 +0000 (20:34 +0000)]
Merge "Allow getResponseCode to block if response hasn't been received from remote"
Alan Viverette [Wed, 27 Jul 2016 14:23:35 +0000 (10:23 -0400)]
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
b46ba3b2b0268688852cdf3d1fb4afe4873d63be)
Dirk Dougherty [Mon, 22 Aug 2016 18:58:44 +0000 (18:58 +0000)]
Doc change: intl page updates for final n release.
am:
e816f1f542
Change-Id: I12b10c8b2bb1e93d65a3d04d294b00af83d548f4
Adam Lesinski [Mon, 22 Aug 2016 18:17:13 +0000 (11:17 -0700)]
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
Julius D'souza [Mon, 8 Aug 2016 02:08:30 +0000 (19:08 -0700)]
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support
Bug:
18572096
Change-Id: Ie0ff1990b8f4a3d435328834871f04a6e2bd5e97
Ajay Panicker [Tue, 9 Aug 2016 00:16:50 +0000 (17:16 -0700)]
Allow getResponseCode to block if response hasn't been received from remote
Bug:
30645605
Change-Id: I9854ccbe98ace6d5490cb99586ca36379f5a1db1
Dirk Dougherty [Mon, 22 Aug 2016 06:41:37 +0000 (23:41 -0700)]
Doc change: intl page updates for final n release.
Change-Id: I11445717cf49438ba5a04b50245209161740d4b0
caiqinl [Fri, 24 Jun 2016 05:37:46 +0000 (13:37 +0800)]
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
Dirk Dougherty [Sat, 20 Aug 2016 06:06:23 +0000 (06:06 +0000)]
Doc change: updates for final N landing page and related resources.
am:
b0ca00431f
Change-Id: Ic5bbcdd6bd7e1575e274db16dfb81ed885a24dad
Dirk Dougherty [Thu, 18 Aug 2016 02:09:14 +0000 (19:09 -0700)]
Doc change: updates for final N landing page and related resources.
Change-Id: Ieeb3dd74a889d6c0118e4ca8575abdaddcde7e73
David Friedman [Fri, 19 Aug 2016 21:33:23 +0000 (21:33 +0000)]
Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev
am:
410ae5b004
Change-Id: I3343999202759cd81689b23b03a3401ef7ed2e6d
David Friedman [Fri, 19 Aug 2016 21:33:19 +0000 (21:33 +0000)]
Docs: Adding information to Building-for-Billions landing page.
am:
cbaf3f9986
Change-Id: I8f89a4a5ad0191d59367c85dca9378e0fdaf380b
David Friedman [Fri, 19 Aug 2016 21:33:14 +0000 (21:33 +0000)]
Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev
am:
162a0005ac
Change-Id: I0c2fc6c772e4da335b694e5b3f535841c63c3be8
David Friedman [Fri, 19 Aug 2016 21:33:11 +0000 (21:33 +0000)]
Docs: Adds a redirect to make it easier to access Performance section on DAC.
am:
196cb73dbb
Change-Id: I51d5403b966d256e607f0e06fe66728ac7bbda94
David Friedman [Fri, 19 Aug 2016 21:17:54 +0000 (21:17 +0000)]
Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev
David Friedman [Fri, 19 Aug 2016 21:16:52 +0000 (21:16 +0000)]
Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev
Jim Miller [Fri, 19 Aug 2016 20:31:38 +0000 (20:31 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am:
02e9affa42 am:
ddf70b9195 am:
364a51221a -s ours
am:
ce0856f702
Change-Id: I1d859808485d2e75220da9cc41cdf8b945475a82
Jim Miller [Fri, 19 Aug 2016 20:31:34 +0000 (20:31 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE am:
b6f4b48df2 am:
9f04985991 am:
85c390e9fb -s ours
am:
f159feff98
Change-Id: I1064ef601b45a43ea248fbf6d5dd0194d0d61288
Jim Miller [Fri, 19 Aug 2016 20:23:50 +0000 (20:23 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am:
02e9affa42 am:
ddf70b9195
am:
364a51221a -s ours
Change-Id: Iccf0d83b5bbf076684343a0979d7eac718be0603
Jim Miller [Fri, 19 Aug 2016 20:23:45 +0000 (20:23 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE am:
b6f4b48df2 am:
9f04985991
am:
85c390e9fb -s ours
Change-Id: I07ac3fe88dd7acc7ced6b4483d98efe1797bea21
Jim Miller [Fri, 19 Aug 2016 20:16:37 +0000 (20:16 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am:
02e9affa42
am:
ddf70b9195
Change-Id: I8308733be4ac586377b0545057dbf982875e4da5
Jim Miller [Fri, 19 Aug 2016 20:16:34 +0000 (20:16 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE am:
b6f4b48df2
am:
9f04985991
Change-Id: Iff24a78b5a4b4de9b866105fbce2a181125b771e
Jim Miller [Fri, 19 Aug 2016 20:09:43 +0000 (20:09 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev
am:
02e9affa42
Change-Id: I2da2738345bc63e1f40f8f9d6e8215b770cc93b4
Jim Miller [Fri, 19 Aug 2016 20:09:41 +0000 (20:09 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE
am:
b6f4b48df2
Change-Id: Ib70a6f9f82eef19724f6dd83fdefec59a29d0cab
TreeHugger Robot [Fri, 19 Aug 2016 20:03:46 +0000 (20:03 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev
David Friedman [Thu, 18 Aug 2016 01:23:23 +0000 (18:23 -0700)]
Docs: Adds a redirect to make it easier to access Performance section on DAC.
d.android.com/performance will now take you to d.android.com/topic/performance
Change-Id: I56bc85f156a9cb05a664fbf361eb5b99e153b419
David Friedman [Fri, 5 Aug 2016 00:55:52 +0000 (17:55 -0700)]
Docs: Adding information to Building-for-Billions landing page.
Bug:
30700934
Change-Id: I6d6ffafd674340e15e32c04a8bf08ba7fec402a8
Sudheer Shanka [Fri, 19 Aug 2016 18:09:57 +0000 (18:09 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb am:
7e890c8eb5 am:
08eb52f9f9 am:
58def3804c -s ours
am:
e49de5e073
Change-Id: I2213eaf49053cc4ac01746411fc7a35c6b0477b4
Amith Yamasani [Fri, 19 Aug 2016 18:09:53 +0000 (18:09 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4 am:
29ae7b1a27 am:
39c7879365 am:
5841c492a7 -s ours
am:
f705730667
Change-Id: Ic8bc51f29553e19aabd44f8123d6434ed36d15a2
Sudheer Shanka [Fri, 19 Aug 2016 18:02:26 +0000 (18:02 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb am:
7e890c8eb5 am:
08eb52f9f9
am:
58def3804c -s ours
Change-Id: I83e7f1e64a965a7550629d2a891445dab11a8d8d
Amith Yamasani [Fri, 19 Aug 2016 18:02:22 +0000 (18:02 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4 am:
29ae7b1a27 am:
39c7879365
am:
5841c492a7 -s ours
Change-Id: Ia483fee611b51ad0187b625c62d32877e73ff551
Sudheer Shanka [Fri, 19 Aug 2016 17:54:21 +0000 (17:54 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb am:
7e890c8eb5
am:
08eb52f9f9
Change-Id: Ica347f4059b4fbe8f822a963b47df0cbe7c646ba
Amith Yamasani [Fri, 19 Aug 2016 17:54:19 +0000 (17:54 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4 am:
29ae7b1a27
am:
39c7879365
Change-Id: I36e3a9a580c73dc61b5de35740bc4d7206a6e0b7
Sudheer Shanka [Fri, 19 Aug 2016 17:32:47 +0000 (17:32 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb
am:
7e890c8eb5
Change-Id: I53be9e220d21f4322f930f3ee9095d8fa43ef2d6
Amith Yamasani [Fri, 19 Aug 2016 17:32:44 +0000 (17:32 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4
am:
29ae7b1a27
Change-Id: Ia37f8295ee5843412cf4045764b469ee48608f07
Sudheer Shanka [Fri, 19 Aug 2016 17:31:47 +0000 (17:31 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev
am:
badc5cd942
Change-Id: I3c783e856777500d86cc5ae162ab82a727e42967
Amith Yamasani [Fri, 19 Aug 2016 17:31:40 +0000 (17:31 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
am:
55eacb9441
Change-Id: Id1ee0a3dd76a7bb549838e9d74b9927956b96570
Sudheer Shanka [Fri, 19 Aug 2016 17:22:29 +0000 (17:22 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
am:
b51e98becb
Change-Id: I16fab19d30345e14076fda71d1d821539ceb70d2
Amith Yamasani [Fri, 19 Aug 2016 17:22:25 +0000 (17:22 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
am:
d1eeb5b7b4
Change-Id: I2d4df3c6f766c38b78af5598bbd15e40a88381ff
Sudheer Shanka [Fri, 19 Aug 2016 17:06:53 +0000 (17:06 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
Sudheer Shanka [Fri, 19 Aug 2016 17:06:47 +0000 (17:06 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev
Jim Miller [Fri, 19 Aug 2016 03:22:33 +0000 (20:22 -0700)]
Bind fingerprint when we start authentication - DO NOT MERGE
This fixes a bug where it was possible to authenticate the wrong user.
We now bind the userId when we start authentication and confirm it when
authentication completes.
Fixes bug
30744668
Change-Id: I346d92c301414ed81e11fa9c171584c7ae4341c2
Scott Main [Fri, 19 Aug 2016 01:12:12 +0000 (01:12 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev
am:
66ffbbfdf9
Change-Id: I9d9abedcd5721adbcfa4307794721a448bec80d4
smain@google.com [Fri, 19 Aug 2016 01:12:08 +0000 (01:12 +0000)]
fix redirect for AIDL doc bug:
5967288
am:
9ad944f8c9
Change-Id: I5a8bc81c442f54cce2a3b02e0a39e62a87f2d0d9
Scott Main [Fri, 19 Aug 2016 01:04:01 +0000 (01:04 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev
Ajay Panicker [Thu, 18 Aug 2016 22:37:06 +0000 (22:37 +0000)]
Merge "Protect various Bluetooth broadcasts" am:
53ff75bb68
am:
779a1f096c
Change-Id: I979b7fcabc7e1f4714a88a632d3590304e1fb4fb
Ajay Panicker [Thu, 18 Aug 2016 22:32:09 +0000 (22:32 +0000)]
Merge "Protect various Bluetooth broadcasts"
am:
53ff75bb68
Change-Id: Id4f77ea2092f9a04397fe596ed92f2f30a3235df
Treehugger Robot [Thu, 18 Aug 2016 22:25:39 +0000 (22:25 +0000)]
Merge "Protect various Bluetooth broadcasts"
smain@google.com [Thu, 18 Aug 2016 21:41:47 +0000 (14:41 -0700)]
fix redirect for AIDL doc
bug:
5967288
Change-Id: Ia2a4cbdde56d2e6baca4c5f74ea92bb7bfaf2938
Ajay Panicker [Wed, 17 Aug 2016 22:36:24 +0000 (15:36 -0700)]
Protect various Bluetooth broadcasts
Bug:
30832954
Change-Id: I37e0b2ffab65c0703244917a4ade9bb8afbb5e6f
(cherry picked from commit
9a236066dbf604edfd5f873b4a3b94a200efd628)
Narayan Kamath [Thu, 18 Aug 2016 10:20:01 +0000 (10:20 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev
am:
cce8af824a
Change-Id: I728529bd6e54b7e1e220b62f6c84dc5e868d5ecc
Narayan Kamath [Thu, 18 Aug 2016 10:19:58 +0000 (10:19 +0000)]
Process: Fix communication with zygote.
am:
448be0a622
Change-Id: Iabb68084827f798f25ebe870957074d152acaea4
Narayan Kamath [Thu, 18 Aug 2016 10:14:29 +0000 (10:14 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev
Dmitriy Filchenko [Thu, 18 Aug 2016 03:27:54 +0000 (03:27 +0000)]
Merge "Remove unused includes." am:
35da832634
am:
33e65232f3
Change-Id: I72e74566ed21f4aed4b2d6b4fa6e7ac1114a9f43
Dmitriy Filchenko [Thu, 18 Aug 2016 03:22:39 +0000 (03:22 +0000)]
Merge "Remove unused includes."
am:
35da832634
Change-Id: I5804c0ccf6c543471ddf3245a799d5fa651d6d18
Treehugger Robot [Thu, 18 Aug 2016 03:17:04 +0000 (03:17 +0000)]
Merge "Remove unused includes."
Dmitriy Filchenko [Thu, 18 Aug 2016 00:55:24 +0000 (17:55 -0700)]
Remove unused includes.
BUG:
29824203
Change-Id: I795f8abe31575f70da263921c6ec13b73b24dc7b
Jim Miller [Wed, 17 Aug 2016 23:31:06 +0000 (23:31 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c am:
229de7088e am:
cb83f6188b
am:
e3457fc127
Change-Id: I9ec3cc802112160f463fcfb737c6fd5932d62332
Dirk Dougherty [Wed, 17 Aug 2016 23:25:42 +0000 (23:25 +0000)]
Merge "dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links." into nyc-dev
am:
96855c49a6
Change-Id: If3b5e4b033c0038bddaf873108406c9374979c06
Dirk Dougherty [Wed, 17 Aug 2016 23:25:38 +0000 (23:25 +0000)]
dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links.
am:
b042ab1eb6
Change-Id: I1c8026a7ff09cfce9049383123a143b845dcede6
smain@google.com [Wed, 17 Aug 2016 23:17:11 +0000 (16:17 -0700)]
add workaround for annotations dependency conflict with espresso
Change-Id: Ia5f06e35b034d207f19d061b27ddbecd66012130
Jim Miller [Wed, 17 Aug 2016 23:22:33 +0000 (23:22 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c am:
229de7088e
am:
cb83f6188b
Change-Id: I82302931ab714e25ec21721dc05480e1f2d447b0
Jim Miller [Wed, 17 Aug 2016 23:15:43 +0000 (23:15 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c
am:
229de7088e
Change-Id: I8e9d946f96933c1338261d8adf80156cb67d3ba1
OSDN Git Service
