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

246034 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Salvador Martinez
ed004e2958 Merge "Added error handling to settings suggestions list" into nyc-dev 2016-08-24 18:17:40 +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 60d92b3b8390e33e069f343d6a425ab07c498d3d)
 2016-08-24 16:43:22 +00:00
Julius D'souza
b2507eb7b7 DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am: 3275a3a5a5 -s ours 
am: d5bf4039a9  -s ours

Change-Id: I4f1a0acabe5d5385af086791b906ff6f45424e59
 2016-08-23 16:52:24 +00:00
Julius D'souza
d5bf4039a9 DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support 
am: 3275a3a5a5  -s ours

Change-Id: Iaae7763a4d744ad8a63538750c5ed3efe38161d5
 2016-08-23 16:45:41 +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
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
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 b46ba3b2b0268688852cdf3d1fb4afe4873d63be)
 2016-08-22 20:00:30 +00: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
Dirk Dougherty
e816f1f542 Doc change: intl page updates for final n release. 
Change-Id: I11445717cf49438ba5a04b50245209161740d4b0
 2016-08-22 01:13:59 -07: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
410ae5b004 Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev 2016-08-19 21:17:56 +00:00
David Friedman
162a0005ac Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev 2016-08-19 21:16:56 +00:00
Jim Miller
ce0856f702 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
 2016-08-19 20:23:50 +00:00
Jim Miller
f159feff98 Bind fingerprint when we start authentication - DO NOT MERGE am: b6f4b48df2 am: 9f04985991 
am: 85c390e9fb  -s ours

Change-Id: I07ac3fe88dd7acc7ced6b4483d98efe1797bea21
 2016-08-19 20:23:45 +00:00
Jim Miller
364a51221a Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am: 02e9affa42 
am: ddf70b9195

Change-Id: I8308733be4ac586377b0545057dbf982875e4da5
 2016-08-19 20:16:37 +00:00
Jim Miller
85c390e9fb Bind fingerprint when we start authentication - DO NOT MERGE am: b6f4b48df2 
am: 9f04985991

Change-Id: Iff24a78b5a4b4de9b866105fbce2a181125b771e
 2016-08-19 20:16:34 +00:00
Jim Miller
ddf70b9195 Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev 
am: 02e9affa42

Change-Id: I2da2738345bc63e1f40f8f9d6e8215b770cc93b4
 2016-08-19 20:09:43 +00:00
Jim Miller
9f04985991 Bind fingerprint when we start authentication - DO NOT MERGE 
am: b6f4b48df2

Change-Id: Ib70a6f9f82eef19724f6dd83fdefec59a29d0cab
 2016-08-19 20:09:41 +00:00
TreeHugger Robot
02e9affa42 Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev 2016-08-19 20:03:48 +00:00
David Friedman
196cb73dbb 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
 2016-08-19 18:58:28 +00:00
David Friedman
cbaf3f9986 Docs: Adding information to Building-for-Billions landing page. 
Bug: 30700934

Change-Id: I6d6ffafd674340e15e32c04a8bf08ba7fec402a8
 2016-08-19 11:51:24 -07:00
Sudheer Shanka
e49de5e073 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
 2016-08-19 18:02:26 +00:00
Amith Yamasani
f705730667 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
 2016-08-19 18:02:22 +00:00
Sudheer Shanka
58def3804c 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
 2016-08-19 17:54:21 +00:00
Amith Yamasani
5841c492a7 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 am: 29ae7b1a27 
am: 39c7879365

Change-Id: I36e3a9a580c73dc61b5de35740bc4d7206a6e0b7
 2016-08-19 17:54:19 +00:00
Sudheer Shanka
08eb52f9f9 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb 
am: 7e890c8eb5

Change-Id: I53be9e220d21f4322f930f3ee9095d8fa43ef2d6
 2016-08-19 17:32:47 +00:00
Amith Yamasani
39c7879365 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 
am: 29ae7b1a27

Change-Id: Ia37f8295ee5843412cf4045764b469ee48608f07
 2016-08-19 17:32:44 +00:00
Sudheer Shanka
7e890c8eb5 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev 
am: b51e98becb

Change-Id: I16fab19d30345e14076fda71d1d821539ceb70d2
 2016-08-19 17:22:29 +00:00
Amith Yamasani
29ae7b1a27 DO NOT MERGE: Clean up when recycling a pid with a pending launch 
am: d1eeb5b7b4

Change-Id: I2d4df3c6f766c38b78af5598bbd15e40a88381ff
 2016-08-19 17:22:25 +00:00
Sudheer Shanka
b51e98becb Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev 2016-08-19 17:06:55 +00:00
Sudheer Shanka
badc5cd942 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev 2016-08-19 17:06:49 +00:00
Jim Miller
b6f4b48df2 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
 2016-08-19 03:46:40 +00:00
Scott Main
66ffbbfdf9 Merge "fix redirect for AIDL doc bug: 5967288" into nyc-dev 2016-08-19 01:04:03 +00:00
smain@google.com
9ad944f8c9 fix redirect for AIDL doc 
bug: 5967288

Change-Id: Ia2a4cbdde56d2e6baca4c5f74ea92bb7bfaf2938
 2016-08-18 14:41:47 -07:00
Narayan Kamath
cce8af824a Merge "Process: Fix communication with zygote." into nyc-dev 2016-08-18 10:14:31 +00:00
smain@google.com
eee3518d11 add workaround for annotations dependency conflict with espresso 
Change-Id: Ia5f06e35b034d207f19d061b27ddbecd66012130
 2016-08-17 16:23:30 -07:00
Jim Miller
e3457fc127 Fix vulnerability in LockSettings service am: 2d71384a13 am: 485fbda04c am: 229de7088e 
am: cb83f6188b

Change-Id: I82302931ab714e25ec21721dc05480e1f2d447b0
 2016-08-17 23:22:33 +00:00
Jim Miller
cb83f6188b Fix vulnerability in LockSettings service am: 2d71384a13 am: 485fbda04c 
am: 229de7088e

Change-Id: I8e9d946f96933c1338261d8adf80156cb67d3ba1
 2016-08-17 23:15:43 +00:00
Jim Miller
229de7088e Fix vulnerability in LockSettings service am: 2d71384a13 
am: 485fbda04c

Change-Id: I07def32199ecdbbb32aa6ecaca20724cfc81265c
 2016-08-17 23:07:46 +00:00
Jim Miller
485fbda04c Fix vulnerability in LockSettings service 
am: 2d71384a13

Change-Id: I62ca5fb150022fe0971329294b1063957f397248
 2016-08-17 22:59:27 +00:00
Dirk Dougherty
96855c49a6 Merge "dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links." into nyc-dev 2016-08-17 22:53:24 +00:00
Hemal Patel
5e086dc3bb Merge "Docs: Renamed Google Now to Google Voice Actions" into nyc-docs 
am: c7902aa4bb

Change-Id: I45943e80b869adc9017b0e8de116f10e3b710764
 2016-08-17 19:37:17 +00:00
Hemal Patel
00ff40145d Docs: Renamed Google Now to Google Voice Actions 
am: 86bbfaabdd

Change-Id: If177e10f331ca5ade62005337956b0fa81a90f26
 2016-08-17 19:37:14 +00:00
Hemal Patel
c7902aa4bb Merge "Docs: Renamed Google Now to Google Voice Actions" into nyc-docs 2016-08-17 19:32:16 +00:00
Andrew Solovay
39cc61a4db docs: Docs for Support Library 24.2.0 release 
am: 085994c40d

Change-Id: I7e69bf585d342f1075856673e52ff15207be4a1c
 2016-08-17 17:48:47 +00:00
Eric Schmidt
c89c8c3e37 docs: Fixed code snippet in notify-user/navigation.html 
am: 32cc6b7fb7

Change-Id: I43cf6d188bac5cc5b3d0894915ff431e13156cd5
 2016-08-17 17:14:11 +00:00
Dirk Dougherty
b042ab1eb6 dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links. 
Change-Id: I7d26fabfca74d8e706fd99cbeaa1761907c31dbf
 2016-08-16 16:28:20 -07:00
Andrew Solovay
085994c40d docs: Docs for Support Library 24.2.0 release 
Includes updates to the features doc, to reflect the v4 support
library's division into several smaller modules. Also modified
the transitions doc to note the support library's support for
transitions in API levels 14-19.

Since we're deprecating support for API levels below 9, I changed
several examples to use higher API levels.

See first comment for doc stage location.

bug: 30505601
Change-Id: Ic06a023f705893c91ff3b86d0af8cfed957eb724
 2016-08-16 12:29:30 -07:00
Eric Schmidt
32cc6b7fb7 docs: Fixed code snippet in notify-user/navigation.html 
Bug: 25098348
Change-Id: Ic116900eb9c6e1ebfbc6b99673ffeff3f2df8533
 2016-08-16 10:10:49 -07:00